diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index b2c630e7..77f40c3b 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -53,7 +53,8 @@ jobs: cp run/leaves.yml configuration/leaves.yml -f cd configuration git add leaves.yml - git commit leaves.yml -m "https://github.com/LeavesMC/Leaves/commit/$(cd .. && git rev-parse HEAD)" + git commit leaves.yml -m "$(date -u +"%Y-%m-%dT%H:%M:%SZ") + https://github.com/LeavesMC/Leaves/commit/$(cd .. && git rev-parse HEAD)" git push origin HEAD:Leaves - name: Get Release Info run: sh scripts/GetReleaseInfo.sh diff --git a/patches/server/0005-Leaves-Server-Config-And-Command.patch b/patches/server/0005-Leaves-Server-Config-And-Command.patch index 76163bc0..c8abbd81 100644 --- a/patches/server/0005-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0005-Leaves-Server-Config-And-Command.patch @@ -1554,10 +1554,10 @@ index 0000000000000000000000000000000000000000..f6b946e5dfb5e3a2c169f88e8fb54718 +} diff --git a/src/main/java/top/leavesmc/leaves/config/GlobalConfigCreator.java b/src/main/java/top/leavesmc/leaves/config/GlobalConfigCreator.java new file mode 100644 -index 0000000000000000000000000000000000000000..c8da8db4606ecf4a505e4ad88112976d37ea7420 +index 0000000000000000000000000000000000000000..8186cbdd5ce98131670be16ae1757b16d6d7012d --- /dev/null +++ b/src/main/java/top/leavesmc/leaves/config/GlobalConfigCreator.java -@@ -0,0 +1,54 @@ +@@ -0,0 +1,56 @@ +package top.leavesmc.leaves.config; + +import org.bukkit.configuration.file.YamlConfiguration; @@ -1600,6 +1600,8 @@ index 0000000000000000000000000000000000000000..c8da8db4606ecf4a505e4ad88112976d + } + } + ++ config.set("settings.protocol.xaero-map-server-id", 0); ++ + try { + File file = new File("leaves.yml"); + if (file.exists()) {