1.20.4

80 files changed, 88 insertions, 88 deletions

diff --git a/README.md b/README.md
index 96a6d652ef..f42afd2901 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.3-R0.1-SNAPSHOT</version>
+    <version>1.20.4-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.3-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/build.gradle.kts b/build.gradle.kts
index 9a598c0648..2ba754fb96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -67,7 +67,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.3+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.20.4+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
diff --git a/gradle.properties b/gradle.properties
index 2b02b49f36..794f7c1540 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.20.3-R0.1-SNAPSHOT
-mcVersion=1.20.3
+version=1.20.4-R0.1-SNAPSHOT
+mcVersion=1.20.4
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java
index f96c3f3c46..1c54650e44 100644
--- a/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java
+++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.3")
+@GeneratedFrom("1.20.4")
 @ApiStatus.Experimental
 public final class BiomeKeys {
     /**
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java
index 496729eac4..ebb0180aa0 100644
--- a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java
+++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.3")
+@GeneratedFrom("1.20.4")
 @ApiStatus.Experimental
 public final class GameEventKeys {
     /**
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java
index 6324b89a9a..7415875b0d 100644
--- a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java
+++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.3")
+@GeneratedFrom("1.20.4")
 @ApiStatus.Experimental
 public final class StructureTypeKeys {
     /**
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java
index a2c834cbb4..a9946153a2 100644
--- a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java
+++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.3")
+@GeneratedFrom("1.20.4")
 @ApiStatus.Experimental
 public final class TrimMaterialKeys {
     /**
diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java
index ae2b38d54d..5da2648555 100644
--- a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java
+++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.3")
+@GeneratedFrom("1.20.4")
 @ApiStatus.Experimental
 public final class TrimPatternKeys {
     /**
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 335b72da18..98f91f5342 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -9,7 +9,7 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3be7f53046d821d6777481b92b3aa6e3df51ed8f..ff4d0f970990187e9b46324b5cf051fcc546119f 100644
+index 126d8c232de267d6d5639647fcda3b3416deb7e4..f83cda5b820ebb3dcbc3a39059579ba9487586e8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,10 +9,9 @@ plugins {
diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch
index b7eeceef51..53e097733f 100644
--- a/patches/server/0004-Test-changes.patch
+++ b/patches/server/0004-Test-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Test changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ff4d0f970990187e9b46324b5cf051fcc546119f..844eff88c9ad95871900c2d8aa3136b3f2928bf9 100644
+index f83cda5b820ebb3dcbc3a39059579ba9487586e8..ef91080dc7123677190839b057c3458c4d5b9f32 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -58,6 +58,12 @@ tasks.compileJava {
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index fa62d1ad1f..41f119bb82 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -15,7 +15,7 @@ public net.minecraft.server.dedicated.DedicatedServerProperties reload(Lnet/mine
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 844eff88c9ad95871900c2d8aa3136b3f2928bf9..3aca132fcbd7dce2b26ac17f8e365d5f22d61e8d 100644
+index ef91080dc7123677190839b057c3458c4d5b9f32..6f442d70a963dfc65a1b5b9494f850456c31cde3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ dependencies {
@@ -4916,7 +4916,7 @@ index 37ab411817008d4e6194e177d88d50931e53b42e..ca23639f15107ccd43b874ae38fa3727
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0070f5cc0442433cf63a958748d588fbb8c5b735..659d2d5cab4b953c21f560b65b37d9586d9a1c01 100644
+index b091aa07aac623cf87847184444430331445ef16..482ae4d9699891af2ea04a34c979a944d7d29a2c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -236,7 +236,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index 666f62869c..4cfdc12018 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 659d2d5cab4b953c21f560b65b37d9586d9a1c01..9e2b67993ff7d263576d9579885ec1eaea6144df 100644
+index 482ae4d9699891af2ea04a34c979a944d7d29a2c..2b94db53d9046299d1d4b39bce06002039a1800f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -296,7 +296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 622001ebc3..492a47e63f 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -6987,7 +6987,7 @@ index 1d12a7934308aa48d7ea7fa10c7b6b5ccb27e707..7cacfceed5ef9276a19123a8a9079579
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9e2b67993ff7d263576d9579885ec1eaea6144df..0995b63953d62198c117fdc7a8c4703a986d2db2 100644
+index 2b94db53d9046299d1d4b39bce06002039a1800f..634869a2747c655a6705deeb5fcb27d2c4754e0c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -178,6 +178,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 9c58467056..84ba0ce478 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -2296,7 +2296,7 @@ index c8e016135ad80a892b48a6a338c24cfd757a5f10..b403b7d585f474e2b6029404d19e756a
          this.chatVisibility = clientOptions.chatVisibility();
          this.canChatColor = clientOptions.chatColors();
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 790eff842aacb64e8ff9b62bbdee4adeb1b216a7..0a6feccc657e62d7bad5e1461d5538a4c3a16b76 100644
+index 132a79251d5eb46ded6e1a96cc1c8e9c48f3f5fd..56f6f65ceb1271e9273b1ee6658773eb3445beed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -47,7 +47,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index 0e9895372d..d6bbfae1a4 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -1123,7 +1123,7 @@ index 7cacfceed5ef9276a19123a8a9079579423d03ac..5cd680d2ed47aadb5e65a775d70bc662
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0995b63953d62198c117fdc7a8c4703a986d2db2..b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6 100644
+index 634869a2747c655a6705deeb5fcb27d2c4754e0c..e2990302d932a5dc089a25e831e11ac6468f6381 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,6 +1,8 @@
diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/server/0018-Rewrite-chunk-system.patch
index 8f11c54770..2cf88b6a96 100644
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/server/0018-Rewrite-chunk-system.patch
@@ -19101,7 +19101,7 @@ index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..942042863f0105769c15b865d4d98a09
 +    */ // Paper - rewrite chunk system
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 016f387f1f69572634adf3455b295ef5005b84e9..15d928a33306937661e5fed88e2ef7afae8141d2 100644
+index 5cd680d2ed47aadb5e65a775d70bc662a92e3d7a..1ad6b62ee53e2ee4a710211dfc750780519004f9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -139,108 +139,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -19532,7 +19532,7 @@ index 016f387f1f69572634adf3455b295ef5005b84e9..15d928a33306937661e5fed88e2ef7af
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..2c9f52ad948f9ee5bb20f7f8eb4a541f0b596b26 100644
+index e2990302d932a5dc089a25e831e11ac6468f6381..9969b66e39fb6ce8a9ba24ccbd7ef5d3e363197f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -196,7 +196,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0042-Disable-thunder.patch b/patches/server/0042-Disable-thunder.patch
index 3e948ed076..7143a63d06 100644
--- a/patches/server/0042-Disable-thunder.patch
+++ b/patches/server/0042-Disable-thunder.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0c8042a515daeeb95b14147214e0a3151ef6f5a1..3c324ffd8300da534a9877b677294ebcd7949622 100644
+index 363f94a2fb54b7a55f392cc65a6e4d68f313fb07..6e70f759d7f38b16127c12e4a07f2d88fa4cfcaf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -842,7 +842,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0043-Disable-ice-and-snow.patch b/patches/server/0043-Disable-ice-and-snow.patch
index e0a8ae6416..dae4de0702 100644
--- a/patches/server/0043-Disable-ice-and-snow.patch
+++ b/patches/server/0043-Disable-ice-and-snow.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3c324ffd8300da534a9877b677294ebcd7949622..fa6cec1933582fefeffd9382cbc24fea83b5eb13 100644
+index 6e70f759d7f38b16127c12e4a07f2d88fa4cfcaf..91683741c38cb9b9224c40a7637580bb4d15b075 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -872,11 +872,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/server/0070-Add-World-Util-Methods.patch
index 66af3764eb..ff4b919c76 100644
--- a/patches/server/0070-Add-World-Util-Methods.patch
+++ b/patches/server/0070-Add-World-Util-Methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fa6cec1933582fefeffd9382cbc24fea83b5eb13..a95fad7e0de2a6a1e3f37b40b82e3a51548dd3a4 100644
+index 91683741c38cb9b9224c40a7637580bb4d15b075..88249c9a31e6dc1bb0912daebed80ede4d791d9f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,7 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
index 438c8842fc..b8993ebffe 100644
--- a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a95fad7e0de2a6a1e3f37b40b82e3a51548dd3a4..0fda3954f914889f9f3339f1ba231fb4818876af 100644
+index 88249c9a31e6dc1bb0912daebed80ede4d791d9f..30ae12f1d6abdaeaac070c54a22f0c869143745f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -847,7 +847,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index f868dcbb47..75b77a04a0 100644
--- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -18,7 +18,7 @@ index e0a2759169f41b68b8e1bc48f0b323c0a4bc1fed..180bcaa2b5a74c527d8556301fb4a816
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0fda3954f914889f9f3339f1ba231fb4818876af..0718f8745fed4cd0cbb29372159ff39bdce7d0fd 100644
+index 30ae12f1d6abdaeaac070c54a22f0c869143745f..f9e9348a897d8f8bd5eb5bd951c6e2416e73562d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 26e7d65b48..db735a0ec7 100644
--- a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3d826b82034dc12daa521414142dfe3cdd41365b..af16cabd57a5fb28c2e70856730dd0df6c8abf9c 100644
+index 16abfc81d054cdc983500d3e498533ea8e8cc0be..6baf4caafbb4f7a09fe3a806bbff17c9f6105fbd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1619,6 +1619,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0121-Properly-fix-item-duplication-bug.patch
index f1f149146e..4d9300ab4e 100644
--- a/patches/server/0121-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0121-Properly-fix-item-duplication-bug.patch
@@ -19,7 +19,7 @@ index d986c09392182335112040d4b6feae6a1a740d84..75d2213aadcbd1d0a49fd4c8cef2d4d5
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 53833e155cf0d2328f2c2b36702970925045be3d..70168fb930c24689c98da064f7d04cc98d729358 100644
+index a26db4bd859ef52dadf03f1b62155bcc54b7a740..54cc23d07f4c0e9a87cbf63c8e866b2e07a0dbbc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -145,7 +145,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0125-Enforce-Sync-Player-Saves.patch b/patches/server/0125-Enforce-Sync-Player-Saves.patch
index 916344e907..48e89d22cc 100644
--- a/patches/server/0125-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0125-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 34b10814b94fb3fd22f96988c74be434e41058fb..2bbbe256df74726b27359a217c0f0b71c32e6e2b 100644
+index 828abde34c7d883831e81b7759a862db43cfe2c6..6d4099d8c9d0c2ea20b98ea3f30ac44a697ff400 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1061,11 +1061,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
index c687a9113c..1a13167e8c 100644
--- a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -25,7 +25,7 @@ Other changes:
 Co-Authored-By: Emilia Kond <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3aca132fcbd7dce2b26ac17f8e365d5f22d61e8d..526f9e79502a6b0055807a6b831602271b704b23 100644
+index 6f442d70a963dfc65a1b5b9494f850456c31cde3..0bfa5a3fe47d96f159f0093c046de3f2d8a0211c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -6,9 +6,30 @@ plugins {
diff --git a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
index d4ad90ff41..db3e1a54a0 100644
--- a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 526f9e79502a6b0055807a6b831602271b704b23..8c17b903f077d3f7281b0090b9aefdbf1b59a17c 100644
+index 0bfa5a3fe47d96f159f0093c046de3f2d8a0211c..2c885574b6c2667984b4996af0a421d8325842ef 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ dependencies {
diff --git a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
index 9c56c65f63..745884efd2 100644
--- a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 70168fb930c24689c98da064f7d04cc98d729358..75a61cab28928a145fd22159822dd04844c626ac 100644
+index 54cc23d07f4c0e9a87cbf63c8e866b2e07a0dbbc..cc167de8d8fc86793971e2ad1ad45bfa51f1cca0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -83,14 +83,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
index bcafbe9349..45d24fc580 100644
--- a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 75a61cab28928a145fd22159822dd04844c626ac..4286dcc7ec46b446f60e41acd2dcaaa8760fd8b1 100644
+index cc167de8d8fc86793971e2ad1ad45bfa51f1cca0..1bd0ed91f5f64c4cf89f6819bea7ecd3a72f1d5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -48,11 +48,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
index 62678b648f..14397a7b9a 100644
--- a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
@@ -40,7 +40,7 @@ index e580df88baadfd943756b1e440c7253a287fa0e9..ea520b828378c268d05425096c6493ca
  
              return true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index b4d36ff6b6ba72693c269929b84c5481949f13fd..058b4e79ac861e772e828b92aacffba7efe4bb7e 100644
+index 1ad6b62ee53e2ee4a710211dfc750780519004f9..16028723b36c1ca3a3c5d1bf2a7c82d2b42a0be4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -557,6 +557,15 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
index 9539682876..dd9fa1ad6a 100644
--- a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6c03c96adfa68b1817423d012affa5b3952ade04..e024c296f471737764af260ca4cd7e9005e044ac 100644
+index 6d75010bf837a791f5fe04aacb973246410bbd66..0705a1bb63f056a228308d348bc5db87b0bee5a1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1738,12 +1738,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch b/patches/server/0199-ItemStack-getMaxItemUseDuration.patch
index 9966cc2c2b..e81a524d20 100644
--- a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0199-ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index ee5989e52ce0b55d8bf867ab10801ba3252c88a5..550d3290c974eebdeb4bf9b90987448c5d3d2999 100644
+index 7dd0c000fa7f363997178ffa6de7d39e17702348..ae7c3ad0597e5115b43458a91765a176f2d80227 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -184,6 +184,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index e7d6aca094..0feff6194d 100644
--- a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8c17b903f077d3f7281b0090b9aefdbf1b59a17c..ce9ef2199364029c658812851d02047b982d92eb 100644
+index 2c885574b6c2667984b4996af0a421d8325842ef..4b4aa6cc48abb6a2d31c2043e0eff25bca0d05b3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -37,6 +37,7 @@ dependencies {
diff --git a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 792fd30cc7..0bf50e2c9c 100644
--- a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 36bc8d587ef39baf4c85b30578d3066cb36ded21..1cd7a7ab18dca87090e7aba9c0683f937fdb6188 100644
+index ae7c3ad0597e5115b43458a91765a176f2d80227..aab8eb7c96be6a2f157e971d9d494d2e01d3218c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -670,7 +670,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 913d9a8d08..7152ac53a8 100644
--- a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -29,7 +29,7 @@ index ea520b828378c268d05425096c6493ca1c7ad385..8d3a9f8210bf529484aeaf84ef9a55b5
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ac43aba1ae9420a2a02fd3d3e3d4426c04e76139..5ad90a3c6917d7435f6a1c284fc8acb0365457e3 100644
+index cc499b31cf186412e575373a5fb7cad54946b0a7..8870e9999e2a1aba59e5e6e7927bc8c6041f8ad6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0292-Implement-Brigadier-Mojang-API.patch b/patches/server/0292-Implement-Brigadier-Mojang-API.patch
index 8c5f7e67a9..9917b8e153 100644
--- a/patches/server/0292-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0292-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ce9ef2199364029c658812851d02047b982d92eb..80ffd7fd14893c70da92dddb5ec37d409c76b729 100644
+index 4b4aa6cc48abb6a2d31c2043e0eff25bca0d05b3..5fff9ffbede42644dc3639e9e0a31866981fa596 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
diff --git a/patches/server/0297-Entity-getEntitySpawnReason.patch b/patches/server/0297-Entity-getEntitySpawnReason.patch
index 3410c8b86d..9f46264920 100644
--- a/patches/server/0297-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0297-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..a7c89cdf20cb63792c76de81c1ff9f2c
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5ad90a3c6917d7435f6a1c284fc8acb0365457e3..d70e6744edcac48322bfeb8a7df814e65c752af4 100644
+index 8870e9999e2a1aba59e5e6e7927bc8c6041f8ad6..3b7eea628d0b839900145b326a85733e9fec8aa0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1450,6 +1450,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch
index 0b1518c477..50febae5fc 100644
--- a/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 4286dcc7ec46b446f60e41acd2dcaaa8760fd8b1..6b53e65308fb4118ef2d78ec9d171722ba2301f5 100644
+index 1bd0ed91f5f64c4cf89f6819bea7ecd3a72f1d5d..595086133c687d2f9752cbda475123063f22df42 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -297,7 +297,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 76abd46c7f..231a82ccac 100644
--- a/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -63,7 +63,7 @@ index af90bb579429336cc4e99386fd620c898c23d274..96fd66ed2742a79064852af6e936830d
          // this.updateMobSpawningFlags();
          worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d70e6744edcac48322bfeb8a7df814e65c752af4..6f88791ccea015b4a820782f46639adaae1f3447 100644
+index 3b7eea628d0b839900145b326a85733e9fec8aa0..f6d5b6e6ae6699de177ef5fca385bb27ccae70b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1883,12 +1883,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch
index af603958ef..a9e1bdd433 100644
--- a/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6f88791ccea015b4a820782f46639adaae1f3447..6681f8a2e0a49a70edd40c32c95b2ff89c4f92af 100644
+index f6d5b6e6ae6699de177ef5fca385bb27ccae70b1..dca77d98087bef92f4b1f135fa44c70ec61d09c4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -554,6 +554,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0333-Entity-Activation-Range-2.0.patch b/patches/server/0333-Entity-Activation-Range-2.0.patch
index 8a930530f5..24ecbef3be 100644
--- a/patches/server/0333-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0333-Entity-Activation-Range-2.0.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6681f8a2e0a49a70edd40c32c95b2ff89c4f92af..8718f4d458f0ab52b308e33814bbe30b460a0405 100644
+index dca77d98087bef92f4b1f135fa44c70ec61d09c4..5f8654ad9c15818fcb12361a0f76bb77d9a2ce75 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
diff --git a/patches/server/0338-implement-optional-per-player-mob-spawns.patch b/patches/server/0338-implement-optional-per-player-mob-spawns.patch
index cf530597be..729ec88a82 100644
--- a/patches/server/0338-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0338-implement-optional-per-player-mob-spawns.patch
@@ -39,7 +39,7 @@ index 9b16464c4edf334093c9aa0bd164348197b96455..bd15131b7506e965bcf64be203307312
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 058b4e79ac861e772e828b92aacffba7efe4bb7e..5011946a0f8144e617ec24f0ec51d40173d6f451 100644
+index 16028723b36c1ca3a3c5d1bf2a7c82d2b42a0be4..24d9a2c37db4bbf2585b33d06f5ea57eb2adf356 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -549,7 +549,19 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0339-Anti-Xray.patch b/patches/server/0339-Anti-Xray.patch
index 43e1aa46ee..4b474f97c2 100644
--- a/patches/server/0339-Anti-Xray.patch
+++ b/patches/server/0339-Anti-Xray.patch
@@ -1104,7 +1104,7 @@ index be89e5b8c1ea7f85aef267a15986affa5fa1fd4b..43472855136f26b282d94fd241853d86
  
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8718f4d458f0ab52b308e33814bbe30b460a0405..67a5f24fbcf5b618a76f5f59329d25af4e73b9d0 100644
+index 5f8654ad9c15818fcb12361a0f76bb77d9a2ce75..abf495ae094f647db4c9f826315e25c6a05cf67b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -568,7 +568,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index e4a793399b..5a1569ff68 100644
--- a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 5011946a0f8144e617ec24f0ec51d40173d6f451..c9688f21731030f0721e3d11795005a593e5bf53 100644
+index 24d9a2c37db4bbf2585b33d06f5ea57eb2adf356..4039bd5a80bd2305082d21c0fe826f76d8beb4c4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -268,6 +268,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch b/patches/server/0343-Add-debug-for-sync-chunk-loads.patch
index 16492a76a2..2000bc5dff 100644
--- a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0343-Add-debug-for-sync-chunk-loads.patch
@@ -300,7 +300,7 @@ index 0000000000000000000000000000000000000000..95d6022c9cfb2e36ec5a71be6e343540
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index c9688f21731030f0721e3d11795005a593e5bf53..f57d01e1137d73377652f4f118f859340f7bd681 100644
+index 4039bd5a80bd2305082d21c0fe826f76d8beb4c4..974b4970be214ca36a801d39932abcc751e540a5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -292,6 +292,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -312,7 +312,7 @@ index c9688f21731030f0721e3d11795005a593e5bf53..f57d01e1137d73377652f4f118f85934
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 67a5f24fbcf5b618a76f5f59329d25af4e73b9d0..cfb28fbb860ac3d09589776d1b722cbb72d12de8 100644
+index abf495ae094f647db4c9f826315e25c6a05cf67b..321f90a0ad7cdd3b0e8b136682947a467f2388b9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -647,6 +647,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 2a1c6327f5..dcb5f84d35 100644
--- a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 80ffd7fd14893c70da92dddb5ec37d409c76b729..dfd12484b424fffb529f408b6a9974c21598f9c2 100644
+index 5fff9ffbede42644dc3639e9e0a31866981fa596..2566e25f10136ebccb6c9bbdd0722d6cf226f7aa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -36,6 +36,7 @@ dependencies {
@@ -557,7 +557,7 @@ index fe47a38137f7b7fa94c507e790eec4fb7303595f..7f5ecea0ee78a534d7c56fa9e3ad2117
          paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3ba431c4841a03018660f5137894b10298b417b9..fe1ec3aa37b1750467f59fe6ec653900d54ddff0 100644
+index 86015c6b289ce6fb6b9d1b0ca3f637e53192eea3..d672b95fe589a57d469811a12420d7d16ea173c7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,7 +223,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0389-Implement-Mob-Goal-API.patch
index 88835b7935..74171c8f80 100644
--- a/patches/server/0389-Implement-Mob-Goal-API.patch
+++ b/patches/server/0389-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index dfd12484b424fffb529f408b6a9974c21598f9c2..08962fc6c7b66a79e7f6985c45ef593407594f96 100644
+index 2566e25f10136ebccb6c9bbdd0722d6cf226f7aa..664fef8d6a901f0f4ebf03ad49a6baaf2dbd625e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -45,6 +45,7 @@ dependencies {
diff --git a/patches/server/0421-incremental-chunk-and-player-saving.patch b/patches/server/0421-incremental-chunk-and-player-saving.patch
index c4c7dc3bd5..2b14124fc9 100644
--- a/patches/server/0421-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0421-incremental-chunk-and-player-saving.patch
@@ -56,7 +56,7 @@ index 87e0cc467a2139e763130a375387b6df46336992..a82f7dd2cbc2f6311b810f117f0970a4
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index f57d01e1137d73377652f4f118f859340f7bd681..18dceb057ff13679e7caa4b8028ec2e9b5e29381 100644
+index 974b4970be214ca36a801d39932abcc751e540a5..63fad53a9184d7ab97f143b7d85ae9ef2ca9f8bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -450,6 +450,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -76,7 +76,7 @@ index f57d01e1137d73377652f4f118f859340f7bd681..18dceb057ff13679e7caa4b8028ec2e9
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fe1ec3aa37b1750467f59fe6ec653900d54ddff0..e2296d2add58b599ea105434cc511b964a978774 100644
+index d672b95fe589a57d469811a12420d7d16ea173c7..93a60c6dcbe29637e96aa57a76a5ceb544495fb5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1302,6 +1302,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0441-Brand-support.patch b/patches/server/0441-Brand-support.patch
index 21490af439..bd578684f9 100644
--- a/patches/server/0441-Brand-support.patch
+++ b/patches/server/0441-Brand-support.patch
@@ -17,7 +17,7 @@ index 25c5f23b859961c792b2ec08404171eea1aedba7..478abaffd1a80949b96f1c1774c98134
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 6b53e65308fb4118ef2d78ec9d171722ba2301f5..2d0ce31011ce1dbbf3c86f09bbf9a41a6e4a158f 100644
+index 595086133c687d2f9752cbda475123063f22df42..9647f6a274f4a4d2a940759b9cbd00569ac3bb18 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -54,6 +54,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0443-Don-t-require-FACING-data.patch b/patches/server/0443-Don-t-require-FACING-data.patch
index bc170b7402..3191bbac86 100644
--- a/patches/server/0443-Don-t-require-FACING-data.patch
+++ b/patches/server/0443-Don-t-require-FACING-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't require FACING data
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
-index b6c5976278f08c454492e0fabe6fac6c1a881d00..379890ae05b2fb4bd81b2fa907413d3736ba1169 100644
+index f25e28098df0a21fd1ae55f5527cddcef9a36b0d..6c78d90e73b47b62c4052727730850d4b67a9cd2 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
 @@ -14,6 +14,7 @@ import org.bukkit.event.block.BlockDispenseEvent;
diff --git a/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 9054284c93..ee513cdee1 100644
--- a/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e2296d2add58b599ea105434cc511b964a978774..7dca6f99beff7d2ce3631a3c4ea299fcf6bf2b3a 100644
+index 93a60c6dcbe29637e96aa57a76a5ceb544495fb5..8ee66b28ee350564f0595541b904d593a6e3c8d5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2020,9 +2020,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch
index f24d6009f7..d7265e406a 100644
--- a/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7dca6f99beff7d2ce3631a3c4ea299fcf6bf2b3a..bbd1940c5520bbdc0fa1dd177e41f2670957fdd5 100644
+index 8ee66b28ee350564f0595541b904d593a6e3c8d5..6b5f325f847c096a4092ef3591627b21246601a0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1528,6 +1528,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0483-Add-API-for-quit-reason.patch b/patches/server/0483-Add-API-for-quit-reason.patch
index 6f8d023e01..5c0e281f86 100644
--- a/patches/server/0483-Add-API-for-quit-reason.patch
+++ b/patches/server/0483-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index 478abaffd1a80949b96f1c1774c98134be92e5ac..063742400f3065ace62b64b42d952517
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 2d0ce31011ce1dbbf3c86f09bbf9a41a6e4a158f..156e49d682be26f0962cae960acaef613bd6ebba 100644
+index 9647f6a274f4a4d2a940759b9cbd00569ac3bb18..e9b46bc0650050595f9db503c747350dc1997a5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -302,6 +302,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0524-Remove-stale-POIs.patch b/patches/server/0524-Remove-stale-POIs.patch
index a9dbe9d6ea..7caaa1657b 100644
--- a/patches/server/0524-Remove-stale-POIs.patch
+++ b/patches/server/0524-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bbd1940c5520bbdc0fa1dd177e41f2670957fdd5..6d5e73a5c582192d9e569471b6bc025ec84cc547 100644
+index 6b5f325f847c096a4092ef3591627b21246601a0..0b321185ed39bfa056298a1ddfb157b73c4ffa03 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2089,6 +2089,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0541-EntityMoveEvent.patch b/patches/server/0541-EntityMoveEvent.patch
index 959895a4c7..d535a433ad 100644
--- a/patches/server/0541-EntityMoveEvent.patch
+++ b/patches/server/0541-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index c063dece36e110691297b38635a9d14d70c4e391..5f440e3d3a750c65d0d13834eca553b8
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6d5e73a5c582192d9e569471b6bc025ec84cc547..21866ac2fd37362fd888b29b180a6aeb2b128d42 100644
+index 0b321185ed39bfa056298a1ddfb157b73c4ffa03..cb416a3e5a904cae8de4930f49fee7afe9073bad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
index 17bc3654a3..3acd93481c 100644
--- a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 21866ac2fd37362fd888b29b180a6aeb2b128d42..721a9ebaa2710ed26ecdf52ce3be26da7d91aa4b 100644
+index cb416a3e5a904cae8de4930f49fee7afe9073bad..8e2b088fe2ff21a242913c66bcd6e017c1de6f6f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1673,6 +1673,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
index f543421cd7..5e8969dfb3 100644
--- a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 721a9ebaa2710ed26ecdf52ce3be26da7d91aa4b..3f1a2ea5ff192685c913ba1de643a63115707774 100644
+index 8e2b088fe2ff21a242913c66bcd6e017c1de6f6f..e6d8272f3186420478e92c95b508b87f818e50e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -668,8 +668,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0605-Add-PlayerKickEvent-causes.patch b/patches/server/0605-Add-PlayerKickEvent-causes.patch
index c2f4540fa6..b191ac3eae 100644
--- a/patches/server/0605-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0605-Add-PlayerKickEvent-causes.patch
@@ -100,7 +100,7 @@ index b9560b4ae5c0867396006119c5dadd7f3b47f78b..f3e32da770f379d46c65a0ba5a100b5f
                          return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason);
                      }, true);
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 156e49d682be26f0962cae960acaef613bd6ebba..ef43ae46c028462deec7e13e4fba80421c56043d 100644
+index e9b46bc0650050595f9db503c747350dc1997a5d..c0ed5bfcbd17b61c16484cad4b42eb1365a0556b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -94,7 +94,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
index 0e0343624f..101b1ec5de 100644
--- a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3f1a2ea5ff192685c913ba1de643a63115707774..529eb11c6a8e81d17e4e855f6e8bf2b87e2df0b1 100644
+index e6d8272f3186420478e92c95b508b87f818e50e5..abed54daee01f48b81f03b99b8e0615f5394ddac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
index e559407c1f..913de52e2c 100644
--- a/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index 814754a73a8d653adc159b313fa201565db59590..ebbf5f835d619c90eae4240dbd2eb665
      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/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index ef43ae46c028462deec7e13e4fba80421c56043d..e21c9b4de037664d43cfa3259d1b36dab3631557 100644
+index c0ed5bfcbd17b61c16484cad4b42eb1365a0556b..77cd2b73e4d499beca16962a6b3d1fefe279cd87 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -76,6 +76,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
index 8806ef17e2..733482d182 100644
--- a/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 529eb11c6a8e81d17e4e855f6e8bf2b87e2df0b1..345db68dfaca2f2a6ffc4c2f610e008360b268f9 100644
+index abed54daee01f48b81f03b99b8e0615f5394ddac..86969e7b23bcb463ac4143338647329f56af92ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -994,6 +994,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 741987c8fa..4a6b078192 100644
--- a/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 345db68dfaca2f2a6ffc4c2f610e008360b268f9..174f374353e8706c94bfd4466ad42f69d76b2508 100644
+index 86969e7b23bcb463ac4143338647329f56af92ee..7ca843fe809a78a16bca8f61a482b600396d6ab8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1574,9 +1574,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0682-Execute-chunk-tasks-mid-tick.patch b/patches/server/0682-Execute-chunk-tasks-mid-tick.patch
index f6668668dc..0e30021bec 100644
--- a/patches/server/0682-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0682-Execute-chunk-tasks-mid-tick.patch
@@ -103,7 +103,7 @@ index 6f17e5631aace53f75e6badf514dbb77c50065b9..0a23cfeaba071c2179de1931caa86bc4
          } else {
              if (this.tickRateManager.isSprinting() || this.haveTime()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 18dceb057ff13679e7caa4b8028ec2e9b5e29381..f8a848487c1d8fea5ae1d397908baf2e05efc00b 100644
+index 63fad53a9184d7ab97f143b7d85ae9ef2ca9f8bc..1483007b79e18107e41037c279e048f04f666d1d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -566,6 +566,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -123,7 +123,7 @@ index 18dceb057ff13679e7caa4b8028ec2e9b5e29381..f8a848487c1d8fea5ae1d397908baf2e
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 174f374353e8706c94bfd4466ad42f69d76b2508..5885fede6ac94e9d098a00c55cff27c9109afa57 100644
+index 7ca843fe809a78a16bca8f61a482b600396d6ab8..2868549d7e79a0add3c73a85b8eb8960cf77af97 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0685-Optimise-random-block-ticking.patch b/patches/server/0685-Optimise-random-block-ticking.patch
index bde8fcef53..044d35a862 100644
--- a/patches/server/0685-Optimise-random-block-ticking.patch
+++ b/patches/server/0685-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5885fede6ac94e9d098a00c55cff27c9109afa57..9b9bd7e4ee5e748640ebcd144338a189aec991e8 100644
+index 2868549d7e79a0add3c73a85b8eb8960cf77af97..7f981102023230f91eb6c7bf6ade08ed3ab3cbb9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -856,6 +856,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
index 3bd7eec1b7..57520e8b5f 100644
--- a/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 08962fc6c7b66a79e7f6985c45ef593407594f96..0a98693535b55e03abd158f5c469d2eada80650f 100644
+index 664fef8d6a901f0f4ebf03ad49a6baaf2dbd625e..060b9adae21e75e1627f41846e17bc51759b023f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -40,6 +40,11 @@ dependencies {
diff --git a/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
index e46baa9221..da9cbf343b 100644
--- a/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index 7de24c39b460e43d27839b3821e67213508ece81..7297bca9224c12d7ace0e1967340d994
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9b9bd7e4ee5e748640ebcd144338a189aec991e8..5ff0275067f11bcd723cf8884788f76e966832e4 100644
+index 7f981102023230f91eb6c7bf6ade08ed3ab3cbb9..a3ef919ff07655e835a1b423b3d4f71939a47db8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1240,7 +1240,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0773-More-Projectile-API.patch b/patches/server/0773-More-Projectile-API.patch
index 11712124a5..42d1845d4c 100644
--- a/patches/server/0773-More-Projectile-API.patch
+++ b/patches/server/0773-More-Projectile-API.patch
@@ -560,7 +560,7 @@ index cc679e7042c5a5fba2ce34598f2c1eaf49bb065f..58dbb94f101103249028987eda7004c6
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1cd7a7ab18dca87090e7aba9c0683f937fdb6188..a919202adae326294f2598fbe76a5c3f8408a68c 100644
+index aab8eb7c96be6a2f157e971d9d494d2e01d3218c..8c06ff72bcc7cce2c853bf999bda8afc10e53ca6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -289,12 +289,20 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0804-Add-support-for-Proxy-Protocol.patch b/patches/server/0804-Add-support-for-Proxy-Protocol.patch
index 08473c1815..e061f16a5a 100644
--- a/patches/server/0804-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0804-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0a98693535b55e03abd158f5c469d2eada80650f..64479f0a892d6847f987d844efe282a6080d607b 100644
+index 060b9adae21e75e1627f41846e17bc51759b023f..6cfc43610940d3ab7c867352b27980a207ce3045 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,7 @@ dependencies {
diff --git a/patches/server/0811-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0811-Add-Alternate-Current-redstone-implementation.patch
index 01ea974e0e..5d52a6fab1 100644
--- a/patches/server/0811-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0811-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3ac7c157cddfaa9262e727705eb88b55a637f618..e04447234ee94cab2034a0382a541ee2565d4796 100644
+index 91fdab7fc3afacfa58e91d5714f6bf7c3359278a..a30bc2fd80439f65d3dcfcdcfa3d3b71b737afaf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -224,6 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch
index 0b51ffec2d..d16a977205 100644
--- a/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e04447234ee94cab2034a0382a541ee2565d4796..f8c4d9477c924c76d2fbcef7eac1f928541356a4 100644
+index a30bc2fd80439f65d3dcfcdcfa3d3b71b737afaf..d2b3c1e9d5c24e6f09cf0a0f9aa4c83130e54e71 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1583,6 +1583,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
index bfbf87e86c..b17314abd7 100644
--- a/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
@@ -127,7 +127,7 @@ index b71be5e7e18f884cf35cc3a940c87e744e00f811..81d3d664d4397e528a02e50469622c4f
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f8c4d9477c924c76d2fbcef7eac1f928541356a4..222e85b22c5d1f5a135e7620df0786c709dff2e4 100644
+index d2b3c1e9d5c24e6f09cf0a0f9aa4c83130e54e71..ac9f42e8d88ca8cdb2882bd8d7676a793024599c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1028,7 +1028,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch
index d23dc93447..ede93986e1 100644
--- a/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 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 bce494bb7bc1ce20809ac7d355f04aa7aad78308..078dd3ccf046d3ee5ef41108e9db4736182778f1 100644
+index 7a984f531d3ebb6e055f07227b2ef8247fb3a842..28fa46f29639a6b643b475912133d601028facb2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1240,8 +1240,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0897-Flying-Fall-Damage.patch b/patches/server/0897-Flying-Fall-Damage.patch
index ba7ddba0c6..73a6ec3abe 100644
--- a/patches/server/0897-Flying-Fall-Damage.patch
+++ b/patches/server/0897-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 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 078dd3ccf046d3ee5ef41108e9db4736182778f1..82978c058c64563eb091fe9efbe42ade2b9a9225 100644
+index 28fa46f29639a6b643b475912133d601028facb2..7f3466340891b4409d1399ebeb2ca865d77841cd 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch
index 16e1714cdd..2cc8370e15 100644
--- a/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index a919202adae326294f2598fbe76a5c3f8408a68c..0461eb3afcb7953bfe2c912c477227186689a2ac 100644
+index 8c06ff72bcc7cce2c853bf999bda8afc10e53ca6..7081aebf67cc3d8deb27dfc508970f0fa5e9d1b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 14c5d47749..7a3a204017 100644
--- a/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ded19a243173c9d5c3d56d61a719ce169eeb0dfa..ae9aef03d4c9d106e025c3e91310dbef948804b1 100644
+index b3ffc58db60cbe0591086c3768ae6009ca7017c7..c04950851cdcfa707814e3cfc57cad48cf88a6dc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1720,6 +1720,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch
index 03e7044089..4d1c012286 100644
--- a/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch
@@ -17,7 +17,7 @@ index 5f6b93be9e81df8fae9a5ab160a232b65ce7b8bc..c77634ec9c4e7a9eaacc81de7f95e945
          case GLOW_ITEM_FRAME:
          case PAINTING:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 0461eb3afcb7953bfe2c912c477227186689a2ac..b05a5c8a4a4136d30e1c93015f79d753fe1a2ace 100644
+index 7081aebf67cc3d8deb27dfc508970f0fa5e9d1b6..9ce03abd24ae8c2f156ade360094157e20f63666 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -592,6 +592,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 822f9113b1..b80693be70 100644
--- a/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -38,7 +38,7 @@ index c081842b4416d15342cbfc583ef367901dab2b7e..4d406ced4a1996b8883574ce0b785dc1
      // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index f8a848487c1d8fea5ae1d397908baf2e05efc00b..bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca 100644
+index 1483007b79e18107e41037c279e048f04f666d1d..5152979bf81345fc365e7b16028c7d970d2f5856 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -539,7 +539,17 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch
index 5ff6447887..be37c27f01 100644
--- a/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index b05a5c8a4a4136d30e1c93015f79d753fe1a2ace..7722565c5e577c2097c43eb7aaed25c4dce6b7b6 100644
+index 9ce03abd24ae8c2f156ade360094157e20f63666..32da455eb46d09a846bae5270b32a6d6d6b962fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -33,12 +33,19 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/1019-Lag-compensation-ticks.patch b/patches/server/1019-Lag-compensation-ticks.patch
index 692ef6cdea..88e88d9f90 100644
--- a/patches/server/1019-Lag-compensation-ticks.patch
+++ b/patches/server/1019-Lag-compensation-ticks.patch
@@ -30,7 +30,7 @@ index a8f9f4e23575cb58045f9d8efe011a60a51dbd7a..34f19ac897a30c0c4e3ab406013fcca1
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ae9aef03d4c9d106e025c3e91310dbef948804b1..cc6acabb9d531fbdb92393fb4d9ceabdce00a9e5 100644
+index c04950851cdcfa707814e3cfc57cad48cf88a6dc..48eb92446a5e3ce21197cad71f1c454cce4762ff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -566,6 +566,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1023-Optimise-nearby-player-retrieval.patch b/patches/server/1023-Optimise-nearby-player-retrieval.patch
index f569d52afe..dd9f8c12c9 100644
--- a/patches/server/1023-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1023-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc6acabb9d531fbdb92393fb4d9ceabdce00a9e5..8a4f727cc538a47c437c2aa17999f197253adbde 100644
+index 48eb92446a5e3ce21197cad71f1c454cce4762ff..82e5a780c993991c00264f7874ccc7f333f3f590 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -577,6 +577,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1025-Fix-missing-map-initialize-event-call.patch b/patches/server/1025-Fix-missing-map-initialize-event-call.patch
index a197710044..6b6864c316 100644
--- a/patches/server/1025-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1025-Fix-missing-map-initialize-event-call.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing map initialize event call
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8a4f727cc538a47c437c2aa17999f197253adbde..3820d1d79f445eb85ecab51fdcc74e62a1503636 100644
+index 82e5a780c993991c00264f7874ccc7f333f3f590..f4d53d9bfe5b060158f69b5d9e4533a5b9869eed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2129,7 +2129,23 @@ public class ServerLevel extends Level implements WorldGenLevel {