Updated Upstream (Paper)

2025-12-19 14:59:29 +00:00 · 2023-12-13 22:49:59 -05:00
parent 07a2ca6b82
commit b69f76dc1b
125 changed files with 894 additions and 810 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
    java
    `maven-publish`
    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.10"
+    id("io.papermc.paperweight.patcher") version "1.5.11"
 }

 allprojects {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group=org.galemc.gale
-version=1.20.2-R0.1-SNAPSHOT
+version=1.20.4-R0.1-SNAPSHOT

-mcVersion=1.20.2
-paperRef=931781c220b98dde0159c9a3c8dce06c3b2b1e13
+mcVersion=1.20.4
+paperRef=7e15d977ecce23ee72b059e9be292d983a336c50

 org.gradle.caching=true
 org.gradle.parallel=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/patches/api/0001-Hide-irrelevant-compilation-warnings.patch
+++ b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/build.gradle.kts b/build.gradle.kts
-index e827ee211e3c65dc68ac5867fd8476639df63645..d48dade97bbae435fafbd5508664c9b66308cad7 100644
+index 9d817bf3f26ffd484945a00a6538970eca22ee20..4f979f05a05448d46f866779729fc57c98e46dd5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -106,6 +106,15 @@ val generateApiVersioningFile by tasks.registering {
+@@ -109,6 +109,15 @@ val generateApiVersioningFile by tasks.registering {
     }
 }
 
@@ -26,7 +26,7 @@ index e827ee211e3c65dc68ac5867fd8476639df63645..d48dade97bbae435fafbd5508664c9b6
 tasks.jar {
     from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
         into("META-INF/maven/${project.group}/${project.name}")
-@@ -163,6 +172,8 @@ tasks.withType<Javadoc> {
+@@ -166,6 +175,8 @@ tasks.withType<Javadoc> {
             into("build/docs/javadoc")
         }
     }
--- a/patches/api/0002-Gale-branding-changes.patch
+++ b/patches/api/0002-Gale-branding-changes.patch
@@ -46,10 +46,10 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898
 -<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 +<https://www.gnu.org/philosophy/why-not-lgpl.html>.
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d48dade97bbae435fafbd5508664c9b66308cad7..8ca9d7dfdad93c5d162c75399816d704c5184ca8 100644
+index 4f979f05a05448d46f866779729fc57c98e46dd5..2ae5fc85ed538da29af0faa68421175942fcbeb6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -124,6 +124,12 @@ tasks.jar {
+@@ -127,6 +127,12 @@ tasks.jar {
             "Automatic-Module-Name" to "org.bukkit"
         )
     }
--- a/patches/api/0005-SIMD-support.patch
+++ b/patches/api/0005-SIMD-support.patch
@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8ca9d7dfdad93c5d162c75399816d704c5184ca8..6be021dcdef8283db51baa25e74570473afb9063 100644
+index 2ae5fc85ed538da29af0faa68421175942fcbeb6..2149d23d695e0dd8ebab9f049ee6c3a164b5918b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -112,6 +112,7 @@ tasks.withType<JavaCompile> {
+@@ -115,6 +115,7 @@ tasks.withType<JavaCompile> {
     compilerArgs.add("-Xlint:-module")
     compilerArgs.add("-Xlint:-removal")
     compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index 8ca9d7dfdad93c5d162c75399816d704c5184ca8..6be021dcdef8283db51baa25e7457047
 }
 // Gale end - hide irrelevant compilation warnings
 
-@@ -180,6 +181,7 @@ tasks.withType<Javadoc> {
+@@ -183,6 +184,7 @@ tasks.withType<Javadoc> {
     }
 
     options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings
--- a/patches/api/0008-Player-canSee-by-entity-UUID.patch
+++ b/patches/api/0008-Player-canSee-by-entity-UUID.patch
@@ -37,19 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 47fcfa2a3358766dfda2efc9bbcf5b50e3f2f7c1..a47be0fb0220e46cc360729fdf6cc113cdd05a39 100644
+index a8d3451ccfcd21a9e80adc2feab8fc9c2926c753..d323109ef01bcd31970a749854eeaf8805e8de6b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -7,6 +7,8 @@ import java.time.Instant;
- import java.util.Collection;
- import java.util.Date;
- import java.util.Map;
-+import java.util.UUID;
-+
- import org.bukkit.BanEntry;
- import org.bukkit.DyeColor;
- import org.bukkit.Effect;
-@@ -1927,6 +1929,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1928,6 +1928,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     boolean listPlayer(@NotNull Player other);
     // Paper end
 
--- a/patches/server/0001-Gale-project-setup.patch
+++ b/patches/server/0001-Gale-project-setup.patch
@@ -7,20 +7,20 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..f84011f83ebf238023ae6900873b0dfc9dfd0bd4 100644
+index 170a915098f09ace226648da342a04c5c7583d11..7d3a506ed7c4e966baf5c17fba76fd08ac218e3b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,8 +13,14 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- val alsoShade: Configuration by configurations.creating
+@@ -27,8 +27,14 @@ repositories {
 
 dependencies {
+     extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
 +    // Gale start - project setup
 +    // Depend on own API
 +    implementation(project(":gale-api"))
 +    // Depend on Paper MojangAPI
-+    implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") {
+    implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
 +        exclude("io.papermc.paper", "paper-api")
 +    }
 +    // Gale end - project setup
--- a/patches/server/0002-Dev-import-deobfuscation-fixes.patch
+++ b/patches/server/0002-Dev-import-deobfuscation-fixes.patch
@@ -93,10 +93,10 @@ index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..19779298b2b2ecbe30f9308dad1d8037
             });
             return Collections.unmodifiableCollection(list);
 diff --git a/src/main/java/net/minecraft/util/ExtraCodecs.java b/src/main/java/net/minecraft/util/ExtraCodecs.java
-index 607f32b856c6c1fb81d3f1604f3bf3fb240d713f..251f94885bd7758d8804def5ae9d3acd62cfd7ac 100644
+index fc10422e91d01615db15c750ae5d9f83d1bec94e..eafd1acdca9d34804b1894694f1856d5af6c1e51 100644
 --- a/src/main/java/net/minecraft/util/ExtraCodecs.java
 +++ b/src/main/java/net/minecraft/util/ExtraCodecs.java
-@@ -223,7 +223,7 @@ public class ExtraCodecs {
+@@ -219,7 +219,7 @@ public class ExtraCodecs {
         }) : DataResult.success(is[0]);
     }, Character::toString);
     public static Codec<String> RESOURCE_PATH_CODEC = validate(Codec.STRING, (path) -> {
@@ -105,7 +105,7 @@ index 607f32b856c6c1fb81d3f1604f3bf3fb240d713f..251f94885bd7758d8804def5ae9d3acd
             return "Invalid string to use as a resource path element: " + path;
         }) : DataResult.success(path);
     });
