Fix duplicated BlockPistonRetractEvent call (#7111)

538 files changed, 218 insertions, 229 deletions

diff --git a/patches/server/0303-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch
index 80f6e7191d..e8709fab8d 100644
--- a/patches/server/0303-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 03b7b95f8a571e2818a240415a96e09ee564158c..302ecb512dc5bfa7ff448810b25bed3bfab3d3ea 100644
+index 5beb5568c4c2a1ab8ac737e26a78178c788961d2..b04aaab4f7cb7367d0fbc6268b0db269b55b2d17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2419,6 +2419,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
deleted file mode 100644
index 85dfb632e0..0000000000
--- a/patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Thu, 31 Jan 2019 16:33:36 -0500
-Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
-
-There is an explicit check in the handling code for empty pistons that
-prevents sticky pistons from firing the event. However when we look back
-at the history we see that this check was originally added so that ONLY
-sticky pistons would fire the retract event. I'm not sure why.
-https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/1092acbddf07edfa4100bc6824504ac75088e913
-
-Over the course of several updates, the meaning of that field appears to
-have changed from "is NOT sticky" to "is sticky". So now its having the
-opposite effect. Only normal pistons fire the retraction event. And like
-all things in CB, it's just been carried around since.
-
-If we are to believe the history, the correct fix for this issue is to
-flip it so it only fires for sticky pistons, but that puts us in a
-bind. It's already firing for non-sticky pistons, changing it now would
-likely result in breakage. Furthermore, there is little documentation as
-to WHY that was ever intended to be the case.
-
-Instead we opt to remove the check entirely so that the event fires for
-all piston types.
-
-diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index aa4c582172221f7d48c9a64e91bdfb95a2453a6c..2f1345d3c3671953a806cb243a152e080fbb9108 100644
---- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -146,7 +146,7 @@ public class PistonBaseBlock extends DirectionalBlock {
-             }
- 
-             // CraftBukkit start
--            if (!this.isSticky) {
-+            //if (!this.sticky) { // Paper - Prevents empty sticky pistons from firing retract - history behind is odd
-                 org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-                 BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
-                 world.getCraftServer().getPluginManager().callEvent(event);
-@@ -154,7 +154,7 @@ public class PistonBaseBlock extends DirectionalBlock {
-                 if (event.isCancelled()) {
-                     return;
-                 }
--            }
-+            //} // Paper
-             // PAIL: checkME - what happened to setTypeAndData?
-             // CraftBukkit end
-             world.blockEvent(pos, this, b0, enumdirection.get3DDataValue());
diff --git a/patches/server/0304-BlockDestroyEvent.patch b/patches/server/0303-BlockDestroyEvent.patch
index 5732c05749..e5124df56a 100644
--- a/patches/server/0304-BlockDestroyEvent.patch
+++ b/patches/server/0303-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2cdf117a5041830f201d5f1e98f7cc8f9cb6dd6f..4d32ffa674b0617acecebfca784cd7d6b69cc5cb 100644
+index ee5415574dea0712f08e2467ecf93aa1ce39a2e5..40a445f6aa0440307368aba8433e5e7c70753566 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -28,6 +28,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0305-Async-command-map-building.patch b/patches/server/0304-Async-command-map-building.patch
index 7581f7fb8f..7581f7fb8f 100644
--- a/patches/server/0305-Async-command-map-building.patch
+++ b/patches/server/0304-Async-command-map-building.patch
diff --git a/patches/server/0306-Implement-Brigadier-Mojang-API.patch b/patches/server/0305-Implement-Brigadier-Mojang-API.patch
index 18f9505aa1..2b2758f26f 100644
--- a/patches/server/0306-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0305-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 f02dc8b25f406a34535e9ae4666faf6b05ad0831..6e47e915134bccb7efa9555d7f33fbe82a25c003 100644
+index 125630037713c4790636ffd11b14b2c1d83a085a..898e2efb764e5bd97ab4e757e6c4c27fc4efdbef 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ repositories {
diff --git a/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 903ba48692..903ba48692 100644
--- a/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0308-Limit-Client-Sign-length-more.patch b/patches/server/0307-Limit-Client-Sign-length-more.patch
index 9ad77d45f3..9ad77d45f3 100644
--- a/patches/server/0308-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0307-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 1f80323016..1f80323016 100644
--- a/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 8ae2ad20e3..8ae2ad20e3 100644
--- a/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch
index 89a00c32d5..89a00c32d5 100644
--- a/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 493063668c..493063668c 100644
--- a/patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 00abb7bb6b..2657eddbbc 100644
--- a/patches/server/0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fd965ebccc45f04d360dda8c7d0f9b640bcc67c1..7ac89aa6d0af25cac96ede3b085e68a803fb7229 100644
+index 73dd4776fee3429c42b279ab92050a4b872f64b5..25da9e3252154415303db662286e89e3aa7cfcd8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1123,6 +1123,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index 2b7d6b0305..2b7d6b0305 100644
--- a/patches/server/0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0315-Entity-getEntitySpawnReason.patch b/patches/server/0314-Entity-getEntitySpawnReason.patch
index e91f4ef5cc..6d3489374b 100644
--- a/patches/server/0315-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0314-Entity-getEntitySpawnReason.patch
@@ -35,7 +35,7 @@ index 25da9e3252154415303db662286e89e3aa7cfcd8..eea7a625fb00af13944b21e1af4bf180
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7ec6561722644bfd9dd81d12732eab67c8dd57ae..9723109a678f9532cd7ca0034d30bc4b450fcab5 100644
+index f015b1990a509071b6154a9eb7405fa2cbacb111..aa5fdc74a3b06b8d8b82b86fb4f1469ddd4c629e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -67,6 +67,8 @@ import net.minecraft.world.InteractionHand;
diff --git a/patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
index ab0862ea30..ab0862ea30 100644
--- a/patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0317-Fire-event-on-GS4-query.patch b/patches/server/0316-Fire-event-on-GS4-query.patch
index 5b78abf70c..5b78abf70c 100644
--- a/patches/server/0317-Fire-event-on-GS4-query.patch
+++ b/patches/server/0316-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0318-Implement-PlayerPostRespawnEvent.patch b/patches/server/0317-Implement-PlayerPostRespawnEvent.patch
index 69e5a59eb8..607833e55c 100644
--- a/patches/server/0318-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0317-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dc5d5a498460d09de6626b8da8a7bfcbebc028e1..00a221d7523c5b57ca53cc1cecbd3e683cccc8cb 100644
+index eea7a625fb00af13944b21e1af4bf1804c5ce6d9..1b53a2c29734a955b290d196799109047de5b45c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -722,9 +722,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index cb89ee5b2a..ba034d6b24 100644
--- a/patches/server/0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 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 2716fb59e83e2e2bca845bd1b58c5aefb7aa89a0..f3991a30f634122020ca6334bc6f2ca84e93ecac 100644
+index fcbefb814edfc27c5eaa0f943976de238808cc36..1da634eacccff884d50b7f1298bc8e44b0b8b6f2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -106,6 +106,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0320-Server-Tick-Events.patch b/patches/server/0319-Server-Tick-Events.patch
index 0bfdc4234f..0bfdc4234f 100644
--- a/patches/server/0320-Server-Tick-Events.patch
+++ b/patches/server/0319-Server-Tick-Events.patch
diff --git a/patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch
index 97bb22b7c3..97bb22b7c3 100644
--- a/patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
index f86b8bd3f4..19bbc675e5 100644
--- a/patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4d32ffa674b0617acecebfca784cd7d6b69cc5cb..62f5d137e27b51eaf54d2f84b10bb22f3df216af 100644
+index 40a445f6aa0440307368aba8433e5e7c70753566..dac62bad9def39aba8fe7bebf1631eccde9cbf00 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -876,9 +876,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0323-Add-Heightmap-API.patch b/patches/server/0322-Add-Heightmap-API.patch
index 318cfbf8e9..318cfbf8e9 100644
--- a/patches/server/0323-Add-Heightmap-API.patch
+++ b/patches/server/0322-Add-Heightmap-API.patch
diff --git a/patches/server/0324-Mob-Spawner-API-Enhancements.patch b/patches/server/0323-Mob-Spawner-API-Enhancements.patch
index 41e2e0f229..41e2e0f229 100644
--- a/patches/server/0324-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0323-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch
index e82dc3ca33..e82dc3ca33 100644
--- a/patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 866e6f9b91..866e6f9b91 100644
--- a/patches/server/0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index e5b2c90fe3..e5b2c90fe3 100644
--- a/patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0328-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0327-improve-CraftWorld-isChunkLoaded.patch
index 806a9b78e2..806a9b78e2 100644
--- a/patches/server/0328-improve-CraftWorld-isChunkLoaded.patch
+++ b/patches/server/0327-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0329-Implement-CraftBlockSoundGroup.patch b/patches/server/0328-Implement-CraftBlockSoundGroup.patch
index 5f9ce7ce01..5f9ce7ce01 100644
--- a/patches/server/0329-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0328-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index f0e25d5b10..f0e25d5b10 100644
--- a/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0331-ChunkMapDistance-CME.patch b/patches/server/0330-ChunkMapDistance-CME.patch
index 59ef83f7b1..59ef83f7b1 100644
--- a/patches/server/0331-ChunkMapDistance-CME.patch
+++ b/patches/server/0330-ChunkMapDistance-CME.patch
diff --git a/patches/server/0332-Chunk-debug-command.patch b/patches/server/0331-Chunk-debug-command.patch
index 13d30fbe3c..13d30fbe3c 100644
--- a/patches/server/0332-Chunk-debug-command.patch
+++ b/patches/server/0331-Chunk-debug-command.patch
diff --git a/patches/server/0333-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0332-Allow-Saving-of-Oversized-Chunks.patch
index 477e3df551..477e3df551 100644
--- a/patches/server/0333-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0332-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0334-Expose-the-internal-current-tick.patch b/patches/server/0333-Expose-the-internal-current-tick.patch
index a729de62a1..a729de62a1 100644
--- a/patches/server/0334-Expose-the-internal-current-tick.patch
+++ b/patches/server/0333-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0335-Fix-World-isChunkGenerated-calls.patch b/patches/server/0334-Fix-World-isChunkGenerated-calls.patch
index 41006d2ad6..41006d2ad6 100644
--- a/patches/server/0335-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0334-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0336-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch
index 8e71b62924..8e71b62924 100644
--- a/patches/server/0336-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 8d1194ab7a..6844c4be80 100644
--- a/patches/server/0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 624860b6eb087ee412bae3c1aed51a7a65c8af83..33c96bd94af3154327570acd5cc3f7891b09bee8 100644
+index 5589ee42959e3665dd5df9049fe108b6f6629608..e5365453655c0f394dea3d3b388afc24f7724b26 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -442,4 +442,15 @@ public class PaperWorldConfig {
@@ -37,7 +37,7 @@ index 624860b6eb087ee412bae3c1aed51a7a65c8af83..33c96bd94af3154327570acd5cc3f789
  }
 +
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 86cdb9ea888b85424285fc26534dc7a7ad3610ac..63deac19b4006c5d64596cd30e6641caaabc7c1d 100644
+index 94d2d83da52ce20f12a4e3f235f75d5c537ae9d1..6f63f471c2c9a3b85c6fc92bdee31a5ff9714ff5 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -85,6 +85,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0338-Configurable-projectile-relative-velocity.patch b/patches/server/0337-Configurable-projectile-relative-velocity.patch
index 0e75b0347b..1f78daf3b0 100644
--- a/patches/server/0338-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0337-Configurable-projectile-relative-velocity.patch
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 33c96bd94af3154327570acd5cc3f7891b09bee8..2342c42264d902df8553e81d02844296879c23b9 100644
+index e5365453655c0f394dea3d3b388afc24f7724b26..4cbb5e77dad6b096a7de818300c6fc112d983ceb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -452,5 +452,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0339-offset-item-frame-ticking.patch b/patches/server/0338-offset-item-frame-ticking.patch
index 982a600c76..982a600c76 100644
--- a/patches/server/0339-offset-item-frame-ticking.patch
+++ b/patches/server/0338-offset-item-frame-ticking.patch
diff --git a/patches/server/0340-Fix-MC-158900.patch b/patches/server/0339-Fix-MC-158900.patch
index b30fdccd94..8b69e5c5a8 100644
--- a/patches/server/0340-Fix-MC-158900.patch
+++ b/patches/server/0339-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 00a221d7523c5b57ca53cc1cecbd3e683cccc8cb..5d4ef973781eac558c1e8d749f751c04a67c4693 100644
+index 1b53a2c29734a955b290d196799109047de5b45c..81aee8c195307fd3cd4a89c29ebb7ebc25436c83 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -606,8 +606,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch
index 0a090c420b..0a090c420b 100644
--- a/patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0342-Dont-send-unnecessary-sign-update.patch b/patches/server/0341-Dont-send-unnecessary-sign-update.patch
index b482be0ba7..b482be0ba7 100644
--- a/patches/server/0342-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0341-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0343-Add-option-to-disable-pillager-patrols.patch b/patches/server/0342-Add-option-to-disable-pillager-patrols.patch
index ae41819976..83d2a56ecb 100644
--- a/patches/server/0343-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0342-Add-option-to-disable-pillager-patrols.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable pillager patrols
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2342c42264d902df8553e81d02844296879c23b9..275c9e6c60dc78bc2acc6fc8a78727d2030babdd 100644
+index 4cbb5e77dad6b096a7de818300c6fc112d983ceb..3510509a02b5c0de695b55792c035943ceaef222 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -457,5 +457,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0344-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index fe606e0430..fe606e0430 100644
--- a/patches/server/0344-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/0345-Flat-bedrock-generator-settings.patch b/patches/server/0344-Flat-bedrock-generator-settings.patch
index 1873598068..19a21cba19 100644
--- a/patches/server/0345-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0344-Flat-bedrock-generator-settings.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Flat bedrock generator settings
 Co-authored-by: Noah van der Aa <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 275c9e6c60dc78bc2acc6fc8a78727d2030babdd..fa620165fcdd71ee596142260b77688a42b99b78 100644
+index 3510509a02b5c0de695b55792c035943ceaef222..03fbe3ff215cc482108a8926960bb60150ffb80d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -462,5 +462,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index e04a1de2eb..e04a1de2eb 100644
--- a/patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch
index bfb189d48d..21b246762c 100644
--- a/patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fa620165fcdd71ee596142260b77688a42b99b78..8aa327e49f9764dc7240413fe2c66d1956fd2e59 100644
+index 03fbe3ff215cc482108a8926960bb60150ffb80d..e4820ece5279a0324f1e7ebf0027dcb054b7ecc3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -467,5 +467,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0348-Duplicate-UUID-Resolve-Option.patch b/patches/server/0347-Duplicate-UUID-Resolve-Option.patch
index 9f29e293a1..9f29e293a1 100644
--- a/patches/server/0348-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0347-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0349-Optimize-Hoppers.patch b/patches/server/0348-Optimize-Hoppers.patch
index 951a144d91..951a144d91 100644
--- a/patches/server/0349-Optimize-Hoppers.patch
+++ b/patches/server/0348-Optimize-Hoppers.patch
diff --git a/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
index c4f047485d..c4f047485d 100644
--- a/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch
index 1a6db3ffe9..1a6db3ffe9 100644
--- a/patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch
index 369500bf2c..369500bf2c 100644
--- a/patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch
index b877d9624b..b877d9624b 100644
--- a/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0355-Fix-items-not-falling-correctly.patch b/patches/server/0354-Fix-items-not-falling-correctly.patch
index e5f37676a4..c673c73a52 100644
--- a/patches/server/0355-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0354-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's
 move method from Spigot's entity activation range check.
 
 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 f3991a30f634122020ca6334bc6f2ca84e93ecac..1378c8ab35b3828f7c0ad504e64bb72484a1026d 100644
+index 1da634eacccff884d50b7f1298bc8e44b0b8b6f2..abe72b940b21376571e6a0598e847e3e9ed0f061 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -134,7 +134,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0356-Lag-compensate-eating.patch b/patches/server/0355-Lag-compensate-eating.patch
index 8c2ac4598b..8c2ac4598b 100644
--- a/patches/server/0356-Lag-compensate-eating.patch
+++ b/patches/server/0355-Lag-compensate-eating.patch
diff --git a/patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch
index cda154255f..cda154255f 100644
--- a/patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 602eb2b818..602eb2b818 100644
--- a/patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0359-Add-effect-to-block-break-naturally.patch b/patches/server/0358-Add-effect-to-block-break-naturally.patch
index ebb75c4859..97bc989ff2 100644
--- a/patches/server/0359-Add-effect-to-block-break-naturally.patch
+++ b/patches/server/0358-Add-effect-to-block-break-naturally.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0408a72e801178375426edf3e1c1880774ca5478..00056d5b3426df121242de2ae01fca492d20089a 100644
+index 5284b17b77fb714f1b68b2e1ee15b4bf992bd8e1..a3eb8cd92c1c7a40175e3dd637c0fd6b8d0dfc67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -468,6 +468,18 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0360-Entity-Activation-Range-2.0.patch b/patches/server/0359-Entity-Activation-Range-2.0.patch
index cceab0fe78..5123e70572 100644
--- a/patches/server/0360-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0359-Entity-Activation-Range-2.0.patch
@@ -108,7 +108,7 @@ index c04402666b9219d508bfd32b4f2e3faea0c9b648..daeb483b7aa0356447381aec8d92f5df
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9723109a678f9532cd7ca0034d30bc4b450fcab5..09c70c911bfa7be9883b6b83c1e8600fc9031463 100644
+index aa5fdc74a3b06b8d8b82b86fb4f1469ddd4c629e..ae454b12a0671f6698ff2b889988348e3a518b36 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -313,6 +313,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0361-Increase-Light-Queue-Size.patch b/patches/server/0360-Increase-Light-Queue-Size.patch
index 2b9e2a045a..2b9e2a045a 100644
--- a/patches/server/0361-Increase-Light-Queue-Size.patch
+++ b/patches/server/0360-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0362-Fix-Light-Command.patch b/patches/server/0361-Fix-Light-Command.patch
index e572cdca65..f6384f5895 100644
--- a/patches/server/0362-Fix-Light-Command.patch
+++ b/patches/server/0361-Fix-Light-Command.patch
@@ -134,7 +134,7 @@ index 005361c38b02713fb823d0be40954400d59f0c4d..3091c100eaf5a86ba270ef0d96de1852
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f0c4e98a6d5c448850a72ba90fb68c512fff8310..fee7c426876ecfc1e6a55afcd4f7c7a503d02902 100644
+index 848952c9bd3d91488d964c72bdc77925f904c3fa..cb050e658c5c99feb4586c1fba9a57ee3c0d6052 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -134,6 +134,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0363-Anti-Xray.patch b/patches/server/0362-Anti-Xray.patch
index 77ea3047ac..77ea3047ac 100644
--- a/patches/server/0363-Anti-Xray.patch
+++ b/patches/server/0362-Anti-Xray.patch
diff --git a/patches/server/0364-Implement-alternative-item-despawn-rate.patch b/patches/server/0363-Implement-alternative-item-despawn-rate.patch
index 74fb179ec7..623a29dbf7 100644
--- a/patches/server/0364-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0363-Implement-alternative-item-despawn-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6b8f7fec3307bc643a1bdd1fb9f0572fdb9da560..5a1e82727e4861681736c2bb3ed01637c4c42e4d 100644
+index 1cdfba84abcee02c0ac49367c97544bc4758715b..619f5c11ae8e21b060b52b60d681db6dd9cb5816 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -565,5 +565,52 @@ public class PaperWorldConfig {
@@ -63,7 +63,7 @@ index 6b8f7fec3307bc643a1bdd1fb9f0572fdb9da560..5a1e82727e4861681736c2bb3ed01637
 +    }
 +}
 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 1378c8ab35b3828f7c0ad504e64bb72484a1026d..5a6534904e977b5ffbd55d05c4b65f02b3995910 100644
+index abe72b940b21376571e6a0598e847e3e9ed0f061..37d9788c1d4eb40ccdc0ec946bfd648822e486a0 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -174,7 +174,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0365-Tracking-Range-Improvements.patch b/patches/server/0364-Tracking-Range-Improvements.patch
index 1f22b79e87..1f22b79e87 100644
--- a/patches/server/0365-Tracking-Range-Improvements.patch
+++ b/patches/server/0364-Tracking-Range-Improvements.patch
diff --git a/patches/server/0366-Fix-items-vanishing-through-end-portal.patch b/patches/server/0365-Fix-items-vanishing-through-end-portal.patch
index 9f92600f91..5c8d581fc4 100644
--- a/patches/server/0366-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0365-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 09c70c911bfa7be9883b6b83c1e8600fc9031463..50045c262fea182a00853adfdf4a87d46c5a6951 100644
+index ae454b12a0671f6698ff2b889988348e3a518b36..306e23a788798dd0438a6a93cd55854c904eadbd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3011,6 +3011,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0367-implement-optional-per-player-mob-spawns.patch b/patches/server/0366-implement-optional-per-player-mob-spawns.patch
index ca7a347632..91fdd170a8 100644
--- a/patches/server/0367-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0366-implement-optional-per-player-mob-spawns.patch
@@ -547,7 +547,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc
 +    }
 +} 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8de14a3078017c59b7e3a37894c6c250fa8558b0..262a2182d4d98787d0ae396c5ed0fe79177a177e 100644
