diff --git a/gradle.properties b/gradle.properties index 1ef3be85..b830ef17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=cn.dreeam.leaf mcVersion=1.21.4 version=1.21.4-R0.1-SNAPSHOT -galeCommit=6f89f2244c4c3ab4818cbbde7c4a97da4469f95f +galeCommit=94af07ac59b7d1c87c0025b9ae17c624092b9272 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-server/paper-patches/features/0004-Purpur-Server-Paper-Changes.patch b/leaf-server/paper-patches/features/0004-Purpur-Server-Paper-Changes.patch index dd901634..aa80ff2d 100644 --- a/leaf-server/paper-patches/features/0004-Purpur-Server-Paper-Changes.patch +++ b/leaf-server/paper-patches/features/0004-Purpur-Server-Paper-Changes.patch @@ -559,7 +559,7 @@ index 94ca0407303c4493ab4928b12ec6ecc75aaca549..f2d87c12dd19210ce7e2147fada5c101 + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c5e63626217ed730a2289a5f8e2074c9abfb7899..550336d86872e3a27ac61a994d68f249b20f08e3 100644 +index 6f94aed7e136bd13dddaca1e2a214e55cf87403b..bdefa58dac3236e26ca40f92c1c64f8cffa01582 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -428,6 +428,20 @@ public final class CraftServer implements Server { @@ -599,15 +599,15 @@ index c5e63626217ed730a2289a5f8e2074c9abfb7899..550336d86872e3a27ac61a994d68f249 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1121,6 +1137,7 @@ public final class CraftServer implements Server { - org.spigotmc.SpigotConfig.registerCommands(); // Spigot +@@ -1122,6 +1138,7 @@ public final class CraftServer implements Server { io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper + org.galemc.gale.command.GaleCommands.registerCommands(this.console); // Gale - Gale commands - register commands this.spark.registerCommandBeforePlugins(this); // Paper - spark + org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur - Purpur config files this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -1652,6 +1669,60 @@ public final class CraftServer implements Server { +@@ -1653,6 +1670,60 @@ public final class CraftServer implements Server { return true; } @@ -668,7 +668,7 @@ index c5e63626217ed730a2289a5f8e2074c9abfb7899..550336d86872e3a27ac61a994d68f249 @Override public List getRecipesFor(ItemStack result) { Preconditions.checkArgument(result != null, "ItemStack cannot be null"); -@@ -3059,6 +3130,18 @@ public final class CraftServer implements Server { +@@ -3060,6 +3131,18 @@ public final class CraftServer implements Server { } // Gale end - Gale configuration - API @@ -687,7 +687,7 @@ index c5e63626217ed730a2289a5f8e2074c9abfb7899..550336d86872e3a27ac61a994d68f249 @Override public void restart() { org.spigotmc.RestartCommand.restart(); -@@ -3351,4 +3434,18 @@ public final class CraftServer implements Server { +@@ -3352,4 +3435,18 @@ public final class CraftServer implements Server { return MinecraftServer.lastTickOversleepTime; } // Gale end - YAPFA - last tick time - API diff --git a/leaf-server/paper-patches/features/0009-Leaves-Protocol-Core.patch b/leaf-server/paper-patches/features/0009-Leaves-Protocol-Core.patch index 2292ac70..5dfcea97 100644 --- a/leaf-server/paper-patches/features/0009-Leaves-Protocol-Core.patch +++ b/leaf-server/paper-patches/features/0009-Leaves-Protocol-Core.patch @@ -12,7 +12,7 @@ Original project: https://github.com/LeavesMC/Leaves Commit: 41476d86922416c45f703df2871890831fc42bb5 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 911bb12bcbcae2b8046d786e7b828cc1e1bcdb3a..dd054c184095644a122be0f610ade1d47d9be74a 100644 +index c4be459991b458aaf9288b467e73f142e9b26825..53dbd3022fc4ab4786b2b9d8de27b84bfee81935 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -507,6 +507,7 @@ public final class CraftServer implements Server { @@ -23,7 +23,7 @@ index 911bb12bcbcae2b8046d786e7b828cc1e1bcdb3a..dd054c184095644a122be0f610ade1d4 } public boolean getCommandBlockOverride(String command) { -@@ -1138,6 +1139,7 @@ public final class CraftServer implements Server { +@@ -1139,6 +1140,7 @@ public final class CraftServer implements Server { org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur - Purpur config files this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); diff --git a/leaf-server/paper-patches/features/0010-Leaves-Replay-Mod-API.patch b/leaf-server/paper-patches/features/0010-Leaves-Replay-Mod-API.patch index 89aaa424..b0b5b185 100644 --- a/leaf-server/paper-patches/features/0010-Leaves-Replay-Mod-API.patch +++ b/leaf-server/paper-patches/features/0010-Leaves-Replay-Mod-API.patch @@ -27,7 +27,7 @@ index 4c003acccdd2dd17918b15316001e52e7670123e..780f3a48152fef6a06dc67bf7fbd1965 HandlerList handlers = event.getHandlers(); RegisteredListener[] listeners = handlers.getRegisteredListeners(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 00ac7495b034163a848a8e0219a27beeed783831..be38bcad1002e80f81218518d50935e8b6361c65 100644 +index 53dbd3022fc4ab4786b2b9d8de27b84bfee81935..acd4369d6b8766bce201f35105a90bfe3ae99bb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -321,6 +321,8 @@ public final class CraftServer implements Server { @@ -48,7 +48,7 @@ index 00ac7495b034163a848a8e0219a27beeed783831..be38bcad1002e80f81218518d50935e8 @Override public CraftPlayer apply(ServerPlayer player) { return player.getBukkitEntity(); -@@ -3448,4 +3450,11 @@ public final class CraftServer implements Server { +@@ -3449,4 +3451,11 @@ public final class CraftServer implements Server { return getServer().lagging; } // Purpur end - Lagging threshold diff --git a/leaf-server/paper-patches/features/0014-Including-5s-in-getTPS.patch b/leaf-server/paper-patches/features/0014-Including-5s-in-getTPS.patch index c1bd217f..971308d4 100644 --- a/leaf-server/paper-patches/features/0014-Including-5s-in-getTPS.patch +++ b/leaf-server/paper-patches/features/0014-Including-5s-in-getTPS.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Including 5s in getTPS() diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index be38bcad1002e80f81218518d50935e8b6361c65..7bd8f5e5aad2e9a655c1aee81cf9c224ce7d03cc 100644 +index acd4369d6b8766bce201f35105a90bfe3ae99bb1..19de30ac7bf35f1267515857d1790019613f9cc5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3172,6 +3172,8 @@ public final class CraftServer implements Server { +@@ -3173,6 +3173,8 @@ public final class CraftServer implements Server { @Override public double[] getTPS() { diff --git a/leaf-server/paper-patches/features/0018-Matter-Secure-Seed.patch b/leaf-server/paper-patches/features/0018-Matter-Secure-Seed.patch index 1423432f..58a459fc 100644 --- a/leaf-server/paper-patches/features/0018-Matter-Secure-Seed.patch +++ b/leaf-server/paper-patches/features/0018-Matter-Secure-Seed.patch @@ -32,10 +32,10 @@ index de8b9048c8395c05b8688bc9d984b8ad680f15b3..fab62216edd7181585fbf1e5cd9870e8 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 926d85d1584fa0e9ff16c4079f60cde98e6927f7..ac4a964be491e85ef9e7b9d26e609f24387b5c45 100644 +index 19de30ac7bf35f1267515857d1790019613f9cc5..d8e90d528f8bf300a84d2105651059106c5f7d99 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1412,7 +1412,11 @@ public final class CraftServer implements Server { +@@ -1413,7 +1413,11 @@ public final class CraftServer implements Server { registryAccess = levelDataAndDimensions.dimensions().dimensionsRegistryAccess(); } else { LevelSettings levelSettings;