-@@ -261,7 +261,7 @@ public class ExtraCodecs {
+@@ -247,7 +247,7 @@ public class ExtraCodecs {
             return ImmutableList.of(leftFunction.apply(pair), rightFunction.apply(pair));
         });
         Codec<I> codec3 = RecordCodecBuilder.<Pair>create((instance) -> {
@@ -114,7 +114,7 @@ index 607f32b856c6c1fb81d3f1604f3bf3fb240d713f..251f94885bd7758d8804def5ae9d3acd
         }).comapFlatMap((pair) -> {
             return combineFunction.apply((P)pair.getFirst(), (P)pair.getSecond());
         }, (pair) -> {
-@@ -286,7 +286,7 @@ public class ExtraCodecs {
+@@ -272,7 +272,7 @@ public class ExtraCodecs {
                 Optional<Pair<A, T>> optional = dataResult.resultOrPartial(mutableObject::setValue);
                 return optional.isPresent() ? dataResult : DataResult.error(() -> {
                     return "(" + (String)mutableObject.getValue() + " -> using default)";
@@ -123,6 +123,28 @@ index 607f32b856c6c1fb81d3f1604f3bf3fb240d713f..251f94885bd7758d8804def5ae9d3acd
             }
 
             public <T> DataResult<T> coApply(DynamicOps<T> dynamicOps, A objectx, DataResult<T> dataResult) {
+@@ -574,8 +574,10 @@ public class ExtraCodecs {
+                 return object == null ? DataResult.error(() -> {
+                     return "Missing \"" + typeKey + "\" in: " + mapLike;
+                 }) : typeCodec.decode(dynamicOps, object).flatMap((pair) -> {
+-                    T object = Objects.requireNonNullElseGet(mapLike.get(parametersKey), dynamicOps::emptyMap);
+-                    return parametersCodecGetter.apply(pair.getFirst()).decode(dynamicOps, object).map(Pair::getFirst);
+                    // Gale start - dev import deobfuscation fixes
+                    T object2 = Objects.requireNonNullElseGet(mapLike.get(parametersKey), dynamicOps::emptyMap);
+                    return parametersCodecGetter.apply(pair.getFirst()).decode(dynamicOps, object2).map(Pair::getFirst);
+                    // Gale end - dev import deobfuscation fixes
+                 });
+             }
+ 
+@@ -591,7 +593,7 @@ public class ExtraCodecs {
+             }
+ 
+             private <T, V2 extends V> DataResult<T> encode(Codec<V2> codec, V value, DynamicOps<T> ops) {
+-                return codec.encodeStart(ops, value);
+                return codec.encodeStart(ops, (V2) value); // Gale - dev import deobfuscation fixes
+             }
+         };
+     }
 diff --git a/src/main/java/net/minecraft/util/datafix/fixes/ChunkProtoTickListFix.java b/src/main/java/net/minecraft/util/datafix/fixes/ChunkProtoTickListFix.java
 index 2e650637afede22d314bbe4dd4e91806ce88dcc3..8081a24eb5a533a55cdca3c882ccc61255b8a76c 100644
 --- a/src/main/java/net/minecraft/util/datafix/fixes/ChunkProtoTickListFix.java
@@ -222,10 +244,10 @@ index d02ee11066fc4f07ccb110b09b86d895ff90d4f2..5d1a30e09870a5a535c71a2e44b8e693
 
     @Override
 diff --git a/src/main/java/net/minecraft/world/item/BrushItem.java b/src/main/java/net/minecraft/world/item/BrushItem.java
-index d2ae20ec96a51c5d217c3695d53eda492f9090bc..e111bbbba63ec53d709f23ad12b96c2d3766a146 100644
+index 1482f3c93be0768098eccd286971e5945f6456d7..f46c16dd6ff9cd09ea579eecf99ce78c7eb39d49 100644
 --- a/src/main/java/net/minecraft/world/item/BrushItem.java
 +++ b/src/main/java/net/minecraft/world/item/BrushItem.java
-@@ -86,8 +86,10 @@ public class BrushItem extends Item {
+@@ -84,8 +84,10 @@ public class BrushItem extends Item {
                             BlockEntity var18 = world.getBlockEntity(blockPos);
                             if (var18 instanceof BrushableBlockEntity) {
                                 BrushableBlockEntity brushableBlockEntity = (BrushableBlockEntity)var18;
--- a/patches/server/0003-Hide-irrelevant-compilation-warnings.patch
+++ b/patches/server/0003-Hide-irrelevant-compilation-warnings.patch
@@ -7,13 +7,13 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 35f03651dfced13ff8bcfa79097f75324e7b4f51..ecd65a51efc9a43426e880ef85e13d71c8cc9537 100644
+index 7d3a506ed7c4e966baf5c17fba76fd08ac218e3b..a7291ed327c46cab88cdee0c889534986271463c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -64,6 +64,16 @@ dependencies {
+@@ -78,6 +78,16 @@ dependencies {
 }
 
- val craftbukkitPackageVersion = "1_20_R2" // Paper
+ val craftbukkitPackageVersion = "1_20_R3" // Paper
 +
 +// Gale start - hide irrelevant compilation warnings
 +tasks.withType<JavaCompile> {
--- a/patches/server/0004-Enable-preview-features-for-development-runs.patch
+++ b/patches/server/0004-Enable-preview-features-for-development-runs.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/build.gradle.kts b/build.gradle.kts
-index ecd65a51efc9a43426e880ef85e13d71c8cc9537..9f224f18f9f31a9d890b4af4de990b017a126ffd 100644
+index a7291ed327c46cab88cdee0c889534986271463c..b66410965e6c18af9d1ad88496742816f37c402c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -194,6 +194,7 @@ fun TaskContainer.registerRunTask(
+@@ -208,6 +208,7 @@ fun TaskContainer.registerRunTask(
     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
     minHeapSize = "${memoryGb}G"
     maxHeapSize = "${memoryGb}G"
--- a/patches/server/0005-Gale-branding-changes.patch
+++ b/patches/server/0005-Gale-branding-changes.patch
@@ -221,10 +221,10 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898
 -<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 +<https://www.gnu.org/philosophy/why-not-lgpl.html>.
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9f224f18f9f31a9d890b4af4de990b017a126ffd..266e5e177b23b48eb880565dcafdc16419e516db 100644
+index b66410965e6c18af9d1ad88496742816f37c402c..c26c71c8613012c142be24711cb637717e07b6b8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -86,7 +86,7 @@ tasks.jar {
+@@ -100,7 +100,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
@@ -233,7 +233,7 @@ index 9f224f18f9f31a9d890b4af4de990b017a126ffd..266e5e177b23b48eb880565dcafdc164
             "Implementation-Vendor" to date, // Paper
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
-@@ -231,3 +231,22 @@ tasks.registerRunTask("runDev") {
+@@ -245,3 +245,22 @@ tasks.registerRunTask("runDev") {
     classpath(runtimeClasspathForRunDev)
     jvmArgs("-DPaper.isRunDev=true")
 }
@@ -427,10 +427,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b921
                 .completer(new ConsoleCommandCompleter(this.server))
                 .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..d3b16342a44dabb9e14451f68af65d2d6407ef85 100644
+index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..90a06994220979be88ce54c487809e1e7c1b5cdd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -908,7 +908,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -954,7 +954,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         shutdownThread = Thread.currentThread();
         org.spigotmc.WatchdogThread.doStop(); // Paper
         if (!isSameThread()) {
@@ -445,7 +445,7 @@ index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..d3b16342a44dabb9e14451f68af65d2d
             while (this.getRunningThread().isAlive()) {
                 this.getRunningThread().stop();
                 try {
-@@ -1697,7 +1703,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1866,7 +1872,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
@@ -455,10 +455,10 @@ index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..d3b16342a44dabb9e14451f68af65d2d
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c08303de2891de92e06de8a939a618b7a6f7321..d948e78fcd2d8e9af2a9c0057e9a52384b3b0951 100644
+index 782bb8ca67517dde5dba8f0a133eb8699353dd01..0929290650e17f08adfcb93b37554f22562f8a10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
+@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper
 import javax.annotation.Nonnull; // Paper
 
 public final class CraftServer implements Server {
@@ -468,7 +468,7 @@ index 9c08303de2891de92e06de8a939a618b7a6f7321..d948e78fcd2d8e9af2a9c0057e9a5238
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 3ceb5d83be20183da907915f70ba9e64369373a9..fda56c3970e7fa1e9e282eee4323b23a6f80d316 100644
+index 700932b65e4fda560d684b0aa079bcee3923f73e..ddcc9f28cb9ca85e0875bacdfccb883cd1ce0aef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -481,10 +481,10 @@ index 3ceb5d83be20183da907915f70ba9e64369373a9..fda56c3970e7fa1e9e282eee4323b23a
                 // (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 548c77592a3520e8053483644eba805079a14f1a..ce5817b8660ca3c3fb93314bfd326a6bc20b4832 100644
+index ec2396f0e5d62b10450eaa7239a8c5479638b3c3..8561bc5482574365d7cff3a4046afe11b00f6d1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -485,7 +485,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -482,7 +482,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
     @Override
     public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
--- a/patches/server/0007-Gale-semantic-version.patch
+++ b/patches/server/0007-Gale-semantic-version.patch
@@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb
         }
 diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a2618abfd2f4b783a70c41a83f2f275ed08cb655
+index 0000000000000000000000000000000000000000..f873cac7566e1951fc2977d6f7c4ba3cefa1a9f1
 --- /dev/null
 +++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
@@ -0,0 +1,37 @@
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..a2618abfd2f4b783a70c41a83f2f275e
 +     * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
 +     * such as bug fixes, performance improvements or changes in wording.
 +     */
-+    public static final @NotNull String version = "0.6.14";
+    public static final @NotNull String version = "0.6.15";
 +
 +    /**
 +     * The "<code>major.minor</code>" portion of the {@link #version}.
--- a/patches/server/0008-Gale-configuration.patch
+++ b/patches/server/0008-Gale-configuration.patch
@@ -188,7 +188,7 @@ index 8f23276796037d048eb114952891a01a40971b3e..ac9ceb54b894119cb30a22d37e035e2c
     }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d3b16342a44dabb9e14451f68af65d2d6407ef85..9d89b38ad6a0df62c920512c8873e4cb95210571 100644
+index 90a06994220979be88ce54c487809e1e7c1b5cdd..6bcfcc5bf869d63618b8df0d9382a0a37193fff1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -201,7 +201,7 @@ index d3b16342a44dabb9e14451f68af65d2d6407ef85..9d89b38ad6a0df62c920512c8873e4cb
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-@@ -86,7 +83,6 @@ import net.minecraft.server.level.ServerChunkCache;
+@@ -85,7 +82,6 @@ import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
@@ -209,16 +209,16 @@ index d3b16342a44dabb9e14451f68af65d2d6407ef85..9d89b38ad6a0df62c920512c8873e4cb
 import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
 import net.minecraft.server.network.ServerConnectionListener;
-@@ -109,7 +105,6 @@ import net.minecraft.util.NativeModuleLister;
- import net.minecraft.util.ProgressListener;
+@@ -109,7 +105,6 @@ import net.minecraft.util.ProgressListener;
 import net.minecraft.util.RandomSource;
 import net.minecraft.util.SignatureValidator;
+ import net.minecraft.util.TimeUtil;
 -import net.minecraft.util.Unit;
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.util.profiling.EmptyProfileResults;
 import net.minecraft.util.profiling.ProfileResults;
-@@ -160,6 +155,9 @@ import net.minecraft.world.level.storage.PrimaryLevelData;
- import net.minecraft.world.level.storage.ServerLevelData;
+@@ -152,6 +147,9 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
 import net.minecraft.world.level.storage.WorldData;
 import net.minecraft.world.level.storage.loot.LootDataManager;
 +import net.minecraft.world.phys.Vec2;
@@ -227,7 +227,7 @@ index d3b16342a44dabb9e14451f68af65d2d6407ef85..9d89b38ad6a0df62c920512c8873e4cb
 import org.slf4j.Logger;
 
 // CraftBukkit start
-@@ -300,6 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -306,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     public final double[] recentTps = new double[ 3 ];
     // Spigot end
     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
@@ -235,7 +235,7 @@ index d3b16342a44dabb9e14451f68af65d2d6407ef85..9d89b38ad6a0df62c920512c8873e4cb
     public static long currentTickLong = 0L; // Paper
 
     public volatile Thread shutdownThread; // Paper
-@@ -405,6 +404,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -414,6 +413,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
         // CraftBukkit end
         this.paperConfigurations = services.paperConfigurations(); // Paper
@@ -244,7 +244,7 @@ index d3b16342a44dabb9e14451f68af65d2d6407ef85..9d89b38ad6a0df62c920512c8873e4cb
 
     private void readScoreboard(DimensionDataStorage persistentStateManager) {
 diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/net/minecraft/server/Services.java
-index a9b2c8cd4dcd3f884e4306bebee9334d3848fce5..3430a1ac3252ff9a457ee36ffc112503a25e4272 100644
+index a5450eeeab5a6b0ab273810063806d11107d6b26..79e2eff81b267608253e820817862768693ea7ef 100644
 --- a/src/main/java/net/minecraft/server/Services.java
 +++ b/src/main/java/net/minecraft/server/Services.java
@@ -9,12 +9,13 @@ import java.io.File;
@@ -288,7 +288,7 @@ index a9b2c8cd4dcd3f884e4306bebee9334d3848fce5..3430a1ac3252ff9a457ee36ffc112503
     }
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1c9742ad81f04052d2c3bc18c7636f45b2fc5160..ad9eccd0fc981dbbf8e5bea191119afe2e7a7018 100644
+index 58536aabf607015939a1326f80207c0a06eed8ff..0ce390a0ffb021f58dd763e44ebe9dabf62472bc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -1,20 +1,15 @@
@@ -325,10 +325,10 @@ index 1c9742ad81f04052d2c3bc18c7636f45b2fc5160..ad9eccd0fc981dbbf8e5bea191119afe
         if (this.convertOldUsers()) {
             this.getProfileCache().save(false); // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c88d5b9125f6ee43bf2be60fd1745d836f271b78..6421edda569ae8953f23ccd78996ab3ab811264a 100644
+index b78a9628a88f2a495ef6de74446a02a14d41a1f6..5a2e9043c671a7274baa9f9944c7db4883844026 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -132,12 +132,10 @@ import net.minecraft.world.level.chunk.storage.EntityStorage;
+@@ -134,12 +134,10 @@ import net.minecraft.world.level.chunk.storage.EntityStorage;
 import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.dimension.end.EndDragonFight;
@@ -341,7 +341,7 @@ index c88d5b9125f6ee43bf2be60fd1745d836f271b78..6421edda569ae8953f23ccd78996ab3a
 import net.minecraft.world.level.gameevent.DynamicGameEventListener;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.gameevent.GameEventDispatcher;
-@@ -691,7 +689,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -693,7 +691,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
         // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
 
         // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
@@ -351,7 +351,7 @@ index c88d5b9125f6ee43bf2be60fd1745d836f271b78..6421edda569ae8953f23ccd78996ab3a
         this.convertable = convertable_conversionsession;
         this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..e9ea666a09c9f04e37621bf38e61f698f3aaa43a 100644
+index 0b56e5f7f18fc4286992af22d402205b771165a3..d58865422bc63a55cb42acc7ec59d4310d34bfed 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1,10 +1,7 @@
@@ -373,7 +373,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..e9ea666a09c9f04e37621bf38e61f698
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Holder;
-@@ -44,8 +40,6 @@ import net.minecraft.world.DifficultyInstance;
+@@ -47,8 +43,6 @@ import net.minecraft.world.TickRateManager;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.damagesource.DamageSources;
 import net.minecraft.world.entity.Entity;
@@ -382,7 +382,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..e9ea666a09c9f04e37621bf38e61f698
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-@@ -91,17 +85,15 @@ import net.minecraft.network.protocol.game.ClientboundSetBorderSizePacket;
+@@ -94,17 +88,15 @@ import net.minecraft.network.protocol.game.ClientboundSetBorderSizePacket;
 import net.minecraft.network.protocol.game.ClientboundSetBorderWarningDelayPacket;
 import net.minecraft.network.protocol.game.ClientboundSetBorderWarningDistancePacket;
 import org.bukkit.Bukkit;
@@ -401,7 +401,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..e9ea666a09c9f04e37621bf38e61f698
 // CraftBukkit end
 
 public abstract class Level implements LevelAccessor, AutoCloseable {
-@@ -174,6 +166,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -177,6 +169,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return this.paperConfig;
     }
     // Paper end
@@ -414,7 +414,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..e9ea666a09c9f04e37621bf38e61f698
 
     public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
     public final co.aikar.timings.WorldTimingsHandler timings; // Paper
-@@ -210,9 +208,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -213,9 +211,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
 
     public abstract ResourceKey<LevelStem> getTypeKey();
 
@@ -427,10 +427,10 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..e9ea666a09c9f04e37621bf38e61f698
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d948e78fcd2d8e9af2a9c0057e9a52384b3b0951..8abeb9dc5c0e2fe95ea408fbaab9c359cb7cd69f 100644
+index 0929290650e17f08adfcb93b37554f22562f8a10..efebe795001058270ec92fdd8e86fd84589e8563 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1041,6 +1041,7 @@ public final class CraftServer implements Server {
+@@ -1036,6 +1036,7 @@ public final class CraftServer implements Server {
 
         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
         this.console.paperConfigurations.reloadConfigs(this.console);
@@ -438,7 +438,7 @@ index d948e78fcd2d8e9af2a9c0057e9a52384b3b0951..8abeb9dc5c0e2fe95ea408fbaab9c359
         for (ServerLevel world : this.console.getAllLevels()) {
             // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -2978,6 +2979,14 @@ public final class CraftServer implements Server {
+@@ -3010,6 +3011,14 @@ public final class CraftServer implements Server {
             return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
         }
 
--- a/patches/server/0012-Include-server.properties-in-timings.patch
+++ b/patches/server/0012-Include-server.properties-in-timings.patch
@@ -27,10 +27,10 @@ index 1b9d997c31ab281ce9f4719f53b0ad78a430789d..758cb80e64520ff085c4ef5ca8b2ed77
             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
             // Gale start - Gale configuration - include in timings
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..4cd514fd09689c0d1527a53dfe8cb6acb280c1ee 100644
+index 1643186bcb2caf5d29fd551afd35830726dbb80a..96c79afbdc824257b4225a85ff9b2fe2d8310f57 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -68,6 +68,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -67,6 +67,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
     public final Difficulty difficulty;
     public final GameType gamemode;
     public final String levelName;
@@ -38,7 +38,7 @@ index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..4cd514fd09689c0d1527a53dfe8cb6ac
     public final int serverPort;
     @Nullable
     public final Boolean announcePlayerAchievements;
-@@ -100,13 +101,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -99,13 +100,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
     public final boolean hideOnlinePlayers;
     public final int entityBroadcastRangePercentage;
     public final String textFilteringConfig;
@@ -54,7 +54,7 @@ index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..4cd514fd09689c0d1527a53dfe8cb6ac
     public final WorldOptions worldOptions;
 
     public final String rconIp; // Paper - Add rcon ip
-@@ -158,6 +160,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -157,6 +159,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
         this.enforceSecureProfile = this.get("enforce-secure-profile", true);
         this.logIPs = this.get("log-ips", true);
         String s = this.get("level-seed", "");
@@ -62,14 +62,14 @@ index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..4cd514fd09689c0d1527a53dfe8cb6ac
         boolean flag = this.get("generate-structures", true);
         long i = WorldOptions.parseSeed(s).orElse(WorldOptions.randomSeed());
 
-@@ -167,7 +170,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -166,7 +169,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
         }, new JsonObject()), (String) this.get("level-type", (s1) -> {
             return s1.toLowerCase(Locale.ROOT);
         }, WorldPresets.NORMAL.location().toString()));
-        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.get("resource-pack-prompt", ""));
+-        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack-id", ""), this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.get("resource-pack-prompt", ""));
 +        // Gale start - include server.properties in timings
 +        this.resourcePackPrompt = this.get("resource-pack-prompt", "");
-+        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.resourcePackPrompt);
+        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack-id", ""), this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.resourcePackPrompt);
 +        // Gale end - include server.properties in timings
         this.initialDataPackConfiguration = DedicatedServerProperties.getDatapackConfig(this.get("initial-enabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getEnabled())), this.get("initial-disabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getDisabled())));
         // Paper start - Configurable rcon ip
--- a/patches/server/0016-Make-timings-calls-final.patch
+++ b/patches/server/0016-Make-timings-calls-final.patch
@@ -7,11 +7,11 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7306cf0be43ad8673dc5aa28cfe26d1911127d30..2cf29a74159c9ed9fc2c92a3bbac07b0748e15ec 100644
+index 6bcfcc5bf869d63618b8df0d9382a0a37193fff1..fea67d65f4eed87d26086294b198f21bee4491df 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1369,7 +1369,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public void onServerExit() {}
+@@ -1507,7 +1507,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
 
     public void tickServer(BooleanSupplier shouldKeepTicking) {
 -        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
@@ -19,12 +19,12 @@ index 7306cf0be43ad8673dc5aa28cfe26d1911127d30..2cf29a74159c9ed9fc2c92a3bbac07b0
         long i = Util.getNanos();
 
         // Paper start - move oversleep into full server tick
-@@ -1435,7 +1435,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.logTickTime(k - i);
+@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.logTickTime(l - i);
         this.profiler.pop();
         org.spigotmc.WatchdogThread.tick(); // Spigot
 -        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
 +        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingFullServerTick(); // Paper // Gale - final timings calls
     }
 
-     protected void logTickTime(long nanos) {}
+     private int computeNextAutosaveInterval() {
--- a/patches/server/0017-Remove-vanilla-profiler.patch
+++ b/patches/server/0017-Remove-vanilla-profiler.patch
--- a/patches/server/0018-Use-platform-math-functions.patch
+++ b/patches/server/0018-Use-platform-math-functions.patch
@@ -99,10 +99,10 @@ public class Main {
 ```

 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index d02546b18cb689724887b4e85e8d32a18828a4ad..3bf983d4c51d517db613a00cb31dea5440cec300 100644
+index 200ed770b57e1a9240abf0473968d4b85cbefe3c..adfb793ba2ca4552e0b800d37f166ea55562a57a 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -166,13 +166,11 @@ public final class MCUtil {
+@@ -165,13 +165,11 @@ public final class MCUtil {
     }
 
     public static int fastFloor(double x) {
@@ -118,7 +118,7 @@ index d02546b18cb689724887b4e85e8d32a18828a4ad..3bf983d4c51d517db613a00cb31dea54
     }
 
     public static float normalizeYaw(float f) {
-@@ -233,11 +231,11 @@ public final class MCUtil {
+@@ -232,11 +230,11 @@ public final class MCUtil {
     }
 
     public static int getChunkCoordinate(final double coordinate) {
@@ -133,10 +133,10 @@ index d02546b18cb689724887b4e85e8d32a18828a4ad..3bf983d4c51d517db613a00cb31dea54
 
     public static long getBlockKey(final int x, final int y, final int z) {
 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index 33ace08d15bbcad66c09c7bd65dd03e784246e8f..d04586223a9b2a30efb17da01fb7f3e8f2a6af7b 100644
+index 03854a2d26a3cfc1817acfdc28cbf151ba59e05b..d9e0224dc108a99c194d4947d18f2d855a341534 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
-@@ -51,13 +51,11 @@ public class Mth {
+@@ -56,13 +56,11 @@ public class Mth {
     }
 
     public static int floor(float value) {
@@ -152,7 +152,7 @@ index 33ace08d15bbcad66c09c7bd65dd03e784246e8f..d04586223a9b2a30efb17da01fb7f3e8
     }
 
     public static long lfloor(double value) {
-@@ -74,13 +72,11 @@ public class Mth {
+@@ -79,13 +77,11 @@ public class Mth {
     }
 
     public static int ceil(float value) {
@@ -168,7 +168,7 @@ index 33ace08d15bbcad66c09c7bd65dd03e784246e8f..d04586223a9b2a30efb17da01fb7f3e8
     }
 
     public static int clamp(int value, int min, int max) {
-@@ -116,15 +112,7 @@ public class Mth {
+@@ -121,15 +117,7 @@ public class Mth {
     }
 
     public static double absMax(double a, double b) {
--- a/patches/server/0019-Faster-floating-point-positive-modulo.patch
+++ b/patches/server/0019-Faster-floating-point-positive-modulo.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index d04586223a9b2a30efb17da01fb7f3e8f2a6af7b..bae83b708cafb867f43d5378fa78818fc382e2fa 100644
+index d9e0224dc108a99c194d4947d18f2d855a341534..79419f6e1ba900c1686fa9b43866fc43649123a1 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
-@@ -143,14 +143,26 @@ public class Mth {
+@@ -148,14 +148,26 @@ public class Mth {
         return Math.floorMod(dividend, divisor);
     }
 
--- a/patches/server/0021-Reduce-projectile-chunk-loading.patch
+++ b/patches/server/0021-Reduce-projectile-chunk-loading.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a90317100d32974e481e14476843f66997a2cf3a..e799b199bee08bfaf5575eb0c0d2194af495d43e 100644
+index 2f058cec80c6ef7a5a5ca065dc6c9fe353c521de..f2854247ceff3d99f29ced43daa9537aa2ce7549 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -44,6 +44,45 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -45,6 +45,45 @@ public abstract class Projectile extends Entity implements TraceableEntity {
         super(type, world);
     }
 
--- a/patches/server/0022-Predict-Halloween.patch
+++ b/patches/server/0022-Predict-Halloween.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 5beaa849a250ea005733250ad3edfa8382224667..ba809ea753df1f1c347d0410c4ff255ce6a55532 100644
+index 6b614818b14ecfc8fc82b523eeb7e21fdf9bf1ba..685823c4c6f175460fdeb84053ea115c24a67909 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -1,6 +1,6 @@
@@ -18,7 +18,7 @@ index 5beaa849a250ea005733250ad3edfa8382224667..ba809ea753df1f1c347d0410c4ff255c
 import java.time.temporal.ChronoField;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
-@@ -237,12 +237,62 @@ public class Bat extends AmbientCreature {
+@@ -241,12 +241,62 @@ public class Bat extends AmbientCreature {
         }
     }
 
--- a/patches/server/0023-Move-random-tick-random.patch
+++ b/patches/server/0023-Move-random-tick-random.patch
@@ -19,10 +19,10 @@ require it to be initialized earlier. By moving it to the superclass, we
 initialize it earlier, ensuring that it is available sooner.

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4ae45b7a7d2d5634a1bcf5030fa7851157e29827..39a54bf48dd0bc5b47874e3910cf3c3d3e68c2fa 100644
+index 7ec3570c1759f9c7f857fcb74cd397fea14dcd91..e38cd60ba31129ed53c8c3839fedd6f77440f4b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -939,7 +939,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -956,7 +956,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
     }
     // Paper start - optimise random block ticking
     private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -31,10 +31,10 @@ index 4ae45b7a7d2d5634a1bcf5030fa7851157e29827..39a54bf48dd0bc5b47874e3910cf3c3d
 
     public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b6c3ca543e7e89fc29984140c9de7fce8457416b..72f8910ebc1c486f5f3df19718a38ea066c8ee7b 100644
+index 8c3c92e2a666bcfb88aaff4ca36507e6ea20afc5..c434d73f69cf39d2139a2e71605575733c8c4752 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -181,6 +181,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -184,6 +184,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
     public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
 
--- a/patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch
+++ b/patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch
@@ -52,22 +52,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 75f706d580c84deb2faf778552f8129a98bf32c6..4600ebd99e910287c3c97d6b9179af716da7f4c6 100644
+index 19625d104b19e02101ee7685a1df5bfd0c905296..643143fa45c7c480e4bbd3d03e1b7cc19e2969e2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -507,6 +507,7 @@ public class ServerChunkCache extends ChunkSource {
-         } else {
-             LevelData worlddata = this.level.getLevelData();
- 
-+            this.level.resetIceAndSnowTick(); // Gale - Airplane - optimize random calls in chunk ticking - reset ice & snow tick random
-             int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
-             boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
+@@ -603,6 +603,7 @@ public class ServerChunkCache extends ChunkSource {
+                     player.playerNaturallySpawnedEvent = event;
+                 }
+                 // Paper end - optimise chunk tick iteration
+                this.level.resetIceAndSnowTick(); // Gale - Airplane - optimize random calls in chunk ticking - reset ice & snow tick random
+                 int l = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
+                 boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 67c9dabe4a33fe0335aeaee7759ec52b8ab169e0..a7972fba6490aa9f0a9808119b8343b71314391f 100644
+index e38cd60ba31129ed53c8c3839fedd6f77440f4b1..be1dbe955461823de7b3dbf032d399837be62ea9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -941,6 +941,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -958,6 +958,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
     private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
     // Paper end
 
@@ -76,7 +76,7 @@ index 67c9dabe4a33fe0335aeaee7759ec52b8ab169e0..a7972fba6490aa9f0a9808119b8343b7
     public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
         ChunkPos chunkcoordintpair = chunk.getPos();
         boolean flag = this.isRaining();
-@@ -948,7 +950,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -965,7 +967,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
         int k = chunkcoordintpair.getMinBlockZ();
         final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
 
@@ -85,7 +85,7 @@ index 67c9dabe4a33fe0335aeaee7759ec52b8ab169e0..a7972fba6490aa9f0a9808119b8343b7
             blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
 
             if (this.isRainingAt(blockposition)) {
-@@ -976,7 +978,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -993,7 +995,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
             }
         }
 
@@ -93,7 +93,7 @@ index 67c9dabe4a33fe0335aeaee7759ec52b8ab169e0..a7972fba6490aa9f0a9808119b8343b7
 +        if (!this.paperConfig().environment.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper // Gale - Airplane - optimize random calls in chunk ticking - optimize further random ticking
         for (int l = 0; l < randomTickSpeed; ++l) {
             if (this.random.nextInt(48) == 0) {
-                 this.getRandomBlockPosition(j, 0, k, 15, blockposition);
+                 // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 index c5ab3058f66a54dba397aa4b562ec95e4fd25686..cd375184c63453829be96449c4df88372f905d9e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
--- a/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
+++ b/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8abeb9dc5c0e2fe95ea408fbaab9c359cb7cd69f..c0b66b8455c35794c055651b687ba9ca2b89af4c 100644
+index efebe795001058270ec92fdd8e86fd84589e8563..7ff1a1a258e181b6ab0e23374177eb006fd6da05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1125,6 +1125,13 @@ public final class CraftServer implements Server {
+@@ -1120,6 +1120,13 @@ public final class CraftServer implements Server {
                 plugin.getPluginMeta().getDisplayName(),
                 "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
             ));
--- a/patches/server/0031-Cache-on-climbable-check.patch
+++ b/patches/server/0031-Cache-on-climbable-check.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4fc32bb632d2c6e7bcaae11c3c7fee4baeb26fa9..5f7e49d291e93373ba828aafc57fa6df0cd1a3e9 100644
+index f0cc2a0ce82071cf04fa5e885943cc72c44e1eab..93c810fe4c392b20295f73044470aa45f13d857f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -42,7 +42,7 @@ index 4fc32bb632d2c6e7bcaae11c3c7fee4baeb26fa9..5f7e49d291e93373ba828aafc57fa6df
 
 public abstract class LivingEntity extends Entity implements Attackable {
 
-@@ -2002,6 +2001,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1999,6 +1998,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return this.lastClimbablePos;
     }
 
--- a/patches/server/0033-Improve-container-checking-with-a-bitset.patch
+++ b/patches/server/0033-Improve-container-checking-with-a-bitset.patch
@@ -265,7 +265,7 @@ index d6cbe98e67fdbf8db46338a88ab1356dd63b50a3..adbc0a9caf5daad2655658f06e42d752
     int LARGE_MAX_STACK_SIZE = 64;
     int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 272095d7a09ab41227d741172735f66fd2798ce1..77eee9c231ea075feb1ea0492d0be56554f78ec8 100644
+index 6d23c39e4eadf23616080d6d08672e13b5d3c37d..7bd2d00337024e2d9e274c00241e9827ea5383d6 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
@@ -390,7 +390,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..7743f185672e977520218c3ce6b8ddc9
 
     @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..f30278bb704ecfb5746e798b97e6e945bc6bfce7 100644
+index d4dcf7fe26474ae07374e7761d823bc5c8b54f97..90c354d37a8db3bcad79aa882d52d5d25482c02d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -493,10 +493,10 @@ index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..f30278bb704ecfb5746e798b97e6e945
 
     public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index 081691f9710ff1115e4308f79ed49fbc38941193..6347459c1e7347914642c23fe919526db879d103 100644
+index 64875525df244db838560f5fefb7b1b07b0f1f51..1de09539877d40b7bdcdc8a10d1d30c81420aa5b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -96,12 +96,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+@@ -94,12 +94,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
     public boolean isEmpty() {
         this.unpackLootTable((Player)null);
         // Paper start
--- a/patches/server/0036-Inline-level-height.patch
+++ b/patches/server/0036-Inline-level-height.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 72f8910ebc1c486f5f3df19718a38ea066c8ee7b..fa262fdb15a82bf5dd0a03730677ecb777ab99bd 100644
+index c434d73f69cf39d2139a2e71605575733c8c4752..f6f5d385feb4c801a5fd7f1df81ac77838ef2a6f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -209,6 +209,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -212,6 +212,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
 
     public abstract ResourceKey<LevelStem> getTypeKey();
 
@@ -50,7 +50,7 @@ index 72f8910ebc1c486f5f3df19718a38ea066c8ee7b..fa262fdb15a82bf5dd0a03730677ecb7
     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.function.Function<org.spigotmc.SpigotWorldConfig, GaleWorldConfiguration> galeWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor // Gale - Gale configuration // Gale - Purpur - remove vanilla profiler
         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-@@ -231,6 +240,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -234,6 +243,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         });
         final DimensionType dimensionmanager = (DimensionType) holder.value();
 
--- a/patches/server/0040-Reduce-entity-allocations.patch
+++ b/patches/server/0040-Reduce-entity-allocations.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f182201f49dd9db41fe987a42c4c7cd19f07543c..c4fcd0fc2eb029daf2b3724cea1e5b8007373949 100644
+index 58d608a04183041e9b0cfabb1ef4a57b57642236..79096fc0827c6abffb4471fce87b695043643c3d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -434,6 +434,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -439,6 +439,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
         return this.originWorld;
     }
     // Paper end
--- a/patches/server/0041-Remove-lambda-from-ticking-guard.patch
+++ b/patches/server/0041-Remove-lambda-from-ticking-guard.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f13daf2e529aa7e877c4882b76369cef8c780434..8105417cd90379642ca362c8b0d6ddcfcbaf47c6 100644
+index be1dbe955461823de7b3dbf032d399837be62ea9..1043f6e0567dd03dc8f6ef56d2c824493cf8c40e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -878,7 +878,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -895,7 +895,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
                                 entity.stopRiding();
                             }
 
@@ -57,10 +57,10 @@ index f13daf2e529aa7e877c4882b76369cef8c780434..8105417cd90379642ca362c8b0d6ddcf
                     }
                 }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fa262fdb15a82bf5dd0a03730677ecb777ab99bd..785f916d303b7601d4eeff5942ea3373f6454eab 100644
+index f6f5d385feb4c801a5fd7f1df81ac77838ef2a6f..8eb1ab90c11a38c0c35f89d39054efd721f6df6c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1319,13 +1319,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1330,13 +1330,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         try {
             tickConsumer.accept(entity);
             MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
--- a/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c66df436e60bb86c91bf3047fa891a0f027aeab1..46ac334995f4771823f03a85388f6b45443331db 100644
+index 79096fc0827c6abffb4471fce87b695043643c3d..97fe21f2512481169cc269462b866bc194ed5fcc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4346,16 +4346,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4388,16 +4388,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     }
 
     public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index c66df436e60bb86c91bf3047fa891a0f027aeab1..46ac334995f4771823f03a85388f6b45
             double d1 = 0.0D;
             boolean flag = this.isPushedByFluid();
             boolean flag1 = false;
-@@ -4363,14 +4365,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4405,14 +4407,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
             int k1 = 0;
             BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -128,7 +128,7 @@ index c66df436e60bb86c91bf3047fa891a0f027aeab1..46ac334995f4771823f03a85388f6b45
 
                             if (d2 >= axisalignedbb.minY) {
                                 flag1 = true;
-@@ -4392,9 +4441,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4434,9 +4483,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                                 // CraftBukkit end
                             }
                         }
--- a/patches/server/0043-SIMD-support.patch
+++ b/patches/server/0043-SIMD-support.patch
@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 266e5e177b23b48eb880565dcafdc16419e516db..de7a3389c66d5cb3123cf4c85d854bc727528b65 100644
+index c26c71c8613012c142be24711cb637717e07b6b8..e800e16e408d8a2f79c98bba229e878665b332db 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -71,6 +71,7 @@ tasks.withType<JavaCompile> {
+@@ -85,6 +85,7 @@ tasks.withType<JavaCompile> {
     compilerArgs.add("-Xlint:-module")
     compilerArgs.add("-Xlint:-removal")
     compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index 266e5e177b23b48eb880565dcafdc16419e516db..de7a3389c66d5cb3123cf4c85d854bc7
 }
 // Gale end - hide irrelevant compilation warnings
 
-@@ -195,6 +196,7 @@ fun TaskContainer.registerRunTask(
+@@ -209,6 +210,7 @@ fun TaskContainer.registerRunTask(
     minHeapSize = "${memoryGb}G"
     maxHeapSize = "${memoryGb}G"
     jvmArgs("--enable-preview") // Gale - enable preview features for development runs
@@ -84,7 +84,7 @@ index 2acad4c3fd58178b0f8b22bdb04eeeeb689d5afa..850ccd53c5007e8b18344ba76c9e7f00
 
         }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 5ae5eba9b42b3a5adbad4896e692be0b7338ebaa..0c90a38ee504b2cc22d3bdcd57fbcd83f8bf9e6c 100644
+index 06ae3f1fee154d8f283fad6eeb06582ec647d519..d47e5442de3c6bf731b1b31454493855bc1e61e3 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -14,6 +14,8 @@ import java.util.Locale;
--- a/patches/server/0044-Make-book-writing-configurable.patch
+++ b/patches/server/0044-Make-book-writing-configurable.patch
@@ -22,10 +22,10 @@ you to easily disable books, should you want to preemptively remove this
 functionality before additional exploits are found.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 65bb221993147a558995b36fb835f7b82e0eb4bd..11c0f81a6966ba07be793cd6778a5ce14b156898 100644
+index 30ccbab1586a656e0ae41d7406525fb02d9e025b..ec436869418f7c983d635e662b7c0d9eb77c6d13 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -178,6 +178,8 @@ import net.minecraft.world.phys.Vec3;
+@@ -186,6 +186,8 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -34,7 +34,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..11c0f81a6966ba07be793cd6778a5ce1
 import org.slf4j.Logger;
 
 // CraftBukkit start
-@@ -1119,6 +1121,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1124,6 +1126,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
     @Override
     public void handleEditBook(ServerboundEditBookPacket packet) {
--- a/patches/server/0045-Optimize-entity-coordinate-key.patch
+++ b/patches/server/0045-Optimize-entity-coordinate-key.patch
@@ -22,10 +22,10 @@ data is already available in the blockPosition struct, so we use that
 instead of re-doing the casting.

 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 4fd889d717a22c84ebd092d80739c6e7f1fb8534..a7f0c7c0618f004315570801334d52ce3ec4b4e2 100644
+index adfb793ba2ca4552e0b800d37f166ea55562a57a..af49374eea8e85917687da19e8aa7491e560e41b 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -211,7 +211,7 @@ public final class MCUtil {
+@@ -210,7 +210,7 @@ public final class MCUtil {
     }
 
     public static long getCoordinateKey(final Entity entity) {
@@ -35,10 +35,10 @@ index 4fd889d717a22c84ebd092d80739c6e7f1fb8534..a7f0c7c0618f004315570801334d52ce
 
     public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 55306f3aaed98307ed0ac662351d18e274095a01..ec0c8205959d451c5f8c15f0aa11d0115f1d8125 100644
+index 97fe21f2512481169cc269462b866bc194ed5fcc..b9b3391726cbd801e1d386f13323aa907d4d51b9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -307,7 +307,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     public double yo;
     public double zo;
     private Vec3 position;
--- a/patches/server/0046-Reduce-in-wall-checks.patch
+++ b/patches/server/0046-Reduce-in-wall-checks.patch
@@ -28,10 +28,10 @@ but is so much cheaper than the suffocation check that it's worth
 keeping it.

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5f7e49d291e93373ba828aafc57fa6df0cd1a3e9..1794f5d1a8cc912fdd75a18ceccb536f48ab4686 100644
+index 93c810fe4c392b20295f73044470aa45f13d857f..ae070ceb7f696af8b43c4d2c2ff6daf221c8a9db 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -412,7 +412,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -411,7 +411,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
             boolean flag = this instanceof net.minecraft.world.entity.player.Player;
 
             if (!this.level().isClientSide) {
@@ -43,7 +43,7 @@ index 5f7e49d291e93373ba828aafc57fa6df0cd1a3e9..1794f5d1a8cc912fdd75a18ceccb536f
                     this.hurt(this.damageSources().inWall(), 1.0F);
                 } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
                     double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
-@@ -1406,6 +1409,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1405,6 +1408,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return this.getHealth() <= 0.0F;
     }
 
--- a/patches/server/0047-Make-chat-order-verification-configurable.patch
+++ b/patches/server/0047-Make-chat-order-verification-configurable.patch
@@ -12,22 +12,27 @@ By: Kevin Raneri <kevin.raneri@gmail.com>
 As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 11c0f81a6966ba07be793cd6778a5ce14b156898..fd01a4ffb44024e46ea6d45dabd8f851cb8ebfa5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2281,6 +2281,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     }
+diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+index 85a8a687b1568a56e3e646b37ef78b562c1b8a82..992617212932a38f5586cd3d0e1fbebb3a8d4f14 100644
+--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+@@ -9,6 +9,7 @@ import net.minecraft.util.SignatureUpdater;
+ import net.minecraft.util.SignatureValidator;
+ import net.minecraft.util.Signer;
+ import net.minecraft.world.entity.player.ProfilePublicKey;
+import org.galemc.gale.configuration.GaleGlobalConfiguration;
+ import org.slf4j.Logger;
 
-     private boolean updateChatOrder(Instant timestamp) {
-+        // Gale start - Pufferfish - make chat order verification configurable
-+        if (!GaleGlobalConfiguration.get().misc.verifyChatOrder) {
-+            return true;
-+        }
-+        // Gale end - Pufferfish - make chat order verification configurable
-         Instant instant1;
- 
-         do {
+ public class SignedMessageChain {
+@@ -38,7 +39,7 @@ public class SignedMessageChain {
+                 throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.chain_broken"), false); // Paper - diff on change (if disconnects, need a new kick event cause)
+             } else if (playerPublicKey.data().hasExpired()) {
+                 throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.expiredProfileKey", org.bukkit.event.player.PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY), false); // Paper - kick event causes
+-            } else if (body.timeStamp().isBefore(this.lastTimeStamp)) {
+            } else if (body.timeStamp().isBefore(this.lastTimeStamp) && GaleGlobalConfiguration.get().misc.verifyChatOrder) { // Gale - Pufferfish - make chat order verification configurable
+                 throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.out_of_order_chat", org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT), true); // Paper - kick event causes
+             } else {
+                 this.lastTimeStamp = body.timeStamp();
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 index 346fdf6f8a76539fa9ca46015ee122417e4a8102..7c781eabbb6df5df9f9f2cbdeef4e116ca30b645 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
--- a/patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
+++ b/patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
@@ -13,14 +13,14 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index b71638976cacf542662beb1f77fc40182be65215..5ac1667dd79389195f656eff97f83a2dafaf1c28 100644
+index 1de09539877d40b7bdcdc8a10d1d30c81420aa5b..57be35f6a3954aec8b3b039c1d7bb02f8359cf5b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -70,6 +70,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-     }
+@@ -68,6 +68,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
 
-     public void unpackLootTable(@Nullable Player player) {
+     @Override
+     public void unpackLootTable(@org.jetbrains.annotations.Nullable final Player player) {
 +        if (player == null) return; // Gale - EMC - don't trigger lootable refresh for non-player interaction
-         if (this.level != null && this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper - don't unpack loot table if not in world
-             LootTable lootTable = this.level.getServer().getLootData().getLootTable(this.lootTable);
-             if (player instanceof ServerPlayer) {
+         // Copied from super with changes, always check the original method
+         net.minecraft.world.level.Level level = this.getLevel();
+         BlockPos blockPos = this.getBlockPos();
--- a/patches/server/0051-Reduce-hopper-item-checks.patch
+++ b/patches/server/0051-Reduce-hopper-item-checks.patch
@@ -17,7 +17,7 @@ Licensed under: MIT (https://opensource.org/licenses/MIT)
 Only do an item "suck in" action once per second

 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..760e54d74fc027e631e45b07b729d060511d5bfd 100644
+index a39db702063887cf530f272deaf4f334047cc7d4..2abd920e78a4da56654da87034c36c77d2fc6b35 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -14,11 +14,13 @@ import net.minecraft.world.entity.Entity;
@@ -34,7 +34,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..760e54d74fc027e631e45b07b729d060
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
-@@ -209,11 +211,31 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -227,11 +229,31 @@ public class ItemEntity extends Entity implements TraceableEntity {
                 }
                 // CraftBukkit end
                 this.discard();
@@ -66,7 +66,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..760e54d74fc027e631e45b07b729d060
     // Spigot start - copied from above
     @Override
     public void inactiveTick() {
-@@ -233,7 +255,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -251,7 +273,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
             }
             // CraftBukkit end
             this.discard();
@@ -119,7 +119,7 @@ index a05acf709735b40ca86f978508c63a86065fd405..3752b4ba7fb0d680d4b4a61bf44d54d5
 
     double getLevelY();
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index f30278bb704ecfb5746e798b97e6e945bc6bfce7..f44372ec510273c8507865cd079f60bbd6fc586c 100644
+index 90c354d37a8db3bcad79aa882d52d5d25482c02d..375d1dc3a7897007f8d0997153fd77d16ff07388 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -11,6 +11,7 @@ import net.minecraft.core.Direction;
--- a/patches/server/0054-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0054-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -13,10 +13,10 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index db0aa97608cc209ad63a93443498c7ffa362968f..a684be3ed6a464816eabdfe94f0ce1bf5bd91b54 100644
+index 5ed738854aebc3ca56dfba72e91971593c7a0db9..9701f93f0b6c51b01b05a54ed7482dbff75d9e8e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -268,6 +268,7 @@ public class ServerPlayer extends Player {
+@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
     public boolean joining = true;
     public boolean sentListPacket = false;
     public boolean supressTrackerForLogin = false; // Paper
@@ -25,25 +25,25 @@ index db0aa97608cc209ad63a93443498c7ffa362968f..a684be3ed6a464816eabdfe94f0ce1bf
     public boolean isRealPlayer; // Paper
     public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fd01a4ffb44024e46ea6d45dabd8f851cb8ebfa5..80140474fc1b43009e757d1fa7d1324ee9f35bca 100644
+index ec436869418f7c983d635e662b7c0d9eb77c6d13..6f3d36758bbeb6a5f0c3d7681fa09d09ce25a721 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2258,6 +2258,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
-                 this.send(new ClientboundSystemChatPacket(PaperAdventure.asAdventure(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)), false)); // Paper - Adventure
-                 return Optional.empty();
-+                // Gale start - EMC - do not process chat/commands before player has joined
-+            } else if (!player.didPlayerJoinEvent) {
-+                return Optional.empty();
-+                // Gale end - EMC - do not process chat/commands before player has joined
-             } else {
-                 this.player.resetLastActionTime();
-                 return optional;
+@@ -2274,6 +2274,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
+             this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
+             return Optional.empty();
+            // Gale start - EMC - do not process chat/commands before player has joined
+        } else if (!player.didPlayerJoinEvent) {
+            return Optional.empty();
+            // Gale end - EMC - do not process chat/commands before player has joined
+         } else {
+             this.player.resetLastActionTime();
+             return optional;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 33abcf12b4426572b74ca4c813e4392c823494bc..0f8eac5bf5e8f59c511f4b0040bc8a84b8a05c5c 100644
+index a35638a92479b90afa89cf201fc45b49c9e767f3..05eaf2174e055bb78c58c8c2a2b51b17c898ff47 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -349,6 +349,8 @@ public abstract class PlayerList {
+@@ -347,6 +347,8 @@ public abstract class PlayerList {
             return;
         }
 
--- a/patches/server/0056-Do-not-log-empty-message-warnings.patch
+++ b/patches/server/0056-Do-not-log-empty-message-warnings.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 80140474fc1b43009e757d1fa7d1324ee9f35bca..75b6adb8195fac955dd9c741324b63cfc4d4c578 100644
+index 6f3d36758bbeb6a5f0c3d7681fa09d09ce25a721..7333a7302d295f4b085e636ce800090d26982f0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -179,6 +179,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
+@@ -187,6 +187,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
@@ -18,7 +18,7 @@ index 80140474fc1b43009e757d1fa7d1324ee9f35bca..75b6adb8195fac955dd9c741324b63cf
 import org.galemc.gale.configuration.GaleGlobalConfiguration;
 import org.slf4j.Logger;
 
-@@ -2443,7 +2444,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2440,7 +2441,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
         // CraftBukkit start
         String s = message.signedContent();
         if (s.isEmpty()) {
--- a/patches/server/0057-Do-not-log-ignored-advancements.patch
+++ b/patches/server/0057-Do-not-log-ignored-advancements.patch
@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index e38e2e5a7ddba9c140f362021b6be0b0974f7cd1..33c36779548332a8c3653c6b829d941b6dc5fd49 100644
+index f655e0ae4a287886d0291cd0089bad2000249d0f..e15409231e56f5bbbfbcd19cea2c7e3fbc612886 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -46,6 +46,7 @@ import net.minecraft.server.level.ServerPlayer;
+@@ -45,6 +45,7 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.world.level.GameRules;
@@ -48,7 +48,7 @@ index e38e2e5a7ddba9c140f362021b6be0b0974f7cd1..33c36779548332a8c3653c6b829d941b
 import org.slf4j.Logger;
 
 public class PlayerAdvancements {
-@@ -200,7 +201,7 @@ public class PlayerAdvancements {
+@@ -199,7 +200,7 @@ public class PlayerAdvancements {
 
             if (advancementholder == null) {
                 if (!minecraftkey.getNamespace().equals("minecraft")) return; // CraftBukkit
--- a/patches/server/0062-Do-not-log-expired-message-warnings.patch
+++ b/patches/server/0062-Do-not-log-expired-message-warnings.patch
@@ -7,18 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-index c0a80824a0307ea673805015119cc834b268f0dc..d7c6e90ccf3a8ce58e5533c5158ce62668cbcb78 100644
+index 992617212932a38f5586cd3d0e1fbebb3a8d4f14..a61b904b59651b2b9d4dfab7126677ec08a376ac 100644
 --- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
 +++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-@@ -8,6 +8,7 @@ import net.minecraft.util.SignatureUpdater;
- import net.minecraft.util.SignatureValidator;
- import net.minecraft.util.Signer;
- import net.minecraft.world.entity.player.ProfilePublicKey;
-+import org.galemc.gale.configuration.GaleGlobalConfiguration;
- import org.slf4j.Logger;
- 
- public class SignedMessageChain {
-@@ -42,7 +43,7 @@ public class SignedMessageChain {
+@@ -48,7 +48,7 @@ public class SignedMessageChain {
                     throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.unsigned_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event causes
                 } else {
                     if (playerChatMessage.hasExpiredServer(Instant.now())) {
--- a/patches/server/0063-Do-not-log-Not-Secure-marker.patch
+++ b/patches/server/0063-Do-not-log-Not-Secure-marker.patch
@@ -28,13 +28,13 @@ index e4fd372a1d585887287253a02531cd192929377b..397f985756c5bc6c11a32c844d536000
     }
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0f8eac5bf5e8f59c511f4b0040bc8a84b8a05c5c..0353ab33aab3579e82ec0f7115763e190d080e9e 100644
+index 05eaf2174e055bb78c58c8c2a2b51b17c898ff47..206f179a4c6ea8eab75200ee72efb21e29d28a53 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -102,6 +102,7 @@ import net.minecraft.world.scores.Objective;
+@@ -100,6 +100,7 @@ import net.minecraft.world.phys.Vec3;
+ import net.minecraft.world.scores.DisplaySlot;
+ import net.minecraft.world.scores.Objective;
 import net.minecraft.world.scores.PlayerTeam;
- import net.minecraft.world.scores.Scoreboard; // Paper
- import net.minecraft.world.scores.Team;
 +import org.galemc.gale.configuration.GaleGlobalConfiguration;
 import org.slf4j.Logger;
 
@@ -49,13 +49,13 @@ index 0f8eac5bf5e8f59c511f4b0040bc8a84b8a05c5c..0353ab33aab3579e82ec0f7115763e19
         boolean flag1 = false;
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 2d95bad5bf426da29aa7a0e573b38b6e158614ea..6cc221b02d543c7d5cd9a8b1b544206fd31b04fa 100644
+index ca6d3712f4552534585b46e921738ec9416095ab..0f5471291c482bd2b8ecc588da74a408563b7312 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -100,6 +100,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+         public class Chat extends ConfigurationPart {
             public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
             public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
-             public boolean outOfOrderMessageWarning = false; // Gale - do not log out-of-order message warnings
 +            public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
         }
 
--- a/patches/server/0063-Do-not-log-out-of-order-message-warnings.patch
+++ b/patches/server/0063-Do-not-log-out-of-order-message-warnings.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Mon, 26 Dec 2022 05:18:17 +0100
-Subject: [PATCH] Do not log out-of-order message warnings
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75b6adb8195fac955dd9c741324b63cfc4d4c578..b7f3bf0553fe72449f54f45046fe5b8b69eb5b59 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2248,7 +2248,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-     private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
-         if (!this.updateChatOrder(timestamp)) {
-            ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper
-+            if (GaleGlobalConfiguration.get().logToConsole.chat.outOfOrderMessageWarning) ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper // Gale - do not log out-of-order message warnings
-             this.server.scheduleOnMain(() -> { // Paper - push to main
-             this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
-             }); // Paper - push to main
-diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index ca6d3712f4552534585b46e921738ec9416095ab..2d95bad5bf426da29aa7a0e573b38b6e158614ea 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
-         public class Chat extends ConfigurationPart {
-             public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
-             public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
-+            public boolean outOfOrderMessageWarning = false; // Gale - do not log out-of-order message warnings
-         }
- 
-         // Gale start - Purpur - do not log plugin library loads
--- a/patches/server/0064-Do-not-log-disconnections-with-null-id.patch
+++ b/patches/server/0064-Do-not-log-disconnections-with-null-id.patch
@@ -17,18 +17,18 @@ Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 This can help to hide annoying scanning bots from showing up in console.

 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ff2dd53e9e943aa929188fd9d4c35498b78c497a..a8ebafacbf3f146cb835a4855db54baf2731992e 100644
+index 89b3184be952fd0803520dd0f717f3acfc3cb496..4ed1b205d2b31c00fbf9aa70cd2c13e7d0fe0534 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -38,6 +38,7 @@ import net.minecraft.util.Crypt;
- import net.minecraft.util.CryptException;
+@@ -39,6 +39,7 @@ import net.minecraft.util.CryptException;
 import net.minecraft.util.RandomSource;
+ import net.minecraft.world.entity.player.Player;
 import org.apache.commons.lang3.Validate;
 +import org.galemc.gale.configuration.GaleGlobalConfiguration;
 import org.slf4j.Logger;
 import org.bukkit.craftbukkit.util.Waitable;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
-@@ -126,6 +127,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -127,6 +128,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
     @Override
     public void onDisconnect(Component reason) {
@@ -44,7 +44,7 @@ index ff2dd53e9e943aa929188fd9d4c35498b78c497a..a8ebafacbf3f146cb835a4855db54baf
     }
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 6cc221b02d543c7d5cd9a8b1b544206fd31b04fa..91776314125f1101b7b67304b55748bda8c6e09b 100644
+index 0f5471291c482bd2b8ecc588da74a408563b7312..d95141f43ebbad984db96416623957bd47f3ac1b 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -94,6 +94,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
--- a/patches/server/0065-Do-not-log-run-as-root-warning.patch
+++ b/patches/server/0065-Do-not-log-run-as-root-warning.patch
@@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0c90a38ee504b2cc22d3bdcd57fbcd83f8bf9e6c..78e4e90a6267287a83ac178502ae1dbaecd999a0 100644
+index d47e5442de3c6bf731b1b31454493855bc1e61e3..64701667486002c60c9d1819e57ac40153306a71 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -179,7 +179,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/patches/server/0066-Do-not-log-offline-mode-warning.patch
+++ b/patches/server/0066-Do-not-log-offline-mode-warning.patch
@@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 78e4e90a6267287a83ac178502ae1dbaecd999a0..72a364253d5871b4902b50cfd57d0b7f30c742e6 100644
+index 64701667486002c60c9d1819e57ac40153306a71..08d82f8592714eac92ead36b98460de6ff607cfe 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -290,7 +290,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/patches/server/0067-Softly-log-invalid-pool-element-errors.patch
+++ b/patches/server/0067-Softly-log-invalid-pool-element-errors.patch
@@ -39,7 +39,7 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70
         });
         this.rotation = Rotation.valueOf(nbt.getString("rotation"));
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 91776314125f1101b7b67304b55748bda8c6e09b..24c67ac6e8f2572cc2e79350fdf4201825ee9e72 100644
+index d95141f43ebbad984db96416623957bd47f3ac1b..ea7f6a826763af8aa10d79e82b9ba99198e31e06 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -4,10 +4,14 @@ package org.galemc.gale.configuration;
@@ -66,7 +66,7 @@ index 91776314125f1101b7b67304b55748bda8c6e09b..24c67ac6e8f2572cc2e79350fdf42018
 
         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
         public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-@@ -122,6 +126,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -121,6 +125,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         }
         // Gale end - Purpur - do not log plugin library loads
 
--- a/patches/server/0068-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0068-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -38,7 +38,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index 2c13147bc063a09bb7907d6f90c3a1e811a09eb1..38ba786b86de87a3e407e50b4cde40456200936f 100644
+index e5006e7672ba79ed4bcf2c4173c5a9ed4c68395b..cd0971429ae679311269004ffde8743c9ddcef6b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
@@ -153,6 +153,10 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
--- a/patches/server/0069-Make-sand-duping-fix-configurable.patch
+++ b/patches/server/0069-Make-sand-duping-fix-configurable.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 9105418b29c89f092378da11b14e3d324332a2ba..b8454f977c5b5690bffa70a063f7c349905abaae 100644
+index 45c07733f03b5c11f6d8e820f65dc950c70d9a67..fa1888db518d22e4069b4dcc42d80560181243e7 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -133,7 +133,7 @@ public class FallingBlockEntity extends Entity {
--- a/patches/server/0070-Make-tripwire-duping-fix-configurable.patch
+++ b/patches/server/0070-Make-tripwire-duping-fix-configurable.patch
@@ -7,10 +7,10 @@ License: MIT (https://opensource.org/licenses/MIT)
 Leaf - https://github.com/Winds-Studio/Leaf

 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index cb2ff8d94308c637a498d2737f86f6af4c9c1b83..eb1ecbbb5c0f887ee1c7de85a6137f2f182b3fc0 100644
+index 2f947997ca746d18544940ef67ff550a95946edd..cc7096d54a5b9412c3cda4d1a0d99d042739a789 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-@@ -78,7 +78,7 @@ public class TripWireBlock extends Block {
+@@ -91,7 +91,7 @@ public class TripWireBlock extends Block {
     public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
         if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating
         if (!moved && !state.is(newState.getBlock())) {
--- a/patches/server/0071-Fix-MC-238526.patch
+++ b/patches/server/0071-Fix-MC-238526.patch
@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
-index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..db3574e4ec9bad32bbbcd9d7ab9607da60e1715a 100644
+index 827912174ee08cd19249797d351887149b25c880..15dfa2537da2b98deea09a3515c00fb2839121f5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
-@@ -82,6 +82,6 @@ public abstract class WaterAnimal extends PathfinderMob {
+@@ -77,6 +77,6 @@ public abstract class WaterAnimal extends PathfinderMob {
         i = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.maximum.or(i);
         j = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.minimum.or(j);
         // Paper end
--- a/patches/server/0072-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0072-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 52cc265f1663d648b6bfd03f2ac3e191b1c16d44..652c8b5b579a06ab7e66df78bbf323cd9188208c 100644
+index e42b0b19019ef74733fd19b08f882cccff920142..d3982fc50ab87f64893ae5838d0256576912d311 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
@@ -176,12 +176,21 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
--- a/patches/server/0073-Fix-MC-121706.patch
+++ b/patches/server/0073-Fix-MC-121706.patch
--- a/patches/server/0074-Fix-MC-110386.patch
+++ b/patches/server/0074-Fix-MC-110386.patch
--- a/patches/server/0075-Fix-MC-31819.patch
+++ b/patches/server/0075-Fix-MC-31819.patch
@@ -19,10 +19,10 @@ the displayed hunger bar never goes down. Hunger (or any related value, includin
 should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819.

 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d58b4c0dbe651b5068212e5f14dce3164ee520f5..67775a81f88de1523b20bd22695ec161b682417b 100644
+index 7f3466340891b4409d1399ebeb2ca865d77841cd..5005d9ba125fb96900c01098a9a2e5f5d7a5cba6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1935,6 +1935,11 @@ public abstract class Player extends LivingEntity {
+@@ -1850,6 +1850,11 @@ public abstract class Player extends LivingEntity {
     }
 
     public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {
--- a/patches/server/0076-Fix-MC-26304.patch
+++ b/patches/server/0076-Fix-MC-26304.patch
--- a/patches/server/0077-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0077-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7..5f8e169a6e80e8f05df251fa76e60f512508d385 100644
+index 7491e075baebc7d412d35593bb844b200e304447..9a14425e7de3eeca8f489bce03f5c9127811a6aa 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -177,6 +177,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
--- a/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch
+++ b/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch
@@ -42,10 +42,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 8affdd74769aed9aa92a76ba539cd9d27208827c..02d45bf04f541ae85e68ea9f5b5825d4a2140061 100644
+index 42ebd91196ae420eee57f4380abc558555457163..267284a45e710a230c1f1a68db398a39bcd9a644 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -319,7 +319,7 @@ public abstract class AbstractArrow extends Projectile {
         Vec3 vec3d = this.getDeltaMovement();
 
         this.setDeltaMovement(vec3d.multiply((double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F)));
--- a/patches/server/0079-Make-logging-login-locations-configurable.patch
+++ b/patches/server/0079-Make-logging-login-locations-configurable.patch
@@ -13,10 +13,10 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0353ab33aab3579e82ec0f7115763e190d080e9e..b1ae1944d3b5b2ac520b087a3059ae6059807f4d 100644
+index 206f179a4c6ea8eab75200ee72efb21e29d28a53..2306d7aca29b3e399f152eb8470115e6f7bb172a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -492,7 +492,13 @@ public abstract class PlayerList {
+@@ -490,7 +490,13 @@ public abstract class PlayerList {
         }
         // Paper end
         // CraftBukkit - Moved from above, added world
@@ -31,7 +31,7 @@ index 0353ab33aab3579e82ec0f7115763e190d080e9e..b1ae1944d3b5b2ac520b087a3059ae60
 
     public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 24c67ac6e8f2572cc2e79350fdf4201825ee9e72..00d511ed75a5e7268737663baad0c25511e35d53 100644
+index ea7f6a826763af8aa10d79e82b9ba99198e31e06..b2aa32662335c4d64ac87320fcfb334784d89ec5 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
--- a/patches/server/0080-Reduce-array-allocations.patch
+++ b/patches/server/0080-Reduce-array-allocations.patch
@@ -133,7 +133,7 @@ index 7e8dc9e8f381abfdcce2746edc93122d623622d1..66721a27cc9a373a12dffb72c4a40347
                 this.storage = Arrays.copyOf(this.storage, this.storage.length * 2);
 diff --git a/src/main/java/me/titaniumtown/ArrayConstants.java b/src/main/java/me/titaniumtown/ArrayConstants.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c99e9e361ab4377c0df76b943b96bf87e138d91c
+index 0000000000000000000000000000000000000000..bccd0127387d27f7eb7e6ce68f31a1686a008419
 --- /dev/null
 +++ b/src/main/java/me/titaniumtown/ArrayConstants.java
@@ -0,0 +1,21 @@
@@ -141,7 +141,7 @@ index 0000000000000000000000000000000000000000..c99e9e361ab4377c0df76b943b96bf87
 +
 +package me.titaniumtown;
 +
-+import net.minecraft.server.level.ServerLevel;
+//import net.minecraft.server.level.ServerLevel;
 +
 +public final class ArrayConstants {
 +
@@ -155,7 +155,7 @@ index 0000000000000000000000000000000000000000..c99e9e361ab4377c0df76b943b96bf87
 +    public static final long[] emptyLongArray = new long[0];
 +    public static final org.bukkit.entity.Entity[] emptyBukkitEntityArray = new org.bukkit.entity.Entity[0];
 +    public static final net.minecraft.world.entity.Entity[] emptyEntityArray = new net.minecraft.world.entity.Entity[0];
-+    public static final ServerLevel[] emptyServerLevelArray = new ServerLevel[0];
+    //public static final ServerLevel[] emptyServerLevelArray = new ServerLevel[0];
 +
 +}
 diff --git a/src/main/java/net/minecraft/nbt/ByteArrayTag.java b/src/main/java/net/minecraft/nbt/ByteArrayTag.java
@@ -181,7 +181,7 @@ index 06648f9751fd8a322d0809ffebf6a544596ee1a4..b4c2fbdd56ba278560fc1c0d7e086dce
 
     @Override
 diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
-index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..2b1f92ed77d3ae71090c523e47e674b9d14d57e4 100644
+index e464ada187fd1f15efef29a0e5033aeb0c688059..f9f41d23204b4aedb72297482ac5ff466a8e7b62 100644
 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java
 +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
@@ -1,6 +1,5 @@
@@ -200,7 +200,7 @@ index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..2b1f92ed77d3ae71090c523e47e674b9
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.ReportedException;
-@@ -416,7 +417,7 @@ public class CompoundTag implements Tag {
+@@ -420,7 +421,7 @@ public class CompoundTag implements Tag {
             throw new ReportedException(this.createReport(key, ByteArrayTag.TYPE, var3));
         }
 
@@ -209,7 +209,7 @@ index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..2b1f92ed77d3ae71090c523e47e674b9
     }
 
     public int[] getIntArray(String key) {
-@@ -428,7 +429,7 @@ public class CompoundTag implements Tag {
+@@ -432,7 +433,7 @@ public class CompoundTag implements Tag {
             throw new ReportedException(this.createReport(key, IntArrayTag.TYPE, var3));
         }
 
@@ -218,7 +218,7 @@ index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..2b1f92ed77d3ae71090c523e47e674b9
     }
 
     public long[] getLongArray(String key) {
-@@ -440,7 +441,7 @@ public class CompoundTag implements Tag {
+@@ -444,7 +445,7 @@ public class CompoundTag implements Tag {
             throw new ReportedException(this.createReport(key, LongArrayTag.TYPE, var3));
         }
 
@@ -250,7 +250,7 @@ index ff13d67151c50ea11a45117e524c7524e2b1a202..3f6327661e593e52a89c247288f0104c
 
     @Override
 diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java
-index 0ef36f5cfebf60c491d021b77b55c393f26feab5..5b2eb5e3f637bc5860be11c41391c0b4b35978fb 100644
+index c6877c7167dd5b1c61c776b0c7865d9064e69202..43e429053ca92d9ef7e9b5b9d466352b1b0a3fc8 100644
 --- a/src/main/java/net/minecraft/nbt/ListTag.java
 +++ b/src/main/java/net/minecraft/nbt/ListTag.java
@@ -2,6 +2,8 @@ package net.minecraft.nbt;
@@ -355,10 +355,10 @@ index c0ea20dcee8bb293df96bc6ee019e50ad6b383fd..e344fe0f2192f20f5d6d1594f7844b53
 
         if (enumprotocoldirection != this.receiving) {
 diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-index 8a68baf6bd46b59cf57c94ffe5651d47a7cae99c..bd7fa1b2a6fed82ce66fe2b8e3498e4de7c650e0 100644
+index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..25f25c3e2882e11a80142d3282a020d28828edef 100644
 --- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
 +++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-@@ -10,6 +10,8 @@ import java.util.function.Consumer;
+@@ -15,6 +15,8 @@ import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
@@ -367,20 +367,20 @@ index 8a68baf6bd46b59cf57c94ffe5651d47a7cae99c..bd7fa1b2a6fed82ce66fe2b8e3498e4d
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
-@@ -21,7 +23,7 @@ import net.minecraft.network.chat.Style;
+@@ -28,7 +30,7 @@ import net.minecraft.util.ExtraCodecs;
 import net.minecraft.world.entity.Entity;
 
 public class TranslatableContents implements ComponentContents {
 -    public static final Object[] NO_ARGS = new Object[0];
 +    public static final Object[] NO_ARGS = ArrayConstants.emptyObjectArray; // Gale - JettPack - reduce array allocations
-     private static final FormattedText TEXT_PERCENT = FormattedText.of("%");
-     private static final FormattedText TEXT_NULL = FormattedText.of("null");
-     private final String key;
+     private static final Codec<Object> PRIMITIVE_ARG_CODEC = ExtraCodecs.validate(ExtraCodecs.JAVA, TranslatableContents::filterAllowedArguments);
+     private static final Codec<Object> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, ComponentSerialization.CODEC).xmap((either) -> {
+         return either.map((object) -> {
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index ec268189b19b6fa5c4521f96ce211a531db35ec5..1577a6aeeaaf6a131008f536a125b9b986f3139e 100644
+index 7573c12a77797146c51ef2dfe4b2a636df45e21a..43ba5c26f40a9b00480198e10141275c07938994 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -90,7 +90,7 @@ public class Main {
+@@ -87,7 +87,7 @@ public class Main {
         OptionSpec<Void> optionspec5 = optionparser.accepts("eraseCache");
         OptionSpec<Void> optionspec6 = optionparser.accepts("safeMode", "Loads level with vanilla datapack only");
         OptionSpec<Void> optionspec7 = optionparser.accepts("help").forHelp();
@@ -390,10 +390,10 @@ index ec268189b19b6fa5c4521f96ce211a531db35ec5..1577a6aeeaaf6a131008f536a125b9b9
         OptionSpec<Integer> optionspec10 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
         OptionSpec<String> optionspec11 = optionparser.accepts("serverId").withRequiredArg();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3810c8e431258c030fcbe9788d24307a24872677..7db5c6d9a4bab340a2ae95c43388281445690d29 100644
+index 557bfd1405603d1cd7e5210e406e63283947179b..7c691b953d66c9fb7a1f372ac885285ed55d9979 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -50,6 +50,8 @@ import java.util.stream.Collectors;
+@@ -51,6 +51,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
@@ -416,7 +416,7 @@ index e8bb35322d3204e6a126bc6df0beed3f931dae6d..6bfa866ce2b3dab86dcbaba9fdf52737
 
             for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0227b2cd2c38b18b958b52c6febca4a836126b7e..c097ea14a9f43f667b91d3a1cf8a61a5c648b979 100644
+index 1043f6e0567dd03dc8f6ef56d2c824493cf8c40e..902b9c144cdedabbc3dc489c8643351c2f31aabe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -38,6 +38,8 @@ import java.util.stream.Collectors;
@@ -426,18 +426,18 @@ index 0227b2cd2c38b18b958b52c6febca4a836126b7e..c097ea14a9f43f667b91d3a1cf8a61a5
 +
 +import me.titaniumtown.ArrayConstants;
 import net.minecraft.CrashReport;
+ import net.minecraft.CrashReportCategory;
 import net.minecraft.Util;
- import net.minecraft.core.BlockPos;
-@@ -1026,7 +1028,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1045,7 +1047,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                     BlockPos blockposition2 = blockposition.set(j + randomX, randomY, k + randomZ);
                     BlockState iblockdata = com.destroystokyo.paper.util.maplist.IBlockDataList.getBlockDataFromRaw(raw);
 
 -                    iblockdata.randomTick(this, blockposition2, this.randomTickRandom);
 +                    iblockdata.randomTick(this, blockposition2.immutable(), this.randomTickRandom); // Gale - JettPack - reduce array allocations
-                     // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
-                     // TODO CHECK ON UPDATE (ping the Canadian)
                 }
-@@ -1327,7 +1329,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+                 // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
+                 // TODO CHECK ON UPDATE (ping the Canadian)
+@@ -1351,7 +1353,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
 
     public static List<Entity> getCurrentlyTickingEntities() {
         Entity ticking = currentlyTickingEntity.get();
@@ -447,10 +447,10 @@ index 0227b2cd2c38b18b958b52c6febca4a836126b7e..c097ea14a9f43f667b91d3a1cf8a61a5
         return ret;
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7f3bf0553fe72449f54f45046fe5b8b69eb5b59..fadeac3a787350f6b3d4936825b3b02bd0cde31a 100644
+index 7333a7302d295f4b085e636ce800090d26982f0d..8b9fccee2f999836cb7550955ee4b38cde990286 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -29,6 +29,8 @@ import java.util.function.UnaryOperator;
+@@ -28,6 +28,8 @@ import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
@@ -459,7 +459,7 @@ index b7f3bf0553fe72449f54f45046fe5b8b69eb5b59..fadeac3a787350f6b3d4936825b3b02b
 import net.minecraft.ChatFormatting;
 import net.minecraft.SharedConstants;
 import net.minecraft.Util;
-@@ -169,7 +171,6 @@ import net.minecraft.world.level.block.entity.CommandBlockEntity;
+@@ -177,7 +179,6 @@ import net.minecraft.world.level.block.entity.CrafterBlockEntity;
 import net.minecraft.world.level.block.entity.JigsawBlockEntity;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
 import net.minecraft.world.level.block.entity.StructureBlockEntity;
@@ -467,7 +467,7 @@ index b7f3bf0553fe72449f54f45046fe5b8b69eb5b59..fadeac3a787350f6b3d4936825b3b02b
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
-@@ -223,8 +224,6 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
+@@ -227,8 +228,6 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
 import org.bukkit.event.inventory.InventoryType.SlotType;
 import org.bukkit.event.inventory.SmithItemEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -476,7 +476,7 @@ index b7f3bf0553fe72449f54f45046fe5b8b69eb5b59..fadeac3a787350f6b3d4936825b3b02b
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
-@@ -774,13 +773,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -777,13 +776,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
         // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
         // CraftBukkit start
         if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -492,7 +492,7 @@ index b7f3bf0553fe72449f54f45046fe5b8b69eb5b59..fadeac3a787350f6b3d4936825b3b02b
             return;
         }
         // Paper end
-@@ -3215,7 +3214,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3212,7 +3211,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
         // Paper start
         if (!org.bukkit.Bukkit.isPrimaryThread()) {
             if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -502,34 +502,35 @@ index b7f3bf0553fe72449f54f45046fe5b8b69eb5b59..fadeac3a787350f6b3d4936825b3b02b
             }
         }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 07f84c2815d18c6994498ad5e2fca556cca88567..49de4b85a8d8a9c861f8a081a2836bfefec91378 100644
+index 4ed1b205d2b31c00fbf9aa70cd2c13e7d0fe0534..a7ab766fe5259a033d61979d24d78862805b00ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -14,8 +14,9 @@ import java.util.Objects;
- import java.util.UUID;
+@@ -13,9 +13,10 @@ import java.security.PrivateKey;
+ import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
 -import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
+ import net.minecraft.CrashReportCategory;
 +
 +import me.titaniumtown.ArrayConstants;
 import net.minecraft.DefaultUncaughtExceptionHandler;
 import net.minecraft.core.UUIDUtil;
 import net.minecraft.network.Connection;
-@@ -166,8 +167,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -147,8 +148,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
     @Override
     public void handleHello(ServerboundHelloPacket packet) {
 -        Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]);
-        Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]);
+-        if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) Validate.validState(Player.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]); // Paper - config username validation
 +        // Gale start - JettPack - reduce array allocations
 +        Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", ArrayConstants.emptyObjectArray);
-+        Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", ArrayConstants.emptyObjectArray);
+        if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) Validate.validState(Player.isValidUsername(packet.name()), "Invalid characters in username", ArrayConstants.emptyObjectArray); // Paper - config username validation
 +        // Gale end - JettPack - reduce array allocations
-         // Paper start - validate usernames
-         if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation) {
-             if (!this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation && !validateUsername(packet.name())) {
-@@ -260,7 +263,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+         this.requestedUsername = packet.name();
+         GameProfile gameprofile = this.server.getSingleplayerProfile();
+ 
+@@ -227,7 +230,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
     @Override
     public void handleKey(ServerboundKeyPacket packet) {
@@ -538,8 +539,17 @@ index 07f84c2815d18c6994498ad5e2fca556cca88567..49de4b85a8d8a9c861f8a081a2836bfe
 
         final String s;
 
+@@ -409,7 +412,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+ 
+     @Override
+     public void handleLoginAcknowledgement(ServerboundLoginAcknowledgedPacket packet) {
+-        Validate.validState(this.state == ServerLoginPacketListenerImpl.State.PROTOCOL_SWITCHING, "Unexpected login acknowledgement packet", new Object[0]);
+        Validate.validState(this.state == ServerLoginPacketListenerImpl.State.PROTOCOL_SWITCHING, "Unexpected login acknowledgement packet", ArrayConstants.emptyObjectArray); // Gale - JettPack - reduce array allocations
+         CommonListenerCookie commonlistenercookie = CommonListenerCookie.createInitial((GameProfile) Objects.requireNonNull(this.authenticatedProfile));
+         ServerConfigurationPacketListenerImpl serverconfigurationpacketlistenerimpl = new ServerConfigurationPacketListenerImpl(this.server, this.connection, commonlistenercookie, this.player); // CraftBukkit
+ 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b1ae1944d3b5b2ac520b087a3059ae6059807f4d..1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d 100644
+index 2306d7aca29b3e399f152eb8470115e6f7bb172a..2cbdd62e7b8a40ccdc8622c35fd94ae60d083531 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -25,6 +25,8 @@ import java.util.UUID;
@@ -551,7 +561,7 @@ index b1ae1944d3b5b2ac520b087a3059ae6059807f4d..1f7faf3ad062bf2bc0a0b4a4e6549914
 import net.minecraft.ChatFormatting;
 import net.minecraft.FileUtil;
 import net.minecraft.commands.CommandSourceStack;
-@@ -725,7 +727,7 @@ public abstract class PlayerList {
+@@ -723,7 +725,7 @@ public abstract class PlayerList {
         while (iterator.hasNext()) {
             entityplayer = (ServerPlayer) iterator.next();
             this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
@@ -561,7 +571,7 @@ index b1ae1944d3b5b2ac520b087a3059ae6059807f4d..1f7faf3ad062bf2bc0a0b4a4e6549914
 
         // Instead of kicking then returning, we need to store the kick reason
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 09fc086548b9d0f97849f56f41e3a5be87f5091a..ac64513e989500e76f8b0689dae655bcfc7f5b53 100644
+index 665120a62525f56912263a3e1b6f12f6c3e15dec..71e1c1a1ae59f74cfeea071aa6988f6fe47a286d 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
@@ -1,7 +1,6 @@
@@ -572,7 +582,7 @@ index 09fc086548b9d0f97849f56f41e3a5be87f5091a..ac64513e989500e76f8b0689dae655bc
 import com.google.common.collect.Maps;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
-@@ -24,6 +23,8 @@ import java.util.Map;
+@@ -22,6 +21,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
@@ -581,7 +591,7 @@ index 09fc086548b9d0f97849f56f41e3a5be87f5091a..ac64513e989500e76f8b0689dae655bc
 import net.minecraft.Util;
 import net.minecraft.util.GsonHelper;
 import org.slf4j.Logger;
-@@ -96,7 +97,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -79,7 +80,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
     }
 
     public String[] getUserList() {
@@ -641,10 +651,10 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8e91714e3167ab0ad16df681bc080772
     private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
         this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1794f5d1a8cc912fdd75a18ceccb536f48ab4686..d1d30ddc3c46cc7e5a7069e914f1117e8a8e638e 100644
+index ae070ceb7f696af8b43c4d2c2ff6daf221c8a9db..daabae0c34b4d03b71b19843c4b420128f4dbaf6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3141,7 +3141,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3138,7 +3138,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     @Nullable
     private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
         Map<EquipmentSlot, ItemStack> map = null;
@@ -654,10 +664,10 @@ index 1794f5d1a8cc912fdd75a18ceccb536f48ab4686..d1d30ddc3c46cc7e5a7069e914f1117e
 
         for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 8dafe3126ef152d44b4ae6d84dd1a3b908332a1e..5a587d8901b80da72ac850b95b55a21011ae3fb4 100644
+index 5fa46974539fcfe3b344788c49e0be94228b1a6d..fc949fddb5864e4ed2cba4dad3ea5878d8a36b88 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1055,7 +1055,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1056,7 +1056,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
     @Override
     protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) {
         super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops);
@@ -666,7 +676,7 @@ index 8dafe3126ef152d44b4ae6d84dd1a3b908332a1e..5a587d8901b80da72ac850b95b55a210
         int j = aenumitemslot.length;
 
         for (int k = 0; k < j; ++k) {
-@@ -1117,7 +1117,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1118,7 +1118,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
             }
 
             boolean flag = true;
@@ -675,7 +685,7 @@ index 8dafe3126ef152d44b4ae6d84dd1a3b908332a1e..5a587d8901b80da72ac850b95b55a210
             int j = aenumitemslot.length;
 
             for (int k = 0; k < j; ++k) {
-@@ -1204,7 +1204,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1205,7 +1205,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
         float f = localDifficulty.getSpecialMultiplier();
 
         this.enchantSpawnedWeapon(random, f);
@@ -684,7 +694,7 @@ index 8dafe3126ef152d44b4ae6d84dd1a3b908332a1e..5a587d8901b80da72ac850b95b55a210
         int i = aenumitemslot.length;
 
         for (int j = 0; j < i; ++j) {
-@@ -1423,7 +1423,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1424,7 +1424,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
                 t0.setInvulnerable(this.isInvulnerable());
                 if (flag) {
                     t0.setCanPickUpLoot(this.canPickUpLoot());
@@ -707,10 +717,10 @@ index 94396ad1a3c280787d36c6c18256d10340ace488..9e139c1291f40fd730754ac2427269b1
 
         for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..266a8e409af8b8d879d21a5d146acfc353484ce7 100644
+index de277d61b718fe07a87d75a2547bb1c7f8553aa1..2e451090791e1dd374bd54ae74eef617306e5f3e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1027,7 +1027,7 @@ public final class ItemStack {
+@@ -1052,7 +1052,7 @@ public final class ItemStack {
         int k;
 
         if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {
@@ -719,47 +729,47 @@ index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..266a8e409af8b8d879d21a5d146acfc3
 
             k = aenumitemslot.length;
 
-diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
-index 17bef91546fa85d401b263c3a69fbf464f290eca..5644aa6a80a7490909b89148f077ac51e3c861d3 100644
--- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
-@@ -9,6 +9,8 @@ import java.util.Iterator;
- import java.util.List;
+diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipePattern.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipePattern.java
+index 27dc0e4ce21ccf641ea16fd6d2dc1c28fcf62df8..81c9ba1d3455d1eb6619cb04d4e52a7226b2518f 100644
+--- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipePattern.java
+++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipePattern.java
+@@ -11,6 +11,8 @@ import java.util.List;
 import java.util.Map;
- import java.util.Set;
+ import java.util.Optional;
+ import java.util.function.Function;
 +
 +import me.titaniumtown.ArrayConstants;
+ import net.minecraft.Util;
 import net.minecraft.core.NonNullList;
- import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
-@@ -226,7 +228,7 @@ public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookEx
+@@ -89,7 +91,7 @@ public record ShapedRecipePattern(int width, int height, NonNullList<Ingredient>
         }
 
         if (pattern.size() == l) {
 -            return new String[0];
 +            return ArrayConstants.emptyStringArray; // Gale - JettPack - reduce array allocations
         } else {
-             String[] astring = new String[pattern.size() - l - k];
+             String[] strings = new String[pattern.size() - l - k];
 
 diff --git a/src/main/java/net/minecraft/world/item/enchantment/Enchantments.java b/src/main/java/net/minecraft/world/item/enchantment/Enchantments.java
-index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..84f1c4c3ded4f201899f3c74e639349b9d1f00ee 100644
+index 6c2e8049c2197ddc912c1a0fc99c87beae81e25b..a13822a22ab524a0fb9fd998c4ada06b6e10e182 100644
 --- a/src/main/java/net/minecraft/world/item/enchantment/Enchantments.java
 +++ b/src/main/java/net/minecraft/world/item/enchantment/Enchantments.java
-@@ -44,8 +44,10 @@ public class Enchantments {
-     public static final Enchantment MULTISHOT = Enchantments.register("multishot", new MultiShotEnchantment(Enchantment.Rarity.RARE, new EquipmentSlot[]{EquipmentSlot.MAINHAND}));
-     public static final Enchantment QUICK_CHARGE = Enchantments.register("quick_charge", new QuickChargeEnchantment(Enchantment.Rarity.UNCOMMON, new EquipmentSlot[]{EquipmentSlot.MAINHAND}));
-     public static final Enchantment PIERCING = Enchantments.register("piercing", new ArrowPiercingEnchantment(Enchantment.Rarity.COMMON, new EquipmentSlot[]{EquipmentSlot.MAINHAND}));
-    public static final Enchantment MENDING = Enchantments.register("mending", new MendingEnchantment(Enchantment.Rarity.RARE, EquipmentSlot.values()));
-    public static final Enchantment VANISHING_CURSE = Enchantments.register("vanishing_curse", new VanishingCurseEnchantment(Enchantment.Rarity.VERY_RARE, EquipmentSlot.values()));
+@@ -43,8 +43,10 @@ public class Enchantments {
+     public static final Enchantment MULTISHOT = register("multishot", new MultiShotEnchantment(Enchantment.Rarity.RARE, EquipmentSlot.MAINHAND));
+     public static final Enchantment QUICK_CHARGE = register("quick_charge", new QuickChargeEnchantment(Enchantment.Rarity.UNCOMMON, EquipmentSlot.MAINHAND));
+     public static final Enchantment PIERCING = register("piercing", new ArrowPiercingEnchantment(Enchantment.Rarity.COMMON, EquipmentSlot.MAINHAND));
+-    public static final Enchantment MENDING = register("mending", new MendingEnchantment(Enchantment.Rarity.RARE, EquipmentSlot.values()));
+-    public static final Enchantment VANISHING_CURSE = register("vanishing_curse", new VanishingCurseEnchantment(Enchantment.Rarity.VERY_RARE, EquipmentSlot.values()));
 +    // Gale start - JettPack - reduce array allocations
-+    public static final Enchantment MENDING = Enchantments.register("mending", new MendingEnchantment(Enchantment.Rarity.RARE, EquipmentSlot.VALUES));
-+    public static final Enchantment VANISHING_CURSE = Enchantments.register("vanishing_curse", new VanishingCurseEnchantment(Enchantment.Rarity.VERY_RARE, EquipmentSlot.VALUES));
+    public static final Enchantment MENDING = register("mending", new MendingEnchantment(Enchantment.Rarity.RARE, EquipmentSlot.VALUES));
+    public static final Enchantment VANISHING_CURSE = register("vanishing_curse", new VanishingCurseEnchantment(Enchantment.Rarity.VERY_RARE, EquipmentSlot.VALUES));
 +    // Gale end - JettPack - reduce array allocations
 
-     public Enchantments() {}
- 
+     private static Enchantment register(String name, Enchantment enchantment) {
+         return Registry.register(BuiltInRegistries.ENCHANTMENT, name, enchantment);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d0818a177f099817f6735bb341938ce0aa5282f8..4ddf4ad2cdf44841e1ca67a9ba1cce926f92bc6d 100644
+index 8eb1ab90c11a38c0c35f89d39054efd721f6df6c..d2a4e3326939c3c6dde7aba091d92ee84731d394 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -12,6 +12,8 @@ import java.util.function.Consumer;
@@ -771,7 +781,7 @@ index d0818a177f099817f6735bb341938ce0aa5282f8..4ddf4ad2cdf44841e1ca67a9ba1cce92
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.core.BlockPos;
-@@ -1832,7 +1834,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1852,7 +1854,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
         io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ);
         if (slices == null) {
@@ -781,10 +791,10 @@ index d0818a177f099817f6735bb341938ce0aa5282f8..4ddf4ad2cdf44841e1ca67a9ba1cce92
         return slices.getChunkEntities();
     }
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 10d3912ef043eefdf89105332e29b0d2bf4a5539..0500d4b96328ccc64e0dd3bd2d35c6b7bd21907e 100644
+index de8b5cab7925c1c46478952ed2cb2bd40f9a9c48..ce43cb260b36ca170a1d1725a7bf02525e8970d6 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -3,6 +3,8 @@ package net.minecraft.world.level.block;
+@@ -4,6 +4,8 @@ import com.mojang.serialization.MapCodec;
 import it.unimi.dsi.fastutil.objects.Object2FloatMap;
 import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
 import javax.annotation.Nullable;
@@ -793,7 +803,7 @@ index 10d3912ef043eefdf89105332e29b0d2bf4a5539..0500d4b96328ccc64e0dd3bd2d35c6b7
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-@@ -415,7 +417,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -422,7 +424,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
 
         @Override
         public int[] getSlotsForFace(Direction side) {
@@ -802,7 +812,7 @@ index 10d3912ef043eefdf89105332e29b0d2bf4a5539..0500d4b96328ccc64e0dd3bd2d35c6b7
         }
 
         @Override
-@@ -464,7 +466,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -471,7 +473,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
 
         @Override
         public int[] getSlotsForFace(Direction side) {
@@ -811,7 +821,7 @@ index 10d3912ef043eefdf89105332e29b0d2bf4a5539..0500d4b96328ccc64e0dd3bd2d35c6b7
         }
 
         @Override
-@@ -506,7 +508,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -513,7 +515,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
 
         @Override
         public int[] getSlotsForFace(Direction side) {
@@ -843,17 +853,18 @@ index a18aadbf7ae83713e1f2b21553185d8000bc7699..13e100fd2400878c819c7115bb958586
     private static final int[] SLOTS_FOR_SIDES = new int[]{1};
     public static final int DATA_LIT_DURATION = 1;
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 36af81f0957d17e170d229059c66f4eb4539dfeb..d6693314e7814763bf216d62ccf6c2211e8f5341 100644
+index b3a90d6ef0e17c236e0b3c46e2d0012671afdaa7..9c82568d31da70e30c45dbb41be48026eb0dc85a 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -4,12 +4,13 @@ import com.mojang.datafixers.DataFixer;
- import com.mojang.logging.LogUtils;
- import java.io.File;
+@@ -6,13 +6,14 @@ import java.io.File;
+ import java.nio.file.Files;
+ import java.nio.file.Path;
 import javax.annotation.Nullable;
 +
 +import me.titaniumtown.ArrayConstants;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.server.level.ServerPlayer;
@@ -861,7 +872,7 @@ index 36af81f0957d17e170d229059c66f4eb4539dfeb..d6693314e7814763bf216d62ccf6c221
 import net.minecraft.world.entity.player.Player;
 import org.slf4j.Logger;
 
-@@ -119,7 +120,7 @@ public class PlayerDataStorage {
+@@ -124,7 +125,7 @@ public class PlayerDataStorage {
         String[] astring = this.playerDir.list();
 
         if (astring == null) {
--- a/patches/server/0081-Optimize-sun-burn-tick.patch
+++ b/patches/server/0081-Optimize-sun-burn-tick.patch
@@ -13,10 +13,10 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec0c8205959d451c5f8c15f0aa11d0115f1d8125..3229280ed3e019958ae3c475c81397de979bb813 100644
+index b9b3391726cbd801e1d386f13323aa907d4d51b9..4a27430cf605969023437e9310aa685394dcec88 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -305,7 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     public double xo;
     public double yo;
     public double zo;
@@ -25,7 +25,7 @@ index ec0c8205959d451c5f8c15f0aa11d0115f1d8125..3229280ed3e019958ae3c475c81397de
     public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
     private ChunkPos chunkPosition;
     private Vec3 deltaMovement;
-@@ -2000,9 +2000,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2005,9 +2005,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     /** @deprecated */
     @Deprecated
     public float getLightLevelDependentMagicValue() {
@@ -45,10 +45,10 @@ index ec0c8205959d451c5f8c15f0aa11d0115f1d8125..3229280ed3e019958ae3c475c81397de
         this.absMoveTo(x, y, z);
         this.setYRot(yaw % 360.0F);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 5a587d8901b80da72ac850b95b55a21011ae3fb4..b35d9c04f0a9d73d6483526e396035d72fa33825 100644
+index fc949fddb5864e4ed2cba4dad3ea5878d8a36b88..db9aee68b644d318f65df010027b40628ea84ea2 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1685,13 +1685,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1686,13 +1686,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
 
     }
 
--- a/patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
+++ b/patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
--- a/patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch
+++ b/patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch
--- a/patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch
+++ b/patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch
@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 6639902efb85b4f49f26ba5f90556fb871ef8a0e..182db7ed5295edf41c0e28769f78875104c6a825 100644
+index 4f2fa47d094348bb8f86a86e808019ddba56e187..5c7e6b320566473a295f1979d68b3e3edf138895 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -19,6 +19,8 @@ import java.util.function.BiConsumer;
@@ -25,7 +25,7 @@ index 6639902efb85b4f49f26ba5f90556fb871ef8a0e..182db7ed5295edf41c0e28769f788751
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.nbt.CompoundTag;
-@@ -137,7 +139,7 @@ public class GameRules {
+@@ -141,7 +143,7 @@ public class GameRules {
     }
 
     private GameRules(Map<GameRules.Key<?>, GameRules.Value<?>> rules) {
--- a/patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch
+++ b/patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch
--- a/patches/server/0086-Replace-class-map-with-optimized-collection.patch
+++ b/patches/server/0086-Replace-class-map-with-optimized-collection.patch
--- a/patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch
+++ b/patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch
@@ -33,7 +33,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRA
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 73f12e176acc0a035d3283cf5ecebcb1b8b06b73..b76f4b62d58087325d01983effe0a508d551d4ab 100644
+index c6bcf4a5d5c48e6f73b8e5d3662ec0d7c288c6c8..8e7488277bc30f83fa39f7435ca9f1724452e92e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
@@ -1,5 +1,7 @@
--- a/patches/server/0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
+++ b/patches/server/0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
--- a/patches/server/0089-Cache-BlockStatePairKey-hash.patch
+++ b/patches/server/0089-Cache-BlockStatePairKey-hash.patch
@@ -13,10 +13,10 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index d4cbff18adb62073a1dceb189043789620af6877..8f237fa0afb9f8d8fcded1a017342ecacd10bcf2 100644
+index 4d50dd92a7f3187ee1d8edb926e7c273c8156549..2ccfb0456cbc42e79bbab49f0c01443ce1560d3a 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -598,11 +598,18 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -606,11 +606,18 @@ public class Block extends BlockBehaviour implements ItemLike {
         private final BlockState first;
         private final BlockState second;
         private final Direction direction;
@@ -35,7 +35,7 @@ index d4cbff18adb62073a1dceb189043789620af6877..8f237fa0afb9f8d8fcded1a017342eca
         }
 
         public boolean equals(Object object) {
-@@ -618,11 +625,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -626,11 +633,7 @@ public class Block extends BlockBehaviour implements ItemLike {
         }
 
         public int hashCode() {
--- a/patches/server/0090-Cache-CubeVoxelShape-shape-array.patch
+++ b/patches/server/0090-Cache-CubeVoxelShape-shape-array.patch
--- a/patches/server/0091-Replace-division-by-multiplication-in-CubePointRange.patch
+++ b/patches/server/0091-Replace-division-by-multiplication-in-CubePointRange.patch
--- a/patches/server/0092-Replace-parts-by-size-in-CubePointRange.patch
+++ b/patches/server/0092-Replace-parts-by-size-in-CubePointRange.patch
--- a/patches/server/0093-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0093-Check-frozen-ticks-before-landing-block.patch
@@ -13,10 +13,10 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4c707d81158e79554f1af41e3f8d4337cd99d836..0458695fa5cfff003d07ad049d7810acefe6d26e 100644
+index daabae0c34b4d03b71b19843c4b420128f4dbaf6..e2e1b3e148e32441b2b1adc97157253428f4c2ca 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -583,11 +583,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -582,11 +582,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
     }
 
     protected void tryAddFrost() {
@@ -29,7 +29,7 @@ index 4c707d81158e79554f1af41e3f8d4337cd99d836..0458695fa5cfff003d07ad049d7810ac
 
                 if (attributemodifiable == null) {
                     return;
-@@ -597,7 +596,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -596,7 +595,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
                 attributemodifiable.addTransientModifier(new AttributeModifier(LivingEntity.SPEED_MODIFIER_POWDER_SNOW_UUID, "Powder snow slow", (double) f, AttributeModifier.Operation.ADDITION));
             }
--- a/patches/server/0094-Faster-chunk-serialization.patch
+++ b/patches/server/0094-Faster-chunk-serialization.patch
--- a/patches/server/0095-Update-boss-bar-within-tick.patch
+++ b/patches/server/0095-Update-boss-bar-within-tick.patch
--- a/patches/server/0096-Cache-ominous-banner-item.patch
+++ b/patches/server/0096-Cache-ominous-banner-item.patch
@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java b/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java
-index 3509fd5ad4f06cbac24d2dcdde171cebbdd0fcc1..67d446390586797970610e13fcdbd9410660a67e 100644
+index f4e5ada556a7fc7adac9b8d3e75ace483f753782..14b0fb4a1d7bc752fc041dbc850ad457a24c939a 100644
 --- a/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java
 +++ b/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java
@@ -15,7 +15,7 @@ public record EntityEquipmentPredicate(Optional<ItemPredicate> head, Optional<It
--- a/patches/server/0097-Optimize-world-generation-chunk-and-block-access.patch
+++ b/patches/server/0097-Optimize-world-generation-chunk-and-block-access.patch
@@ -115,7 +115,7 @@ index 0000000000000000000000000000000000000000..f2f10b651e4fbecdd1ea1bc28ebf40d6
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 4c8f27673219187399cb9ba1d23447d42077f3fe..719587d86c293cb759632a872213d8e4184c768d 100644
+index 96e811380c891009f2e39ea23c822dc5254a1f73..0b900426ff70af206df96a08c56afedfba1f91ad 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
@@ -8,6 +8,7 @@ import java.util.concurrent.atomic.AtomicLong;
--- a/patches/server/0098-Cache-world-generator-sea-level.patch
+++ b/patches/server/0098-Cache-world-generator-sea-level.patch
--- a/patches/server/0099-Skip-secondary-POI-sensor-if-absent.patch
+++ b/patches/server/0099-Skip-secondary-POI-sensor-if-absent.patch
--- a/patches/server/0100-Optimize-villager-data-storage.patch
+++ b/patches/server/0100-Optimize-villager-data-storage.patch
@@ -212,7 +212,7 @@ index 75dc06a3041bfdfb08c914eb50cfa282ae9eb2fe..53b0519bbc5d52490040eaf0fe449648
         } else {
             brain.eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index bb751dc6afe6d8d56523d53aef0372781bbe730d..e157e11933710e0ceb73c6d41f673332fbeee303 100644
+index e02560e9d4c3a1503862e357fe501b05103052b9..53da46274f3cb2767b20e6959e2a0d01c1899750 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -90,6 +90,7 @@ import net.minecraft.world.item.trading.MerchantOffers;
--- a/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch
@@ -13,10 +13,10 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 80ef2ce17898095a35efc4d47b7b32349fc503c3..dfd6a487b0ab06d5f071806689a85b08da6a9715 100644
+index 4a27430cf605969023437e9310aa685394dcec88..eccf98aca5e904b89a9cae0920b46e34cbcc1703 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -314,6 +314,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -315,6 +315,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     public float yRotO;
     public float xRotO;
     private AABB bb;
@@ -24,7 +24,7 @@ index 80ef2ce17898095a35efc4d47b7b32349fc503c3..dfd6a487b0ab06d5f071806689a85b08
     public boolean onGround;
     public boolean horizontalCollision;
     public boolean verticalCollision;
-@@ -1067,6 +1068,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1072,6 +1073,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     // Paper end - detailed watchdog information
 
     public void move(MoverType movementType, Vec3 movement) {
@@ -36,7 +36,7 @@ index 80ef2ce17898095a35efc4d47b7b32349fc503c3..dfd6a487b0ab06d5f071806689a85b08
         // Paper start - detailed watchdog information
         io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
         synchronized (this.posLock) {
-@@ -4038,6 +4044,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4076,6 +4082,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
     }
 
     public final void setBoundingBox(AABB boundingBox) {
--- a/patches/server/0102-Store-mob-counts-in-an-array.patch
+++ b/patches/server/0102-Store-mob-counts-in-an-array.patch
--- a/patches/server/0103-Use-linked-map-for-entity-trackers.patch
+++ b/patches/server/0103-Use-linked-map-for-entity-trackers.patch
--- a/patches/server/0104-Optimize-noise-generation.patch
+++ b/patches/server/0104-Optimize-noise-generation.patch
--- a/patches/server/0105-Optimize-sheep-offspring-color.patch
+++ b/patches/server/0105-Optimize-sheep-offspring-color.patch
--- a/patches/server/0106-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0106-Hide-flames-on-entities-with-fire-resistance.patch
@@ -13,10 +13,10 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd3db2d1978c5195bbdb70d2ec58550a2d7abdf1..bc36a10a918763ad00268374e88f2037916f1ca6 100644
+index eccf98aca5e904b89a9cae0920b46e34cbcc1703..bc54774c3caed6102dd256a1311ebb244242a16a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -869,7 +869,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -874,7 +874,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
 
         this.checkBelowWorld();
         if (!this.level().isClientSide) {
--- a/patches/server/0107-Skip-cloning-advancement-criteria.patch
+++ b/patches/server/0107-Skip-cloning-advancement-criteria.patch
@@ -13,15 +13,15 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/advancements/Advancement.java b/src/main/java/net/minecraft/advancements/Advancement.java
-index afa5ac5e3b045f8eeafd14b7db09e547fbd59f3a..1ba07aaec7c0fba5ad92d0b88b623ec769b3fbb6 100644
+index a053d30f171c0c022888f098313b50f73c434180..afe6dc0e814ecbe57f92b541947d2edadcd5b370 100644
 --- a/src/main/java/net/minecraft/advancements/Advancement.java
 +++ b/src/main/java/net/minecraft/advancements/Advancement.java
-@@ -22,7 +22,7 @@ import net.minecraft.world.level.ItemLike;
+@@ -40,7 +40,7 @@ public record Advancement(Optional<ResourceLocation> parent, Optional<DisplayInf
+     }), Advancement::validate);
 
- public record Advancement(Optional<ResourceLocation> parent, Optional<DisplayInfo> display, AdvancementRewards rewards, Map<String, Criterion<?>> criteria, AdvancementRequirements requirements, boolean sendsTelemetryEvent, Optional<Component> name) {
     public Advancement(Optional<ResourceLocation> parent, Optional<DisplayInfo> display, AdvancementRewards rewards, Map<String, Criterion<?>> criteria, AdvancementRequirements requirements, boolean sendsTelemetryEvent) {
 -        this(parent, display, rewards, Map.copyOf(criteria), requirements, sendsTelemetryEvent, display.map(Advancement::decorateName));
 +        this(parent, display, rewards, criteria, requirements, sendsTelemetryEvent, display.map(Advancement::decorateName)); // Gale - Mirai - skip cloning advancement criteria
     }
 
-     public static Component decorateName(DisplayInfo display) {
+     private static DataResult<Advancement> validate(Advancement advancement) {
--- a/patches/server/0108-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0108-Reduce-block-destruction-packet-allocations.patch
@@ -13,10 +13,10 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 786f0d50aefec0f76b6ad4df57b1389fa66f21ea..fbfef5678423f1224bfcfe62073e0603bb0bd58d 100644
+index 902b9c144cdedabbc3dc489c8643351c2f31aabe..b19571f838469dcaba5ecee06fe43de23bcdc776 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1728,7 +1728,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1752,7 +1752,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
 
     @Override
     public void destroyBlockProgress(int entityId, BlockPos pos, int progress) {
@@ -35,7 +35,7 @@ index 786f0d50aefec0f76b6ad4df57b1389fa66f21ea..fbfef5678423f1224bfcfe62073e0603
 
         // CraftBukkit start
         Player entityhuman = null;
-@@ -1751,7 +1761,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1775,7 +1785,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                 // CraftBukkit end
 
                 if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
--- a/patches/server/0109-Spread-out-sending-all-player-info.patch
+++ b/patches/server/0109-Spread-out-sending-all-player-info.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d188d4d90 100644
+index 2cbdd62e7b8a40ccdc8622c35fd94ae60d083531..81eb658675ffaf0ee61bf7e04a02dd0c8a2d3da3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -13,6 +13,8 @@ import java.net.SocketAddress;
@@ -49,7 +49,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Iterator;
-@@ -135,10 +137,11 @@ public abstract class PlayerList {
+@@ -133,10 +135,11 @@ public abstract class PlayerList {
     public static final Component CHAT_FILTERED_FULL = Component.translatable("chat.filtered_full");
     public static final Component DUPLICATE_LOGIN_DISCONNECT_MESSAGE = Component.translatable("multiplayer.disconnect.duplicate_login");
     private static final Logger LOGGER = LogUtils.getLogger();
@@ -62,7 +62,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
     private final Map<UUID, ServerPlayer> playersByUUID = Maps.newHashMap();
     private final UserBanList bans;
     private final IpBanList ipBans;
-@@ -329,6 +332,7 @@ public abstract class PlayerList {
+@@ -327,6 +330,7 @@ public abstract class PlayerList {
 
         // entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
         this.players.add(player);
@@ -70,7 +70,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
         this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
         this.playersByUUID.put(player.getUUID(), player);
         // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
-@@ -673,6 +677,7 @@ public abstract class PlayerList {
+@@ -671,6 +675,7 @@ public abstract class PlayerList {
         entityplayer.retireScheduler(); // Paper - Folia schedulers
         entityplayer.getAdvancements().stopListening();
         this.players.remove(entityplayer);
@@ -78,7 +78,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
         this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
         this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
         UUID uuid = entityplayer.getUUID();
-@@ -834,6 +839,7 @@ public abstract class PlayerList {
+@@ -832,6 +837,7 @@ public abstract class PlayerList {
         // Paper end
         entityplayer.stopRiding(); // CraftBukkit
         this.players.remove(entityplayer);
@@ -86,7 +86,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
         this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
         entityplayer.serverLevel().removePlayerImmediately(entityplayer, Entity.RemovalReason.DISCARDED);
         BlockPos blockposition = entityplayer.getRespawnPosition();
-@@ -970,6 +976,7 @@ public abstract class PlayerList {
+@@ -968,6 +974,7 @@ public abstract class PlayerList {
         if (!entityplayer.connection.isDisconnected()) {
             worldserver1.addRespawnedPlayer(entityplayer1);
             this.players.add(entityplayer1);
@@ -94,7 +94,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
             this.playersByName.put(entityplayer1.getScoreboardName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot
             this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
         }
-@@ -1022,20 +1029,55 @@ public abstract class PlayerList {
+@@ -1020,20 +1027,55 @@ public abstract class PlayerList {
         this.sendPlayerPermissionLevel(player, i);
     }
 
@@ -157,7 +157,7 @@ index 1f7faf3ad062bf2bc0a0b4a4e6549914a05f0f9d..45eefa9fd18950fbd913cef7c1e78f7d
         }
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index fc4b9144cb093fe84b0d5cb27f0efee23c7a39ed..ff17428fc260f4737cda81bca5f4fdb8e50dbd67 100644
+index 5005d9ba125fb96900c01098a9a2e5f5d7a5cba6..b6c2044d9688c352b96a81c8d0abc4028fbe0ad1 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -39,6 +39,7 @@ import net.minecraft.network.syncher.SynchedEntityData;
@@ -168,7 +168,7 @@ index fc4b9144cb093fe84b0d5cb27f0efee23c7a39ed..ff17428fc260f4737cda81bca5f4fdb8
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
-@@ -199,12 +200,15 @@ public abstract class Player extends LivingEntity {
+@@ -194,12 +195,15 @@ public abstract class Player extends LivingEntity {
     }
     // CraftBukkit end
 
--- a/patches/server/0110-Optimize-player-list-for-sending-player-info.patch
+++ b/patches/server/0110-Optimize-player-list-for-sending-player-info.patch
@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 45eefa9fd18950fbd913cef7c1e78f7d188d4d90..b4ca4f9e418086a156823d2afd16fd2c8d47a542 100644
+index 81eb658675ffaf0ee61bf7e04a02dd0c8a2d3da3..4ffccef1c0c2646923e8016ddefc78a604b25f63 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1065,14 +1065,18 @@ public abstract class PlayerList {
+@@ -1063,14 +1063,18 @@ public abstract class PlayerList {
         // Gale start - Purpur - spread out sending all player info
         ServerPlayer[] sendAllPlayerInfoBucket = this.sendAllPlayerInfoBuckets[this.sendAllPlayerInfoIn];
         if (sendAllPlayerInfoBucket != null) {
--- a/patches/server/0111-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
+++ b/patches/server/0111-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index a2ba17ce6ceda1f52cf685783676a49ca17fd396..500a515f4c059dd2b521e82018e839dc244241e2 100644
+index e0a149b2bc29b3aab7be10798f6a0978f9381c07..f609e2a61a1362b0cc15fbb4e81ca66fd67eff6c 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -455,6 +455,7 @@ public class Commands {
+@@ -509,6 +509,7 @@ public class Commands {
     private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
         // Paper end - Async command map building
         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
@@ -48,7 +48,7 @@ index a2ba17ce6ceda1f52cf685783676a49ca17fd396..500a515f4c059dd2b521e82018e839dc
         PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
         event.getPlayer().getServer().getPluginManager().callEvent(event);
 
-@@ -465,6 +466,7 @@ public class Commands {
+@@ -519,6 +520,7 @@ public class Commands {
             }
         }
         // CraftBukkit end
--- a/patches/server/0112-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0112-Send-multiple-keep-alive-packets.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 09595e58058e9c91b181c212bb629de463cc48b9..9019bbc86f3e94b8f4033f2e5fb43dd7efac15f9 100644
+index f5d81da99a47fc1237a670d0000f19f1d61a5160..cb453c4db347b320f19a79ede2d8898106605e25 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -4,6 +4,9 @@ import com.mojang.authlib.GameProfile;
@@ -128,7 +128,7 @@ index 09595e58058e9c91b181c212bb629de463cc48b9..9019bbc86f3e94b8f4033f2e5fb43dd7
 
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fadeac3a787350f6b3d4936825b3b02bd0cde31a..f81ec0b6e542ac697769f6b7392d62e9e0aac0a6 100644
+index 8b9fccee2f999836cb7550955ee4b38cde990286..347b1d225d2e7084d13ea9a633f50e08bf8e58b4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -8,6 +8,8 @@ import com.mojang.brigadier.StringReader;
@@ -140,7 +140,7 @@ index fadeac3a787350f6b3d4936825b3b02bd0cde31a..f81ec0b6e542ac697769f6b7392d62e9
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import java.net.SocketAddress;
-@@ -3407,6 +3409,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3404,6 +3406,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
     }
 
     @Override
@@ -149,7 +149,7 @@ index fadeac3a787350f6b3d4936825b3b02bd0cde31a..f81ec0b6e542ac697769f6b7392d62e9
         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
         // CraftBukkit start
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 00d511ed75a5e7268737663baad0c25511e35d53..d6d5bb73db5eb3f620e2c0d4858a96901f364462 100644
+index b2aa32662335c4d64ac87320fcfb334784d89ec5..4650c69295adcc780f00d8d098cf939931147828 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -88,6 +88,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
--- a/patches/server/0113-Make-slow-login-timeout-configurable.patch
+++ b/patches/server/0113-Make-slow-login-timeout-configurable.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index e1f442b204cdf8c58c4f980af1714368ef9a61b9..4dc8365202fe851933545635bd14c7633534ee34 100644
+index a7ab766fe5259a033d61979d24d78862805b00ea..c4a681cdcd4d9e94fa7ef68562b9e41c2390852d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -93,7 +93,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -94,7 +94,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
             this.finishLoginAndWaitForClient(this.authenticatedProfile);
         }
 
@@ -23,7 +23,7 @@ index e1f442b204cdf8c58c4f980af1714368ef9a61b9..4dc8365202fe851933545635bd14c763
         }
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index d6d5bb73db5eb3f620e2c0d4858a96901f364462..f53328d3be9238c01bf2ec9b6ed0a854696a60f0 100644
+index 4650c69295adcc780f00d8d098cf939931147828..35a59ea0ba0b018278287c7aefb39b18b5a72267 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -52,6 +52,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
--- a/patches/server/0114-Make-max-interaction-distance-configurable.patch
+++ b/patches/server/0114-Make-max-interaction-distance-configurable.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 106a312aba249d1e83e4b535fc6e741e04ccfd14..58e3ac1e155fcd352efcc90401e4e13ae4c6a2ca 100644
+index 58f972832c39a27a8ccd606f9144e1c54adbf6f3..c0b368b8137ca6d90c4e6ec931e07b7ea69f8d9b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -174,7 +174,7 @@ public class ServerPlayerGameMode {
@@ -20,10 +20,10 @@ index 106a312aba249d1e83e4b535fc6e741e04ccfd14..58e3ac1e155fcd352efcc90401e4e13a
             this.debugLogging(pos, false, sequence, "too far");
         } else if (pos.getY() >= worldHeight) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f81ec0b6e542ac697769f6b7392d62e9e0aac0a6..477c343670599ba16dc34a5d4c07392ae1cc873b 100644
+index 347b1d225d2e7084d13ea9a633f50e08bf8e58b4..7b955100e39a935259887475278b24cf29905577 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -247,7 +247,7 @@ import org.bukkit.inventory.SmithingInventory;
+@@ -251,7 +251,7 @@ import org.bukkit.inventory.SmithingInventory;
 public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl implements ServerGamePacketListener, ServerPlayerConnection, TickablePacketListener {
 
     static final Logger LOGGER = LogUtils.getLogger();
@@ -32,7 +32,7 @@ index f81ec0b6e542ac697769f6b7392d62e9e0aac0a6..477c343670599ba16dc34a5d4c07392a
     private static final int NO_BLOCK_UPDATES_TO_ACK = -1;
     private static final int TRACKED_MESSAGE_DISCONNECT_THRESHOLD = 4096;
     private static final Component CHAT_VALIDATION_FAILED = Component.translatable("multiplayer.disconnect.chat_validation_failed");
-@@ -327,6 +327,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -330,6 +330,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
     private boolean hasMoved; // Spigot
     // CraftBukkit end
 
@@ -46,7 +46,7 @@ index f81ec0b6e542ac697769f6b7392d62e9e0aac0a6..477c343670599ba16dc34a5d4c07392a
     @Override
     public void tick() {
         if (this.ackBlockChangesUpTo > -1) {
-@@ -1901,7 +1908,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1928,7 +1935,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
             BlockPos blockposition = movingobjectpositionblock.getBlockPos();
             Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
 
@@ -55,7 +55,7 @@ index f81ec0b6e542ac697769f6b7392d62e9e0aac0a6..477c343670599ba16dc34a5d4c07392a
                 Vec3 vec3d2 = vec3d.subtract(vec3d1);
                 double d0 = 1.0000001D;
 
-@@ -2716,7 +2723,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2713,7 +2720,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
             AABB axisalignedbb = entity.getBoundingBox();
 
@@ -65,22 +65,22 @@ index f81ec0b6e542ac697769f6b7392d62e9e0aac0a6..477c343670599ba16dc34a5d4c07392a
                     private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                         ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
 diff --git a/src/main/java/net/minecraft/world/item/BrushItem.java b/src/main/java/net/minecraft/world/item/BrushItem.java
-index e111bbbba63ec53d709f23ad12b96c2d3766a146..72718684cf99a3b74ea7dce1e2e9d7a3c4b88d7e 100644
+index f46c16dd6ff9cd09ea579eecf99ce78c7eb39d49..430b8a2bb1639eeb7338e0f7b1030248d66ef31e 100644
 --- a/src/main/java/net/minecraft/world/item/BrushItem.java
 +++ b/src/main/java/net/minecraft/world/item/BrushItem.java
-@@ -30,7 +30,6 @@ import net.minecraft.world.phys.Vec3;
- public class BrushItem extends Item {
-     public static final int ANIMATION_DURATION = 10;
-     private static final int USE_DURATION = 200;
-    private static final double MAX_BRUSH_DISTANCE = Math.sqrt(ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) - 1.0D;
- 
-     public BrushItem(Item.Properties settings) {
-         super(settings);
-@@ -112,7 +111,7 @@ public class BrushItem extends Item {
-     private HitResult calculateHitResult(LivingEntity user) {
+@@ -4,6 +4,7 @@ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.particles.BlockParticleOption;
+ import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+ import net.minecraft.sounds.SoundEvent;
+ import net.minecraft.sounds.SoundEvents;
+ import net.minecraft.sounds.SoundSource;
+@@ -110,7 +111,7 @@ public class BrushItem extends Item {
+     private HitResult calculateHitResult(Player user) {
         return ProjectileUtil.getHitResultOnViewVector(user, (entity) -> {
             return !entity.isSpectator() && entity.isPickable();
-        }, MAX_BRUSH_DISTANCE);
+-        }, (double)Player.getPickRange(user.isCreative()));
 +        }, Math.sqrt(ServerGamePacketListenerImpl.getMaxInteractionDistanceSquared(user.level())) - 1.0D); // Gale - make max interaction distance configurable
     }
 
--- a/patches/server/0115-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0115-Load-portal-destination-chunk-before-entity-teleport.patch
@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1ec01ffb3c0b7e62304b5342927d81d5140e02d1..92b5d832427af60a5a0efc33c54f7ba49a0de9c4 100644
+index bc54774c3caed6102dd256a1311ebb244242a16a..9199686ff08b8fc5f54438ade7bef5e71d74ff9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3668,6 +3668,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3697,6 +3697,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                 Entity entity = this.getType().create(worldserver);
 
                 if (entity != null) {
--- a/patches/server/0116-Don-t-load-chunks-to-spawn-phantoms.patch
+++ b/patches/server/0116-Don-t-load-chunks-to-spawn-phantoms.patch
--- a/patches/server/0117-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0117-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 92b5d832427af60a5a0efc33c54f7ba49a0de9c4..f27b32d5e1acf83527930f25a7b026d243bf4d26 100644
+index 9199686ff08b8fc5f54438ade7bef5e71d74ff9f..1fd0af1085a56fef7b2255c726f52d0fe370cced 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4565,6 +4565,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4607,6 +4607,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
         return this.feetBlockState;
     }
 
@@ -28,10 +28,10 @@ index 92b5d832427af60a5a0efc33c54f7ba49a0de9c4..f27b32d5e1acf83527930f25a7b026d2
         return this.chunkPosition;
     }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ad7b59a9b49d3d9c4a506fef24412b065b904578..61178e3e8a64b4d01db0ce5361d0e1edc6d746e5 100644
+index e2e1b3e148e32441b2b1adc97157253428f4c2ca..3f0fe74372c1fe440688da2b058ceae106180ed3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2018,19 +2018,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2015,19 +2015,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
     public boolean onClimbableCached() {
         if (!this.blockPosition().equals(this.lastClimbingPosition)) {
--- a/patches/server/0118-Broadcast-crit-animations-as-the-entity-being-critte.patch
+++ b/patches/server/0118-Broadcast-crit-animations-as-the-entity-being-critte.patch
@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c651cef360efe8f80a49c3d572064ee16c786205..58bed6f664fc82665f680695070ee785a441f9bb 100644
+index 9701f93f0b6c51b01b05a54ed7482dbff75d9e8e..6f03370c6c05cbbbadf28f19c4263ded15b559d7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1916,12 +1916,18 @@ public class ServerPlayer extends Player {
+@@ -2017,12 +2017,18 @@ public class ServerPlayer extends Player {
 
     @Override
     public void crit(Entity target) {
--- a/patches/server/0119-Ignore-null-legacy-structure-data.patch
+++ b/patches/server/0119-Ignore-null-legacy-structure-data.patch
@@ -46,7 +46,7 @@ index 541314ba47ea158e4751aa4e853117f8861fad82..eb61a0f1cea465884baa17c2d0a0768d
                         continue;
                     }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index f53328d3be9238c01bf2ec9b6ed0a854696a60f0..f83fa90b2ed4a60d5f3b305a99ae16498a20aef1 100644
+index 35a59ea0ba0b018278287c7aefb39b18b5a72267..506d34b207da63893204b3da7490d24826f5b662 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -53,6 +53,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
--- a/Show More
+++ b/Show More