Merge branch 'delta'.

.gitignore

@@ -202,3 +202,6 @@ plugins/LuckPerms/libs/
 plugins/dynmap/*.pending
 plugins/WorldEdit/.archive-unpack/
 !plugins/LuckPerms/*.db
+
+# Ignore the update script
+update.sh

Jenkinsfile

@@ -5,10 +5,6 @@ pipeline {
             steps {
                 sh 'git checkout delta'
                 sh 'git reset --hard origin/delta'
-                sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
-                    sh 'git fetch --prune --prune-tags'
-                    sh 'git pull --force origin delta'
-                }
                 sh 'git clean -fd'
             }
         }
@@ -19,23 +15,5 @@ pipeline {
                 sh 'git reset --hard'
             }
         }
-        stage('queue') {
-            steps {
-                sh 'git checkout master'
-
-                sh 'git reset --hard origin/master'
-                sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
-                    sh 'git fetch --prune --prune-tags'
-                    sh 'git pull --force origin master'
-                }
-                sh 'git clean -fd'
-
-                sh 'git merge --strategy-option theirs origin/delta'
-                sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
-                    sh 'git push origin master'
-                    sh 'git push origin --tags'
-                }
-            }
-        }
     }
 }

plugins/dynmap/configuration.txt

@@ -315,7 +315,7 @@ render-triggers:
   #- blockredstone
 
 # Title for the web page - if not specified, defaults to the server's name (unless it is the default of 'Unknown Server')
-#webpage-title: "My Awesome Server Map"
+webpage-title: "RSEMCS Dynmap"
 
 # The path where the tile-files are placed.
 tilespath: web/tiles

plugins/dynmap/templates/nether-hires.txt

@@ -24,7 +24,7 @@ templates:
         shader: stdtexture
         lighting: nethershadows
         # Map background color (day or night)
-        background: "#300806"
+        background: "#00000000"
         mapzoomin: 1
       - class: org.dynmap.hdmap.HDMap
         name: nether
@@ -34,5 +34,5 @@ templates:
         shader: stdtexture
         lighting: nethershadows
         # Map background color (day or night)
-        background: "#300806"
+        background: "#00000000"
         mapzoomin: 1

plugins/dynmap/templates/normal-hires.txt

@@ -23,6 +23,7 @@ templates:
         perspective: iso_S_90_lowres
         shader: stdtexture
         lighting: shadows
+        background: "#00000000"
         mapzoomin: 1
       - class: org.dynmap.hdmap.HDMap
         name: surface
@@ -31,6 +32,7 @@ templates:
         perspective: iso_SE_30_hires
         shader: stdtexture
         lighting: shadows
+        background: "#00000000"
         mapzoomin: 1
       - class: org.dynmap.hdmap.HDMap
         name: cave
@@ -39,4 +41,5 @@ templates:
         perspective: iso_SE_60_lowres
         shader: cave
         lighting: default
+        background: "#00000000"
         mapzoomin: 3

plugins/dynmap/templates/the_end-hires.txt

@@ -23,6 +23,7 @@ templates:
         perspective: iso_S_90_lowres
         shader: stdtexture
         lighting: brightnight
+        background: "#00000000"
         mapzoomin: 1
       - class: org.dynmap.hdmap.HDMap
         name: the_end
@@ -31,5 +32,6 @@ templates:
         perspective: iso_SE_30_hires
         shader: stdtexture
         lighting: brightnight
+        background: "#00000000"
         mapzoomin: 1
             

run.sh

@@ -2,4 +2,4 @@
 
 ./update.sh
 
-java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui
+/usr/lib/jvm/java-17-openjdk/bin/java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui

update.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-git reset --hard
-git pull origin master --ff-only
-git checkout master@{'24 hours ago'}