diff --git a/gradle.properties b/gradle.properties index cd1472c1..ddb124fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=cn.dreeam.leaf mcVersion=1.21.5 version=1.21.5-R0.1-SNAPSHOT -paperCommit=c0bd5688b53672eeeb63ed19ec76af2e2dc629b9 +paperCommit=6c2b0378fe8c105dd9636ca8b4fa6b09b8dfa244 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-server/paper-patches/features/0001-Rebrand.patch b/leaf-server/paper-patches/features/0001-Rebrand.patch index dd0416ba..a92d221b 100644 --- a/leaf-server/paper-patches/features/0001-Rebrand.patch +++ b/leaf-server/paper-patches/features/0001-Rebrand.patch @@ -429,10 +429,10 @@ index 1354ccfbf525e5e64483ac5f443cc2325ba63850..f6f787db016f4d1ac14648ebf2b8e162 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 060f0c5f1e54bf4809e28d1857965ff8254698a9..f318d4c8a3455f9acb1aff6fed04d4e0757624a0 100644 +index f78cfd9c03014a10187dae58e2af1e137149dbc7..e0a7e8f97b1e00c9de7f764c686d4de9579cd93a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -484,7 +484,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -485,7 +485,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/leaf-server/paper-patches/features/0039-Configurable-unknown-command-message.patch b/leaf-server/paper-patches/features/0039-Configurable-unknown-command-message.patch index 7ef1eaf7..ac17d024 100644 --- a/leaf-server/paper-patches/features/0039-Configurable-unknown-command-message.patch +++ b/leaf-server/paper-patches/features/0039-Configurable-unknown-command-message.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable unknown command message diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 7c585b71d06f438f414227c2625f27b6c323045e..de271fc2a9866d60ec760b9589faef260de1cb67 100644 +index c935d75b83338ce41507e9be11153dd1c4052cb6..ea79dc59fd1964900f193e22881dab006f90f2bf 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -151,7 +151,6 @@ public class SpigotConfig { +@@ -152,7 +152,6 @@ public class SpigotConfig { } public static String whitelistMessage; @@ -16,7 +16,7 @@ index 7c585b71d06f438f414227c2625f27b6c323045e..de271fc2a9866d60ec760b9589faef26 public static String serverFullMessage; public static String outdatedClientMessage = "Outdated client! Please use {0}"; public static String outdatedServerMessage = "Outdated server! I'm still on {0}"; -@@ -167,7 +166,6 @@ public class SpigotConfig { +@@ -168,7 +167,6 @@ public class SpigotConfig { } SpigotConfig.whitelistMessage = SpigotConfig.transform(SpigotConfig.getString("messages.whitelist", "You are not whitelisted on this server!"));