+index 0c82b270c7095c7e4666a8078ecc7142503795c4..0583d7ee24f694fbf5138dfae9f7b8c8e4225ab3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -151,6 +151,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0368-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0367-Avoid-hopper-searches-if-there-are-no-items.patch
index 98df650a5a..98df650a5a 100644
--- a/patches/server/0368-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0367-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index e9d7e64447..e9d7e64447 100644
--- a/patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index dd76a8c686..88f3dc5615 100644
--- a/patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0369-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 7ffebfa03a2a92d285c837b97d5190a052006e36..fa95322c02f9eee7d2cca06c48c19383d414032f 100644
+index 313e1ba78abd6394def9d00ae671b901a6298bd1..8a6d23475983560644e391607137953803824b4b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -612,6 +612,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0371-Add-debug-for-sync-chunk-loads.patch b/patches/server/0370-Add-debug-for-sync-chunk-loads.patch
index 5e497afc6b..5e497afc6b 100644
--- a/patches/server/0371-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0370-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0372-Allow-overriding-the-java-version-check.patch b/patches/server/0371-Allow-overriding-the-java-version-check.patch
index bf02cce178..bf02cce178 100644
--- a/patches/server/0372-Allow-overriding-the-java-version-check.patch
+++ b/patches/server/0371-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0373-Add-ThrownEggHatchEvent.patch b/patches/server/0372-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0373-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0372-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0374-Entity-Jump-API.patch b/patches/server/0373-Entity-Jump-API.patch
index aefcc8ac52..aefcc8ac52 100644
--- a/patches/server/0374-Entity-Jump-API.patch
+++ b/patches/server/0373-Entity-Jump-API.patch
diff --git a/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
index a7837855c4..1de7b9b9b6 100644
--- a/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -21,7 +21,7 @@ index 88d140a03b6f28070b2f78588ee5ce4d5ac3cf0f..67dcc28e5c5f6bdcafaea4bfe317203d
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 50045c262fea182a00853adfdf4a87d46c5a6951..497fec66a9bb22ca9e4c8eea6c588bb42f64b320 100644
+index 306e23a788798dd0438a6a93cd55854c904eadbd..6fbbd591873d28dde1ff59ab0ae46f9ce4d6ae31 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -315,6 +315,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0376-Make-the-GUI-graph-fancier.patch b/patches/server/0375-Make-the-GUI-graph-fancier.patch
index f6061a031e..f6061a031e 100644
--- a/patches/server/0376-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0375-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch
index a191025dfe..f48dfe4a10 100644
--- a/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 61c95f98a3e3e52a23f65f7c957019f7f1aa7417..bf7c61c767bdfe8ddb63367f1b38dbbeba17ba02 100644
+index b4032ce470346915251d85d1aa7375a116efe771..aaea18e64db3851f98a7a391d9f9bb265d659d99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -344,13 +344,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0378-Prevent-teleporting-dead-entities.patch b/patches/server/0377-Prevent-teleporting-dead-entities.patch
index f55c8fa69e..f55c8fa69e 100644
--- a/patches/server/0378-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0377-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0379-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch
index 9c50f803d4..9c50f803d4 100644
--- a/patches/server/0379-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index eaa656dbb1..9b936e4d4e 100644
--- a/patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38aa300d296124729297aa5c6975f797961d7063..fbfff8b0647bdd1caf8b4ff0841a230417bebdb6 100644
+index 67dcc28e5c5f6bdcafaea4bfe317203ddee09454..e0ebea2f62db5d0723aa353db49cdc3854aa5dd7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -423,6 +423,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch
index 5fe457cd3e..a3d1bb8638 100644
--- a/patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fbfff8b0647bdd1caf8b4ff0841a230417bebdb6..5c6fdf9668a08cf0ff48309b9fbbefefadf5ecee 100644
+index e0ebea2f62db5d0723aa353db49cdc3854aa5dd7..5fee3bdea651fcdd7ea01df4cfb8288a231f9236 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -536,6 +536,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0382-Optimise-Chunk-getFluid.patch b/patches/server/0381-Optimise-Chunk-getFluid.patch
index ad524802ea..10bb6a295c 100644
--- a/patches/server/0382-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0381-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 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 3a32f1adac69f1891d8fdbdc17a1f211a1590bf0..520645a8ee50e049e59c21fc57c88203f9a18993 100644
+index 4e2405f416102d744f76384bbfdf051c29f87286..8cfe47012b78eb582afff23ffcf758ca2e9dec95 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -373,18 +373,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0383-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0382-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 4b0c8ea948..ffe792e94f 100644
--- a/patches/server/0383-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0382-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 6dd8adabc23931c8e4b8f448bd867207ed25c385..f7f7313ff4ff4b2cb21b64ef29b5900e39f52ad1 100644
+index 58aaf0d98cbd6814ecdf00f46f8ff9fc7901006c..9f7541cb62600f022da75cba74731ff4e57f7f36 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0384-Add-tick-times-API-and-mspt-command.patch b/patches/server/0383-Add-tick-times-API-and-mspt-command.patch
index 0754a3d76f..0754a3d76f 100644
--- a/patches/server/0384-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0383-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0385-Expose-MinecraftServer-isRunning.patch b/patches/server/0384-Expose-MinecraftServer-isRunning.patch
index c1c7c662fd..c1c7c662fd 100644
--- a/patches/server/0385-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0384-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0386-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch
index 318f55574a..e6ae5ed134 100644
--- a/patches/server/0386-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 6487c87dbb3b8c019254581cb40875ad083d5a62..19401098850f3fecaaea1f27ff4febd7bda1f7c9 100644
+index 063321a195bdbabc9be77672bc7b51202196286c..1c0ea2664e4b9b95b9bbd1351efd5e51111937f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -395,6 +395,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch
index c5ca876174..56b72c21d5 100644
--- a/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4857b84a3bf406346448942ff91938b9e145c3bc..64b1e860a946ba3a2f3cbbe4b69dab52ede2139b 100644
+index 5fee3bdea651fcdd7ea01df4cfb8288a231f9236..7f09e1178b73b3c436aea9059162628bfa8a6911 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -505,8 +505,18 @@ public class PaperWorldConfig {
diff --git a/patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d902e4aeda..d902e4aeda 100644
--- a/patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 5472a4dd1d..5472a4dd1d 100644
--- a/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 47185d77fc..47185d77fc 100644
--- a/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0391-Don-t-tick-dead-players.patch b/patches/server/0390-Don-t-tick-dead-players.patch
index 2bfc8b4078..2bfc8b4078 100644
--- a/patches/server/0391-Don-t-tick-dead-players.patch
+++ b/patches/server/0390-Don-t-tick-dead-players.patch
diff --git a/patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
index b069a347d2..b069a347d2 100644
--- a/patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0392-Optimize-Collision-to-not-load-chunks.patch
index 4c47698534..5572ad19a0 100644
--- a/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0392-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 81aee8c195307fd3cd4a89c29ebb7ebc25436c83..2458619f7f377398322459e00a49f7f4
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd45dea99ea38b07577e2dbf399b87856bc28573..333686cdcedd612ddbd33ec0ef8a3beb326d41b3 100644
+index 6fbbd591873d28dde1ff59ab0ae46f9ce4d6ae31..a3a80ad047dfa9ba1c058eaaf95b76cd3e0ec490 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -171,6 +171,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch
index f59f642d8b..7f48166177 100644
--- a/patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch
@@ -32,7 +32,7 @@ index fd609c7b757b570206c17444867f786c1767aa69..d507adcb538933fcf36e9a4bfb561106
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 33b607227718e08f26d7ab5744bbbff806f33366..e1d729d86d11f9bc9452b7382f12aeb668c19936 100644
+index 2458619f7f377398322459e00a49f7f49437f9a2..362fe0c88021c4530110d1128819016c8ae9c0d5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -210,6 +210,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0395-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 0f741cb320..0f741cb320 100644
--- a/patches/server/0395-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0396-Improved-Watchdog-Support.patch b/patches/server/0395-Improved-Watchdog-Support.patch
index 42b646feff..42b646feff 100644
--- a/patches/server/0396-Improved-Watchdog-Support.patch
+++ b/patches/server/0395-Improved-Watchdog-Support.patch
diff --git a/patches/server/0397-Optimize-Pathfinding.patch b/patches/server/0396-Optimize-Pathfinding.patch
index 590eb8051d..590eb8051d 100644
--- a/patches/server/0397-Optimize-Pathfinding.patch
+++ b/patches/server/0396-Optimize-Pathfinding.patch
diff --git a/patches/server/0398-Reduce-Either-Optional-allocation.patch b/patches/server/0397-Reduce-Either-Optional-allocation.patch
index 0f4641263b..0f4641263b 100644
--- a/patches/server/0398-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0397-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0399-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch
index a47c3ab7a6..a47c3ab7a6 100644
--- a/patches/server/0399-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0400-Prevent-opening-inventories-when-frozen.patch b/patches/server/0399-Prevent-opening-inventories-when-frozen.patch
index a16fd79371..e6cb075af5 100644
--- a/patches/server/0400-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0399-Prevent-opening-inventories-when-frozen.patch
@@ -27,7 +27,7 @@ index d507adcb538933fcf36e9a4bfb561106d509c26f..9cbca14b0a111e57a1d01bcbcf2164ab
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 76a08aaf5106a5e8d0a24e9d966817574ec26068..9ad94aea2959082dfd44edd63c0a5aa1cec1e655 100644
+index c787bb69baa1b30fc513965fe4a9578c1be551d8..5d14403e1826ab2be43c0436b1fc2f1877072e6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -322,7 +322,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0401-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0400-Optimise-ArraySetSorted-removeIf.patch
index 1f9f1e2e4e..1f9f1e2e4e 100644
--- a/patches/server/0401-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/server/0400-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch
index 7e27487f4c..7e27487f4c 100644
--- a/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0403-Implement-Player-Client-Options-API.patch b/patches/server/0402-Implement-Player-Client-Options-API.patch
index fdcd1d64d9..6abd2e07aa 100644
--- a/patches/server/0403-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0402-Implement-Player-Client-Options-API.patch
@@ -97,7 +97,7 @@ index 9cbca14b0a111e57a1d01bcbcf2164ab8b53b1a5..cdb0eb8e21299ca70ed7ed5c1195d07f
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 946b33afb3a2c11836e6da887309f70d45dc586d..1b1d0742ef534becb462e2231e814604aeca7d87 100644
+index b04aaab4f7cb7367d0fbc6268b0db269b55b2d17..3f25e799ba13d8280c644a943ca0d191fde9eb7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -546,6 +546,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0404-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index cd2777bf53..cd2777bf53 100644
--- a/patches/server/0404-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0405-Broadcast-join-message-to-console.patch b/patches/server/0404-Broadcast-join-message-to-console.patch
index 2dc0451917..a36f6c7dbb 100644
--- a/patches/server/0405-Broadcast-join-message-to-console.patch
+++ b/patches/server/0404-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dc6ea42139774d1cd4ff856781abb0327fd0da4c..734f74e4ef178ae4b887bccdd571d9b269b29abe 100644
+index 11698ed04d77c974f18aa6981e7f1efa60c5c7b7..f32fad01c9f1b0642615be896bbf79f73f4656db 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -293,7 +293,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 3c97b33094..3c97b33094 100644
--- a/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 76c107076b..76c107076b 100644
--- a/patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch
index de38679eb8..de38679eb8 100644
--- a/patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 512d3a854a..79510cd186 100644
--- a/patches/server/0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fa4242cb9bd5b8b5a088585a6709d0b27835a261..12f00a6d3b4335aa8f60646ac129dd481082feec 100644
+index a3a80ad047dfa9ba1c058eaaf95b76cd3e0ec490..3ef63d278464d4b4ebd5bd1b69b68bf0c818b9ab 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1998,9 +1998,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0409-Add-PlayerAttackEntityCooldownResetEvent.patch
index 9876e98e86..9876e98e86 100644
--- a/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0409-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0411-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0410-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a5268c81a..8a5268c81a 100644
--- a/patches/server/0411-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0410-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0412-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0411-Add-phantom-creative-and-insomniac-controls.patch
index c7a7ba2bd9..7f41e4a0e0 100644
--- a/patches/server/0412-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0411-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5140fc524b9995312324e494a42fa4334ac518c7..6aa85780d08a617195cd8521331e91b212f12f0c 100644
+index 7f09e1178b73b3c436aea9059162628bfa8a6911..1ea83baba79254e11fc770a6a1c7fb740ac43d82 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -646,4 +646,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0413-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 6d8c0014c8..a70213ea92 100644
--- a/patches/server/0413-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 12f00a6d3b4335aa8f60646ac129dd481082feec..f2be5a99ea4074a72858ddf8f728f5aa81aec59b 100644
+index 3ef63d278464d4b4ebd5bd1b69b68bf0c818b9ab..9336ad8bc5e11d6412869d597b5360c90be4df78 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2148,11 +2148,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0414-Villager-Restocks-API.patch b/patches/server/0413-Villager-Restocks-API.patch
index e0652b4cdb..e0652b4cdb 100644
--- a/patches/server/0414-Villager-Restocks-API.patch
+++ b/patches/server/0413-Villager-Restocks-API.patch
diff --git a/patches/server/0415-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch
index b46c78bdb2..b46c78bdb2 100644
--- a/patches/server/0415-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0416-Expose-game-version.patch b/patches/server/0415-Expose-game-version.patch
index 71ee6acb34..71ee6acb34 100644
--- a/patches/server/0416-Expose-game-version.patch
+++ b/patches/server/0415-Expose-game-version.patch
diff --git a/patches/server/0417-Optimize-Voxel-Shape-Merging.patch b/patches/server/0416-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0417-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0416-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0418-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 9f6a56cec1..9f6a56cec1 100644
--- a/patches/server/0418-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0419-misc-debugging-dumps.patch b/patches/server/0418-misc-debugging-dumps.patch
index 687469904b..687469904b 100644
--- a/patches/server/0419-misc-debugging-dumps.patch
+++ b/patches/server/0418-misc-debugging-dumps.patch
diff --git a/patches/server/0420-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 52590b5222..52590b5222 100644
--- a/patches/server/0420-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0421-Implement-Mob-Goal-API.patch b/patches/server/0420-Implement-Mob-Goal-API.patch
index 3f50c4d346..3f50c4d346 100644
--- a/patches/server/0421-Implement-Mob-Goal-API.patch
+++ b/patches/server/0420-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0422-Add-villager-reputation-API.patch b/patches/server/0421-Add-villager-reputation-API.patch
index 11bc8d930a..11bc8d930a 100644
--- a/patches/server/0422-Add-villager-reputation-API.patch
+++ b/patches/server/0421-Add-villager-reputation-API.patch
diff --git a/patches/server/0423-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0422-Option-for-maximum-exp-value-when-merging-orbs.patch
index e11db26db3..d482dc9223 100644
--- a/patches/server/0423-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0422-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6aa85780d08a617195cd8521331e91b212f12f0c..e661a3d19f6e9fc7e7e55574222865487d7a817a 100644
+index 1ea83baba79254e11fc770a6a1c7fb740ac43d82..65fcdbc5c1f637f809d3033b83e5b1c807472911 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -653,4 +653,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 6aa85780d08a617195cd8521331e91b212f12f0c..e661a3d19f6e9fc7e7e5557422286548
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4cdac8044d3a14861dab5b018479c735d094adcf..147839ff49ad5ac20dfd1cfdb09a25dafc6ae03c 100644
+index d74db5ac46314683b8c8713b8e6f6450ef7eb1b1..d62b1f22ee5679b0f223320db0db9c53b2120c91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -630,16 +630,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0424-ExperienceOrbMergeEvent.patch b/patches/server/0423-ExperienceOrbMergeEvent.patch
index 9ca6a034ef..2a2c3c1eb1 100644
--- a/patches/server/0424-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0423-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 147839ff49ad5ac20dfd1cfdb09a25dafc6ae03c..5fea023590fd1456a4d43c1ebc5b8c243e185631 100644
+index d62b1f22ee5679b0f223320db0db9c53b2120c91..f49c636a7485a7f41aae7acb584dc1c7c1d2c3a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -640,7 +640,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0425-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0424-Fix-PotionEffect-ignores-icon-flag.patch
index e542865e62..e542865e62 100644
--- a/patches/server/0425-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0424-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0426-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0425-Optimize-brigadier-child-sorting-performance.patch
index 3dd2ebd6a4..3dd2ebd6a4 100644
--- a/patches/server/0426-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/server/0425-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0427-Potential-bed-API.patch b/patches/server/0426-Potential-bed-API.patch
index 8b5848a992..dba834abeb 100644
--- a/patches/server/0427-Potential-bed-API.patch
+++ b/patches/server/0426-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 9ad94aea2959082dfd44edd63c0a5aa1cec1e655..a0af465056786f0c8e177a3f48bbf51c0f79b949 100644
+index 5d14403e1826ab2be43c0436b1fc2f1877072e6f..319aa663bd0250c6371c06501fc7986e80fcec6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0428-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0427-Wait-for-Async-Tasks-during-shutdown.patch
index d4b780a618..d4b780a618 100644
--- a/patches/server/0428-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0427-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0429-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index dc78ba0edd..dc78ba0edd 100644
--- a/patches/server/0429-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0430-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 9f9fee10fb..8c82c7b9da 100644
--- a/patches/server/0430-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -54,7 +54,7 @@ index 548f103e648d9670d7434182c6598dc29ae77b57..f0c789d339fe8402c9c2a684d7e0415f
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5abdb1c0247fde6da03e7689d5e2abab54f116d1..c7a69b84dada3fef89d798bd9c4cb151d61ee2de 100644
+index 634a858e4e03968ada7c13e26e151d8f05ad611c..ad9b48a0c89689a602c85f65e6cc68977af5ea29 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -416,6 +416,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -93,7 +93,7 @@ index b77eda6af8b430311e502465a2590d83555ff6cf..a37213bce34f45898f56a22196b0d5ef
      public co.aikar.timings.Timing getTiming() {
          if (timing == null) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 2f1345d3c3671953a806cb243a152e080fbb9108..e9b315fb5a7b466e2ac65ae4ae69e893dd992739 100644
+index aa4c582172221f7d48c9a64e91bdfb95a2453a6c..ebd8a234acf42f8d6ae0790bb6a60a214d22429f 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -199,6 +199,12 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0431-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0430-Reduce-MutableInt-allocations-from-light-engine.patch
index 881c2f0231..881c2f0231 100644
--- a/patches/server/0431-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/server/0430-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0432-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 510e73aae3..510e73aae3 100644
--- a/patches/server/0432-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0433-Ensure-safe-gateway-teleport.patch b/patches/server/0432-Ensure-safe-gateway-teleport.patch
index c81dcd4074..c81dcd4074 100644
--- a/patches/server/0433-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0432-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0434-Add-option-for-console-having-all-permissions.patch b/patches/server/0433-Add-option-for-console-having-all-permissions.patch
index 3c76e7d308..3c76e7d308 100644
--- a/patches/server/0434-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0433-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0435-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index b1ccb5f6ec..b1ccb5f6ec 100644
--- a/patches/server/0435-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0436-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0435-Use-distance-map-to-optimise-entity-tracker.patch
index c27f897cc3..77b881a3df 100644
--- a/patches/server/0436-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0435-Use-distance-map-to-optimise-entity-tracker.patch
@@ -280,7 +280,7 @@ index 44dc880042dc16a4146c6d3bb35a8eb7b28fd3a4..847c4705f88b999976c9a99519939eb2
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f2be5a99ea4074a72858ddf8f728f5aa81aec59b..b047726aa8672d2298a0bbbcff43ada76969c809 100644
+index 9336ad8bc5e11d6412869d597b5360c90be4df78..f7c783ad7ee5d29b489d20ed399076c4b4a9c496 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -51,6 +51,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0436-Optimize-ServerLevels-chunk-level-checking-methods.patch
index 21abb956a9..21abb956a9 100644
--- a/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0436-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0438-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 592d67ecca..7adaad7b67 100644
--- a/patches/server/0438-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e661a3d19f6e9fc7e7e55574222865487d7a817a..d7e2d0625fe113387f9475688d38be515673d986 100644
+index 65fcdbc5c1f637f809d3033b83e5b1c807472911..d6d549df6e8920c936dd0d1b7ba828dbebc60b32 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -659,4 +659,13 @@ public class PaperWorldConfig {
diff --git a/patches/server/0439-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0438-Fix-villager-trading-demand-MC-163962.patch
index 0850983283..0850983283 100644
--- a/patches/server/0439-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0438-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0440-Maps-shouldn-t-load-chunks.patch b/patches/server/0439-Maps-shouldn-t-load-chunks.patch
index c1f48bd1ba..c1f48bd1ba 100644
--- a/patches/server/0440-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0439-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0441-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 7361ae68fa..7361ae68fa 100644
--- a/patches/server/0441-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0442-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0441-Fix-missing-chunks-due-to-integer-overflow.patch
index d2f7884b38..d2f7884b38 100644
--- a/patches/server/0442-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0441-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0443-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0443-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0444-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0443-Fix-piston-physics-inconsistency-MC-188840.patch
index 84ffd5bdd4..48e00c4d03 100644
--- a/patches/server/0444-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0443-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -49,7 +49,7 @@ index 374cb5a2fb8c44b7d914beff5688cf36fc08640c..ebbbffd209c6796bc608992e29303514
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index e9b315fb5a7b466e2ac65ae4ae69e893dd992739..da9ae487799e58b196ebf219a62020d0c28adc70 100644
+index ebd8a234acf42f8d6ae0790bb6a60a214d22429f..2e95de4250f3b53591749ebbe7a5f2b607f6b7fa 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -410,14 +410,26 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0445-Fix-sand-duping.patch b/patches/server/0444-Fix-sand-duping.patch
index db38b47879..db38b47879 100644
--- a/patches/server/0445-Fix-sand-duping.patch
+++ b/patches/server/0444-Fix-sand-duping.patch
diff --git a/patches/server/0446-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch
index a0c9934cf6..a0c9934cf6 100644
--- a/patches/server/0446-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0447-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0446-Inventory-getHolder-method-without-block-snapshot.patch
index dca3e657db..dca3e657db 100644
--- a/patches/server/0447-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0446-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0448-Expose-Arrow-getItemStack.patch b/patches/server/0447-Expose-Arrow-getItemStack.patch
index 38c157797a..38c157797a 100644
--- a/patches/server/0448-Expose-Arrow-getItemStack.patch
+++ b/patches/server/0447-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0449-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 5059337530..5059337530 100644
--- a/patches/server/0449-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0450-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0449-Hide-sync-chunk-writes-behind-flag.patch
index 9f93092cb4..9f93092cb4 100644
--- a/patches/server/0450-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0449-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0451-Add-permission-for-command-blocks.patch b/patches/server/0450-Add-permission-for-command-blocks.patch
index 47344e7f6f..47344e7f6f 100644
--- a/patches/server/0451-Add-permission-for-command-blocks.patch
+++ b/patches/server/0450-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0452-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0451-Ensure-Entity-AABB-s-are-never-invalid.patch
index 99ab79280c..9b6fc7a9bb 100644
--- a/patches/server/0452-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0451-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b047726aa8672d2298a0bbbcff43ada76969c809..ad7065566b984159e464f4472adac6b48573fdfc 100644
+index f7c783ad7ee5d29b489d20ed399076c4b4a9c496..59175679a2fae171b3d01fed5db8ac57d0a63a29 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -589,8 +589,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0453-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 1e824670c1..1e824670c1 100644
--- a/patches/server/0453-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0454-Paper-dumpitem-command.patch b/patches/server/0453-Paper-dumpitem-command.patch
index be0e942b1b..be0e942b1b 100644
--- a/patches/server/0454-Paper-dumpitem-command.patch
+++ b/patches/server/0453-Paper-dumpitem-command.patch
diff --git a/patches/server/0455-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0454-Don-t-allow-null-UUID-s-for-chat.patch
index 79ac87a844..79ac87a844 100644
--- a/patches/server/0455-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/server/0454-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0456-Improve-Legacy-Component-serialization-size.patch b/patches/server/0455-Improve-Legacy-Component-serialization-size.patch
index 8d30b49c6b..8d30b49c6b 100644
--- a/patches/server/0456-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0455-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0457-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0456-Optimize-Bit-Operations-by-inlining.patch
index e0dc27b511..e0dc27b511 100644
--- a/patches/server/0457-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0456-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0458-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index b8c17f7de9..b8c17f7de9 100644
--- a/patches/server/0458-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0459-incremental-chunk-and-player-saving.patch b/patches/server/0458-incremental-chunk-and-player-saving.patch
index f5e658a985..f5e658a985 100644
--- a/patches/server/0459-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0458-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0460-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 3fe4a3693e..3fe4a3693e 100644
--- a/patches/server/0460-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0461-Support-old-UUID-format-for-NBT.patch b/patches/server/0460-Support-old-UUID-format-for-NBT.patch
index 607a1ac12a..607a1ac12a 100644
--- a/patches/server/0461-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0460-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0462-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch
index d9c0d0a1c7..d9c0d0a1c7 100644
--- a/patches/server/0462-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0463-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch
index 1225ad8355..1225ad8355 100644
--- a/patches/server/0463-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0464-Remove-some-streams-from-structures.patch b/patches/server/0463-Remove-some-streams-from-structures.patch
index 0f1c833772..0f1c833772 100644
--- a/patches/server/0464-Remove-some-streams-from-structures.patch
+++ b/patches/server/0463-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0465-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch
index 23c4519a7b..23c4519a7b 100644
--- a/patches/server/0465-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0466-Support-components-in-ItemMeta.patch b/patches/server/0465-Support-components-in-ItemMeta.patch
index 64e131bec1..64e131bec1 100644
--- a/patches/server/0466-Support-components-in-ItemMeta.patch
+++ b/patches/server/0465-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0467-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 9a07cce833..9a07cce833 100644
--- a/patches/server/0467-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0468-Add-entity-liquid-API.patch b/patches/server/0467-Add-entity-liquid-API.patch
index 44a97c5636..0507e83a33 100644
--- a/patches/server/0468-Add-entity-liquid-API.patch
+++ b/patches/server/0467-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ad7065566b984159e464f4472adac6b48573fdfc..96de46b0b1b4bd69b1afa689083ec57ffb07120e 100644
+index 59175679a2fae171b3d01fed5db8ac57d0a63a29..5a23c9fe4147c82ce2e6eda9690b158b030f71f6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1353,7 +1353,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0469-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0468-Update-itemstack-legacy-name-and-lore.patch
index d59dc7e541..d59dc7e541 100644
--- a/patches/server/0469-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0468-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0470-Spawn-player-in-correct-world-on-login.patch b/patches/server/0469-Spawn-player-in-correct-world-on-login.patch
index bac42e47f9..389efb21aa 100644
--- a/patches/server/0470-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0469-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a8048e3af5bccb4cabe1ed1bc774aac6b8486bec..c1bdd32fade0a613116b0ff848bfa5a4e8c428e6 100644
+index 8c0faa9ee28943c7750dc33947e3f096b45a2026..135337afa09f090847d26268fcb8e542b1535ef3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0471-Add-PrepareResultEvent.patch b/patches/server/0470-Add-PrepareResultEvent.patch
index f9606eccdc..f9606eccdc 100644
--- a/patches/server/0471-Add-PrepareResultEvent.patch
+++ b/patches/server/0470-Add-PrepareResultEvent.patch
diff --git a/patches/server/0472-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 0c39cba0cd..0c39cba0cd 100644
--- a/patches/server/0472-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 7f224b44fe..28a89aa53b 100644
--- a/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -1151,7 +1151,7 @@ index 135337afa09f090847d26268fcb8e542b1535ef3..b164b43d9d61398231451162cfb07d11
              if (updatingChunk != null) {
                  return updatingChunk.getEntityTickingChunkFuture();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 96de46b0b1b4bd69b1afa689083ec57ffb07120e..40e8c0b36ec521a8850782f349eb29b4802d2c68 100644
+index 5a23c9fe4147c82ce2e6eda9690b158b030f71f6..e289c08936e0a3c5558e65f247406414d7fb0daa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -223,7 +223,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -1210,7 +1210,7 @@ index c11bdc266434aa9d90e5ab25e185dc1a1ba57d9b..eea11a2bf87d409f484f07f207c57c86
              net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk) either.left().orElse(null);
              if (chunk != null) addTicket(x, z); // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1b1d0742ef534becb462e2231e814604aeca7d87..fd27b0e62c3da17e7f6b948b6380d9d29422b9ba 100644
+index 3f25e799ba13d8280c644a943ca0d191fde9eb7b..d22662c5d12f03196b00e8342b063f346d86f76a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -909,6 +909,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0474-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch
index 79d4327e4f..79d4327e4f 100644
--- a/patches/server/0474-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0475-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch
index f60ffe8b92..f60ffe8b92 100644
--- a/patches/server/0475-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0476-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch
index 85c6131304..85c6131304 100644
--- a/patches/server/0476-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0477-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch
index 834506f5be..834506f5be 100644
--- a/patches/server/0477-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0478-Move-range-check-for-block-placing-up.patch b/patches/server/0477-Move-range-check-for-block-placing-up.patch
index 5f4bf62156..5f4bf62156 100644
--- a/patches/server/0478-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0477-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0479-Fix-SPIGOT-5989.patch b/patches/server/0478-Fix-SPIGOT-5989.patch
index bd7b4e439a..3167dae2e3 100644
--- a/patches/server/0479-Fix-SPIGOT-5989.patch
+++ b/patches/server/0478-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bcc4de5c0f970325efaa9d99bb0845c2ed422b6d..c75218775bb5e9745b863ef1db5280a4a3f2bed9 100644
+index b164b43d9d61398231451162cfb07d118f2045ba..98c70121c53e42e3c9bc7403eed83335f567bc74 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -78,6 +78,7 @@ import net.minecraft.world.level.GameRules;
diff --git a/patches/server/0480-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 86102faf60..566018e251 100644
--- a/patches/server/0480-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index e0c1e4e38ff49429a587c59afb86e95c452d52a0..e2882c60621d64458a480abaceeddd0417afc5d0 100644
+index afc7606e0df5dc87767444b42bb4e4b1b2f96b2d..8fb463bf0e73ff81ee3270e249258910d3e7296e 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -134,11 +134,20 @@ public class Main {
diff --git a/patches/server/0481-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 5f3e63546b..49987a6faf 100644
--- a/patches/server/0481-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index e2882c60621d64458a480abaceeddd0417afc5d0..bb85bfb074830d771be8527f6c25ebb578578f18 100644
+index 8fb463bf0e73ff81ee3270e249258910d3e7296e..d7975e6f0c855955ac04552cfbd4c9a8c86ae188 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -134,6 +134,7 @@ public class Main {
diff --git a/patches/server/0482-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 0cccf4b597..0cccf4b597 100644
--- a/patches/server/0482-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0483-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 49f5faddcf..49f5faddcf 100644
--- a/patches/server/0483-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0484-Fix-some-rails-connecting-improperly.patch b/patches/server/0483-Fix-some-rails-connecting-improperly.patch
index 8de7ddf603..8de7ddf603 100644
--- a/patches/server/0484-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0483-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0485-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0485-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0486-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 0ab51e6a0f..0ab51e6a0f 100644
--- a/patches/server/0486-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0487-Brand-support.patch b/patches/server/0486-Brand-support.patch
index b3c9a3d8e1..c86dbfdaac 100644
--- a/patches/server/0487-Brand-support.patch
+++ b/patches/server/0486-Brand-support.patch
@@ -72,7 +72,7 @@ index 938e6ee89bdb398dc4e2ce1682727c0e63f28c26..4065a1cb1b4b68aa3ff9f1c3e86c270e
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8429d6aa616c08520bdf7bf71f7e61895583e3ed..95dae09e710cc50905a6af3a33e8c4c0a29719da 100644
+index d22662c5d12f03196b00e8342b063f346d86f76a..08d6dfbbf62e7adb801a7bf49dd1a1f611e768c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2563,6 +2563,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0488-Add-setMaxPlayers-API.patch b/patches/server/0487-Add-setMaxPlayers-API.patch
index 25631acf0d..25631acf0d 100644
--- a/patches/server/0488-Add-setMaxPlayers-API.patch
+++ b/patches/server/0487-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0489-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch
index 9efead6d4e..9efead6d4e 100644
--- a/patches/server/0489-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0490-Don-t-require-FACING-data.patch b/patches/server/0489-Don-t-require-FACING-data.patch
index e1c274797e..e1c274797e 100644
--- a/patches/server/0490-Don-t-require-FACING-data.patch
+++ b/patches/server/0489-Don-t-require-FACING-data.patch
diff --git a/patches/server/0491-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 24c50ccb97..24c50ccb97 100644
--- a/patches/server/0491-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0492-Add-moon-phase-API.patch b/patches/server/0491-Add-moon-phase-API.patch
index 453da7fc7b..453da7fc7b 100644
--- a/patches/server/0492-Add-moon-phase-API.patch
+++ b/patches/server/0491-Add-moon-phase-API.patch
diff --git a/patches/server/0493-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch
index e3f37a7db6..e3f37a7db6 100644
--- a/patches/server/0493-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0494-Prevent-headless-pistons-from-being-created.patch b/patches/server/0493-Prevent-headless-pistons-from-being-created.patch
index 9361ff6c4a..9361ff6c4a 100644
--- a/patches/server/0494-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0493-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0495-Add-BellRingEvent.patch b/patches/server/0494-Add-BellRingEvent.patch
index e101aa373c..e101aa373c 100644
--- a/patches/server/0495-Add-BellRingEvent.patch
+++ b/patches/server/0494-Add-BellRingEvent.patch
diff --git a/patches/server/0496-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0495-Add-zombie-targets-turtle-egg-config.patch
index c06cc34209..0c0a662b76 100644
--- a/patches/server/0496-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0495-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7029f424e9a0280421a880c5e64e4dfa4f8f0e92..9f179b1f3be36481e38104e7a52fd7d4e3f1ef16 100644
+index 8b4b521a84c8623665d21d0340bca7665953d20b..786253c675bff5aee5c5d79db897a282e6fb4b65 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -58,6 +58,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0497-Buffer-joins-to-world.patch b/patches/server/0496-Buffer-joins-to-world.patch
index 80114c30ef..80114c30ef 100644
--- a/patches/server/0497-Buffer-joins-to-world.patch
+++ b/patches/server/0496-Buffer-joins-to-world.patch
diff --git a/patches/server/0498-Optimize-redstone-algorithm.patch b/patches/server/0497-Optimize-redstone-algorithm.patch
index 073d360ddb..909e595c8d 100644
--- a/patches/server/0498-Optimize-redstone-algorithm.patch
+++ b/patches/server/0497-Optimize-redstone-algorithm.patch
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9f179b1f3be36481e38104e7a52fd7d4e3f1ef16..6ebc8ef074e6e31f39978b69669af80f4ac82bf9 100644
+index 786253c675bff5aee5c5d79db897a282e6fb4b65..21adf6cb4cef00bc5f16a6e065a43c7894e24ba9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -63,6 +63,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0499-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 31e71d4263..bace25f987 100644
--- a/patches/server/0499-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix hex colors not working in some kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index c09d3cdb3acb04b6a833c30a619ff2af5e8b6b18..2384ae5082afd01c4f28fe2f3f782cdce15ff3f2 100644
+index 687308a414095f95b567a2993b679d8b62856578..54de844431cf9cc88d6e82014d5eb69babd7784c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -50,7 +50,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0500-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch
index 19b2867cf5..19b2867cf5 100644
--- a/patches/server/0500-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0501-Fix-CraftTeam-null-check.patch b/patches/server/0500-Fix-CraftTeam-null-check.patch
index 61de747dfd..61de747dfd 100644
--- a/patches/server/0501-Fix-CraftTeam-null-check.patch
+++ b/patches/server/0500-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0502-Add-more-Evoker-API.patch b/patches/server/0501-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0502-Add-more-Evoker-API.patch
+++ b/patches/server/0501-Add-more-Evoker-API.patch
diff --git a/patches/server/0503-Add-methods-to-get-translation-keys.patch b/patches/server/0502-Add-methods-to-get-translation-keys.patch
index fdc247d975..e6ff06a000 100644
--- a/patches/server/0503-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0502-Add-methods-to-get-translation-keys.patch
@@ -42,7 +42,7 @@ index eb99e0c2462a2d1ab4508a5c3f1580b6e31d7465..c536eceef3365a7b726cd970df345ba1
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 30142e9177ac1f8a985643524d5c11fda9854d64..b160c437fea9a09e9a67d6bd103960b038fe88fe 100644
+index 1c0ea2664e4b9b95b9bbd1351efd5e51111937f7..7f697673e41068d4f2252fc319355e20bcd5ad30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -442,6 +442,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0504-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch
index 3a415bc680..3a415bc680 100644
--- a/patches/server/0504-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0505-Cache-block-data-strings.patch b/patches/server/0504-Cache-block-data-strings.patch
index cb7563b976..cb7563b976 100644
--- a/patches/server/0505-Cache-block-data-strings.patch
+++ b/patches/server/0504-Cache-block-data-strings.patch
diff --git a/patches/server/0506-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 22f0e6e4ec..896ba470cd 100644
--- a/patches/server/0506-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index 4065a1cb1b4b68aa3ff9f1c3e86c270e1509f93f..70c1f6d91d1792ef713e46b93897a94f
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 40e8c0b36ec521a8850782f349eb29b4802d2c68..eb822db65be446cd1de2a0bbc0c9ba0fb1620192 100644
+index e289c08936e0a3c5558e65f247406414d7fb0daa..a35078c299c3c8d7e670d2ca82c110e62b374490 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -151,6 +151,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0507-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch
index ce59f1dbfc..673327c917 100644
--- a/patches/server/0507-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a0af465056786f0c8e177a3f48bbf51c0f79b949..45fe3d2d728b984651c478ff050a7c69b1eebef3 100644
+index 319aa663bd0250c6371c06501fc7986e80fcec6b..e4759fe6779b2c174388c1b5f56ce13c51d653b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -458,6 +458,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0508-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index a02addc375..a02addc375 100644
--- a/patches/server/0508-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0509-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch
index eb1b351172..eb1b351172 100644
--- a/patches/server/0509-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0510-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index 77d27fca91..77d27fca91 100644
--- a/patches/server/0510-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0511-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 1bd1f6f1cd..c5fdc388fb 100644
--- a/patches/server/0511-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb822db65be446cd1de2a0bbc0c9ba0fb1620192..599da702921001c5e459167acffd747148698e0f 100644
+index a35078c299c3c8d7e670d2ca82c110e62b374490..a6cc8d8691f314fe7d5499f525a45b1c2e7f31e5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3971,4 +3971,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -21,7 +21,7 @@ index eb822db65be446cd1de2a0bbc0c9ba0fb1620192..599da702921001c5e459167acffd7471
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b9fe4efe0975acfc92a9e112213c39b60cff557b..4191d8766e769ef65429b4f63a336770b06b1d3b 100644
+index 7f697673e41068d4f2252fc319355e20bcd5ad30..91a8891531025dcce41e9c49505534250dbb7612 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -466,6 +466,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0512-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch
index e2d6b40548..e2d6b40548 100644
--- a/patches/server/0512-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0513-Entity-isTicking.patch b/patches/server/0512-Entity-isTicking.patch
index 5733422ff4..d814f5634a 100644
--- a/patches/server/0513-Entity-isTicking.patch
+++ b/patches/server/0512-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 599da702921001c5e459167acffd747148698e0f..678fad5c3ac832766bc20c750a148219493aafc6 100644
+index a6cc8d8691f314fe7d5499f525a45b1c2e7f31e5..de984785361221dffece2a86c859ccf95a8b4af8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -53,6 +53,7 @@ import net.minecraft.resources.ResourceKey;
diff --git a/patches/server/0514-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index d71261900a..d71261900a 100644
--- a/patches/server/0514-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0515-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch
index 4f6d7689d1..4f6d7689d1 100644
--- a/patches/server/0515-Fix-Concurrency-issue-in-WeightedList.patch
+++ b/patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0516-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 0e429e17b8..0e429e17b8 100644
--- a/patches/server/0516-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0517-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch
index 7d8b99b371..7d8b99b371 100644
--- a/patches/server/0517-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0518-Optimise-getType-calls.patch b/patches/server/0517-Optimise-getType-calls.patch
index 4464845139..2d3e0a72de 100644
--- a/patches/server/0518-Optimise-getType-calls.patch
+++ b/patches/server/0517-Optimise-getType-calls.patch
@@ -41,7 +41,7 @@ index dc1b73816e0e02d3a35a64e02904a034fbaeb8c9..83f8c3ab5ed1f491902e86e4cf605cfa
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index ce97c1cafc520db5670004e00aee6b08045e9e00..e69b1831cbfdff3f2b1e4be4d5de313bfe724795 100644
+index 980f0ec9d343b4186dfeb07b9b08edfde9efeb33..aa783fb4d77c9edb58c56ff98c604a87d9583767 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -215,7 +215,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0519-Villager-resetOffers.patch b/patches/server/0518-Villager-resetOffers.patch
index da091e898a..da091e898a 100644
--- a/patches/server/0519-Villager-resetOffers.patch
+++ b/patches/server/0518-Villager-resetOffers.patch
diff --git a/patches/server/0520-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 00f9811691..00f9811691 100644
--- a/patches/server/0520-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0521-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch
index 63e5017277..87bb0c76c0 100644
--- a/patches/server/0521-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c7a69b84dada3fef89d798bd9c4cb151d61ee2de..0149e5c3618e1c35ec15230fe9838650429afeb9 100644
+index ad9b48a0c89689a602c85f65e6cc68977af5ea29..c76b508026c5ad54879ba400a9b6f8287f3f95b8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -149,7 +149,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0522-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch
index 9e0f352b59..27a1ee6c38 100644
--- a/patches/server/0522-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce blockpos allocation from pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-index 16b3b4a168e37f0b4c8d6c41a4e3a4095f26115e..5e28c09d782166be6d0fbc6778ef9f6c4d7af409 100644
+index e23679b8c2bc35de82cb3245f35b53b44058f53d..737d0405a195d322ffe9a57acadb9f6d645c03b8 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 @@ -471,7 +471,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
diff --git a/patches/server/0523-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0522-Fix-item-locations-dropped-from-campfires.patch
index 49b095cf5a..49b095cf5a 100644
--- a/patches/server/0523-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0522-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0524-Player-elytra-boost-API.patch b/patches/server/0523-Player-elytra-boost-API.patch
index 3e06a95d7c..8f44cf956a 100644
--- a/patches/server/0524-Player-elytra-boost-API.patch
+++ b/patches/server/0523-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2f961b09c0e2a79391e13f2ea473099080471af6..86814204543d56f2ecc0878525d0864d1fdbf76e 100644
+index 08d6dfbbf62e7adb801a7bf49dd1a1f611e768c6..3cb295a37f8cd1a84712a0b2b6b2c09dfafca162 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -564,6 +564,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0525-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0524-Fixed-TileEntityBell-memory-leak.patch
index 8f350486f1..8f350486f1 100644
--- a/patches/server/0525-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0524-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0526-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index d61dbeae68..d61dbeae68 100644
--- a/patches/server/0526-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0527-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0526-Add-getOfflinePlayerIfCached-String.patch
index 5f9c235557..5f9c235557 100644
--- a/patches/server/0527-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0526-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0528-Add-ignore-discounts-API.patch b/patches/server/0527-Add-ignore-discounts-API.patch
index b09ae75fa6..b09ae75fa6 100644
--- a/patches/server/0528-Add-ignore-discounts-API.patch
+++ b/patches/server/0527-Add-ignore-discounts-API.patch
diff --git a/patches/server/0529-Toggle-for-removing-existing-dragon.patch b/patches/server/0528-Toggle-for-removing-existing-dragon.patch
index d6e1807335..81a8b06509 100644
--- a/patches/server/0529-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0528-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ebc8ef074e6e31f39978b69669af80f4ac82bf9..224bb42722961de0c1365dbfcbf73b81966777f3 100644
+index 21adf6cb4cef00bc5f16a6e065a43c7894e24ba9..2953c4d8bdfc0a7e7570c8994fd1c6ced6eaf654 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,6 +73,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0530-Fix-client-lag-on-advancement-loading.patch b/patches/server/0529-Fix-client-lag-on-advancement-loading.patch
index ba1add3c37..ffe4462c4d 100644
--- a/patches/server/0530-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0529-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 92e3717b217448398c4d07d8331ed8c57cd68c8f..de6343455ce92835f3e5bc2646f64c03dab8aba2 100644
+index 91a8891531025dcce41e9c49505534250dbb7612..b56b206c5d875a6b0f55bc506521d5a3dd7c8b68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -323,7 +323,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0531-Item-no-age-no-player-pickup.patch b/patches/server/0530-Item-no-age-no-player-pickup.patch
index a121c378e3..a121c378e3 100644
--- a/patches/server/0531-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0530-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0532-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index a7916d16e0..a7916d16e0 100644
--- a/patches/server/0532-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0533-Beacon-API-custom-effect-ranges.patch b/patches/server/0532-Beacon-API-custom-effect-ranges.patch
index 6da9cb0f32..6da9cb0f32 100644
--- a/patches/server/0533-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0532-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0534-Add-API-for-quit-reason.patch b/patches/server/0533-Add-API-for-quit-reason.patch
index 89a652575c..89a652575c 100644
--- a/patches/server/0534-Add-API-for-quit-reason.patch
+++ b/patches/server/0533-Add-API-for-quit-reason.patch
diff --git a/patches/server/0535-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch
index a26f2021e2..0051d0ab5c 100644
--- a/patches/server/0535-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 224bb42722961de0c1365dbfcbf73b81966777f3..bec9d5fce523d51c1d9c2b4c45bbcb5806aaad07 100644
+index 2953c4d8bdfc0a7e7570c8994fd1c6ced6eaf654..f56992472665b59e3ae22fab74d994686dc767f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -81,6 +81,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0536-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch
index 49888cfa4c..49888cfa4c 100644
--- a/patches/server/0536-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0537-Expose-world-spawn-angle.patch b/patches/server/0536-Expose-world-spawn-angle.patch
index fcd5d2979c..aef9275fc2 100644
--- a/patches/server/0537-Expose-world-spawn-angle.patch
+++ b/patches/server/0536-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 38f0f98c2191bfe36c3547501e49680faef50403..1a52902d80d5abf2d914f7b49ab461cb3cda8d80 100644
+index 3428f3014d9b8e9422a9f586268f5e82dcf1e33f..ba0596c0d6340492f2d4b017a87459450ffdd77b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -874,7 +874,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0538-Add-Destroy-Speed-API.patch b/patches/server/0537-Add-Destroy-Speed-API.patch
index 8727a04a53..8727a04a53 100644
--- a/patches/server/0538-Add-Destroy-Speed-API.patch
+++ b/patches/server/0537-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0539-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 8b85239552..8f8d39ab05 100644
--- a/patches/server/0539-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4afa5667e58999b684376e2eda9cfe3c7832ec32..84d26ab488b0c13ce253d64a053e1aef8de78567 100644
+index 3cb295a37f8cd1a84712a0b2b6b2c09dfafca162..a06fd29b6006459edf0069ce8d1dddcb36ca3104 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2134,7 +2134,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0540-Add-LivingEntity-clearActiveItem.patch b/patches/server/0539-Add-LivingEntity-clearActiveItem.patch
index 6b43687673..6b43687673 100644
--- a/patches/server/0540-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0539-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0541-Add-PlayerItemCooldownEvent.patch b/patches/server/0540-Add-PlayerItemCooldownEvent.patch
index 01259836dd..01259836dd 100644
--- a/patches/server/0541-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0540-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0542-More-lightning-API.patch b/patches/server/0541-More-lightning-API.patch
index 4d6ed605b2..4d6ed605b2 100644
--- a/patches/server/0542-More-lightning-API.patch
+++ b/patches/server/0541-More-lightning-API.patch
diff --git a/patches/server/0543-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch
index eb4a4ebf8b..0da714de49 100644
--- a/patches/server/0543-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -21,7 +21,7 @@ index f56992472665b59e3ae22fab74d994686dc767f4..8a266d1276595d5b2bd0b60f08d99d4c
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 678fad5c3ac832766bc20c750a148219493aafc6..8554a0098ad59c69877fa4180df19c97b6cf9a1a 100644
+index de984785361221dffece2a86c859ccf95a8b4af8..97bfbb01febae2cb4f9b4eb7b9540486d6eb94a2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1737,6 +1737,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0544-Added-missing-default-perms-for-commands.patch b/patches/server/0543-Added-missing-default-perms-for-commands.patch
index e9e468da5e..e9e468da5e 100644
--- a/patches/server/0544-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0543-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0545-Add-PlayerShearBlockEvent.patch b/patches/server/0544-Add-PlayerShearBlockEvent.patch
index aa9a8b1203..aa9a8b1203 100644
--- a/patches/server/0545-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0544-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0546-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch
index 52d19719a7..1fdd4122e7 100644
--- a/patches/server/0546-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch
@@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of
 the reputation when it is cured.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 166631507bf707954b82739b7c2f0558cc3d4956..40b88453904e3ff4e958e811d101c1740be3f99d 100644
+index 8a266d1276595d5b2bd0b60f08d99d4cceea929a..0dafb6b4837f9b68249e64a9f0b7f8f727d58327 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -99,6 +99,11 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index 166631507bf707954b82739b7c2f0558cc3d4956..40b88453904e3ff4e958e811d101c174
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 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 353ee3699c7c7e40dc920e687055d82e23f02008..dbd17107f08c218d88ef075fc04823b83083648b 100644
+index 6cd297e66a7563bb8f2988302c657ac81fdd3d0f..0ac3d6b25857bc5af0a4909a70053eeb86ea48ea 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -1059,6 +1059,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0547-Limit-recipe-packets.patch b/patches/server/0546-Limit-recipe-packets.patch
index 228cb4bc55..228cb4bc55 100644
--- a/patches/server/0547-Limit-recipe-packets.patch
+++ b/patches/server/0546-Limit-recipe-packets.patch
diff --git a/patches/server/0548-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0547-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0548-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0547-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0549-MC-4-Fix-item-position-desync.patch b/patches/server/0548-MC-4-Fix-item-position-desync.patch
index eb470061d2..97d9ce3a34 100644
--- a/patches/server/0549-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0548-MC-4-Fix-item-position-desync.patch
@@ -43,7 +43,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9
  
      public Vec3 updateEntityPosition(Vec3 orig) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8554a0098ad59c69877fa4180df19c97b6cf9a1a..1f43c7bd5d711c2e5a7ff67b3b399b408e950b59 100644
+index 97bfbb01febae2cb4f9b4eb7b9540486d6eb94a2..755e9dbc4646314c3e666fb5d64a30178eaa155e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3790,6 +3790,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0550-Player-Chunk-Load-Unload-Events.patch b/patches/server/0549-Player-Chunk-Load-Unload-Events.patch
index efd272c070..294a930cb3 100644
--- a/patches/server/0550-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0549-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 257942084d988cac5f87ff998ea637fa263a3fe9..e03c315f53a0962f1135b59d66c9074c9bbdb9ed 100644
+index 57ca53876941faf6a1cbefd6e0382ee0ce2e678f..ab1c7a35c6a6f04bc90264a3227c0a3dbffe9b5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2109,11 +2109,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0551-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0551-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0552-Expose-LivingEntity-hurt-direction.patch b/patches/server/0551-Expose-LivingEntity-hurt-direction.patch
index 2f461711f6..2f461711f6 100644
--- a/patches/server/0552-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0551-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0553-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 5bd4c80e2e..801f7008d0 100644
--- a/patches/server/0553-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1c0bf20f19a697e588a1d0210c181d29edbcaba7..37d99e3a1771feee9edb94f17a649ebb3511a459 100644
+index dc65191f170954fbc93012bfc02401de36d8d1fd..0bfe25bd5dee6853d624af6988d2b72155aed8c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -262,6 +262,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0554-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index e870bb8917..e870bb8917 100644
--- a/patches/server/0554-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0555-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index a32b1130cf..a32b1130cf 100644
--- a/patches/server/0555-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0556-Implement-TargetHitEvent.patch b/patches/server/0555-Implement-TargetHitEvent.patch
index 3386fe16dd..3386fe16dd 100644
--- a/patches/server/0556-Implement-TargetHitEvent.patch
+++ b/patches/server/0555-Implement-TargetHitEvent.patch
diff --git a/patches/server/0557-Additional-Block-Material-API-s.patch b/patches/server/0556-Additional-Block-Material-API-s.patch
index bbb409e9e4..386e4c1eb3 100644
--- a/patches/server/0557-Additional-Block-Material-API-s.patch
+++ b/patches/server/0556-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index f0d5c3a182acc8a2ccb936e98376f2840892be28..4c30b6d0d70a48b39bd99b5e9761f950b8b0c340 100644
+index 2144126241450fe2d6e801bd9452d211a03b6f7c..fdf342e6059d967746164f18dc041b4e586f1a20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -456,6 +456,25 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0558-Fix-harming-potion-dupe.patch b/patches/server/0557-Fix-harming-potion-dupe.patch
index 40de75b0d2..40de75b0d2 100644
--- a/patches/server/0558-Fix-harming-potion-dupe.patch
+++ b/patches/server/0557-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0559-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 69d3ef793f..69d3ef793f 100644
--- a/patches/server/0559-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0560-Cache-burn-durations.patch b/patches/server/0559-Cache-burn-durations.patch
index e833ebe637..e833ebe637 100644
--- a/patches/server/0560-Cache-burn-durations.patch
+++ b/patches/server/0559-Cache-burn-durations.patch
diff --git a/patches/server/0561-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 02bb2281eb..9d5b1cb668 100644
--- a/patches/server/0561-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 40b88453904e3ff4e958e811d101c1740be3f99d..f0f714f52d3aa163c2dc601dd98c157f16ce0719 100644
+index 0dafb6b4837f9b68249e64a9f0b7f8f727d58327..8df810594156944a2cb149af35863caf10edbb83 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -104,6 +104,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0562-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch
index 61ebd79af9..61ebd79af9 100644
--- a/patches/server/0562-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0563-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0563-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0564-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch
index c577168e70..c577168e70 100644
--- a/patches/server/0564-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0565-Zombie-API-breaking-doors.patch b/patches/server/0564-Zombie-API-breaking-doors.patch
index 2b1fa20025..2b1fa20025 100644
--- a/patches/server/0565-Zombie-API-breaking-doors.patch
+++ b/patches/server/0564-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0566-Fix-nerfed-slime-when-splitting.patch b/patches/server/0565-Fix-nerfed-slime-when-splitting.patch
index f858016096..f858016096 100644
--- a/patches/server/0566-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0565-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0567-Add-EntityLoadCrossbowEvent.patch b/patches/server/0566-Add-EntityLoadCrossbowEvent.patch
index d5edf09a56..d5edf09a56 100644
--- a/patches/server/0567-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0566-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0568-Guardian-beam-workaround.patch b/patches/server/0567-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0568-Guardian-beam-workaround.patch
+++ b/patches/server/0567-Guardian-beam-workaround.patch
diff --git a/patches/server/0569-Added-WorldGameRuleChangeEvent.patch b/patches/server/0568-Added-WorldGameRuleChangeEvent.patch
index aef4b0d49c..aef4b0d49c 100644
--- a/patches/server/0569-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0568-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0570-Added-ServerResourcesReloadedEvent.patch b/patches/server/0569-Added-ServerResourcesReloadedEvent.patch
index 4c706db0bd..4c706db0bd 100644
--- a/patches/server/0570-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0569-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0571-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch
index b8a40411f7..1ee510f3ca 100644
--- a/patches/server/0571-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added world settings for mobs picking up loot
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f0f714f52d3aa163c2dc601dd98c157f16ce0719..b289f6eb973d1ddf6cf913a0e995f899b9ecd041 100644
+index 8df810594156944a2cb149af35863caf10edbb83..63d0971379f96e000ab9e7939f626c216cb6d12c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -720,6 +720,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0572-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0571-Implemented-BlockFailedDispenseEvent.patch
index 2f78e79985..2f78e79985 100644
--- a/patches/server/0572-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0571-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0573-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0572-Added-PlayerLecternPageChangeEvent.patch
index cd550d08ad..cd550d08ad 100644
--- a/patches/server/0573-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0572-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0574-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch
index 336ac8dfc8..336ac8dfc8 100644
--- a/patches/server/0574-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0575-Configurable-door-breaking-difficulty.patch b/patches/server/0574-Configurable-door-breaking-difficulty.patch
index bc480c1abb..a8527c8842 100644
--- a/patches/server/0575-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0574-Configurable-door-breaking-difficulty.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable door breaking difficulty
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b289f6eb973d1ddf6cf913a0e995f899b9ecd041..e8b3ce26f289b961e2763be3b033c611bdfe583b 100644
+index 63d0971379f96e000ab9e7939f626c216cb6d12c..95952806a544d38952b82f7078a46a5eeb622cd8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -109,6 +109,25 @@ public class PaperWorldConfig {
diff --git a/patches/server/0576-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0575-Empty-commands-shall-not-be-dispatched.patch
index febba5dbe5..3b10fb96c2 100644
--- a/patches/server/0576-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0575-Empty-commands-shall-not-be-dispatched.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Empty commands shall not be dispatched
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 6624045921ef64046b375ec787cadda1e8c8435b..e4cb8f2b8602650e26c21a856ed0d8c2ea8f6c28 100644
+index 4049576478efed97092b7e1b3d40afda6b114d68..09bc5589fec90336ba1a116d0f4fbeccd61c88cd 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -239,6 +239,7 @@ public class Commands {
diff --git a/patches/server/0577-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch
index 06bc7e440c..82a87bae1d 100644
--- a/patches/server/0577-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement API to expose exact interaction point
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 01b19225193ef3a3f69291f0357c096fc9e71618..3a8e87f19aa03786b3bf60b793958b59284d31ac 100644
+index aa065f732637b6220fd7328b4d5bc6005ee31832..e39e16f0b3a0d168b3049c37f5a2a9dc8f15a652 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -499,7 +499,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 01b19225193ef3a3f69291f0357c096fc9e71618..3a8e87f19aa03786b3bf60b793958b59
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fa46a33e34c4ebcf94a54cb597ff6bbb02cfcef9..419c5bd638230c31dd68ba37174c8057c0229a6a 100644
+index d4b772c1df839ad1ec2bfb514432ee1b12099193..bfc3442e7952e1ec927f3ebdbefba153e7304e19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
diff --git a/patches/server/0578-Remove-stale-POIs.patch b/patches/server/0577-Remove-stale-POIs.patch
index 0dfcb57c09..0dfcb57c09 100644
--- a/patches/server/0578-Remove-stale-POIs.patch
+++ b/patches/server/0577-Remove-stale-POIs.patch
diff --git a/patches/server/0579-Fix-villager-boat-exploit.patch b/patches/server/0578-Fix-villager-boat-exploit.patch
index 68099d756a..625456be47 100644
--- a/patches/server/0579-Fix-villager-boat-exploit.patch
+++ b/patches/server/0578-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1a52902d80d5abf2d914f7b49ab461cb3cda8d80..04e314761b09f7c13c94cb83a9a7da629fb16641 100644
+index ba0596c0d6340492f2d4b017a87459450ffdd77b..201f36b0f8ae391b2efbad5cc38f115537a761a2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -621,6 +621,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0580-Add-sendOpLevel-API.patch b/patches/server/0579-Add-sendOpLevel-API.patch
index d5e74a0402..88c06d3e0b 100644
--- a/patches/server/0580-Add-sendOpLevel-API.patch
+++ b/patches/server/0579-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 201f36b0f8ae391b2efbad5cc38f115537a761a2..0052a9c5d19db44331bb7ee93544d783
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2e75bdfaeaef4acfbbb6e4f79317f1050fe82852..af7f9645f21b1b21981a7c525068acaa238e9f59 100644
+index a06fd29b6006459edf0069ce8d1dddcb36ca3104..198731f323baee319100cb537afb9f5bb9a6af3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -578,6 +578,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0581-Add-StructureLocateEvent.patch b/patches/server/0580-Add-StructureLocateEvent.patch
index 61178fc4a9..61178fc4a9 100644
--- a/patches/server/0581-Add-StructureLocateEvent.patch
+++ b/patches/server/0580-Add-StructureLocateEvent.patch
diff --git a/patches/server/0582-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch
index 486f38feec..2f703c88e0 100644
--- a/patches/server/0582-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch
@@ -28,7 +28,7 @@ index 95952806a544d38952b82f7078a46a5eeb622cd8..19ae4ae82be4a5a387b0f6e1b18e36b2
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1f43c7bd5d711c2e5a7ff67b3b399b408e950b59..9bb77e98466544aa8efe603618348990e8e40546 100644
+index 755e9dbc4646314c3e666fb5d64a30178eaa155e..56d8939c34e0edd74ee2980a41a889bb3ccf659e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1620,6 +1620,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0583-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index f6d7cce33f..f6d7cce33f 100644
--- a/patches/server/0583-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0584-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch
index 988a54be94..988a54be94 100644
--- a/patches/server/0584-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0585-Make-schedule-command-per-world.patch b/patches/server/0584-Make-schedule-command-per-world.patch
index 4859bb69f5..4859bb69f5 100644
--- a/patches/server/0585-Make-schedule-command-per-world.patch
+++ b/patches/server/0584-Make-schedule-command-per-world.patch
diff --git a/patches/server/0586-Configurable-max-leash-distance.patch b/patches/server/0585-Configurable-max-leash-distance.patch
index 58f56f72ef..334d10649f 100644
--- a/patches/server/0586-Configurable-max-leash-distance.patch
+++ b/patches/server/0585-Configurable-max-leash-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cb9c9e87be27659febe3df24f93adee989904ca3..b90f9046897325293bdb55f69df1b19833bd453d 100644
+index 19ae4ae82be4a5a387b0f6e1b18e36b24d0cbbdb..671ca20b02097332ef98d2be2e7aaafeadaf2a2c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -301,6 +301,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0587-Implement-BlockPreDispenseEvent.patch b/patches/server/0586-Implement-BlockPreDispenseEvent.patch
index 4915921000..4915921000 100644
--- a/patches/server/0587-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0586-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0588-added-Wither-API.patch b/patches/server/0587-added-Wither-API.patch
index 16df60938a..16df60938a 100644
--- a/patches/server/0588-added-Wither-API.patch
+++ b/patches/server/0587-added-Wither-API.patch
diff --git a/patches/server/0589-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 3ec45e2a4d..3ec45e2a4d 100644
--- a/patches/server/0589-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0590-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch
index 7bb5f13456..ea99947854 100644
--- a/patches/server/0590-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b90f9046897325293bdb55f69df1b19833bd453d..24f33bf34bacd1748aa7394fbe8951a818e85060 100644
+index 671ca20b02097332ef98d2be2e7aaafeadaf2a2c..a17dc48e0bddea3272120f4a129278b755834d40 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -750,6 +750,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0591-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch
index c8cefc8ca5..c8cefc8ca5 100644
--- a/patches/server/0591-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0592-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index dd1e928fa0..dd1e928fa0 100644
--- a/patches/server/0592-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0593-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch
index 2488267353..11557d5dcb 100644
--- a/patches/server/0593-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip distance map update when spawning disabled.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 364375f5da5a3daea200c97c5dca86cbb8be5fb9..f7abb67568cf1034dae3fe9e0adff9bcc36b96e7 100644
+index 785f07fddb84cf34fbd9d6ca89ff391d451aad17..761bd290d5a041d56ce6be98443107b8f87137aa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -966,7 +966,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0594-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0593-Reset-shield-blocking-on-dimension-change.patch
index 2c33b73be8..87e0e76574 100644
--- a/patches/server/0594-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0593-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e03c315f53a0962f1135b59d66c9074c9bbdb9ed..174104dcb9c4300201d48cdb3701f5a09fdd2167 100644
+index ab1c7a35c6a6f04bc90264a3227c0a3dbffe9b5d..88eef461048dafaa13681f91bfe69f71a4481b95 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1169,6 +1169,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0595-add-DragonEggFormEvent.patch b/patches/server/0594-add-DragonEggFormEvent.patch
index 7f32c9846d..7f32c9846d 100644
--- a/patches/server/0595-add-DragonEggFormEvent.patch
+++ b/patches/server/0594-add-DragonEggFormEvent.patch
diff --git a/patches/server/0596-EntityMoveEvent.patch b/patches/server/0595-EntityMoveEvent.patch
index c4e9383131..c4e9383131 100644
--- a/patches/server/0596-EntityMoveEvent.patch
+++ b/patches/server/0595-EntityMoveEvent.patch
diff --git a/patches/server/0597-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch
index 62989c5691..62989c5691 100644
--- a/patches/server/0597-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0598-Inline-shift-direction-fields.patch b/patches/server/0597-Inline-shift-direction-fields.patch
index aea372f6f4..aea372f6f4 100644
--- a/patches/server/0598-Inline-shift-direction-fields.patch
+++ b/patches/server/0597-Inline-shift-direction-fields.patch
diff --git a/patches/server/0599-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch
index 5b2955f3c1..7503eb2684 100644
--- a/patches/server/0599-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5931cf0c05ca22f72a465d096dfb60508d84b859..5013a93f9bdc6d2c52239ca0434c7aa40f0572e1 100644
+index afb6eb856d22845716351d5be7eff5991da72dd3..ee0e27500187d695ac6cfaf5fb5d2e844f230b32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -395,13 +395,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0600-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0600-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0601-living-entity-allow-attribute-registration.patch b/patches/server/0600-living-entity-allow-attribute-registration.patch
index 4bc58ce5e3..4bc58ce5e3 100644
--- a/patches/server/0601-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0600-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0602-fix-dead-slime-setSize-invincibility.patch b/patches/server/0601-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0602-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0601-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0603-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0603-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0604-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0603-Add-support-for-hex-color-codes-in-console.patch
index 4d129a981e..4d129a981e 100644
--- a/patches/server/0604-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0603-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0605-Expose-Tracked-Players.patch b/patches/server/0604-Expose-Tracked-Players.patch
index a7b6532874..a7b6532874 100644
--- a/patches/server/0605-Expose-Tracked-Players.patch
+++ b/patches/server/0604-Expose-Tracked-Players.patch
diff --git a/patches/server/0606-Remove-streams-from-SensorNearest.patch b/patches/server/0605-Remove-streams-from-SensorNearest.patch
index 91ae33c411..91ae33c411 100644
--- a/patches/server/0606-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0605-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0607-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch
index 97b26758f7..97b26758f7 100644
--- a/patches/server/0607-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0608-Improve-ServerGUI.patch b/patches/server/0607-Improve-ServerGUI.patch
index 1599e3103f..1599e3103f 100644
--- a/patches/server/0608-Improve-ServerGUI.patch
+++ b/patches/server/0607-Improve-ServerGUI.patch
diff --git a/patches/server/0609-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0609-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0610-fix-converting-txt-to-json-file.patch b/patches/server/0609-fix-converting-txt-to-json-file.patch
index de3c433c66..c24f51f249 100644
--- a/patches/server/0610-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0609-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index e968b880e435b8753314d85b919a0abc4f35be25..02d7b16f81ebf9f902a36d4f31802b20
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 52f8e91462b9f605aa529bc3ec4d55c9a006e472..f4966251d35323d526479a8a9c1fb552ad1709e9 100644
+index 0052a9c5d19db44331bb7ee93544d783b471e70a..bcdbdc648a76d2c57f4b0d86ae6f577fbc4be3d8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -174,6 +174,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0611-Add-worldborder-events.patch b/patches/server/0610-Add-worldborder-events.patch
index 26898cfba0..26898cfba0 100644
--- a/patches/server/0611-Add-worldborder-events.patch
+++ b/patches/server/0610-Add-worldborder-events.patch
diff --git a/patches/server/0612-added-PlayerNameEntityEvent.patch b/patches/server/0611-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0612-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0611-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0613-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0612-Prevent-grindstones-from-overstacking-items.patch
index 3719f82383..3719f82383 100644
--- a/patches/server/0613-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0612-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0614-Add-recipe-to-cook-events.patch b/patches/server/0613-Add-recipe-to-cook-events.patch
index 37fe944542..37fe944542 100644
--- a/patches/server/0614-Add-recipe-to-cook-events.patch
+++ b/patches/server/0613-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0615-Add-Block-isValidTool.patch b/patches/server/0614-Add-Block-isValidTool.patch
index 766561ca56..766561ca56 100644
--- a/patches/server/0615-Add-Block-isValidTool.patch
+++ b/patches/server/0614-Add-Block-isValidTool.patch
diff --git a/patches/server/0616-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch
index c799932a1a..c799932a1a 100644
--- a/patches/server/0616-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0617-Implement-Keyed-on-World.patch b/patches/server/0616-Implement-Keyed-on-World.patch
index 896d602707..896d602707 100644
--- a/patches/server/0617-Implement-Keyed-on-World.patch
+++ b/patches/server/0616-Implement-Keyed-on-World.patch
diff --git a/patches/server/0618-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch
index d2a627b5b6..d2a627b5b6 100644
--- a/patches/server/0618-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0619-Item-Rarity-API.patch b/patches/server/0618-Item-Rarity-API.patch
index 4deefe1dde..ca26a5009f 100644
--- a/patches/server/0619-Item-Rarity-API.patch
+++ b/patches/server/0618-Item-Rarity-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item Rarity API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index de6343455ce92835f3e5bc2646f64c03dab8aba2..a76516003fe2c2c713658837de992bf237fec9ad 100644
+index b56b206c5d875a6b0f55bc506521d5a3dd7c8b68..88d18bcf4f0d7e14c7d358a2771c90422bca2f73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -476,6 +476,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0620-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index eef34ce857..eef34ce857 100644
--- a/patches/server/0620-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0621-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0620-copy-TESign-isEditable-from-snapshots.patch
index c62a00d76e..c62a00d76e 100644
--- a/patches/server/0621-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0620-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0622-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch
index ab409204fc..65fd472cc8 100644
--- a/patches/server/0622-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f4966251d35323d526479a8a9c1fb552ad1709e9..19e6da4ab7d609470ef1597ac45ad3ab6a6a2825 100644
+index bcdbdc648a76d2c57f4b0d86ae6f577fbc4be3d8..8e80783cd72eb7a07806f89341aff52a370ed87a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -614,6 +614,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0623-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0622-forced-whitelist-use-configurable-kick-message.patch
index 0e9fa76a3f..0e9fa76a3f 100644
--- a/patches/server/0623-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0622-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0624-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 899ceb3a90..899ceb3a90 100644
--- a/patches/server/0624-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0625-Entity-load-save-limit-per-chunk.patch b/patches/server/0624-Entity-load-save-limit-per-chunk.patch
index e9f4fbe4c2..1e6dba8513 100644
--- a/patches/server/0625-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0624-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 716747f86cb7b4ee811c5e128c00b5319959cb64..3db7a4ad81db0475ce975c02c435a069abf2ad7e 100644
+index f372caad76d5f59f37d073bb245fca3a037c2bef..1fc750c1f33d8f25a65cf286fd88fd21ab46c0ef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -8,6 +8,8 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap;
diff --git a/patches/server/0626-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch
index e68d092a83..e68d092a83 100644
--- a/patches/server/0626-fix-cancelling-block-falling-causing-client-desync.patch
+++ b/patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0627-Expose-protocol-version.patch b/patches/server/0626-Expose-protocol-version.patch
index 5e797761af..1a3f4e2093 100644
--- a/patches/server/0627-Expose-protocol-version.patch
+++ b/patches/server/0626-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a76516003fe2c2c713658837de992bf237fec9ad..3a7b7a0766075e8a7d359138ca01dbcc88c609a3 100644
+index 88d18bcf4f0d7e14c7d358a2771c90422bca2f73..fdbc4ce80e99c6120daf6102102409c1ccab88ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -490,6 +490,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0628-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 885ffa6011..885ffa6011 100644
--- a/patches/server/0628-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0629-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch
index 139325cbeb..139325cbeb 100644
--- a/patches/server/0629-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0630-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 231a84fa40..231a84fa40 100644
--- a/patches/server/0630-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0631-Add-bypass-host-check.patch b/patches/server/0630-Add-bypass-host-check.patch
index a9a87f8a74..a9a87f8a74 100644
--- a/patches/server/0631-Add-bypass-host-check.patch
+++ b/patches/server/0630-Add-bypass-host-check.patch
diff --git a/patches/server/0632-Set-area-affect-cloud-rotation.patch b/patches/server/0631-Set-area-affect-cloud-rotation.patch
index b7cb1837b3..b7cb1837b3 100644
--- a/patches/server/0632-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0631-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0633-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch
index b83aaecf3f..f54e630675 100644
--- a/patches/server/0633-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 45fe3d2d728b984651c478ff050a7c69b1eebef3..eb0ce87bc8eac723b73c2ee6da41db5da3fab401 100644
+index e4759fe6779b2c174388c1b5f56ce13c51d653b6..b39117c4505926da0be9c8248964a233393e8e2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -121,6 +121,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0634-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch
index ee8bbaabe6..ee8bbaabe6 100644
--- a/patches/server/0634-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0635-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch
index 546a504059..546a504059 100644
--- a/patches/server/0635-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0636-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0636-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0637-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch
index b0a3c9d25d..b0a3c9d25d 100644
--- a/patches/server/0637-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0638-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0638-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0639-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch
index 0354ab8a80..0354ab8a80 100644
--- a/patches/server/0639-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0640-Added-PlayerDeepSleepEvent.patch b/patches/server/0639-Added-PlayerDeepSleepEvent.patch
index b0434fe757..b0434fe757 100644
--- a/patches/server/0640-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0639-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0641-More-World-API.patch b/patches/server/0640-More-World-API.patch
index d104b92d9d..d104b92d9d 100644
--- a/patches/server/0641-More-World-API.patch
+++ b/patches/server/0640-More-World-API.patch
diff --git a/patches/server/0642-Added-PlayerBedFailEnterEvent.patch b/patches/server/0641-Added-PlayerBedFailEnterEvent.patch
index 95b8821728..95b8821728 100644
--- a/patches/server/0642-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0641-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0643-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch
index a483142256..a483142256 100644
--- a/patches/server/0643-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0644-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index e593462f25..8f807990a5 100644
--- a/patches/server/0644-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 19e6da4ab7d609470ef1597ac45ad3ab6a6a2825..2edb28eddc740a13f1bcad1271f7f0163538846b 100644
+index 8e80783cd72eb7a07806f89341aff52a370ed87a..d7e6baab6fd48e4126e1c333d997a8673b4c0139 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -847,6 +847,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0645-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0644-Introduce-beacon-activation-deactivation-events.patch
index 766214f6eb..766214f6eb 100644
--- a/patches/server/0645-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0644-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0646-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 01902436d8..01902436d8 100644
--- a/patches/server/0646-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0647-Add-Channel-initialization-listeners.patch b/patches/server/0646-Add-Channel-initialization-listeners.patch
index 0efca8f11f..0efca8f11f 100644
--- a/patches/server/0647-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0646-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0648-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch
index a2bbfd3906..8ec39c7cd4 100644
--- a/patches/server/0648-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Send empty commands if tab completion is disabled
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index e4cb8f2b8602650e26c21a856ed0d8c2ea8f6c28..40a0fbc2049aeffef597f867383877cce9ea7a03 100644
+index 09bc5589fec90336ba1a116d0f4fbeccd61c88cd..112dddca796f9d987c321174bf9d6ad98dbb7a5e 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -343,7 +343,12 @@ public class Commands {
diff --git a/patches/server/0649-Add-more-WanderingTrader-API.patch b/patches/server/0648-Add-more-WanderingTrader-API.patch
index fd2be763ca..fd2be763ca 100644
--- a/patches/server/0649-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0648-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0650-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch
index 71da98f3c3..71da98f3c3 100644
--- a/patches/server/0650-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0651-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index d62b24cd3e..d62b24cd3e 100644
--- a/patches/server/0651-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0652-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 699e712c81..699e712c81 100644
--- a/patches/server/0652-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0653-Inventory-close.patch b/patches/server/0652-Inventory-close.patch
index e21cf25bc1..e21cf25bc1 100644
--- a/patches/server/0653-Inventory-close.patch
+++ b/patches/server/0652-Inventory-close.patch
diff --git a/patches/server/0654-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch
index 1dd96ed2ec..65f4f53c09 100644
--- a/patches/server/0654-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] call PortalCreateEvent players and end platform
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 174104dcb9c4300201d48cdb3701f5a09fdd2167..670048f5114ec1dcb0d6e0bb6173ba9d657e6eb1 100644
+index 88eef461048dafaa13681f91bfe69f71a4481b95..fd6eb3b3953ca0413af6a71c52503c9674917a9e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1196,15 +1196,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0655-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index db9414e188..db9414e188 100644
--- a/patches/server/0655-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0656-Fix-CraftPotionBrewer-cache.patch b/patches/server/0655-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0656-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0655-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0657-Add-basic-Datapack-API.patch b/patches/server/0656-Add-basic-Datapack-API.patch
index dd319fdd20..dd319fdd20 100644
--- a/patches/server/0657-Add-basic-Datapack-API.patch
+++ b/patches/server/0656-Add-basic-Datapack-API.patch
diff --git a/patches/server/0658-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0657-Add-environment-variable-to-disable-server-gui.patch
index a7f97d8c99..6ec5d19365 100644
--- a/patches/server/0658-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0657-Add-environment-variable-to-disable-server-gui.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add environment variable to disable server gui
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index bb85bfb074830d771be8527f6c25ebb578578f18..f685ab3cc6e4fd76e8dec3d2d3627a13715cda44 100644
+index d7975e6f0c855955ac04552cfbd4c9a8c86ae188..3835a8340792837674bdbcd5583ce74446b0460b 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -249,6 +249,7 @@ public class Main {
diff --git a/patches/server/0659-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch
index 436d2bd876..1866cdbe2c 100644
--- a/patches/server/0659-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch
@@ -139,7 +139,7 @@ index d16de053be28cb7d31f431e56cd7f6c01311e2fd..16ab98df5f5f538fa48feb9de32d06c8
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index af7f9645f21b1b21981a7c525068acaa238e9f59..d06cc95d50f2a499b9b8abf73b669a3cdd51dc04 100644
+index 198731f323baee319100cb537afb9f5bb9a6af3c..ffa49594d4a137be7476677488605ce74c607bba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1269,7 +1269,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0660-ItemStack-repair-check-API.patch b/patches/server/0659-ItemStack-repair-check-API.patch
index 518bb79325..ac1a338c44 100644
--- a/patches/server/0660-ItemStack-repair-check-API.patch
+++ b/patches/server/0659-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3a7b7a0766075e8a7d359138ca01dbcc88c609a3..d9eb0f7c38118014b8dd22c42f3330977c6af228 100644
+index fdbc4ce80e99c6120daf6102102409c1ccab88ba..1b1147c10c2e9caa4ccf3f2bcdb1211ed39d293a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -491,6 +491,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0661-More-Enchantment-API.patch b/patches/server/0660-More-Enchantment-API.patch
index be8a7f96c7..be8a7f96c7 100644
--- a/patches/server/0661-More-Enchantment-API.patch
+++ b/patches/server/0660-More-Enchantment-API.patch
diff --git a/patches/server/0662-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0661-Fix-and-optimise-world-force-upgrading.patch
index 697a7622df..697a7622df 100644
--- a/patches/server/0662-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0661-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0663-Add-Mob-lookAt-API.patch b/patches/server/0662-Add-Mob-lookAt-API.patch
index 26b90782d2..26b90782d2 100644
--- a/patches/server/0663-Add-Mob-lookAt-API.patch
+++ b/patches/server/0662-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0664-Add-Unix-domain-socket-support.patch b/patches/server/0663-Add-Unix-domain-socket-support.patch
index 35fbd12a48..35fbd12a48 100644
--- a/patches/server/0664-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0663-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0665-Add-EntityInsideBlockEvent.patch b/patches/server/0664-Add-EntityInsideBlockEvent.patch
index ca973e9b06..ca973e9b06 100644
--- a/patches/server/0665-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0664-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0666-Attributes-API-for-item-defaults.patch b/patches/server/0665-Attributes-API-for-item-defaults.patch
index a50591e591..7953a2e0d1 100644
--- a/patches/server/0666-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0665-Attributes-API-for-item-defaults.patch
@@ -20,7 +20,7 @@ index 7e3826b271b2db3b48e6e21ac2e66911bf8993aa..393a19335c52b6e63d37aacdfbeff93e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d9eb0f7c38118014b8dd22c42f3330977c6af228..957c1091a810160c0fba83419bb8f83ca06c72fd 100644
+index 1b1147c10c2e9caa4ccf3f2bcdb1211ed39d293a..444da43415fc1341800260ebf9359f29dc628c22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -499,6 +499,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0667-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch
index 9de063e065..9de063e065 100644
--- a/patches/server/0667-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0668-More-Lidded-Block-API.patch b/patches/server/0667-More-Lidded-Block-API.patch
index 5b7c8a3b64..5b7c8a3b64 100644
--- a/patches/server/0668-More-Lidded-Block-API.patch
+++ b/patches/server/0667-More-Lidded-Block-API.patch
diff --git a/patches/server/0669-Limit-item-frame-cursors-on-maps.patch b/patches/server/0668-Limit-item-frame-cursors-on-maps.patch
index 72fffc70b9..ad7412ae3c 100644
--- a/patches/server/0669-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0668-Limit-item-frame-cursors-on-maps.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3db7a4ad81db0475ce975c02c435a069abf2ad7e..fb6eaddccc5153037680840f6a7ec29dff733dee 100644
+index 1fc750c1f33d8f25a65cf286fd88fd21ab46c0ef..9b9b2a70a33639c7e24ec8fee68b20a979bea37d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -828,4 +828,9 @@ public class PaperWorldConfig {
diff --git a/patches/server/0670-Add-PlayerKickEvent-causes.patch b/patches/server/0669-Add-PlayerKickEvent-causes.patch
index cb2c7d5483..f8a1240b99 100644
--- a/patches/server/0670-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0669-Add-PlayerKickEvent-causes.patch
@@ -342,7 +342,7 @@ index ad7e4ec5ca3f2f874c916d7ee80f5b2b2ae03bf8..9b55968cb1db5f77a8e858e2a7aa66d5
          // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d06cc95d50f2a499b9b8abf73b669a3cdd51dc04..6a76ae601bfaa64b64bd4c62c488cd4f70953427 100644
+index ffa49594d4a137be7476677488605ce74c607bba..43bfae712369c3c895a0007041d3821bb6257ccd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -504,16 +504,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0671-Add-PufferFishStateChangeEvent.patch b/patches/server/0670-Add-PufferFishStateChangeEvent.patch
index 14a8a30708..14a8a30708 100644
--- a/patches/server/0671-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0670-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0672-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 2b9de8138c..2b9de8138c 100644
--- a/patches/server/0672-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0673-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index df2a76b8ab..df2a76b8ab 100644
--- a/patches/server/0673-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0674-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch
index 9dfcb756ce..0f347c0e74 100644
--- a/patches/server/0674-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fb6eaddccc5153037680840f6a7ec29dff733dee..1305c1a7ae6505c1c89d2a4c2a3fbae2111e2e81 100644
+index 9b9b2a70a33639c7e24ec8fee68b20a979bea37d..04c91116d88b7c7b8a5886cc54f21be645998e38 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -833,4 +833,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index fb6eaddccc5153037680840f6a7ec29dff733dee..1305c1a7ae6505c1c89d2a4c2a3fbae2
 +    }
  }
 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 5a6534904e977b5ffbd55d05c4b65f02b3995910..7897b3324bc8d5a33cd3cd144b9fae9ffdc9241e 100644
+index 37d9788c1d4eb40ccdc0ec946bfd648822e486a0..f63502307fce7d3721b368d81af5a121b7dd9744 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -240,6 +240,14 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0675-Add-BellRevealRaiderEvent.patch b/patches/server/0674-Add-BellRevealRaiderEvent.patch
index 069c85f11e..069c85f11e 100644
--- a/patches/server/0675-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0674-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0676-Fix-invulnerable-end-crystals.patch b/patches/server/0675-Fix-invulnerable-end-crystals.patch
index 8abc3f294c..6df71dbd44 100644
--- a/patches/server/0676-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0675-Fix-invulnerable-end-crystals.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1305c1a7ae6505c1c89d2a4c2a3fbae2111e2e81..e6935a01c648773c83f0d1ad2ba0fc9e9e169d6c 100644
+index 04c91116d88b7c7b8a5886cc54f21be645998e38..478c93a4eae18047df037958720e56e94a131f1c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -838,4 +838,9 @@ public class PaperWorldConfig {
diff --git a/patches/server/0677-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0676-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0677-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0676-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0678-Fix-dangerous-end-portal-logic.patch b/patches/server/0677-Fix-dangerous-end-portal-logic.patch
index e4d5df5907..430c5ca9a1 100644
--- a/patches/server/0678-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0677-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9bb77e98466544aa8efe603618348990e8e40546..4049a35d44c8351e81d7867b3524fa960ecc2d71 100644
+index 56d8939c34e0edd74ee2980a41a889bb3ccf659e..6970bb9951e83d5e1a76bad8ca4a7cb16d7fdd92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -388,6 +388,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0679-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 143d33b783..143d33b783 100644
--- a/patches/server/0679-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0680-Make-item-validations-configurable.patch b/patches/server/0679-Make-item-validations-configurable.patch
index 48a1f4174b..48a1f4174b 100644
--- a/patches/server/0680-Make-item-validations-configurable.patch
+++ b/patches/server/0679-Make-item-validations-configurable.patch
diff --git a/patches/server/0681-Line-Of-Sight-Changes.patch b/patches/server/0680-Line-Of-Sight-Changes.patch
index 3368a32d56..3368a32d56 100644
--- a/patches/server/0681-Line-Of-Sight-Changes.patch
+++ b/patches/server/0680-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0682-add-per-world-spawn-limits.patch b/patches/server/0681-add-per-world-spawn-limits.patch
index e363c931da..745fef09d8 100644
--- a/patches/server/0682-add-per-world-spawn-limits.patch
+++ b/patches/server/0681-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e6935a01c648773c83f0d1ad2ba0fc9e9e169d6c..3831ac4a373009ef2c06fd329459cd84b6329003 100644
+index 478c93a4eae18047df037958720e56e94a131f1c..feaabc6d65845b81a3a184dc332d115200bdcca3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -53,6 +53,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 77e8e4be3d..77e8e4be3d 100644
--- a/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0684-Add-more-LimitedRegion-API.patch b/patches/server/0683-Add-more-LimitedRegion-API.patch
index b8d8e5c146..b8d8e5c146 100644
--- a/patches/server/0684-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0683-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0685-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 23cedb13cf..2f4982d5d8 100644
--- a/patches/server/0685-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b6230ce81d50da84b2db9446232c83bde3632a91..df0b08628d736b7f75120f1b9840784f6c472853 100644
+index 77ba7fe43ceffcb816d209da45ab0c5de2112ee3..6f5be46ae4c4f53695cdc5954352a2589842ede6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2176,7 +2176,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0686-Missing-Entity-Behavior-API.patch b/patches/server/0685-Missing-Entity-Behavior-API.patch
index 130dd2939f..130dd2939f 100644
--- a/patches/server/0686-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0685-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0687-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 6c7f6fb6e6..6c7f6fb6e6 100644
--- a/patches/server/0687-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0688-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 90092e8142..90092e8142 100644
--- a/patches/server/0688-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0689-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch
index 7b1716dae9..7b1716dae9 100644
--- a/patches/server/0689-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0690-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch
index b22aa11f86..b9ba804e6c 100644
--- a/patches/server/0690-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch
@@ -10,7 +10,7 @@ This patch changes sign command logic so that `run_command` click events:
   - sends failure messages to the player who clicked the sign
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3831ac4a373009ef2c06fd329459cd84b6329003..754e1f91feb8e6a806ea885d95d95eb25be5405f 100644
+index feaabc6d65845b81a3a184dc332d115200bdcca3..3a83320bae86ba1acb189b9b2cf934ad0393c353 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -863,4 +863,9 @@ public class PaperWorldConfig {
diff --git a/patches/server/0691-Adds-PlayerArmSwingEvent.patch b/patches/server/0690-Adds-PlayerArmSwingEvent.patch
index 74eee7020e..74eee7020e 100644
--- a/patches/server/0691-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0690-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0692-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch
index ab1a07ff97..ab1a07ff97 100644
--- a/patches/server/0692-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0693-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch
index 7e3abd4a7a..4ce1570992 100644
--- a/patches/server/0693-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 754e1f91feb8e6a806ea885d95d95eb25be5405f..f07174ca6cdf9609fd695f999b09312c7b2b468e 100644
+index 3a83320bae86ba1acb189b9b2cf934ad0393c353..be7b7f9345a42007d6ccea6a31c93a4c874647b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -683,6 +683,21 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index 754e1f91feb8e6a806ea885d95d95eb25be5405f..f07174ca6cdf9609fd695f999b09312c
      private void nerfNetherPortalPigmen() {
          nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4c0c2bc9fae878304eab1c18b5ef0cae1b780cfd..bec2507294e266dc16f810d0deb7b790dd0a6df0 100644
+index 1879271ef55e07cd93ebab2d01bfeb7e7b247883..2b0ba27fbded68270421f31037f71bb81f98d139 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1128,7 +1128,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0694-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0693-Fix-incorrect-message-for-outdated-client.patch
index e5f39a1485..87ff34d0b8 100644
--- a/patches/server/0694-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0693-Fix-incorrect-message-for-outdated-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect message for outdated client
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index e0cd786f130e34b3401d40663e1548fc0076f74a..451ca1a1d84227274fd59fc5d46654a441561710 100644
+index 97ee159867c4800c8fdec9a5fa42f648112be186..150050fb343ef6119204b7d5220207765a6937bc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -81,7 +81,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0695-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0694-Don-t-apply-cramming-damage-to-players.patch
index b51e8e18ca..b51e8e18ca 100644
--- a/patches/server/0695-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0694-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0696-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 730ffaccf0..730ffaccf0 100644
--- a/patches/server/0696-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0697-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 8e3b6ad7b3..8e3b6ad7b3 100644
--- a/patches/server/0697-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0698-Stinger-API.patch b/patches/server/0697-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0698-Stinger-API.patch
+++ b/patches/server/0697-Stinger-API.patch
diff --git a/patches/server/0699-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 77196f4ae2..77196f4ae2 100644
--- a/patches/server/0699-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0700-Add-System.out-err-catcher.patch b/patches/server/0699-Add-System.out-err-catcher.patch
index 4af2eb2238..4af2eb2238 100644
--- a/patches/server/0700-Add-System.out-err-catcher.patch
+++ b/patches/server/0699-Add-System.out-err-catcher.patch
diff --git a/patches/server/0701-Fix-test-not-bootstrapping.patch b/patches/server/0700-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0701-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0700-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0702-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0702-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0703-Improve-boat-collision-performance.patch b/patches/server/0702-Improve-boat-collision-performance.patch
index 9e8bbe1be1..9e8bbe1be1 100644
--- a/patches/server/0703-Improve-boat-collision-performance.patch
+++ b/patches/server/0702-Improve-boat-collision-performance.patch
diff --git a/patches/server/0704-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch
index 0a0996db8c..0a0996db8c 100644
--- a/patches/server/0704-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0705-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch
index d4d19d0e69..d4d19d0e69 100644
--- a/patches/server/0705-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0706-Add-PlayerSetSpawnEvent.patch b/patches/server/0705-Add-PlayerSetSpawnEvent.patch
index 648acdbf32..5e5bfcaa9b 100644
--- a/patches/server/0706-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0705-Add-PlayerSetSpawnEvent.patch
@@ -93,7 +93,7 @@ index d620f559cdd1bd0e161a99123ef6c6f64e3302df..07e893f1859abe3c2a765694c21309d6
                      return InteractionResult.SUCCESS;
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 39afaf3355aaf601bab0526c720dbe2049518e8c..03888e95445147ed462233c0115d7e90411c192c 100644
+index 43bfae712369c3c895a0007041d3821bb6257ccd..261a2b4d750c0b57c3c83a82ee41a2bb7d770d8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1089,9 +1089,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0707-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch
index fe1da128ae..fe1da128ae 100644
--- a/patches/server/0707-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0708-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0707-Optimize-entity-tracker-passenger-checks.patch
index ce8a02f22d..ce8a02f22d 100644
--- a/patches/server/0708-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0707-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0709-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0708-Config-option-for-Piglins-guarding-chests.patch
index a5ae275da7..a5ae275da7 100644
--- a/patches/server/0709-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0708-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0710-Added-EntityDamageItemEvent.patch b/patches/server/0709-Added-EntityDamageItemEvent.patch
index bab8258ae6..bab8258ae6 100644
--- a/patches/server/0710-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0709-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0711-Optimize-indirect-passenger-iteration.patch b/patches/server/0710-Optimize-indirect-passenger-iteration.patch
index 2011f87762..2011f87762 100644
--- a/patches/server/0711-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0710-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0712-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch
index 7077043f4f..7077043f4f 100644
--- a/patches/server/0712-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0713-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch
index 6a567624e6..6a567624e6 100644
--- a/patches/server/0713-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0714-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0713-Make-EntityUnleashEvent-cancellable.patch
index 76356ad122..76356ad122 100644
--- a/patches/server/0714-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0713-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0715-Clear-bucket-NBT-after-dispense.patch b/patches/server/0714-Clear-bucket-NBT-after-dispense.patch
index 046e7d2e5c..046e7d2e5c 100644
--- a/patches/server/0715-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0714-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0716-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0715-Respect-despawn-rate-in-item-merge-check.patch
index d5cd293f4a..80ac80b533 100644
--- a/patches/server/0716-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/server/0715-Respect-despawn-rate-in-item-merge-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Respect despawn rate in item merge check
 
 
 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 7897b3324bc8d5a33cd3cd144b9fae9ffdc9241e..0ac107d7a360a5812a43488c611498d12546eed9 100644
+index f63502307fce7d3721b368d81af5a121b7dd9744..f09db211f6f789ced85f7bf716428cd04bb41378 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -261,7 +261,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0718-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0716-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0718-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0716-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0719-Add-BlockBreakBlockEvent.patch b/patches/server/0717-Add-BlockBreakBlockEvent.patch
index bbd9414dca..18cf6e58e8 100644
--- a/patches/server/0719-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0717-Add-BlockBreakBlockEvent.patch
@@ -33,10 +33,10 @@ index 76b3d78f4c866a11bd7798af6b330340d898d7d9..ab5b9f00123e2ede2931ffc520684e48
      public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, Entity entity, ItemStack stack) {
          if (world instanceof ServerLevel) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index c7d23fcaa5702f0e8bbf616c86b16ab1b3400dbb..28256f1f0aeb7718a5866add4ec40ce0198c36b9 100644
+index 2e95de4250f3b53591749ebbe7a5f2b607f6b7fa..ed70d63db8b674d987ad468a5bb27fd7567bcdc7 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -409,7 +409,7 @@ public class PistonBaseBlock extends DirectionalBlock {
+@@ -400,7 +400,7 @@ public class PistonBaseBlock extends DirectionalBlock {
                  iblockdata1 = world.getBlockState(blockposition3);
                  BlockEntity tileentity = iblockdata1.hasBlockEntity() ? world.getBlockEntity(blockposition3) : null;
  
diff --git a/patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch
deleted file mode 100644
index 87cfb92404..0000000000
--- a/patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <[email protected]>
-Date: Sun, 22 Aug 2021 22:17:18 +1000
-Subject: [PATCH] Move BlockPistonRetractEvent to fix duplication
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index da9ae487799e58b196ebf219a62020d0c28adc70..c7d23fcaa5702f0e8bbf616c86b16ab1b3400dbb 100644
---- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -146,14 +146,14 @@ public class PistonBaseBlock extends DirectionalBlock {
-             }
- 
-             // CraftBukkit start
--            //if (!this.sticky) { // Paper - Prevents empty sticky pistons from firing retract - history behind is odd
--                org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
--                BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
--                world.getCraftServer().getPluginManager().callEvent(event);
--
--                if (event.isCancelled()) {
--                    return;
--                }
-+            //if (!this.sticky) { // Paper - Prevents empty sticky pistons from firing retract - history behind is odd - Move further down
-+            //  org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-+            //  BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
-+            //  world.getCraftServer().getPluginManager().callEvent(event);
-+
-+            //  if (event.isCancelled()) {
-+            //    return;
-+            //  }
-             //} // Paper
-             // PAIL: checkME - what happened to setTypeAndData?
-             // CraftBukkit end
-@@ -236,6 +236,15 @@ public class PistonBaseBlock extends DirectionalBlock {
- 
-             BlockState iblockdata1 = (BlockState) ((BlockState) Blocks.MOVING_PISTON.defaultBlockState().setValue(MovingPistonBlock.FACING, enumdirection)).setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
- 
-+            // Paper - Move empty piston retract call to fix duplication
-+            org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-+            BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
-+            world.getCraftServer().getPluginManager().callEvent(event);
-+
-+            if (event.isCancelled()) {
-+                return false;
-+            } // Paper
-+
-             world.setBlock(pos, iblockdata1, 20);
-             world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata1, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true)); // Paper - diff on change
-             world.blockUpdated(pos, iblockdata1.getBlock());
diff --git a/patches/server/0720-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0718-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0720-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0718-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0721-More-CommandBlock-API.patch b/patches/server/0719-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0721-More-CommandBlock-API.patch
+++ b/patches/server/0719-More-CommandBlock-API.patch
diff --git a/patches/server/0722-Add-missing-team-sidebar-display-slots.patch b/patches/server/0720-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0722-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0720-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0723-Add-back-EntityPortalExitEvent.patch b/patches/server/0721-Add-back-EntityPortalExitEvent.patch
index 6b82f775a0..6b82f775a0 100644
--- a/patches/server/0723-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0721-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0724-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0722-Add-methods-to-find-targets-for-lightning-strikes.patch
index 166bb4006d..166bb4006d 100644
--- a/patches/server/0724-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0722-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0725-Get-entity-default-attributes.patch b/patches/server/0723-Get-entity-default-attributes.patch
index 82c52bd6fe..7858927218 100644
--- a/patches/server/0725-Get-entity-default-attributes.patch
+++ b/patches/server/0723-Get-entity-default-attributes.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..4ecba0b02c2813a890aecc5586987879
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 88b32c3fb3e35819f0de34dc92084c3c0b861d31..5ca85ce019e7160081451a6f26f2edded34a917d 100644
+index 444da43415fc1341800260ebf9359f29dc628c22..812fc61a81519980dad5dcd80127c8420f73676e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -516,6 +516,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0726-Left-handed-API.patch b/patches/server/0724-Left-handed-API.patch
index dd1acc7723..dd1acc7723 100644
--- a/patches/server/0726-Left-handed-API.patch
+++ b/patches/server/0724-Left-handed-API.patch
diff --git a/patches/server/0727-Add-advancement-display-API.patch b/patches/server/0725-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0727-Add-advancement-display-API.patch
+++ b/patches/server/0725-Add-advancement-display-API.patch
diff --git a/patches/server/0728-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0726-Add-ItemFactory-getMonsterEgg-API.patch
index a7a82e297a..a7a82e297a 100644
--- a/patches/server/0728-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0726-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0729-Add-critical-damage-API.patch b/patches/server/0727-Add-critical-damage-API.patch
index e9da7c9a2f..e9da7c9a2f 100644
--- a/patches/server/0729-Add-critical-damage-API.patch
+++ b/patches/server/0727-Add-critical-damage-API.patch
diff --git a/patches/server/0730-Fix-issues-with-mob-conversion.patch b/patches/server/0728-Fix-issues-with-mob-conversion.patch
index 65a03ed56e..69feb4b3a4 100644
--- a/patches/server/0730-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0728-Fix-issues-with-mob-conversion.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix issues with mob conversion
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 116709ba2b298268ac806e6e45f2e910ca600706..1eeaf0cc9b00afd54f38f9cb50404ec9f9ba51f8 100644
+index ded88c78c9000d4401d293d18b89b07ea46088dd..3a3f3358c4bbd16bdcadc56c6a865ecfb942ad54 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -86,10 +86,15 @@ public class Skeleton extends AbstractSkeleton {
diff --git a/patches/server/0731-Add-isCollidable-methods-to-various-places.patch b/patches/server/0729-Add-isCollidable-methods-to-various-places.patch
index 002bcd906b..3d05bde04f 100644
--- a/patches/server/0731-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0729-Add-isCollidable-methods-to-various-places.patch
@@ -37,7 +37,7 @@ index 7b9e943b391c061782fccd2b8d705ceec8db50fe..966ac60daebb7bb211ab8096fc0c5f33
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5ca85ce019e7160081451a6f26f2edded34a917d..b43a6df5665f88e0d715ead5ca71a8f9f03e8e4b 100644
+index 812fc61a81519980dad5dcd80127c8420f73676e..9787bc1b989a7d7f92fe0a058b725519fe0d2156 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -528,6 +528,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0732-Goat-ram-API.patch b/patches/server/0730-Goat-ram-API.patch
index 641bebca80..641bebca80 100644
--- a/patches/server/0732-Goat-ram-API.patch
+++ b/patches/server/0730-Goat-ram-API.patch
diff --git a/patches/server/0733-Add-API-for-resetting-a-single-score.patch b/patches/server/0731-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0733-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0731-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0734-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0732-Add-Raw-Byte-Entity-Serialization.patch
index 7272e6803a..30e527bb2a 100644
--- a/patches/server/0734-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0732-Add-Raw-Byte-Entity-Serialization.patch
@@ -45,7 +45,7 @@ index ee50ea695585639d0ff184b675f3fb3b205b9f86..5aae88e20bc04560d6ad52cfcaa872d2
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b43a6df5665f88e0d715ead5ca71a8f9f03e8e4b..90e68a8cfd00e4ad7ffaddfc8e8d5df26c49cf7a 100644
+index 9787bc1b989a7d7f92fe0a058b725519fe0d2156..7978b4aa50f3abbcb9e07a0207c897b6be2a6129 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -421,6 +421,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0735-Vanilla-command-permission-fixes.patch b/patches/server/0733-Vanilla-command-permission-fixes.patch
index b5097e5762..b5097e5762 100644
--- a/patches/server/0735-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0733-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0736-Make-CallbackExecutor-strict-again.patch b/patches/server/0734-Make-CallbackExecutor-strict-again.patch
index 48a552aa64..48a552aa64 100644
--- a/patches/server/0736-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0734-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0735-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index 0f9c3bedf6..0f9c3bedf6 100644
--- a/patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0735-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0736-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 04bbf92438..04bbf92438 100644
--- a/patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0736-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0737-Correctly-handle-recursion-for-chunkholder-updates.patch
index d4a47032bf..d4a47032bf 100644
--- a/patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0737-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0740-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0738-Separate-lookup-locking-from-state-access-in-UserCac.patch
index 20298aa1a6..20298aa1a6 100644
--- a/patches/server/0740-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/server/0738-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0739-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index b0b95db3bf..b0b95db3bf 100644
--- a/patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0739-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0740-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index af693f3838..af693f3838 100644
--- a/patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0740-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0741-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index 538eaa84b7..538eaa84b7 100644
--- a/patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0741-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0744-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0742-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 534570379c..534570379c 100644
--- a/patches/server/0744-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0742-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0745-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0743-Log-when-the-async-catcher-is-tripped.patch
index 7006040b25..7006040b25 100644
--- a/patches/server/0745-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0743-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0746-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0744-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 2983360250..2983360250 100644
--- a/patches/server/0746-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0744-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0745-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index 2c13e7604d..2c13e7604d 100644
--- a/patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0745-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0748-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0746-Sanitize-ResourceLocation-error-logging.patch
index 1f990a622a..1f990a622a 100644
--- a/patches/server/0748-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0746-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0749-Optimise-general-POI-access.patch b/patches/server/0747-Optimise-general-POI-access.patch
index c920f51774..c920f51774 100644
--- a/patches/server/0749-Optimise-general-POI-access.patch
+++ b/patches/server/0747-Optimise-general-POI-access.patch
diff --git a/patches/server/0750-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0748-Allow-controlled-flushing-for-network-manager.patch
index c52730c1df..c52730c1df 100644
--- a/patches/server/0750-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0748-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0751-Add-more-async-catchers.patch b/patches/server/0749-Add-more-async-catchers.patch
index 9eca07f148..9eca07f148 100644
--- a/patches/server/0751-Add-more-async-catchers.patch
+++ b/patches/server/0749-Add-more-async-catchers.patch
diff --git a/patches/server/0752-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch
index 1643085a3e..1643085a3e 100644
--- a/patches/server/0752-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0753-Optimise-chunk-tick-iteration.patch b/patches/server/0751-Optimise-chunk-tick-iteration.patch
index c381730e4a..c381730e4a 100644
--- a/patches/server/0753-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0751-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0754-Execute-chunk-tasks-mid-tick.patch b/patches/server/0752-Execute-chunk-tasks-mid-tick.patch
index 9f14b511e7..9f14b511e7 100644
--- a/patches/server/0754-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0752-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0755-Do-not-copy-visible-chunks.patch b/patches/server/0753-Do-not-copy-visible-chunks.patch
index ba44aac258..ba44aac258 100644
--- a/patches/server/0755-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0753-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0756-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0754-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 48436825c0..48436825c0 100644
--- a/patches/server/0756-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0754-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0757-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0755-Custom-table-implementation-for-blockstate-state-loo.patch
index 9b556d7fe8..9b556d7fe8 100644
--- a/patches/server/0757-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0755-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0758-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0756-Detail-more-information-in-watchdog-dumps.patch
index d0b6b6fd2e..d0b6b6fd2e 100644
--- a/patches/server/0758-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0756-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0759-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0757-Manually-inline-methods-in-BlockPosition.patch
index 9d7f17f71a..9d7f17f71a 100644
--- a/patches/server/0759-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0757-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0760-Distance-manager-tick-timings.patch b/patches/server/0758-Distance-manager-tick-timings.patch
index c12b5b8d05..c12b5b8d05 100644
--- a/patches/server/0760-Distance-manager-tick-timings.patch
+++ b/patches/server/0758-Distance-manager-tick-timings.patch
diff --git a/patches/server/0761-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0759-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0761-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0759-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0762-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0760-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c20e5ba267..c20e5ba267 100644
--- a/patches/server/0762-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0760-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0763-Add-packet-limiter-config.patch b/patches/server/0761-Add-packet-limiter-config.patch
index 4ff4c8272f..4ff4c8272f 100644
--- a/patches/server/0763-Add-packet-limiter-config.patch
+++ b/patches/server/0761-Add-packet-limiter-config.patch
diff --git a/patches/server/0764-Lag-compensate-block-breaking.patch b/patches/server/0762-Lag-compensate-block-breaking.patch
index 520e151053..520e151053 100644
--- a/patches/server/0764-Lag-compensate-block-breaking.patch
+++ b/patches/server/0762-Lag-compensate-block-breaking.patch
diff --git a/patches/server/0765-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0763-Use-correct-LevelStem-registry-when-loading-default-.patch
index 7cd2d9c9f6..7cd2d9c9f6 100644
--- a/patches/server/0765-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0763-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0766-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0764-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index b201e36d10..b201e36d10 100644
--- a/patches/server/0766-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0764-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0767-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0765-Consolidate-flush-calls-for-entity-tracker-packets.patch
index faa1b46041..faa1b46041 100644
--- a/patches/server/0767-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0765-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0768-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0766-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0768-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0766-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0769-Time-scoreboard-search.patch b/patches/server/0767-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0769-Time-scoreboard-search.patch
+++ b/patches/server/0767-Time-scoreboard-search.patch
diff --git a/patches/server/0770-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0768-Send-full-pos-packets-for-hard-colliding-entities.patch
index af1611e279..af1611e279 100644
--- a/patches/server/0770-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0768-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0771-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0769-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0771-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0769-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0772-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0770-Oprimise-map-impl-for-tracked-players.patch
index 977c8a0a81..977c8a0a81 100644
--- a/patches/server/0772-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0770-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0773-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0771-Optimise-BlockSoil-nearby-water-lookup.patch
index ab3e7cfa17..ab3e7cfa17 100644
--- a/patches/server/0773-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0771-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0774-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0772-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0774-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0772-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0775-Optimise-random-block-ticking.patch b/patches/server/0773-Optimise-random-block-ticking.patch
index 74ef7737b2..74ef7737b2 100644
--- a/patches/server/0775-Optimise-random-block-ticking.patch
+++ b/patches/server/0773-Optimise-random-block-ticking.patch
diff --git a/patches/server/0776-Optimise-non-flush-packet-sending.patch b/patches/server/0774-Optimise-non-flush-packet-sending.patch
index f8dc75ba8c..f8dc75ba8c 100644
--- a/patches/server/0776-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0774-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0777-Optimise-nearby-player-lookups.patch b/patches/server/0775-Optimise-nearby-player-lookups.patch
index 7eacd2f196..7eacd2f196 100644
--- a/patches/server/0777-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0775-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0778-Optimise-WorldServer-notify.patch b/patches/server/0776-Optimise-WorldServer-notify.patch
index c1218ac6bd..c1218ac6bd 100644
--- a/patches/server/0778-Optimise-WorldServer-notify.patch
+++ b/patches/server/0776-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0779-Remove-streams-for-villager-AI.patch b/patches/server/0777-Remove-streams-for-villager-AI.patch
index 8257c2de40..8257c2de40 100644
--- a/patches/server/0779-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0777-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0780-Rewrite-dataconverter-system.patch b/patches/server/0778-Rewrite-dataconverter-system.patch
index c2ceaf8d0f..c2ceaf8d0f 100644
--- a/patches/server/0780-Rewrite-dataconverter-system.patch
+++ b/patches/server/0778-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0781-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0779-Use-Velocity-compression-and-cipher-natives.patch
index bea421075b..eb2878182d 100644
--- a/patches/server/0781-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0779-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 eed80e8716468c8b918f3237b326198973e87fe9..70232e71f8495a1beeed880bdf66856b4d0ca5e6 100644
+index 0ed1fa068da85543b161fe86869ad8c90e701b73..17cde4eaf23e01710c131fbea5d171fd25725250 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -44,6 +44,11 @@ dependencies {
diff --git a/patches/server/0782-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0780-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 07f72d1a93..07f72d1a93 100644
--- a/patches/server/0782-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0780-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0783-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0781-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index ddc57c0d3a..ddc57c0d3a 100644
--- a/patches/server/0783-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0781-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0784-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0782-Async-catch-modifications-to-critical-entity-state.patch
index 7b91e7da2c..7b91e7da2c 100644
--- a/patches/server/0784-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0782-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0785-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0783-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0785-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0783-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0786-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0784-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 5f9cbf9735..5f9cbf9735 100644
--- a/patches/server/0786-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0784-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0787-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0785-Check-requirement-before-suggesting-root-nodes.patch
index da19d3f1ca..da19d3f1ca 100644
--- a/patches/server/0787-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0785-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0788-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0786-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 1b40cf1c18..1b40cf1c18 100644
--- a/patches/server/0788-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0786-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0789-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0787-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 31e987614a..31e987614a 100644
--- a/patches/server/0789-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0787-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0790-Ensure-valid-vehicle-status.patch b/patches/server/0788-Ensure-valid-vehicle-status.patch
index 80521d64a1..80521d64a1 100644
--- a/patches/server/0790-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0788-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0791-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0789-Prevent-softlocked-end-exit-portal-generation.patch
index d7ec8ee0ea..d7ec8ee0ea 100644
--- a/patches/server/0791-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0789-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0792-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0790-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0792-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0790-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0793-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0791-Don-t-log-debug-logging-being-disabled.patch
index 52bf120706..52bf120706 100644
--- a/patches/server/0793-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0791-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0794-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0792-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index 5a420fb241..5a420fb241 100644
--- a/patches/server/0794-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0792-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0795-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0793-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0795-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0793-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0794-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index 7cda38b29f..7cda38b29f 100644
--- a/patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0794-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0797-Preserve-overstacked-loot.patch b/patches/server/0795-Preserve-overstacked-loot.patch
index c344524a24..c344524a24 100644
--- a/patches/server/0797-Preserve-overstacked-loot.patch
+++ b/patches/server/0795-Preserve-overstacked-loot.patch
diff --git a/patches/server/0798-Update-head-rotation-in-missing-places.patch b/patches/server/0796-Update-head-rotation-in-missing-places.patch
index 0ed572e8a7..0ed572e8a7 100644
--- a/patches/server/0798-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0796-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0799-prevent-unintended-light-block-manipulation.patch b/patches/server/0797-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0799-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0797-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0800-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0798-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 17215f32f2..17215f32f2 100644
--- a/patches/server/0800-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0798-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0801-Fix-CraftCriteria-defaults-map.patch b/patches/server/0799-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0801-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0799-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0802-Fix-upstreams-block-state-factories.patch b/patches/server/0800-Fix-upstreams-block-state-factories.patch
index 0d31f433f5..0d31f433f5 100644
--- a/patches/server/0802-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0800-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0803-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0801-Add-config-option-for-logging-player-ip-addresses.patch
index 39b64883ac..39b64883ac 100644
--- a/patches/server/0803-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0801-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0804-Configurable-feature-seeds.patch b/patches/server/0802-Configurable-feature-seeds.patch
index 4a81ec7caf..4a81ec7caf 100644
--- a/patches/server/0804-Configurable-feature-seeds.patch
+++ b/patches/server/0802-Configurable-feature-seeds.patch
diff --git a/patches/server/0805-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0803-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0805-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0803-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0806-Add-root-admin-user-detection.patch b/patches/server/0804-Add-root-admin-user-detection.patch
index 63ae0993b1..63ae0993b1 100644
--- a/patches/server/0806-Add-root-admin-user-detection.patch
+++ b/patches/server/0804-Add-root-admin-user-detection.patch
diff --git a/patches/server/0807-Always-allow-item-changing-in-Fireball.patch b/patches/server/0805-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0807-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0805-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0808-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0806-don-t-attempt-to-teleport-dead-entities.patch
index 93735c2294..93735c2294 100644
--- a/patches/server/0808-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0806-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0809-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0807-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
index 408215402f..408215402f 100644
--- a/patches/server/0809-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
+++ b/patches/server/0807-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0810-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0808-Prevent-excessive-velocity-through-repeated-crits.patch
index 794b416d60..794b416d60 100644
--- a/patches/server/0810-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0808-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0811-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0809-Remove-client-side-code-using-deprecated-for-removal.patch
index 654a699a88..654a699a88 100644
--- a/patches/server/0811-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0809-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0812-Rewrite-the-light-engine.patch b/patches/server/0810-Rewrite-the-light-engine.patch
index 2aef0702ca..2aef0702ca 100644
--- a/patches/server/0812-Rewrite-the-light-engine.patch
+++ b/patches/server/0810-Rewrite-the-light-engine.patch
diff --git a/patches/server/0813-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0811-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index 96c4a80599..96c4a80599 100644
--- a/patches/server/0813-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0811-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0814-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0812-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0814-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0812-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0815-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0813-Prevent-sending-oversized-item-data-in-equipment-and.patch
index ce6b90d603..ce6b90d603 100644
--- a/patches/server/0815-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0813-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0816-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0814-Hide-unnecessary-itemmeta-from-clients.patch
index e0d22d41e6..e0d22d41e6 100644
--- a/patches/server/0816-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0814-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0817-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0815-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index 3342b664b5..3342b664b5 100644
--- a/patches/server/0817-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0815-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0818-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0816-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 0e41fd2743..0e41fd2743 100644
--- a/patches/server/0818-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0816-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0819-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0817-Add-PlayerItemFrameChangeEvent.patch
index 8e8fbb1fb8..8e8fbb1fb8 100644
--- a/patches/server/0819-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0817-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0820-Add-player-health-update-API.patch b/patches/server/0818-Add-player-health-update-API.patch
index 60d79df5d3..e8738d4855 100644
--- a/patches/server/0820-Add-player-health-update-API.patch
+++ b/patches/server/0818-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f2cbfcb069e882ca117d1538e0e69c846bcffd85..cbb24244ec09ab25c7ff8da8bd3ee5a1ef4ae1cc 100644
+index 261a2b4d750c0b57c3c83a82ee41a2bb7d770d8a..8de4ad9f2120d22b78202981624abd1d2fc70148 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2013,9 +2013,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0821-Optimize-HashMapPalette.patch b/patches/server/0819-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0821-Optimize-HashMapPalette.patch
+++ b/patches/server/0819-Optimize-HashMapPalette.patch
diff --git a/patches/server/0822-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0820-Allow-delegation-to-vanilla-chunk-gen.patch
index e5618d5f78..e5618d5f78 100644
--- a/patches/server/0822-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0820-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0823-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0821-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 093ed036f5..093ed036f5 100644
--- a/patches/server/0823-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0821-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0824-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0822-Optimise-collision-checking-in-player-move-packet-ha.patch
index c5199df153..c5199df153 100644
--- a/patches/server/0824-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0822-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0825-Actually-unload-POI-data.patch b/patches/server/0823-Actually-unload-POI-data.patch
index c03e727b8f..c03e727b8f 100644
--- a/patches/server/0825-Actually-unload-POI-data.patch
+++ b/patches/server/0823-Actually-unload-POI-data.patch
diff --git a/patches/server/0826-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0824-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 6f7e30efa6..6f7e30efa6 100644
--- a/patches/server/0826-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0824-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0827-Update-Log4j.patch b/patches/server/0825-Update-Log4j.patch
index 4b014b2e90..0b0678fc3e 100644
--- a/patches/server/0827-Update-Log4j.patch
+++ b/patches/server/0825-Update-Log4j.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update Log4j
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 70232e71f8495a1beeed880bdf66856b4d0ca5e6..954c49fedd2ae228dde7076b80ba22bb7ecb1197 100644
+index 17cde4eaf23e01710c131fbea5d171fd25725250..da31e84cb558e6fad9cab015cfae753ce7be7db0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -29,10 +29,11 @@ dependencies {
diff --git a/patches/server/0828-Add-more-Campfire-API.patch b/patches/server/0826-Add-more-Campfire-API.patch
index ceffa1575f..ceffa1575f 100644
--- a/patches/server/0828-Add-more-Campfire-API.patch
+++ b/patches/server/0826-Add-more-Campfire-API.patch
diff --git a/patches/server/0829-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch b/patches/server/0827-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch
index 2768b9635e..2768b9635e 100644
--- a/patches/server/0829-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch
+++ b/patches/server/0827-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch
diff --git a/patches/server/0830-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0828-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index f6365f90b4..f6365f90b4 100644
--- a/patches/server/0830-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0828-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0831-Fix-tripwire-state-inconsistency.patch b/patches/server/0829-Fix-tripwire-state-inconsistency.patch
index d3a454f329..d3a454f329 100644
--- a/patches/server/0831-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0829-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0832-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0830-Fix-fluid-logging-on-Block-breakNaturally.patch
index 2489e93ffd..2489e93ffd 100644
--- a/patches/server/0832-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0830-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0833-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0831-Forward-CraftEntity-in-teleport-command.patch
index e8e89b6b09..e8e89b6b09 100644
--- a/patches/server/0833-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0831-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0834-Improve-scoreboard-entries.patch b/patches/server/0832-Improve-scoreboard-entries.patch
index 07b32e52e9..07b32e52e9 100644
--- a/patches/server/0834-Improve-scoreboard-entries.patch
+++ b/patches/server/0832-Improve-scoreboard-entries.patch
diff --git a/patches/server/0835-Entity-powdered-snow-API.patch b/patches/server/0833-Entity-powdered-snow-API.patch
index 9531b9a5b8..9531b9a5b8 100644
--- a/patches/server/0835-Entity-powdered-snow-API.patch
+++ b/patches/server/0833-Entity-powdered-snow-API.patch
diff --git a/patches/server/0836-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0834-Fix-entity-type-tags-suggestions-in-selectors.patch
index c86a4323be..c86a4323be 100644
--- a/patches/server/0836-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0834-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0837-Add-API-for-item-entity-health.patch b/patches/server/0835-Add-API-for-item-entity-health.patch
index c475b8fda1..c475b8fda1 100644
--- a/patches/server/0837-Add-API-for-item-entity-health.patch
+++ b/patches/server/0835-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0838-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0836-Configurable-max-block-light-for-monster-spawning.patch
index ce32a15368..ce32a15368 100644
--- a/patches/server/0838-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0836-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0837-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0837-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
new file mode 100644
index 0000000000..8db19c209b
--- /dev/null
+++ b/patches/server/0837-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
@@ -0,0 +1,85 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Wed, 22 Dec 2021 09:51:48 -0800
+Subject: [PATCH] Fix sticky pistons and BlockPistonRetractEvent
+
+There is an explicit check in the handling code for empty pistons that
+prevents sticky pistons from firing the event. However when we look back
+at the history we see that this check was originally added so that ONLY
+sticky pistons would fire the retract event. I'm not sure why.
+https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/1092acbddf07edfa4100bc6824504ac75088e913
+
+Over the course of several updates, the meaning of that field appears to
+have changed from "is NOT sticky" to "is sticky". So now its having the
+opposite effect. Only normal pistons fire the retraction event. And like
+all things in CB, it's just been carried around since.
+
+If we are to believe the history, the correct fix for this issue is to
+flip it so it only fires for sticky pistons, but that puts us in a
+bind. It's already firing for non-sticky pistons, changing it now would
+likely result in breakage. Furthermore, there is little documentation as
+to WHY that was ever intended to be the case.
+
+Instead we opt to remove the check entirely so that the event fires for
+all piston types.
+
+Co-authored-by: Zach Brown <[email protected]>
+Co-authored-by: Madeline Miller <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+index ed70d63db8b674d987ad468a5bb27fd7567bcdc7..c9c18cf84e4ee5c253bbc64a4b41e91f9f4c4bc7 100644
+--- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+@@ -146,15 +146,15 @@ public class PistonBaseBlock extends DirectionalBlock {
+             }
+ 
+             // CraftBukkit start
+-            if (!this.isSticky) {
+-                org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
+-                BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
+-                world.getCraftServer().getPluginManager().callEvent(event);
+-
+-                if (event.isCancelled()) {
+-                    return;
+-                }
+-            }
++            // if (!this.isSticky) { // Paper - Move further down
++            //     org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
++            //     BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
++            //     world.getCraftServer().getPluginManager().callEvent(event);
++            //
++            //     if (event.isCancelled()) {
++            //         return;
++            //     }
++            // }
+             // PAIL: checkME - what happened to setTypeAndData?
+             // CraftBukkit end
+             world.blockEvent(pos, this, b0, enumdirection.get3DDataValue());
+@@ -236,6 +236,13 @@ public class PistonBaseBlock extends DirectionalBlock {
+ 
+             BlockState iblockdata1 = (BlockState) ((BlockState) Blocks.MOVING_PISTON.defaultBlockState().setValue(MovingPistonBlock.FACING, enumdirection)).setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
+ 
++            // Paper start - Move empty piston retract call to fix multiple event fires
++            if (!this.isSticky) {
++                if (!new BlockPistonRetractEvent(CraftBlock.at(world, pos), java.util.Collections.emptyList(), CraftBlock.notchToBlockFace(enumdirection)).callEvent()) {
++                    return false;
++                }
++            }
++            // Paper end
+             world.setBlock(pos, iblockdata1, 20);
+             world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata1, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true)); // Paper - diff on change
+             world.blockUpdated(pos, iblockdata1.getBlock());
+@@ -262,6 +269,13 @@ public class PistonBaseBlock extends DirectionalBlock {
+                     if (type == 1 && !iblockdata2.isAir() && PistonBaseBlock.isPushable(iblockdata2, world, blockposition1, enumdirection.getOpposite(), false, enumdirection) && (iblockdata2.getPistonPushReaction() == PushReaction.NORMAL || iblockdata2.is(Blocks.PISTON) || iblockdata2.is(Blocks.STICKY_PISTON))) {
+                         this.moveBlocks(world, pos, enumdirection, false);
+                     } else {
++                        // Paper start - fire BlockPistonRetractEvent for sticky pistons retracting nothing (air)
++                        if (type == TRIGGER_CONTRACT && iblockdata2.isAir()) {
++                            if (!new BlockPistonRetractEvent(CraftBlock.at(world, pos), java.util.Collections.emptyList(), CraftBlock.notchToBlockFace(enumdirection)).callEvent()) {
++                                return false;
++                            }
++                        }
++                        // Paper end
+                         world.removeBlock(pos.relative(enumdirection), false);
+                     }
+                 }