Fix horse armor desync (#11341)

846 files changed, 335 insertions, 341 deletions

diff --git a/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
deleted file mode 100644
index ebc80323b4..0000000000
--- a/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <[email protected]>
-Date: Fri, 13 Jul 2018 14:54:43 +0200
-Subject: [PATCH] Refresh player inventory when cancelling
- PlayerInteractEntityEvent
-
-When interacting with entities with an item, the client will assume
-the interaction is successful, and update the held item on the
-client. However, if the interaction is cancelled on the server side,
-the client will still mistakenly remove/replace the item in hand.
-
-Examples for this are milking cows with a bucket or dyeing sheep.
-The bucket is replaced with milk and the dye removed from inventory.
-
-Refresh the player inventory when PlayerInteractEntityEvent is
-cancelled to avoid this problem.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a954d3b0ff0917d857002dba70c54b3fcdf77943..087e87976d738426db9a850926463900b0c1e8ca 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2496,6 +2496,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                             }
- 
-                             if (event.isCancelled()) {
-+                                ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - Refresh player inventory
-                                 return;
-                             }
-                             // CraftBukkit end
diff --git a/patches/server/0211-add-more-information-to-Entity.toString.patch b/patches/server/0210-add-more-information-to-Entity.toString.patch
index 3fcefb7c59..b104bbec15 100644
--- a/patches/server/0211-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0210-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 629942afb41f73ca7a7855cba58c81fd0e734a7a..f431c5a17bfc3bdf2a464470af4ec5e226b0d13e 100644
+index a2b727dea997ed0d7b1ef677a94b5957f12d5abb..7fd1a75ba0068ee3ca6c29a550a9a1b33c5cacc5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3279,7 +3279,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0212-EnderDragon-Events.patch b/patches/server/0211-EnderDragon-Events.patch
index 73e0d7b169..73e0d7b169 100644
--- a/patches/server/0212-EnderDragon-Events.patch
+++ b/patches/server/0211-EnderDragon-Events.patch
diff --git a/patches/server/0213-PlayerElytraBoostEvent.patch b/patches/server/0212-PlayerElytraBoostEvent.patch
index 0581d2cd0a..0581d2cd0a 100644
--- a/patches/server/0213-PlayerElytraBoostEvent.patch
+++ b/patches/server/0212-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0214-PlayerLaunchProjectileEvent.patch b/patches/server/0213-PlayerLaunchProjectileEvent.patch
index be34c111d3..be34c111d3 100644
--- a/patches/server/0214-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0213-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0215-Improve-BlockPosition-inlining.patch b/patches/server/0214-Improve-BlockPosition-inlining.patch
index 469c5f7390..469c5f7390 100644
--- a/patches/server/0215-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0214-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0215-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 474a50ce86..fbe09d5031 100644
--- a/patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0215-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -17,7 +17,7 @@ index dae6835696e90bc5a541cacd37ea7aa88c60f4f4..1057679ceec86898a3e62bd183c6944f
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 27e2718124aad69546c1d9adb9c8e69fa4a43ca7..16c244f56813479b2e51f1d883ff739949fc86e3 100644
+index 6944c0b0cfcde9fa4dd78742aee3e3b87d679abf..a9227581ec78a56e96dc3a342006e4a649906326 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -764,6 +764,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0217-Vanished-players-don-t-have-rights.patch b/patches/server/0216-Vanished-players-don-t-have-rights.patch
index 5820c721da..5820c721da 100644
--- a/patches/server/0217-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0216-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0218-Allow-disabling-armor-stand-ticking.patch b/patches/server/0217-Allow-disabling-armor-stand-ticking.patch
index bf0bbc008e..bf0bbc008e 100644
--- a/patches/server/0218-Allow-disabling-armor-stand-ticking.patch
+++ b/patches/server/0217-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0219-SkeletonHorse-Additions.patch b/patches/server/0218-SkeletonHorse-Additions.patch
index 3d2b910a9b..3d2b910a9b 100644
--- a/patches/server/0219-SkeletonHorse-Additions.patch
+++ b/patches/server/0218-SkeletonHorse-Additions.patch
diff --git a/patches/server/0220-Expand-ArmorStand-API.patch b/patches/server/0219-Expand-ArmorStand-API.patch
index d68ca34219..d68ca34219 100644
--- a/patches/server/0220-Expand-ArmorStand-API.patch
+++ b/patches/server/0219-Expand-ArmorStand-API.patch
diff --git a/patches/server/0221-AnvilDamageEvent.patch b/patches/server/0220-AnvilDamageEvent.patch
index 6fca9fbf25..7437518ee2 100644
--- a/patches/server/0221-AnvilDamageEvent.patch
+++ b/patches/server/0220-AnvilDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index 1c98d1ab7159ce0061da80c83901d3dac084f3d3..c6ec9fc6ccde2a5c086a2bfe32686954c074c31d 100644
+index 4a6295c0133606131c2b2b881b4dbe7f1e3e47b0..ffda2c984c5683edb38a56f04c53b0ea339e08fc 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 @@ -110,6 +110,16 @@ public class AnvilMenu extends ItemCombinerMenu {
diff --git a/patches/server/0222-Add-TNTPrimeEvent.patch b/patches/server/0221-Add-TNTPrimeEvent.patch
index 5ce6ea7a52..1dc0962e1d 100644
--- a/patches/server/0222-Add-TNTPrimeEvent.patch
+++ b/patches/server/0221-Add-TNTPrimeEvent.patch
@@ -21,7 +21,7 @@ index b02a77b486f8d5eee31850de4a1b033fe6a107c7..a2cde7b1b316e43382cb1639ffccf29d
  
                  this.level().removeBlock(blockposition, false);
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index c7c4b04dede992991229b149b96ff6a81f499ae3..886b8d2284e3ae85184c842b24869029b9ee4ebe 100644
+index b288db03dd5385a8a9cc49a8a7d89a9fab7224a7..c1111bd8065b53cb140e4289cb72985f03e6f549 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -302,12 +302,19 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0223-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0222-Break-up-and-make-tab-spam-limits-configurable.patch
index 43418bc01d..504d5c5e39 100644
--- a/patches/server/0223-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0222-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 087e87976d738426db9a850926463900b0c1e8ca..f1e31a80349a9cbd677a5216b332a99761b94814 100644
+index 0321128ab745250e79fa5f66079c9aeb7f394cc0..5ed35d744a87290a03e9bf58143b5650501af0e6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0224-Fix-NBT-type-issues.patch b/patches/server/0223-Fix-NBT-type-issues.patch
index 7444db91d2..7444db91d2 100644
--- a/patches/server/0224-Fix-NBT-type-issues.patch
+++ b/patches/server/0223-Fix-NBT-type-issues.patch
diff --git a/patches/server/0225-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0224-Remove-unnecessary-itemmeta-handling.patch
index 6a2f490da8..787fe866f3 100644
--- a/patches/server/0225-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0224-Remove-unnecessary-itemmeta-handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary itemmeta handling
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index abf502b8395bb0a8a32c1fdcd62532790deb1c6e..f53ce5f063d3b7b8d3f6a3bc1165d1788c112e6d 100644
+index 1138d238caa18171b6562cc748c92cec03bfbb97..b0d0e08e81e3b87e5d4faf62e9afe9606c254115 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -165,7 +165,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0226-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0225-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 07722aef15..07722aef15 100644
--- a/patches/server/0226-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0225-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0227-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0226-Add-Early-Warning-Feature-to-WatchDog.patch
index 6165e2a51e..6843b0c3c4 100644
--- a/patches/server/0227-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0226-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -33,7 +33,7 @@ index c466ec011d059b9960606ef2ee51ea3a3a65f8d0..baf93b5d5883d0a5c360f1a475949804
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 745970d9f07ed7ca98a653bfff1b861dc4aaa177..274d7d7f36ce2eb38d2f630ca48b6aa4f791b0e3 100644
+index 2fa82336da744b6617e55c7d8303f6d769ccefef..a4e969a82eabc5ffdb776d1574f5b003fc19b177 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -962,6 +962,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0228-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0227-Use-ConcurrentHashMap-in-JsonList.patch
index 06ff8bd2a0..35ab668887 100644
--- a/patches/server/0228-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0227-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 38cf3cf1cc7ebae4b6ca8a89dc026b5b4f0b4c2b..c5ca2d8feed71cdd4dce851941654768c1e5d648 100644
+index 25dee4848c8b2cff74075c6d26d384e71f706627..5fc76fd70f98fe874b38d8da08017fdadbd115e5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -627,7 +627,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0228-Use-a-Queue-for-Queueing-Commands.patch
index eee2655478..eee2655478 100644
--- a/patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0228-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0230-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0229-Ability-to-get-block-entities-from-a-chunk-without-s.patch
index 8ecb7597f5..8ecb7597f5 100644
--- a/patches/server/0230-Ability-to-get-block-entities-from-a-chunk-without-s.patch
+++ b/patches/server/0229-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0231-Optimize-BlockPosition-helper-methods.patch b/patches/server/0230-Optimize-BlockPosition-helper-methods.patch
index b5729f8949..b5729f8949 100644
--- a/patches/server/0231-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0230-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0232-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0231-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 0ed98b85c4..0ed98b85c4 100644
--- a/patches/server/0232-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0231-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0233-Slime-Pathfinder-Events.patch b/patches/server/0232-Slime-Pathfinder-Events.patch
index 3cbd43d550..3cbd43d550 100644
--- a/patches/server/0233-Slime-Pathfinder-Events.patch
+++ b/patches/server/0232-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0234-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0233-Configurable-speed-for-water-flowing-over-lava.patch
index fafdd583ab..fafdd583ab 100644
--- a/patches/server/0234-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0233-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0235-Optimize-CraftBlockData-Creation.patch b/patches/server/0234-Optimize-CraftBlockData-Creation.patch
index 501971aa29..501971aa29 100644
--- a/patches/server/0235-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0234-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0236-Optimize-MappedRegistry.patch b/patches/server/0235-Optimize-MappedRegistry.patch
index 17c68f31d7..17c68f31d7 100644
--- a/patches/server/0236-Optimize-MappedRegistry.patch
+++ b/patches/server/0235-Optimize-MappedRegistry.patch
diff --git a/patches/server/0237-Add-PhantomPreSpawnEvent.patch b/patches/server/0236-Add-PhantomPreSpawnEvent.patch
index 42c7ae9133..42c7ae9133 100644
--- a/patches/server/0237-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0236-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0238-Add-More-Creeper-API.patch b/patches/server/0237-Add-More-Creeper-API.patch
index 931f2b6158..931f2b6158 100644
--- a/patches/server/0238-Add-More-Creeper-API.patch
+++ b/patches/server/0237-Add-More-Creeper-API.patch
diff --git a/patches/server/0239-Inventory-removeItemAnySlot.patch b/patches/server/0238-Inventory-removeItemAnySlot.patch
index 1316343a0a..1316343a0a 100644
--- a/patches/server/0239-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0238-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0240-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0239-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 911ca5db1f..911ca5db1f 100644
--- a/patches/server/0240-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0239-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0241-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0240-Add-ray-tracing-methods-to-LivingEntity.patch
index f490695366..1f0a581e4e 100644
--- a/patches/server/0241-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0240-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bf1b8ee85551ff1989369268edf8012758b86fd7..f7a77b31dc196823510f96bd3b2344058e20feac 100644
+index ada79af49d1cafe25ca6c1fb456e1c4c3a42cb73..39dff0a38b53624c935f27cc86ff036c831f407f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3977,6 +3977,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0242-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0241-Expose-attack-cooldown-methods-for-Player.patch
index 56a5662d56..0d19ca5bf3 100644
--- a/patches/server/0242-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0241-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7ad63581c7c78a7d8b78be2e95002550b3b2c222..597594409b4d1fadf4ae1c3a7156421e70989d97 100644
+index 12c61db6d4b1284765f9bed3ae26131a118b318e..a7e611aaeb457820ad303b95822d8ea86b060477 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2980,6 +2980,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0243-Improve-death-events.patch b/patches/server/0242-Improve-death-events.patch
index 32eb4bc818..32eb4bc818 100644
--- a/patches/server/0243-Improve-death-events.patch
+++ b/patches/server/0242-Improve-death-events.patch
diff --git a/patches/server/0244-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0243-Allow-chests-to-be-placed-with-NBT-data.patch
index 7bb901ef2e..92d7a5d3fc 100644
--- a/patches/server/0244-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0243-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f53ce5f063d3b7b8d3f6a3bc1165d1788c112e6d..cc8825acea0d84b36194313656a6f70d8c049072 100644
+index b0d0e08e81e3b87e5d4faf62e9afe9606c254115..2ee949e1b0015c62499c557d5e359df4b9de6027 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -490,6 +490,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0245-Mob-Pathfinding-API.patch b/patches/server/0244-Mob-Pathfinding-API.patch
index 427d08a157..427d08a157 100644
--- a/patches/server/0245-Mob-Pathfinding-API.patch
+++ b/patches/server/0244-Mob-Pathfinding-API.patch
diff --git a/patches/server/0246-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0245-Prevent-various-interactions-from-causing-chunk-load.patch
index 01a574e73c..01a574e73c 100644
--- a/patches/server/0246-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/server/0245-Prevent-various-interactions-from-causing-chunk-load.patch
diff --git a/patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0246-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 1ca48ef5a8..1ca48ef5a8 100644
--- a/patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0246-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0248-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0247-Implement-furnace-cook-speed-multiplier-API.patch
index 24067a522f..24067a522f 100644
--- a/patches/server/0248-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0247-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0249-Honor-EntityAgeable.ageLock.patch b/patches/server/0248-Honor-EntityAgeable.ageLock.patch
index 1522ccc882..1522ccc882 100644
--- a/patches/server/0249-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0248-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0250-Configurable-connection-throttle-kick-message.patch b/patches/server/0249-Configurable-connection-throttle-kick-message.patch
index ed8fbcb06d..ed8fbcb06d 100644
--- a/patches/server/0250-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0249-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0251-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0250-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 50c82e5d54..50c82e5d54 100644
--- a/patches/server/0251-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0250-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0252-PreSpawnerSpawnEvent.patch b/patches/server/0251-PreSpawnerSpawnEvent.patch
index 3512bab510..3512bab510 100644
--- a/patches/server/0252-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0251-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0253-Add-LivingEntity-getTargetEntity.patch b/patches/server/0252-Add-LivingEntity-getTargetEntity.patch
index f75a1b66aa..e11276838f 100644
--- a/patches/server/0253-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0252-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 279fa00fd9043e1995f22c79f47d0b41c27bd933..43eddcd8496ff2f089119f6632acfe1b56466c3d 100644
+index bdee5725029eda3a0e7bee407286480c0bb47db1..689aaf4ceedc598fe71db726215cceae6cc97296 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -127,6 +127,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
diff --git a/patches/server/0254-Add-sun-related-API.patch b/patches/server/0253-Add-sun-related-API.patch
index 01cd62209b..01cd62209b 100644
--- a/patches/server/0254-Add-sun-related-API.patch
+++ b/patches/server/0253-Add-sun-related-API.patch
diff --git a/patches/server/0255-Turtle-API.patch b/patches/server/0254-Turtle-API.patch
index efd6b79262..efd6b79262 100644
--- a/patches/server/0255-Turtle-API.patch
+++ b/patches/server/0254-Turtle-API.patch
diff --git a/patches/server/0256-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0255-Call-player-spectator-target-events-and-improve-impl.patch
index b29358d325..b29358d325 100644
--- a/patches/server/0256-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0255-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0257-Add-more-Witch-API.patch b/patches/server/0256-Add-more-Witch-API.patch
index ead3a185c6..ead3a185c6 100644
--- a/patches/server/0257-Add-more-Witch-API.patch
+++ b/patches/server/0256-Add-more-Witch-API.patch
diff --git a/patches/server/0258-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0257-Check-Drowned-for-Villager-Aggression-Config.patch
index efafeb919c..efafeb919c 100644
--- a/patches/server/0258-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0257-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0259-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0258-Add-option-to-prevent-players-from-moving-into-unloa.patch
index bcd7e3f8f6..c62badf3b1 100644
--- a/patches/server/0259-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0258-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f1e31a80349a9cbd677a5216b332a99761b94814..cc7a14df387e68e8b6d3abdee62f4b48fdbaa6a7 100644
+index 5ed35d744a87290a03e9bf58143b5650501af0e6..6cf68d7173bc23c39261856f11cbd42de387bd60 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -494,9 +494,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0260-Reset-players-airTicks-on-respawn.patch b/patches/server/0259-Reset-players-airTicks-on-respawn.patch
index 0669db4de0..0669db4de0 100644
--- a/patches/server/0260-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0259-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0261-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0260-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index d871ee76b6..d871ee76b6 100644
--- a/patches/server/0261-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0260-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0262-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0261-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 278b5c5f14..278b5c5f14 100644
--- a/patches/server/0262-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0261-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0263-Optimize-World-Time-Updates.patch b/patches/server/0262-Optimize-World-Time-Updates.patch
index 1ce97af599..1ce97af599 100644
--- a/patches/server/0263-Optimize-World-Time-Updates.patch
+++ b/patches/server/0262-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0264-Restore-custom-InventoryHolder-support.patch b/patches/server/0263-Restore-custom-InventoryHolder-support.patch
index 4fa1d8fac1..4fa1d8fac1 100644
--- a/patches/server/0264-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0263-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0265-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0264-Fix-SpongeAbsortEvent-handling.patch
index be21ac2045..be21ac2045 100644
--- a/patches/server/0265-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0264-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0266-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0265-Don-t-allow-digging-into-unloaded-chunks.patch
index 1e6c4cb7c2..f65e5077e7 100644
--- a/patches/server/0266-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0265-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index a5b0efd6142075ca1ecb604afbc1d0162199e7a4..da9e864520150acd8027545672aa476b
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cc7a14df387e68e8b6d3abdee62f4b48fdbaa6a7..2e35c6cfdf0cded5adc9f512612faaa68876961c 100644
+index 6cf68d7173bc23c39261856f11cbd42de387bd60..4942aa857ecc5762c9b0b1662eefaeae4daab80d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1595,6 +1595,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0267-Make-the-default-permission-message-configurable.patch b/patches/server/0266-Make-the-default-permission-message-configurable.patch
index 404444d7eb..45ffed84a2 100644
--- a/patches/server/0267-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0266-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 5b070d158760789bbcaa984426a55d20767abe4a..e1820a339452cd3388dd7cbb928c5f58
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 274d7d7f36ce2eb38d2f630ca48b6aa4f791b0e3..c4b1e3064f3778909a2f152a69ca229f4c86b71b 100644
+index a4e969a82eabc5ffdb776d1574f5b003fc19b177..f727b7882a86b1e3f736816634ab4b61f69d1dff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2875,6 +2875,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0268-force-entity-dismount-during-teleportation.patch b/patches/server/0267-force-entity-dismount-during-teleportation.patch
index a91a738571..a91a738571 100644
--- a/patches/server/0268-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0267-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0269-Add-more-Zombie-API.patch b/patches/server/0268-Add-more-Zombie-API.patch
index 4c7955b4ae..4c7955b4ae 100644
--- a/patches/server/0269-Add-more-Zombie-API.patch
+++ b/patches/server/0268-Add-more-Zombie-API.patch
diff --git a/patches/server/0270-Book-size-limits.patch b/patches/server/0269-Book-size-limits.patch
index de9ce90396..964cf927a7 100644
--- a/patches/server/0270-Book-size-limits.patch
+++ b/patches/server/0269-Book-size-limits.patch
@@ -22,7 +22,7 @@ index ed61767a64cdce37dc7c226ebd0d693a60de24a9..f634a830a2b58a419e84f969bd53eeae
          ServerboundEditBookPacket::new
      );
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ce06a41d98bafc878918507404bd5d6cabc45776..d8f940016b68f488b5061d2826607c0db7e8f852 100644
+index 4942aa857ecc5762c9b0b1662eefaeae4daab80d..577f0e290f66afd2ded18714fb8b5f62a7a9aa71 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1043,6 +1043,44 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0271-Add-PlayerConnectionCloseEvent.patch b/patches/server/0270-Add-PlayerConnectionCloseEvent.patch
index 5c63a589af..5c63a589af 100644
--- a/patches/server/0271-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0270-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0272-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0271-Replace-OfflinePlayer-getLastPlayed.patch
index 325676c465..be35600681 100644
--- a/patches/server/0272-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0271-Replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b4947ee9615b1b2108046b9ab87b65b53dbb23f6..dbdc6b4065acc363c128580fdffe9049259386c2 100644
+index c2571855ca6a8ecd144b8fbb97d601d1808e8d61..bd130d3a4d0cfe431be627c3f4d85bb394fe099b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -269,6 +269,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -28,7 +28,7 @@ index b4947ee9615b1b2108046b9ab87b65b53dbb23f6..dbdc6b4065acc363c128580fdffe9049
      public boolean queueHealthUpdatePacket;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c5ca2d8feed71cdd4dce851941654768c1e5d648..9e8938627bfd1c45a2546e221f819e20c483a9e2 100644
+index 5fc76fd70f98fe874b38d8da08017fdadbd115e5..cdd1d8222ad1796abd0858b9ed0e2ddc9be83c93 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -182,6 +182,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index 461656e1cb095243bfe7a9ee2906e5b00574ae78..411b280ac3e27e72091db813c0c9b69b
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6c5bd88777ff79c7408cf5ffed0f099a79e5429a..c3c1dff8afb9d9e27ead7c037626c97696663930 100644
+index 004ac565d4124f6059d530034cf0c9a28f0be467..6a3bf3f34ff36e0b11bb3c250074f672b1e81b4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -210,6 +210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0273-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0272-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index a8477b1786..a8477b1786 100644
--- a/patches/server/0273-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0272-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0274-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0273-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 674772b619..4869ad5e17 100644
--- a/patches/server/0274-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0273-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2974f806ef677376ee2b53fccb6ca83151bb8451..80a9a4df9b1114f932badd847238c7a0a1a00941 100644
+index 6a3bf3f34ff36e0b11bb3c250074f672b1e81b4f..d0af4b838bd43ef2388e918ac14e7acec71b63ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -224,8 +224,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0275-BlockDestroyEvent.patch b/patches/server/0274-BlockDestroyEvent.patch
index 27911d5058..c156645f02 100644
--- a/patches/server/0275-BlockDestroyEvent.patch
+++ b/patches/server/0274-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 c0b0a9328faf93b85ceaf6cc9989f1a59520c7f4..8e2acb3c6f815b5b1d3237a2f4e0b5f3683d2c60 100644
+index 5929b450a26e7c3cf63de3dc1d0e67cb781b24c7..4c4449f7dee8695a362f83b9356e5754244fff18 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -25,6 +25,7 @@ import net.minecraft.core.registries.Registries;
diff --git a/patches/server/0276-Async-command-map-building.patch b/patches/server/0275-Async-command-map-building.patch
index 4a9cc54166..4a9cc54166 100644
--- a/patches/server/0276-Async-command-map-building.patch
+++ b/patches/server/0275-Async-command-map-building.patch
diff --git a/patches/server/0277-Brigadier-Mojang-API.patch b/patches/server/0276-Brigadier-Mojang-API.patch
index a9bc0d2666..6556c6eccc 100644
--- a/patches/server/0277-Brigadier-Mojang-API.patch
+++ b/patches/server/0276-Brigadier-Mojang-API.patch
@@ -119,7 +119,7 @@ index a05aea8561ac102476ee1b3068942b095950a86a..e25fc35716aff1d1805884b18f67b0eb
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index abab7c6ce2079a0101c59c130fd65db7b2a73498..29678ddb0cb53fae9ae497614690f9d855f9eb86 100644
+index 577f0e290f66afd2ded18714fb8b5f62a7a9aa71..e786d4b940a6fcd6d5ce66c5e13f52ff001b8367 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -769,19 +769,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0278-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0277-Improve-exact-choice-recipe-ingredients.patch
index 9c0b7b8275..9c0b7b8275 100644
--- a/patches/server/0278-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/0277-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0279-Limit-Client-Sign-length-more.patch b/patches/server/0278-Limit-Client-Sign-length-more.patch
index 57e96a49d8..a5c3397ebe 100644
--- a/patches/server/0279-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0278-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 33a7aaf8c6b73b1732465125edd43cce06da7dc9..88fa94f33e5939bc8a5acb20f48ad5bdf35c2ada 100644
+index e786d4b940a6fcd6d5ce66c5e13f52ff001b8367..0ed2d0f5ec9d107e8049aa9e803479ffd341639f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -299,6 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -33,7 +33,7 @@ index 33a7aaf8c6b73b1732465125edd43cce06da7dc9..88fa94f33e5939bc8a5acb20f48ad5bd
  
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
          super(server, connection, clientData, player); // CraftBukkit
-@@ -3150,7 +3151,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3149,7 +3150,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
diff --git a/patches/server/0280-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0279-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 9eceb9ab5a..9eceb9ab5a 100644
--- a/patches/server/0280-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0279-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/server/0280-Fixes-and-additions-to-the-spawn-reason-API.patch
index a8fda4a8d7..a8fda4a8d7 100644
--- a/patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch
+++ b/patches/server/0280-Fixes-and-additions-to-the-spawn-reason-API.patch
diff --git a/patches/server/0282-Fire-event-on-GS4-query.patch b/patches/server/0281-Fire-event-on-GS4-query.patch
index 6468ff12c1..6468ff12c1 100644
--- a/patches/server/0282-Fire-event-on-GS4-query.patch
+++ b/patches/server/0281-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0283-Add-PlayerPostRespawnEvent.patch b/patches/server/0282-Add-PlayerPostRespawnEvent.patch
index 719434b7d5..719434b7d5 100644
--- a/patches/server/0283-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0282-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0284-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0283-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index f6592c8703..f6592c8703 100644
--- a/patches/server/0284-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0283-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0285-Server-Tick-Events.patch b/patches/server/0284-Server-Tick-Events.patch
index afbd125410..afbd125410 100644
--- a/patches/server/0285-Server-Tick-Events.patch
+++ b/patches/server/0284-Server-Tick-Events.patch
diff --git a/patches/server/0286-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0285-PlayerDeathEvent-getItemsToKeep.patch
index f271959bbf..4284b5ff3b 100644
--- a/patches/server/0286-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0285-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index afed961e6714abc1a1709d12973cbfae40b950fa..bac135546695ff575fc32be3ababea5fb9f31d01 100644
+index ad2b8ea068469f2b0597c0e0436ad3c94dcb62ea..cba123f40d72ebd39305a76694be508510997d1e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -897,6 +897,46 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0287-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0286-Optimize-Captured-BlockEntity-Lookup.patch
index 24aead6840..0cbe385bec 100644
--- a/patches/server/0287-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0286-Optimize-Captured-BlockEntity-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 8e2acb3c6f815b5b1d3237a2f4e0b5f3683d2c60..5a3a89c568d42a2adbc2b6e2631fd4b70e54f0bf 100644
+index 4c4449f7dee8695a362f83b9356e5754244fff18..60b04a16c6cb0a7109bda5c16e23c1d56ab7afad 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -912,9 +912,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0288-Mob-Spawner-API-Enhancements.patch b/patches/server/0287-Mob-Spawner-API-Enhancements.patch
index 9f35b91c5a..9f35b91c5a 100644
--- a/patches/server/0288-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0287-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0289-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0288-Fix-CB-call-to-changed-postToMainThread-method.patch
index 06263e3eef..06263e3eef 100644
--- a/patches/server/0289-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0288-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0290-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0289-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 83a7d7d541..83a7d7d541 100644
--- a/patches/server/0290-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0289-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0291-Implement-CraftBlockSoundGroup.patch b/patches/server/0290-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0291-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0290-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0292-Expose-the-internal-current-tick.patch b/patches/server/0291-Expose-the-internal-current-tick.patch
index daef1c0510..479758b47f 100644
--- a/patches/server/0292-Expose-the-internal-current-tick.patch
+++ b/patches/server/0291-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c4b1e3064f3778909a2f152a69ca229f4c86b71b..510013c4e15595d24cf5d3053cbb7558c2f26569 100644
+index f727b7882a86b1e3f736816634ab4b61f69d1dff..285bdabc7cb231d95e2a55684fbcfc81ed794117 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2918,5 +2918,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0293-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch
index 35f4f6c443..35f4f6c443 100644
--- a/patches/server/0293-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0294-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0293-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index cb2e502f71..cb2e502f71 100644
--- a/patches/server/0294-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0293-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0295-Configurable-projectile-relative-velocity.patch b/patches/server/0294-Configurable-projectile-relative-velocity.patch
index 1616b1c050..1616b1c050 100644
--- a/patches/server/0295-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0294-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0296-offset-item-frame-ticking.patch b/patches/server/0295-offset-item-frame-ticking.patch
index 3db1ffe305..3db1ffe305 100644
--- a/patches/server/0296-offset-item-frame-ticking.patch
+++ b/patches/server/0295-offset-item-frame-ticking.patch
diff --git a/patches/server/0297-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0296-Prevent-consuming-the-wrong-itemstack.patch
index cb2edff807..b0a13ebab5 100644
--- a/patches/server/0297-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0296-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e047911c7faa3cdcd3df8899857fcadf3eec3d89..f13fb8d408e02e3c561e8f2b9c823c13033b4f94 100644
+index fad0445628499ac14cd9d8ab7f618c490885e798..6bec55f685dddc4d6e541f1edf3b5c4f756f8b33 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3855,9 +3855,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0298-Dont-send-unnecessary-sign-update.patch b/patches/server/0297-Dont-send-unnecessary-sign-update.patch
index afca8562db..afca8562db 100644
--- a/patches/server/0298-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0297-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0299-Add-option-to-disable-pillager-patrols.patch b/patches/server/0298-Add-option-to-disable-pillager-patrols.patch
index 3021a1f6c8..3021a1f6c8 100644
--- a/patches/server/0299-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0298-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0300-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0299-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0300-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0299-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0301-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0300-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0301-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0300-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0302-Duplicate-UUID-Resolve-Option.patch b/patches/server/0301-Duplicate-UUID-Resolve-Option.patch
index 0139752e8e..0139752e8e 100644
--- a/patches/server/0302-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0301-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0303-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0302-PlayerDeathEvent-shouldDropExperience.patch
index cd7488ea2a..b48dcea61d 100644
--- a/patches/server/0303-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0302-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bac135546695ff575fc32be3ababea5fb9f31d01..45af5a361e939c07eb3f9316b3fd686d5c2584ba 100644
+index cba123f40d72ebd39305a76694be508510997d1e..4ccb5ba03d19223d25aee4cebd4b8bec2838a3e0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1018,7 +1018,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0304-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0303-Prevent-bees-loading-chunks-checking-hive-position.patch
index e933516d42..e933516d42 100644
--- a/patches/server/0304-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0303-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0305-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0304-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0305-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0304-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0306-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0305-Optimise-EntityGetter-getPlayerByUUID.patch
index 6ffcd9f3c3..6ffcd9f3c3 100644
--- a/patches/server/0306-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0305-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0307-Fix-items-not-falling-correctly.patch b/patches/server/0306-Fix-items-not-falling-correctly.patch
index aaff528185..aaff528185 100644
--- a/patches/server/0307-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0306-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0308-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0307-Optimize-call-to-getFluid-for-explosions.patch
index 7c2fe736a6..4cd45e61ca 100644
--- a/patches/server/0308-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0307-Optimize-call-to-getFluid-for-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 512d79b66fed3d1bef645c3ecb59bda032c81d15..1350c8df69b4ffcf9daa73549e496627db8bc6f7 100644
+index b216140a8be65e210250358af8daf49344850f20..8bbc5025f202be784db78401154038f1f70f0163 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -193,7 +193,7 @@ public class Explosion {
diff --git a/patches/server/0309-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0308-Guard-against-serializing-mismatching-chunk-coordina.patch
index 6752b44617..6752b44617 100644
--- a/patches/server/0309-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0308-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0310-Alternative-item-despawn-rate.patch b/patches/server/0309-Alternative-item-despawn-rate.patch
index 5f9a648f99..5f9a648f99 100644
--- a/patches/server/0310-Alternative-item-despawn-rate.patch
+++ b/patches/server/0309-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0311-Tracking-Range-Improvements.patch b/patches/server/0310-Tracking-Range-Improvements.patch
index 845b77df2e..845b77df2e 100644
--- a/patches/server/0311-Tracking-Range-Improvements.patch
+++ b/patches/server/0310-Tracking-Range-Improvements.patch
diff --git a/patches/server/0312-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0311-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 9ea731b674..9ea731b674 100644
--- a/patches/server/0312-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0311-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0313-Improve-Block-breakNaturally-API.patch b/patches/server/0312-Improve-Block-breakNaturally-API.patch
index b478ee5bb4..b478ee5bb4 100644
--- a/patches/server/0313-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0312-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0314-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0313-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index d1fed5285f..d1fed5285f 100644
--- a/patches/server/0314-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0313-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0315-Add-debug-for-sync-chunk-loads.patch b/patches/server/0314-Add-debug-for-sync-chunk-loads.patch
index bf5532d58e..bf5532d58e 100644
--- a/patches/server/0315-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0314-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0316-Improve-java-version-check.patch b/patches/server/0315-Improve-java-version-check.patch
index 3d9eed5372..3d9eed5372 100644
--- a/patches/server/0316-Improve-java-version-check.patch
+++ b/patches/server/0315-Improve-java-version-check.patch
diff --git a/patches/server/0317-Add-ThrownEggHatchEvent.patch b/patches/server/0316-Add-ThrownEggHatchEvent.patch
index 21fd12f380..21fd12f380 100644
--- a/patches/server/0317-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0316-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0318-Entity-Jump-API.patch b/patches/server/0317-Entity-Jump-API.patch
index 20e546b1d6..eebb514dc6 100644
--- a/patches/server/0318-Entity-Jump-API.patch
+++ b/patches/server/0317-Entity-Jump-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Entity Jump API
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f13fb8d408e02e3c561e8f2b9c823c13033b4f94..f4ba1c72ec470cc79e40d7427e08185d5944d373 100644
+index 6bec55f685dddc4d6e541f1edf3b5c4f756f8b33..bfa914857ff36d6c2f5f96a1ddbc4ca96c3ee7ac 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3433,8 +3433,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0319-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0318-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 0078e4fca3..18fff797e7 100644
--- a/patches/server/0319-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0318-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -35,7 +35,7 @@ index 9d56aff2766b684f0fb20e93d504de1a7a564b11..94242c19740ae6ab2c86e3949bab6cee
                  String spawnReasonName = nbt.getString("Paper.SpawnReason");
                  try {
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 19c813ab9e71eed150ae569f903287e9283d9292..ab1cbcf5ef1ebffd39373bacb2b0983d2c8fa15a 100644
+index 8072e67f7b2f5944670159d3de1b01090bd1019d..a4e1c878dc7677e8ccc7c568ab455e85513d86cb 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -88,6 +88,8 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/server/0320-Make-the-GUI-graph-fancier.patch b/patches/server/0319-Make-the-GUI-graph-fancier.patch
index 9e79ca7b91..9e79ca7b91 100644
--- a/patches/server/0320-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0319-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0321-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch
index 56eb680f94..56eb680f94 100644
--- a/patches/server/0321-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0322-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0321-Validate-tripwire-hook-placement-before-update.patch
index bc1125b169..bc1125b169 100644
--- a/patches/server/0322-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0321-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0323-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0322-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 75d1d9c02b..75d1d9c02b 100644
--- a/patches/server/0323-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0322-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0324-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0323-Configurable-chance-of-villager-zombie-infection.patch
index 217787cdc9..217787cdc9 100644
--- a/patches/server/0324-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0323-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0325-Optimise-Chunk-getFluid.patch b/patches/server/0324-Optimise-Chunk-getFluid.patch
index 0e2e9cccd5..8142952ce6 100644
--- a/patches/server/0325-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0324-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 a0f9fb2ac15f2fa51a3bbe915550155ac2e76649..c7be1f8fdca34bcc12ecbe40ee5f426e0cd068d7 100644
+index 6775217c065026aa61fce56a17c93010209b6941..59f9ff720e92c69e11afe7f6ccecd81b0e54a74d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -270,18 +270,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0326-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0325-Set-spigots-verbose-world-setting-to-false-by-def.patch
index d6e5084490..d6e5084490 100644
--- a/patches/server/0326-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0325-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0327-Add-tick-times-API-and-mspt-command.patch b/patches/server/0326-Add-tick-times-API-and-mspt-command.patch
index 5e6a428135..22290805e9 100644
--- a/patches/server/0327-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0326-Add-tick-times-API-and-mspt-command.patch
@@ -184,7 +184,7 @@ index 3ffb330a16797c04694f73b0cd9f5b38a07641b4..ff73167bfe210305491e35f18adc2755
 +    // Paper end - Add tick times API and /mspt command
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 510013c4e15595d24cf5d3053cbb7558c2f26569..a6564ddf47d50b618627680a55b6546bf6d9eab9 100644
+index 285bdabc7cb231d95e2a55684fbcfc81ed794117..3f8076d077844e272e544a600f8f63611674ac62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2689,6 +2689,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0328-Expose-MinecraftServer-isRunning.patch b/patches/server/0327-Expose-MinecraftServer-isRunning.patch
index f31f5711df..ec3e02234c 100644
--- a/patches/server/0328-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0327-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a6564ddf47d50b618627680a55b6546bf6d9eab9..6707e213d9bd2b173928b1e9dae87c403342953b 100644
+index 3f8076d077844e272e544a600f8f63611674ac62..7b0f0777dd20c5fd1813fabf8d34bc99659be9d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2933,5 +2933,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0329-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0328-Add-Raw-Byte-ItemStack-Serialization.patch
index f6d20a8f29..fe8bfe79ba 100644
--- a/patches/server/0329-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0328-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 e091356ee1fa3ec09839de6ef5c450824ea40844..e6bca66597b9b5a15d911760b44641e17e42e521 100644
+index d08b01fef9928f2239c8663cf90219dc7acad58c..af706146a26ede6b9f5a39c8deb490ff25334ae6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -458,6 +458,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0330-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0329-Pillager-patrol-spawn-settings-and-per-player-option.patch
index c57e5efaed..d6517e07b1 100644
--- a/patches/server/0330-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0329-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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 45af5a361e939c07eb3f9316b3fd686d5c2584ba..e754500547df4ae4601e7c6f3a77eb52fda21059 100644
+index 4ccb5ba03d19223d25aee4cebd4b8bec2838a3e0..d4bda65d10bee880a341196364db63523f36e380 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -270,6 +270,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0331-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0330-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index fb2f7c6706..fb2f7c6706 100644
--- a/patches/server/0331-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0330-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0332-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0331-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index f361af6e50..f361af6e50 100644
--- a/patches/server/0332-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0331-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0333-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0332-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 8b8acb0b21..2ab532b2d0 100644
--- a/patches/server/0333-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0332-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6159ab8831a233c21aad48c64ef76b06c1955bb0..ee3a5b2f2f1591f68bbacea01b8eafed65c29356 100644
+index ee54706b36bd227edacea2a1b6099009bd652039..8206ec366b429858d9582e437781191e5aa0fa02 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1241,6 +1241,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0334-Don-t-tick-dead-players.patch b/patches/server/0333-Don-t-tick-dead-players.patch
index a3f831249b..0633c8502c 100644
--- a/patches/server/0334-Don-t-tick-dead-players.patch
+++ b/patches/server/0333-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e754500547df4ae4601e7c6f3a77eb52fda21059..613eefeb44beb35181243b570bad631f15802918 100644
+index d4bda65d10bee880a341196364db63523f36e380..47982f87ce93658c73ee3d7a5f7dd680e2f9aa36 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -765,7 +765,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0335-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0334-Dead-Player-s-shouldn-t-be-able-to-move.patch
index d10a5a50c4..d10a5a50c4 100644
--- a/patches/server/0335-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0334-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0336-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0335-Don-t-move-existing-players-to-world-spawn.patch
index aaa9cf191b..5b2b160a1f 100644
--- a/patches/server/0336-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0335-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 613eefeb44beb35181243b570bad631f15802918..9b6887f40dea57d4b5e2f08d7645b1edfaa5b189 100644
+index 47982f87ce93658c73ee3d7a5f7dd680e2f9aa36..f8d4bd18f98ed914e116d0cc4a80140e4e8d759f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -358,7 +358,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -35,7 +35,7 @@ index 613eefeb44beb35181243b570bad631f15802918..9b6887f40dea57d4b5e2f08d7645b1ed
          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 f0cc34002e260567322d7acaf803f43a8b92e563..8b0c098c795c5a57fce96ad5d98ac8436024cda9 100644
+index a2a913e20cdea9518da5ad0d1ef8908538860890..d29885aabcead3d410329ba3056a48bb29ff75cf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -226,6 +226,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0337-Optimize-Pathfinding.patch b/patches/server/0336-Optimize-Pathfinding.patch
index 281988ce37..281988ce37 100644
--- a/patches/server/0337-Optimize-Pathfinding.patch
+++ b/patches/server/0336-Optimize-Pathfinding.patch
diff --git a/patches/server/0338-Reduce-Either-Optional-allocation.patch b/patches/server/0337-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0338-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0337-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0339-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0338-Reduce-memory-footprint-of-CompoundTag.patch
index 55111ab6e8..c29c346e90 100644
--- a/patches/server/0339-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0338-Reduce-memory-footprint-of-CompoundTag.patch
@@ -8,7 +8,7 @@ is important because we clone chunk data after reading it for safety.
 So, reduce the impact of the clone on GC.
 
 diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
-index 1cbc42c44911b71dfadebc2d60e0e5cb9b6cafe6..df246d69591e1a5822a0109c99b0f67996da71fa 100644
+index d721ae6d9b54cbace5b7ade657e9739fc7c42d14..e88161e662d5605b50aead673c9b3794874e5f7f 100644
 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java
 +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
 @@ -49,7 +49,7 @@ public class CompoundTag implements Tag {
diff --git a/patches/server/0340-Prevent-opening-inventories-when-frozen.patch b/patches/server/0339-Prevent-opening-inventories-when-frozen.patch
index 1e3d68bf93..1e3d68bf93 100644
--- a/patches/server/0340-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0339-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0341-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0340-Don-t-run-entity-collision-code-if-not-needed.patch
index ce9cc70a02..513fbebb15 100644
--- a/patches/server/0341-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0340-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f4ba1c72ec470cc79e40d7427e08185d5944d373..57528fce99102da6b3d0c3d9dbf9d2cd71375ff8 100644
+index bfa914857ff36d6c2f5f96a1ddbc4ca96c3ee7ac..855edf966c36e6ee9ec524e189b18d711baeec78 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3544,10 +3544,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0342-Implement-Player-Client-Options-API.patch b/patches/server/0341-Implement-Player-Client-Options-API.patch
index e7bff21f02..e7bff21f02 100644
--- a/patches/server/0342-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0341-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0343-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0342-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 3e893aae8c..3e893aae8c 100644
--- a/patches/server/0343-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0342-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0344-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index f99c0af332..91acc7ee25 100644
--- a/patches/server/0344-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -31,7 +31,7 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ee3a5b2f2f1591f68bbacea01b8eafed65c29356..bac8e53cab360142f224965e68d8f9e6ae0c15f6 100644
+index 8206ec366b429858d9582e437781191e5aa0fa02..d91279f3bd009e1542e73354aadd6a16c80965e2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1248,6 +1248,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -43,7 +43,7 @@ index ee3a5b2f2f1591f68bbacea01b8eafed65c29356..bac8e53cab360142f224965e68d8f9e6
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a794131746c6cfdcbeeb64b31fb122a38be085c1..f0103bcfb29b9fed41c7642620d78fe75b978b60 100644
+index 8938f90c53de8aef71aa70522a66a69edb467e73..e6e7dc17d1196a8211a565355f34b5dcfd478852 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -289,6 +289,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -55,7 +55,7 @@ index a794131746c6cfdcbeeb64b31fb122a38be085c1..f0103bcfb29b9fed41c7642620d78fe7
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8b0c098c795c5a57fce96ad5d98ac8436024cda9..ed0ffff1cfc25f66e1947e40008c6c7259b17019 100644
+index d29885aabcead3d410329ba3056a48bb29ff75cf..9da65c0d3e8398d018da28a8668481aaf9ded472 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -297,6 +297,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0345-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 21e56df741..a75160c9e4 100644
--- a/patches/server/0345-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 01362d092a5b170ce5c334422d7797f190666e25..c322d8284b4d17d6b9a949d85849892d7c88817e 100644
+index 9da65c0d3e8398d018da28a8668481aaf9ded472..9044ed6cba10314c52c44a19be1fa88771c54be6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -197,6 +197,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0346-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch
index be9e57b2e3..6958e0c01f 100644
--- a/patches/server/0346-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 57528fce99102da6b3d0c3d9dbf9d2cd71375ff8..f2e66b50b32d197f9a8d4a9672ebf1413e66d59b 100644
+index 855edf966c36e6ee9ec524e189b18d711baeec78..926c8fd21bb610dc07658c41431a7795ba4f2870 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2277,7 +2277,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0347-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0346-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a262c1f35..a909ceca12 100644
--- a/patches/server/0347-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0346-Don-t-fire-BlockFade-on-worldgen-threads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 886b8d2284e3ae85184c842b24869029b9ee4ebe..ceaa2a7048afc4955d3695af5291e83a79d83c5d 100644
+index c1111bd8065b53cb140e4289cb72985f03e6f549..9db6df5f28be559a324ead2fcfbe189eac076e2e 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -108,6 +108,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0348-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch
index 9a012509be..9a012509be 100644
--- a/patches/server/0348-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0349-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0348-Fix-item-duplication-and-teleport-issues.patch
index c577f08518..c577f08518 100644
--- a/patches/server/0349-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0348-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0350-Villager-Restocks-API.patch b/patches/server/0349-Villager-Restocks-API.patch
index 1f7c26de9d..1f7c26de9d 100644
--- a/patches/server/0350-Villager-Restocks-API.patch
+++ b/patches/server/0349-Villager-Restocks-API.patch
diff --git a/patches/server/0351-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0350-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 7f0081b049..774f59a115 100644
--- a/patches/server/0351-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0350-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86cb92b7cf18272ee4b46c292ed4a7192119ce1a..9103d27e5a80c095b22569bb1bba754f98a9b43c 100644
+index 0ed2d0f5ec9d107e8049aa9e803479ffd341639f..119b9b2c45e3321b4197f3e6a34037e3fa99622d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -895,7 +895,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0352-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0351-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index a52cf1acdb..46f51a9f45 100644
--- a/patches/server/0352-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0351-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e226eda5efc0e45e59cb5f6251ed008b67d5299a..b9b93a4e20eed028b76eab4dcb9610ae05f22faf 100644
+index ed167d0d399924d54d9ff99c10ab8ee093efc149..168cbb239ac5d632908f2b0aca82cbcfdc35651f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -27,6 +27,7 @@ public class Main {
diff --git a/patches/server/0353-misc-debugging-dumps.patch b/patches/server/0352-misc-debugging-dumps.patch
index 5eab4a7f76..51357a8884 100644
--- a/patches/server/0353-misc-debugging-dumps.patch
+++ b/patches/server/0352-misc-debugging-dumps.patch
@@ -105,7 +105,7 @@ index 5457358bc76889153036818fdfd70a043ec4e40f..880e5c52746e9e3a9a1f42ec6461be54
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6707e213d9bd2b173928b1e9dae87c403342953b..b36d62380a939a0b777fecf1472645f148289a6c 100644
+index 7b0f0777dd20c5fd1813fabf8d34bc99659be9d2..9699d15f1194af7a565504cbae5aa9e3743665ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1047,6 +1047,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0354-Prevent-teleporting-dead-entities.patch b/patches/server/0353-Prevent-teleporting-dead-entities.patch
index 64b5e3f936..361f87db56 100644
--- a/patches/server/0354-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0353-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5dcb459b7ae7f31375e982501e7f16beb913114f..175fef59a8853727e58ba48e46009df17d8e7b6e 100644
+index 119b9b2c45e3321b4197f3e6a34037e3fa99622d..c6bcde25b476ef2362f469bd7cba82ce97cb300c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1552,6 +1552,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0355-Implement-Mob-Goal-API.patch b/patches/server/0354-Implement-Mob-Goal-API.patch
index 40df29d023..940e3b1ee1 100644
--- a/patches/server/0355-Implement-Mob-Goal-API.patch
+++ b/patches/server/0354-Implement-Mob-Goal-API.patch
@@ -780,7 +780,7 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..16f9a98b8a939e5ca7e2dc04f87134a7
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b36d62380a939a0b777fecf1472645f148289a6c..d3cdb5feb1656249fee14885b1f01c1c0b40ab8e 100644
+index 9699d15f1194af7a565504cbae5aa9e3743665ec..0b87d9c3fb7e2442798faacdd49d3fd368e64b7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2939,5 +2939,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0356-Add-villager-reputation-API.patch b/patches/server/0355-Add-villager-reputation-API.patch
index cf69cd346a..cf69cd346a 100644
--- a/patches/server/0356-Add-villager-reputation-API.patch
+++ b/patches/server/0355-Add-villager-reputation-API.patch
diff --git a/patches/server/0357-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0356-ExperienceOrb-merging-stacking-API-and-fixes.patch
index 3ebf6e2165..3ebf6e2165 100644
--- a/patches/server/0357-ExperienceOrb-merging-stacking-API-and-fixes.patch
+++ b/patches/server/0356-ExperienceOrb-merging-stacking-API-and-fixes.patch
diff --git a/patches/server/0358-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0357-Fix-PotionEffect-ignores-icon-flag.patch
index 59845e22d4..59845e22d4 100644
--- a/patches/server/0358-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0357-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0359-Potential-bed-API.patch b/patches/server/0358-Potential-bed-API.patch
index 9b500674e0..9b500674e0 100644
--- a/patches/server/0359-Potential-bed-API.patch
+++ b/patches/server/0358-Potential-bed-API.patch
diff --git a/patches/server/0360-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch
index 5e30eed559..86d1266b2e 100644
--- a/patches/server/0360-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index 1088a91ee131d1c303961557d8fb90101c2d8d3b..2d25ba18d3db4b3eea8bd30812656f1a
          // CraftBukkit end
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.shutdown(); // Paper - Plugin remapping
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d3cdb5feb1656249fee14885b1f01c1c0b40ab8e..c2ccd10efd5096b2683fe235de1e8176ee7d2083 100644
+index 0b87d9c3fb7e2442798faacdd49d3fd368e64b7d..1b3f1b06155e114cd5ab76a406c1b4e745ef58c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1058,6 +1058,32 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0361-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0360-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index dfe8e5260b..dfe8e5260b 100644
--- a/patches/server/0361-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0360-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0362-Add-option-for-console-having-all-permissions.patch b/patches/server/0361-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0362-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0361-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0363-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0362-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0363-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0362-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0364-Maps-shouldn-t-load-chunks.patch b/patches/server/0363-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0364-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0363-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0365-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0364-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0365-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0364-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0366-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0365-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index f3c9792760..f3c9792760 100644
--- a/patches/server/0366-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0365-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0367-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0366-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0367-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0366-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0368-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0367-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0368-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0367-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0369-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0368-Prevent-position-desync-causing-tp-exploit.patch
index 4e1569de2e..0bd37ce94e 100644
--- a/patches/server/0369-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0368-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 175fef59a8853727e58ba48e46009df17d8e7b6e..c466e405b123ddcd3abe931f83930369ab668b90 100644
+index c6bcde25b476ef2362f469bd7cba82ce97cb300c..3455781a47fbececab33406e829ceb392c72a113 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1349,6 +1349,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0370-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0369-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0370-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0369-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0371-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0370-Add-PlayerRecipeBookClickEvent.patch
index 0ae3b66096..add0eaf3d4 100644
--- a/patches/server/0371-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0370-Add-PlayerRecipeBookClickEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c466e405b123ddcd3abe931f83930369ab668b90..bba23db382a99ea3456bd6aefc437d9f4077705a 100644
+index 3455781a47fbececab33406e829ceb392c72a113..b4af560246c1fe102bae9ec9383cbef385bb1887 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3057,16 +3057,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3056,16 +3056,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              if (!this.player.containerMenu.stillValid(this.player)) {
                  ServerGamePacketListenerImpl.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
              } else {
diff --git a/patches/server/0372-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0371-Hide-sync-chunk-writes-behind-flag.patch
index e8889b31d8..e8889b31d8 100644
--- a/patches/server/0372-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0371-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0373-Add-permission-for-command-blocks.patch b/patches/server/0372-Add-permission-for-command-blocks.patch
index 8f73a21aea..84caef8385 100644
--- a/patches/server/0373-Add-permission-for-command-blocks.patch
+++ b/patches/server/0372-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index da9e864520150acd8027545672aa476be414bb4d..d4bd44210d58b30696feeea48e190947
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 090b42aba7353d232a210d67936d024d00388047..01def06cf90faaf67421b6e5a87f4c47dd4c1142 100644
+index b4af560246c1fe102bae9ec9383cbef385bb1887..e242ca5ec8c50bfd81b8ab1429e6e4e441025a75 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -806,7 +806,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0374-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0373-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 252401e1b4..63a1e5a411 100644
--- a/patches/server/0374-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0373-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd5291ca4680572d2c5f3cec1231b1a3dcf72fa8..284d0f88968d386559be94d1e1e7af361658da3f 100644
+index 10015beb7a2de890fe27bffde8f55c1dd78ce344..9d08d0610be1741b4cd18a1454e538f46928fd94 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -669,8 +669,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0375-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0374-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 661ddc7971..5b790d236b 100644
--- a/patches/server/0375-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0374-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -76,10 +76,10 @@ index d6dc8c983d26ce89f17a990be4284fdc78ad164b..2b1d7a2360a9ee7bca9d93a2dc8c61d1
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 15db3eaaab7471e6dde0a4f0d6ca2a1c38a3eb2d..0db5407cdf08d63e520db9b847bc9fcae8f585c7 100644
+index e242ca5ec8c50bfd81b8ab1429e6e4e441025a75..d2eb8c619905d87a38820a4c1179ad93093c0ac3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3260,7 +3260,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3259,7 +3259,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) {
diff --git a/patches/server/0376-Paper-dumpitem-command.patch b/patches/server/0375-Paper-dumpitem-command.patch
index 088efe087c..088efe087c 100644
--- a/patches/server/0376-Paper-dumpitem-command.patch
+++ b/patches/server/0375-Paper-dumpitem-command.patch
diff --git a/patches/server/0377-Improve-Legacy-Component-serialization-size.patch b/patches/server/0376-Improve-Legacy-Component-serialization-size.patch
index 5a1da5d1f0..5a1da5d1f0 100644
--- a/patches/server/0377-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0376-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0378-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0377-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 13fc9119a3..c709376967 100644
--- a/patches/server/0378-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0377-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ebe69ce183b8bba43ed4d6fdbac09fdc1eaaa988..8efa537503ec52de17918e2e99d01015df8bf62a 100644
+index 52e8664f8d0368daed43e349aa67e3b295697f26..9c022b16d143cff10015936af8f4b157b5173079 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -380,7 +380,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0379-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0378-Add-BlockStateMeta-clearBlockState.patch
index 680235a49a..680235a49a 100644
--- a/patches/server/0379-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0378-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0380-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0379-Convert-legacy-attributes-in-Item-Meta.patch
index 76437f1a9b..76437f1a9b 100644
--- a/patches/server/0380-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0379-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0381-Do-not-accept-invalid-client-settings.patch b/patches/server/0380-Do-not-accept-invalid-client-settings.patch
index 5cdf534c94..e0e0f8912e 100644
--- a/patches/server/0381-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0380-Do-not-accept-invalid-client-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0db5407cdf08d63e520db9b847bc9fcae8f585c7..f0e60add7df4d00ee5b84164a532b75f9d90cfa8 100644
+index d2eb8c619905d87a38820a4c1179ad93093c0ac3..90e5f263dcb8033dae3ca32cbf5dbd332a109282 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3252,6 +3252,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3251,6 +3251,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleClientInformation(ServerboundClientInformationPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0382-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0381-Improve-fix-EntityTargetLivingEntityEvent.patch
index 29703174a1..29703174a1 100644
--- a/patches/server/0382-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0381-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0383-Add-entity-liquid-API.patch b/patches/server/0382-Add-entity-liquid-API.patch
index 51765a7f3a..51765a7f3a 100644
--- a/patches/server/0383-Add-entity-liquid-API.patch
+++ b/patches/server/0382-Add-entity-liquid-API.patch
diff --git a/patches/server/0384-Add-PrepareResultEvent.patch b/patches/server/0383-Add-PrepareResultEvent.patch
index ffb4806752..ffb4806752 100644
--- a/patches/server/0384-Add-PrepareResultEvent.patch
+++ b/patches/server/0383-Add-PrepareResultEvent.patch
diff --git a/patches/server/0385-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0384-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 0603020790..9742de370e 100644
--- a/patches/server/0385-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0384-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fe73a6728de0fad50451d3090002b6c0421d4c43..ef2240b476cc994618ea002b302b537a5d70c799 100644
+index c0bbeaa4a37c1ba9f5125a0c68f4511aac6a0e71..c9ef71184cdf73ca275331a5b99902426c5df436 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3659,7 +3659,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0386-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0385-Fix-arrows-never-despawning-MC-125757.patch
index dbcb4ce450..dbcb4ce450 100644
--- a/patches/server/0386-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0385-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0387-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0386-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0387-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0386-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0388-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0387-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0388-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0387-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0389-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0388-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0389-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0388-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0390-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0389-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 5f0bca47b3..5f0bca47b3 100644
--- a/patches/server/0390-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0389-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0391-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0390-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0391-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0390-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0392-Fix-some-rails-connecting-improperly.patch b/patches/server/0391-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0392-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0391-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0393-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0392-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0393-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0392-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0394-Brand-support.patch b/patches/server/0393-Brand-support.patch
index 2816203229..bb0376315f 100644
--- a/patches/server/0394-Brand-support.patch
+++ b/patches/server/0393-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f0103bcfb29b9fed41c7642620d78fe75b978b60..3a1d0ab6a7513fad7a3e4530e2fbccd9b20f9702 100644
+index e6e7dc17d1196a8211a565355f34b5dcfd478852..45181bc9c422507682d479e4d43177ecd3253971 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -294,6 +294,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -57,7 +57,7 @@ index 2d1fad00ee084841618f0da8113c7aac8c0e2b0d..a3c67bdc2c08b3550534f37d15b0db90
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8c61e7a1681cbf4c2fd153d9cba5929bc853235a..1292e7b9889777448b728ef3bb3ae4cb25d42d61 100644
+index b9487ce9391413c4c596cc5450ed5c396347ec1b..12e38fcbd3a3bcf102244a2b246c090c57ef327b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3139,6 +3139,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0395-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0394-Add-playPickupItemAnimation-to-LivingEntity.patch
index 0fcb956c33..0fcb956c33 100644
--- a/patches/server/0395-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0394-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0396-Don-t-require-FACING-data.patch b/patches/server/0395-Don-t-require-FACING-data.patch
index 2cec1e5276..2cec1e5276 100644
--- a/patches/server/0396-Don-t-require-FACING-data.patch
+++ b/patches/server/0395-Don-t-require-FACING-data.patch
diff --git a/patches/server/0397-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0396-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 37342b6ffe..37342b6ffe 100644
--- a/patches/server/0397-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0396-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0398-Add-moon-phase-API.patch b/patches/server/0397-Add-moon-phase-API.patch
index 539ccca6de..539ccca6de 100644
--- a/patches/server/0398-Add-moon-phase-API.patch
+++ b/patches/server/0397-Add-moon-phase-API.patch
diff --git a/patches/server/0399-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0398-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 9ada63fcdf..9ada63fcdf 100644
--- a/patches/server/0399-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0398-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0400-Prevent-headless-pistons-from-being-created.patch b/patches/server/0399-Prevent-headless-pistons-from-being-created.patch
index e375acc68a..58b77cb5be 100644
--- a/patches/server/0400-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0399-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 1350c8df69b4ffcf9daa73549e496627db8bc6f7..69914a048987c21ee2ed2c489aab269862fda8f2 100644
+index 8bbc5025f202be784db78401154038f1f70f0163..6a1e2614453bc3d6fe082c1fd43228c4a182442e 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -207,6 +207,15 @@ public class Explosion {
diff --git a/patches/server/0401-Add-BellRingEvent.patch b/patches/server/0400-Add-BellRingEvent.patch
index b774d09a82..b774d09a82 100644
--- a/patches/server/0401-Add-BellRingEvent.patch
+++ b/patches/server/0400-Add-BellRingEvent.patch
diff --git a/patches/server/0402-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0401-Add-zombie-targets-turtle-egg-config.patch
index 56529e1fd4..56529e1fd4 100644
--- a/patches/server/0402-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0401-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0403-Buffer-joins-to-world.patch b/patches/server/0402-Buffer-joins-to-world.patch
index 2e31ea4385..2e31ea4385 100644
--- a/patches/server/0403-Buffer-joins-to-world.patch
+++ b/patches/server/0402-Buffer-joins-to-world.patch
diff --git a/patches/server/0404-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0403-Fix-hex-colors-not-working-in-some-kick-messages.patch
index f6f865ab1a..f6f865ab1a 100644
--- a/patches/server/0404-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0403-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0405-Add-more-Evoker-API.patch b/patches/server/0404-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0405-Add-more-Evoker-API.patch
+++ b/patches/server/0404-Add-more-Evoker-API.patch
diff --git a/patches/server/0406-Add-methods-to-get-translation-keys.patch b/patches/server/0405-Add-methods-to-get-translation-keys.patch
index 5b5a9288df..5b5a9288df 100644
--- a/patches/server/0406-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0405-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0407-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0406-Create-HoverEvent-from-ItemStack-Entity.patch
index 081d6c07e5..081d6c07e5 100644
--- a/patches/server/0407-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0406-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0408-Cache-block-data-strings.patch b/patches/server/0407-Cache-block-data-strings.patch
index 28a1635b20..28a1635b20 100644
--- a/patches/server/0408-Cache-block-data-strings.patch
+++ b/patches/server/0407-Cache-block-data-strings.patch
diff --git a/patches/server/0409-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0408-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 2f58aefb71..dce8c6c40b 100644
--- a/patches/server/0409-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0408-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f0e60add7df4d00ee5b84164a532b75f9d90cfa8..a7b270c0ba76f25876c4bb7bda60e61a670d15d9 100644
+index 90e5f263dcb8033dae3ca32cbf5dbd332a109282..82f49aad1d0ce2d62bf61aa634ebef3711d4d930 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -679,7 +679,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -31,7 +31,7 @@ index f0e60add7df4d00ee5b84164a532b75f9d90cfa8..a7b270c0ba76f25876c4bb7bda60e61a
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 284d0f88968d386559be94d1e1e7af361658da3f..8a1014d7181b493a24692271aa9c561c159801d3 100644
+index 9d08d0610be1741b4cd18a1454e538f46928fd94..f1383906dbd16e088f57c9c77c051c8501b155cc 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 SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0410-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0409-Add-additional-open-container-api-to-HumanEntity.patch
index be29dd6b1c..be29dd6b1c 100644
--- a/patches/server/0410-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0409-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0411-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0410-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 9a0c6f1492..9a0c6f1492 100644
--- a/patches/server/0411-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0410-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0412-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0411-Extend-block-drop-capture-to-capture-all-items-added.patch
index 9cb478d120..9cb478d120 100644
--- a/patches/server/0412-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0411-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0413-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0412-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 2162c250c9..7a0217f4f0 100644
--- a/patches/server/0413-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0412-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 8a1014d7181b493a24692271aa9c561c159801d3..14ef888ef46a873046a286e25e923d980e2035e8 100644
+index f1383906dbd16e088f57c9c77c051c8501b155cc..c01a9305eb1c3e2ee5effab1e11980c2540d3c2a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4508,4 +4508,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -21,7 +21,7 @@ index 8a1014d7181b493a24692271aa9c561c159801d3..14ef888ef46a873046a286e25e923d98
 +    // Paper end - Expose entity id counter
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e6bca66597b9b5a15d911760b44641e17e42e521..2979277847635c0bef54d06be30e5051557cc5e9 100644
+index af706146a26ede6b9f5a39c8deb490ff25334ae6..a557b40e1807933cf510ea489ebcab4a19c066c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -505,6 +505,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0414-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0413-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0414-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0413-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0415-Entity-isTicking.patch b/patches/server/0414-Entity-isTicking.patch
index 30e4fbdfe9..502eb20937 100644
--- a/patches/server/0415-Entity-isTicking.patch
+++ b/patches/server/0414-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 14ef888ef46a873046a286e25e923d980e2035e8..62441eeee9064e982e7e87676e87935a3adc7c2b 100644
+index c01a9305eb1c3e2ee5effab1e11980c2540d3c2a..6ab665efcac4c2543bab9d95472026e0ec8580c5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4513,5 +4513,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0416-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0415-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 18a0880395..18a0880395 100644
--- a/patches/server/0416-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0415-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0417-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0416-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0417-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0416-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0418-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0417-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index c9cb9f1660..bc690f31a3 100644
--- a/patches/server/0418-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0417-Reset-Ender-Crystals-on-Dragon-Spawn.patch
@@ -11,7 +11,7 @@ This ensures the crystals/pillars are in expected state when the dragon spawns.
 See #3522
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 3aa4301521ea8155287ce97a9bb69fe20d9a54b7..f90d637e5477275b870c1a1963774de04aaa218d 100644
+index 93337fd026fefb76c8a288674fed05cb3c1eca38..a12299604ea88c268db5065191d641eb7d52c3e3 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -474,6 +474,7 @@ public class EndDragonFight {
diff --git a/patches/server/0419-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0418-Fix-for-large-move-vectors-crashing-server.patch
index 78079a62bb..251671c2f1 100644
--- a/patches/server/0419-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0418-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a7b270c0ba76f25876c4bb7bda60e61a670d15d9..172a1acdbdfb639ca4fc6f880570a7829c8b3d45 100644
+index 82f49aad1d0ce2d62bf61aa634ebef3711d4d930..d33cf08f7c47111823abbce481505946db249577 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -492,9 +492,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0420-Optimise-getType-calls.patch b/patches/server/0419-Optimise-getType-calls.patch
index 1b14b0202b..1b14b0202b 100644
--- a/patches/server/0420-Optimise-getType-calls.patch
+++ b/patches/server/0419-Optimise-getType-calls.patch
diff --git a/patches/server/0421-Villager-resetOffers.patch b/patches/server/0420-Villager-resetOffers.patch
index 77f071ec77..77f071ec77 100644
--- a/patches/server/0421-Villager-resetOffers.patch
+++ b/patches/server/0420-Villager-resetOffers.patch
diff --git a/patches/server/0422-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0421-Retain-block-place-order-when-capturing-blockstates.patch
index bac1a1074b..bac1a1074b 100644
--- a/patches/server/0422-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0421-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0423-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0422-Fix-item-locations-dropped-from-campfires.patch
index 26a43eb186..26a43eb186 100644
--- a/patches/server/0423-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0422-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0424-Fix-bell-block-entity-memory-leak.patch b/patches/server/0423-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0424-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0423-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0425-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0424-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 6ab78855c4..6ab78855c4 100644
--- a/patches/server/0425-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0424-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0426-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0425-Add-getOfflinePlayerIfCached-String.patch
index 31066c85a1..368490ced4 100644
--- a/patches/server/0426-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0425-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8efa537503ec52de17918e2e99d01015df8bf62a..856de462a5a92d00896b5454244014eae2cdbf24 100644
+index 9c022b16d143cff10015936af8f4b157b5173079..75fe99d8ec74435cf62b427d6bed89c76c0cf6d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1963,6 +1963,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0427-Add-ignore-discounts-API.patch b/patches/server/0426-Add-ignore-discounts-API.patch
index 5a2d4be36b..5a2d4be36b 100644
--- a/patches/server/0427-Add-ignore-discounts-API.patch
+++ b/patches/server/0426-Add-ignore-discounts-API.patch
diff --git a/patches/server/0428-Toggle-for-removing-existing-dragon.patch b/patches/server/0427-Toggle-for-removing-existing-dragon.patch
index 23aadb86ee..26ae1ded8a 100644
--- a/patches/server/0428-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0427-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index f90d637e5477275b870c1a1963774de04aaa218d..943d9f84ad839562a4e30fff1257a1224d0b70b6 100644
+index a12299604ea88c268db5065191d641eb7d52c3e3..d6deedb96583c19eeb27e671289c4edc8a9245b4 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -211,7 +211,7 @@ public class EndDragonFight {
diff --git a/patches/server/0429-Fix-client-lag-on-advancement-loading.patch b/patches/server/0428-Fix-client-lag-on-advancement-loading.patch
index f93c34b2cb..62630304af 100644
--- a/patches/server/0429-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0428-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 2979277847635c0bef54d06be30e5051557cc5e9..5fe9b94c342a91d6fb3bc582ac7e84cb25b90a9e 100644
+index a557b40e1807933cf510ea489ebcab4a19c066c1..481aeb922952578ea68ce2425c84e1a93eff0cf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -317,7 +317,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0430-Item-no-age-no-player-pickup.patch b/patches/server/0429-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0430-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0429-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0431-Beacon-API-custom-effect-ranges.patch b/patches/server/0430-Beacon-API-custom-effect-ranges.patch
index b80f1772cd..b80f1772cd 100644
--- a/patches/server/0431-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0430-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0432-Add-API-for-quit-reason.patch b/patches/server/0431-Add-API-for-quit-reason.patch
index 22a6ea3114..de4285201f 100644
--- a/patches/server/0432-Add-API-for-quit-reason.patch
+++ b/patches/server/0431-Add-API-for-quit-reason.patch
@@ -28,7 +28,7 @@ index 134810ac91d828d67759cd1ed56f11b71e292917..ba41646a5edb57c4d9766df08bbc5701
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3a1d0ab6a7513fad7a3e4530e2fbccd9b20f9702..c973b003ea22a37e841b20ca8b9e2915264820cf 100644
+index 45181bc9c422507682d479e4d43177ecd3253971..2ea613f818403f8e8ece4b36891738139345cf89 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -295,6 +295,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -52,7 +52,7 @@ index a3c67bdc2c08b3550534f37d15b0db90b479e34f..24bf661e76fb421a8be565d9ea68edf7
              this.connection.disconnect(disconnectiondetails);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c322d8284b4d17d6b9a949d85849892d7c88817e..f11309e0a067546aa5b14272156087664dbdd021 100644
+index 9044ed6cba10314c52c44a19be1fa88771c54be6..45e7b41f746ceb2ef295a81fa65795df062844ef 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -570,7 +570,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0433-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0432-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0433-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0432-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0434-Add-Destroy-Speed-API.patch b/patches/server/0433-Add-Destroy-Speed-API.patch
index 43e752ecb5..43e752ecb5 100644
--- a/patches/server/0434-Add-Destroy-Speed-API.patch
+++ b/patches/server/0433-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0435-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0434-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index ed356df971..a099a492e9 100644
--- a/patches/server/0435-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0434-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 1292e7b9889777448b728ef3bb3ae4cb25d42d61..a3b1a19fb28dfba93ae04ea0859f744ede1579f6 100644
+index 12e38fcbd3a3bcf102244a2b246c090c57ef327b..39e8dff2a1b62b8313b4d87ce8d2fad7516452c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2707,7 +2707,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0436-Add-LivingEntity-clearActiveItem.patch b/patches/server/0435-Add-LivingEntity-clearActiveItem.patch
index a5b17788b8..a5b17788b8 100644
--- a/patches/server/0436-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0435-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0437-Add-PlayerItemCooldownEvent.patch b/patches/server/0436-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0437-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0436-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0438-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0437-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0438-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0437-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0439-More-lightning-API.patch b/patches/server/0438-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0439-More-lightning-API.patch
+++ b/patches/server/0438-More-lightning-API.patch
diff --git a/patches/server/0440-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0439-Climbing-should-not-bypass-cramming-gamerule.patch
index b5661df64e..d6564a3749 100644
--- a/patches/server/0440-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0439-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 62441eeee9064e982e7e87676e87935a3adc7c2b..b093de4b2bfdca0817b496e1b0a436b3f6be9c2f 100644
+index 6ab665efcac4c2543bab9d95472026e0ec8580c5..dae7643897b47dba304cbea56112445df2736cff 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2079,6 +2079,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -44,7 +44,7 @@ index ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb..e382a29b441b656f35bc24cb90f95cb4
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ef2240b476cc994618ea002b302b537a5d70c799..c7ead86c5048381c97d01a09ac8a5a84cd93c5db 100644
+index c9ef71184cdf73ca275331a5b99902426c5df436..40b86b9b25135e55cc01e502dbc8cc22344efa5d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3573,7 +3573,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0441-Add-missing-default-perms-for-commands.patch b/patches/server/0440-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0441-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0440-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0442-Add-PlayerShearBlockEvent.patch b/patches/server/0441-Add-PlayerShearBlockEvent.patch
index c659b655c0..c659b655c0 100644
--- a/patches/server/0442-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0441-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0443-Limit-recipe-packets.patch b/patches/server/0442-Limit-recipe-packets.patch
index 5ec90fce7f..a18fe75650 100644
--- a/patches/server/0443-Limit-recipe-packets.patch
+++ b/patches/server/0442-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 172a1acdbdfb639ca4fc6f880570a7829c8b3d45..4bc7ca9ec9eecf3172cf2140a7d2a07c7c708482 100644
+index d33cf08f7c47111823abbce481505946db249577..57063f01993445a9965976332306c7f2ab20ed1f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -266,6 +266,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -24,7 +24,7 @@ index 172a1acdbdfb639ca4fc6f880570a7829c8b3d45..4bc7ca9ec9eecf3172cf2140a7d2a07c
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -3069,6 +3071,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3068,6 +3070,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
diff --git a/patches/server/0444-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0443-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0444-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0443-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0445-Player-Chunk-Load-Unload-Events.patch b/patches/server/0444-Player-Chunk-Load-Unload-Events.patch
index 0fee853cd3..0fee853cd3 100644
--- a/patches/server/0445-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0444-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0446-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0445-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0446-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0445-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0447-Expose-LivingEntity-hurt-direction.patch b/patches/server/0446-Expose-LivingEntity-hurt-direction.patch
index f43a7b04aa..f43a7b04aa 100644
--- a/patches/server/0447-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0446-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0448-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0447-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 11a90a4f27..11a90a4f27 100644
--- a/patches/server/0448-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0447-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0449-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0448-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 4186b39237..4186b39237 100644
--- a/patches/server/0449-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0448-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0450-Add-TargetHitEvent.patch b/patches/server/0449-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0450-Add-TargetHitEvent.patch
+++ b/patches/server/0449-Add-TargetHitEvent.patch
diff --git a/patches/server/0451-MC-4-Fix-item-position-desync.patch b/patches/server/0450-MC-4-Fix-item-position-desync.patch
index cd26c40293..3f4003c4f5 100644
--- a/patches/server/0451-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0450-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index 488ebd443903af812913437f1ade3002093f2470..a043ac10834562d357ef0b5aded2e916
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b093de4b2bfdca0817b496e1b0a436b3f6be9c2f..e997c009821c3e7645a6acff163ece8c98f6db36 100644
+index dae7643897b47dba304cbea56112445df2736cff..bed376337035545e7ec677f2f7fe3372a3c9ea25 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4260,6 +4260,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0452-Additional-Block-Material-API.patch b/patches/server/0451-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0452-Additional-Block-Material-API.patch
+++ b/patches/server/0451-Additional-Block-Material-API.patch
diff --git a/patches/server/0453-Fix-harming-potion-dupe.patch b/patches/server/0452-Fix-harming-potion-dupe.patch
index b184bf641c..b184bf641c 100644
--- a/patches/server/0453-Fix-harming-potion-dupe.patch
+++ b/patches/server/0452-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0454-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0453-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0454-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0453-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0455-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0454-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0455-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0454-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0456-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0455-Fix-Not-a-string-Map-Conversion-spam.patch
index 5b2328afe8..5b2328afe8 100644
--- a/patches/server/0456-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0455-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0457-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0456-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0457-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0456-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0458-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0457-Fix-interact-event-not-being-called-sometimes.patch
index 0a9de441a9..fc4bcdc2d1 100644
--- a/patches/server/0458-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0457-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4bc7ca9ec9eecf3172cf2140a7d2a07c7c708482..b96490d16d9a38be14d6777213d883f2223fd5a4 100644
+index 57063f01993445a9965976332306c7f2ab20ed1f..d7d36b5148f2e7280816cc70b300b9b10720f751 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1770,7 +1770,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0459-Zombie-API-breaking-doors.patch b/patches/server/0458-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0459-Zombie-API-breaking-doors.patch
+++ b/patches/server/0458-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0460-Fix-nerfed-slime-when-splitting.patch b/patches/server/0459-Fix-nerfed-slime-when-splitting.patch
index a32a88f5ad..a32a88f5ad 100644
--- a/patches/server/0460-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0459-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0461-Add-EntityLoadCrossbowEvent.patch b/patches/server/0460-Add-EntityLoadCrossbowEvent.patch
index a2f95139f8..a2f95139f8 100644
--- a/patches/server/0461-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0460-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0462-Add-WorldGameRuleChangeEvent.patch b/patches/server/0461-Add-WorldGameRuleChangeEvent.patch
index 737b50a1b8..737b50a1b8 100644
--- a/patches/server/0462-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0461-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0463-Add-ServerResourcesReloadedEvent.patch b/patches/server/0462-Add-ServerResourcesReloadedEvent.patch
index 8996d46e70..8996d46e70 100644
--- a/patches/server/0463-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0462-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0464-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0463-Add-world-settings-for-mobs-picking-up-loot.patch
index a6e23dc931..a6e23dc931 100644
--- a/patches/server/0464-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0463-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0465-Add-BlockFailedDispenseEvent.patch b/patches/server/0464-Add-BlockFailedDispenseEvent.patch
index 7fd4f0505f..7fd4f0505f 100644
--- a/patches/server/0465-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0464-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0466-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0465-Add-PlayerLecternPageChangeEvent.patch
index 15052d962d..15052d962d 100644
--- a/patches/server/0466-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0465-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0467-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0466-Add-PlayerLoomPatternSelectEvent.patch
index f7032ecdde..f7032ecdde 100644
--- a/patches/server/0467-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0466-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0468-Configurable-door-breaking-difficulty.patch b/patches/server/0467-Configurable-door-breaking-difficulty.patch
index 679bb5f5e7..679bb5f5e7 100644
--- a/patches/server/0468-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0467-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0469-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0468-Empty-commands-shall-not-be-dispatched.patch
index f58be08904..f58be08904 100644
--- a/patches/server/0469-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0468-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0470-Remove-stale-POIs.patch b/patches/server/0469-Remove-stale-POIs.patch
index 02c2f1843b..02c2f1843b 100644
--- a/patches/server/0470-Remove-stale-POIs.patch
+++ b/patches/server/0469-Remove-stale-POIs.patch
diff --git a/patches/server/0471-Fix-villager-boat-exploit.patch b/patches/server/0470-Fix-villager-boat-exploit.patch
index e835b1ee94..23eb1f4bdb 100644
--- a/patches/server/0471-Fix-villager-boat-exploit.patch
+++ b/patches/server/0470-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 f11309e0a067546aa5b14272156087664dbdd021..44422100246a61f8353f26d5149f3e96c8832fea 100644
+index 45e7b41f746ceb2ef295a81fa65795df062844ef..23bd0e0b62fef174b55b5915a44fee32db02c656 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -595,6 +595,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0472-Add-sendOpLevel-API.patch b/patches/server/0471-Add-sendOpLevel-API.patch
index b2851eafe2..b2851eafe2 100644
--- a/patches/server/0472-Add-sendOpLevel-API.patch
+++ b/patches/server/0471-Add-sendOpLevel-API.patch
diff --git a/patches/server/0473-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0472-Add-RegistryAccess-for-managing-Registries.patch
index 0ee306bcf5..7ab8906051 100644
--- a/patches/server/0473-Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/server/0472-Add-RegistryAccess-for-managing-Registries.patch
@@ -844,7 +844,7 @@ index a9832482500f08df30568ecbc65e4496ee01b414..154733684a53ff84ca8c2a994b96b687
      @Override
      public B get(NamespacedKey namespacedKey) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 856de462a5a92d00896b5454244014eae2cdbf24..a29f4992f7927d0f241962f972dd13ce77094d97 100644
+index 75fe99d8ec74435cf62b427d6bed89c76c0cf6d9..f79af6910c4c83f1c56bc73434846f3e5270509f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -281,7 +281,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0474-Add-StructuresLocateEvent.patch b/patches/server/0473-Add-StructuresLocateEvent.patch
index d8c688e2ae..d8c688e2ae 100644
--- a/patches/server/0474-Add-StructuresLocateEvent.patch
+++ b/patches/server/0473-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0475-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0474-Collision-option-for-requiring-a-player-participant.patch
index 4f7280ae82..1725f5c65d 100644
--- a/patches/server/0475-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0474-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e997c009821c3e7645a6acff163ece8c98f6db36..44efb857aa839bbc0eca608661f22750bb059f4f 100644
+index bed376337035545e7ec677f2f7fe3372a3c9ea25..7d131f3b3f5739468aa3115e97ed28b6bfeca33d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1936,6 +1936,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0476-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0475-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 265be53faf..265be53faf 100644
--- a/patches/server/0476-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0475-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0477-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0476-Return-chat-component-with-empty-text-instead-of-thr.patch
index 4dea2ddeed..af20b23c54 100644
--- a/patches/server/0477-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0476-Return-chat-component-with-empty-text-instead-of-thr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 810662eeb9ef7f2239a7937e58654a0407f9d8df..00031a013d8e1e9f40bc1ef9491da6df3b061d5f 100644
+index fe8d66893aa2c2ca6fc57ea96479ce4d646d8619..b8d8aad81f54f7f43c01da075e63ec9173750bec 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -89,7 +89,12 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0478-Make-schedule-command-per-world.patch b/patches/server/0477-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0478-Make-schedule-command-per-world.patch
+++ b/patches/server/0477-Make-schedule-command-per-world.patch
diff --git a/patches/server/0479-Configurable-max-leash-distance.patch b/patches/server/0478-Configurable-max-leash-distance.patch
index d2f544737b..d2f544737b 100644
--- a/patches/server/0479-Configurable-max-leash-distance.patch
+++ b/patches/server/0478-Configurable-max-leash-distance.patch
diff --git a/patches/server/0480-Add-BlockPreDispenseEvent.patch b/patches/server/0479-Add-BlockPreDispenseEvent.patch
index a2d508ee1c..a2d508ee1c 100644
--- a/patches/server/0480-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0479-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0481-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0480-Add-PlayerChangeBeaconEffectEvent.patch
index 1903c21ba8..1903c21ba8 100644
--- a/patches/server/0481-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0480-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0482-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0481-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39031695e8..ccbab4766e 100644
--- a/patches/server/0482-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0481-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/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 943d9f84ad839562a4e30fff1257a1224d0b70b6..412838a4eb3d29da5955bf1c279f66a2e7ccad12 100644
+index d6deedb96583c19eeb27e671289c4edc8a9245b4..4f3fdc6ea0cafd61f778edb6a967bd0eb00abdb9 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -409,7 +409,7 @@ public class EndDragonFight {
diff --git a/patches/server/0483-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0482-Add-PlayerStonecutterRecipeSelectEvent.patch
index 0c96d8fa15..0c96d8fa15 100644
--- a/patches/server/0483-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0482-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0484-Expand-EntityUnleashEvent.patch b/patches/server/0483-Expand-EntityUnleashEvent.patch
index 8d0a37b004..8d0a37b004 100644
--- a/patches/server/0484-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0483-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0485-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0484-Reset-shield-blocking-on-dimension-change.patch
index f0f37986b6..f0f37986b6 100644
--- a/patches/server/0485-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0484-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0486-Add-DragonEggFormEvent.patch b/patches/server/0485-Add-DragonEggFormEvent.patch
index 1277e3504a..8a1ea59534 100644
--- a/patches/server/0486-Add-DragonEggFormEvent.patch
+++ b/patches/server/0485-Add-DragonEggFormEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add DragonEggFormEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 412838a4eb3d29da5955bf1c279f66a2e7ccad12..0455c5fd2bb7955a0f343468b4bea760d6d35310 100644
+index 4f3fdc6ea0cafd61f778edb6a967bd0eb00abdb9..460744ec3a1abe9a2d9d16c2ec521c52c7f8db95 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -409,8 +409,22 @@ public class EndDragonFight {
diff --git a/patches/server/0487-Add-EntityMoveEvent.patch b/patches/server/0486-Add-EntityMoveEvent.patch
index 2992bc3199..bb3bf939b2 100644
--- a/patches/server/0487-Add-EntityMoveEvent.patch
+++ b/patches/server/0486-Add-EntityMoveEvent.patch
@@ -29,7 +29,7 @@ index 373560fc82e491e6c8b755fecfe78d49a2fc3e2f..644341b8bc3079c6f092226acd11667f
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c7ead86c5048381c97d01a09ac8a5a84cd93c5db..7e4f3f88cbd79a497aeaa65b5fb0997d27d4ee0f 100644
+index 40b86b9b25135e55cc01e502dbc8cc22344efa5d..205d2b50232447a4b8b6180a622b968a32311c5f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3510,6 +3510,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0488-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0487-added-option-to-disable-pathfinding-updates-on-block.patch
index e40ef31e16..e40ef31e16 100644
--- a/patches/server/0488-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0487-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0489-Inline-shift-direction-fields.patch b/patches/server/0488-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0489-Inline-shift-direction-fields.patch
+++ b/patches/server/0488-Inline-shift-direction-fields.patch
diff --git a/patches/server/0490-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0489-Allow-adding-items-to-BlockDropItemEvent.patch
index 5082d493dc..5082d493dc 100644
--- a/patches/server/0490-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0489-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0491-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0490-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 6ae0c8d11b..6ae0c8d11b 100644
--- a/patches/server/0491-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0490-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0492-living-entity-allow-attribute-registration.patch b/patches/server/0491-living-entity-allow-attribute-registration.patch
index 586ae419e6..586ae419e6 100644
--- a/patches/server/0492-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0491-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0493-fix-dead-slime-setSize-invincibility.patch b/patches/server/0492-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0493-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0492-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0494-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0493-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0494-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0493-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0495-Expose-Tracked-Players.patch b/patches/server/0494-Expose-Tracked-Players.patch
index d8ca4c111c..d8ca4c111c 100644
--- a/patches/server/0495-Expose-Tracked-Players.patch
+++ b/patches/server/0494-Expose-Tracked-Players.patch
diff --git a/patches/server/0496-Improve-ServerGUI.patch b/patches/server/0495-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0496-Improve-ServerGUI.patch
+++ b/patches/server/0495-Improve-ServerGUI.patch
diff --git a/patches/server/0497-fix-converting-txt-to-json-file.patch b/patches/server/0496-fix-converting-txt-to-json-file.patch
index dde0a0677e..8657ccb6b3 100644
--- a/patches/server/0497-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0496-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 2b1d7a2360a9ee7bca9d93a2dc8c61d1648a8348..d5153f804cfcfd1a70c46975e3fb1e50
          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 3c7d31725c4a5dd7728fa394f88d37a0e493e919..59c30bb1fd19b718662dd10b0eb9dcd5ed79e400 100644
+index 7c334ac1ae2a1b14b7570127e775a5e7d7ab2ae7..3ed10df63671725b823247840bb057292f747f3f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0498-Add-worldborder-events.patch b/patches/server/0497-Add-worldborder-events.patch
index 44a467547c..44a467547c 100644
--- a/patches/server/0498-Add-worldborder-events.patch
+++ b/patches/server/0497-Add-worldborder-events.patch
diff --git a/patches/server/0499-Add-PlayerNameEntityEvent.patch b/patches/server/0498-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0499-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0498-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0500-Add-recipe-to-cook-events.patch b/patches/server/0499-Add-recipe-to-cook-events.patch
index 6fe8720d21..6fe8720d21 100644
--- a/patches/server/0500-Add-recipe-to-cook-events.patch
+++ b/patches/server/0499-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0501-Add-Block-isValidTool.patch b/patches/server/0500-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0501-Add-Block-isValidTool.patch
+++ b/patches/server/0500-Add-Block-isValidTool.patch
diff --git a/patches/server/0502-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0501-Allow-using-signs-inside-spawn-protection.patch
index 898cf6905b..9f0399c60f 100644
--- a/patches/server/0502-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0501-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b96490d16d9a38be14d6777213d883f2223fd5a4..1cff57113816614c5b6a43056bb47f29c5839cc5 100644
+index d7d36b5148f2e7280816cc70b300b9b10720f751..25d060e8d77b1e8ea2ac951d2b25d60a984398cd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1758,8 +1758,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0503-Expand-world-key-API.patch b/patches/server/0502-Expand-world-key-API.patch
index bf1f6198d8..bf1f6198d8 100644
--- a/patches/server/0503-Expand-world-key-API.patch
+++ b/patches/server/0502-Expand-world-key-API.patch
diff --git a/patches/server/0504-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0503-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0504-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0503-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0505-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0504-Drop-carried-item-when-player-has-disconnected.patch
index 5a79f00284..e7dd2e05b7 100644
--- a/patches/server/0505-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0504-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 59c30bb1fd19b718662dd10b0eb9dcd5ed79e400..0cbd4e6bc9b3695fd2ff0b943a69b8fd393e0f36 100644
+index 3ed10df63671725b823247840bb057292f747f3f..28d99ca33606d2ff44c639c78edfcaa131faf626 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -588,6 +588,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0506-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0505-forced-whitelist-use-configurable-kick-message.patch
index 4ec0ee6b72..4ec0ee6b72 100644
--- a/patches/server/0506-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0505-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0507-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0506-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index cd6c157f9c..04bcbb953c 100644
--- a/patches/server/0507-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0506-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1cff57113816614c5b6a43056bb47f29c5839cc5..0b6db265a2a7a20be647bf6e3387af20634af68c 100644
+index 25d060e8d77b1e8ea2ac951d2b25d60a984398cd..403b2499374906daa0ca2bb774522f92e186e6d5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1154,7 +1154,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0508-Expose-protocol-version.patch b/patches/server/0507-Expose-protocol-version.patch
index 3b28ea2ad4..293d2dd336 100644
--- a/patches/server/0508-Expose-protocol-version.patch
+++ b/patches/server/0507-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 e44bcf61c09245a63d50dd1be3c5b1fca7225ff9..fd36c8c62503e4ce035d51b0cc4e8dd55e66cc5d 100644
+index b075d4b21b53a3f39094444e4024556b23e399f2..f833fcead688180daf7039e09dce46fde924043c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -521,6 +521,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0509-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0508-Enhance-console-tab-completions-for-brigadier-comman.patch
index 701ba9042a..701ba9042a 100644
--- a/patches/server/0509-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0508-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0510-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0509-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 8663738c4b..b131d8d3a7 100644
--- a/patches/server/0510-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0509-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7e4f3f88cbd79a497aeaa65b5fb0997d27d4ee0f..d2bb6d312e67462e36cffb8de26b88e3050d0518 100644
+index 205d2b50232447a4b8b6180a622b968a32311c5f..5b0ff701bd9dd9ccd9596a68732241d689b530d5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4011,6 +4011,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0511-Add-bypass-host-check.patch b/patches/server/0510-Add-bypass-host-check.patch
index 53fea6e14d..53fea6e14d 100644
--- a/patches/server/0511-Add-bypass-host-check.patch
+++ b/patches/server/0510-Add-bypass-host-check.patch
diff --git a/patches/server/0512-Set-area-affect-cloud-rotation.patch b/patches/server/0511-Set-area-affect-cloud-rotation.patch
index 1816791836..1816791836 100644
--- a/patches/server/0512-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0511-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0513-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0512-add-isDeeplySleeping-to-HumanEntity.patch
index 8784fcb163..8784fcb163 100644
--- a/patches/server/0513-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0512-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0514-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0513-add-consumeFuel-to-FurnaceBurnEvent.patch
index 1938dc07ed..1938dc07ed 100644
--- a/patches/server/0514-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0513-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0515-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0514-add-get-set-drop-chance-to-EntityEquipment.patch
index 746b410784..746b410784 100644
--- a/patches/server/0515-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0514-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0516-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0515-fix-PigZombieAngerEvent-cancellation.patch
index 3f0d89aea9..3f0d89aea9 100644
--- a/patches/server/0516-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0515-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0517-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0516-fix-PlayerItemHeldEvent-firing-twice.patch
index 11155e76d5..9bb8e4f1e1 100644
--- a/patches/server/0517-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0516-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0b6db265a2a7a20be647bf6e3387af20634af68c..4b9b8cda8578c871c677f283ba0746460a0fadf0 100644
+index 403b2499374906daa0ca2bb774522f92e186e6d5..276c0b017452a1d7b60a2a8e779f2f3fcf4960cc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1933,6 +1933,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0518-Add-PlayerDeepSleepEvent.patch b/patches/server/0517-Add-PlayerDeepSleepEvent.patch
index c348ba15bc..c348ba15bc 100644
--- a/patches/server/0518-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0517-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0519-More-World-API.patch b/patches/server/0518-More-World-API.patch
index acbb18e7df..acbb18e7df 100644
--- a/patches/server/0519-More-World-API.patch
+++ b/patches/server/0518-More-World-API.patch
diff --git a/patches/server/0520-Add-PlayerBedFailEnterEvent.patch b/patches/server/0519-Add-PlayerBedFailEnterEvent.patch
index feffef2aec..feffef2aec 100644
--- a/patches/server/0520-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0519-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0521-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0520-Implement-methods-to-convert-between-Component-and-B.patch
index 614386ecde..614386ecde 100644
--- a/patches/server/0521-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0520-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0522-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0521-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index e907ed80ed..7d836d5307 100644
--- a/patches/server/0522-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0521-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 433102e21d18bbfc3cba9abf9f9a760a71d2ba74..6b2c82d80bc673a74ae894f794eb50402b9cc30d 100644
+index fffd3ae6c4fc0b86057cd915bb4f0987f41a64d0..52a5274fb811870481a48bf0505769d7ac5df31f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1195,7 +1195,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0523-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0522-Introduce-beacon-activation-deactivation-events.patch
index 6d74a805c1..6d74a805c1 100644
--- a/patches/server/0523-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0522-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0524-Add-Channel-initialization-listeners.patch b/patches/server/0523-Add-Channel-initialization-listeners.patch
index 334eb230f0..334eb230f0 100644
--- a/patches/server/0524-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0523-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0525-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0524-Send-empty-commands-if-tab-completion-is-disabled.patch
index daa33fbefc..daa33fbefc 100644
--- a/patches/server/0525-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0524-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0526-Add-more-WanderingTrader-API.patch b/patches/server/0525-Add-more-WanderingTrader-API.patch
index 0ce65786dc..0ce65786dc 100644
--- a/patches/server/0526-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0525-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0527-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0526-Add-EntityBlockStorage-clearEntities.patch
index b19812d989..b19812d989 100644
--- a/patches/server/0527-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0526-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0528-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0527-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index c0fd5f11db..c0fd5f11db 100644
--- a/patches/server/0528-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0527-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0529-Add-HiddenPotionEffect-API.patch b/patches/server/0528-Add-HiddenPotionEffect-API.patch
index 2d0b0d5b03..2d0b0d5b03 100644
--- a/patches/server/0529-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0528-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0530-Inventory-close.patch b/patches/server/0529-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0530-Inventory-close.patch
+++ b/patches/server/0529-Inventory-close.patch
diff --git a/patches/server/0531-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0530-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index d5f2f9db1f..d5f2f9db1f 100644
--- a/patches/server/0531-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0530-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0532-Add-basic-Datapack-API.patch b/patches/server/0531-Add-basic-Datapack-API.patch
index 7a89592b48..a01b7be0cd 100644
--- a/patches/server/0532-Add-basic-Datapack-API.patch
+++ b/patches/server/0531-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f83eb7fd5c9b368ba0bf9e07a568d69c6566a5af..691ad3df67ff32528ac18c2927e96c91db25741e 100644
+index 3b1e073f8873e23eee187a2d60529c044e3d2f55..46a763c111e97c60f44f1a3bb35bedcc33f97817 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -305,6 +305,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0533-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0532-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0533-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0532-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0534-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0533-Expand-PlayerGameModeChangeEvent.patch
index b9d7a9d493..3d09038111 100644
--- a/patches/server/0534-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0533-Expand-PlayerGameModeChangeEvent.patch
@@ -134,10 +134,10 @@ index 5de472df78940d1b8320f73d18b2edf3a796227e..073cf184a0e7af41048ae67a9b17b4cd
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4b9b8cda8578c871c677f283ba0746460a0fadf0..baa01aaeeb710f160c470702649356e5be124fa9 100644
+index 276c0b017452a1d7b60a2a8e779f2f3fcf4960cc..9781047aa5e0a6e6bc9f9c43a1eb347b6ecdff66 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2731,7 +2731,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2730,7 +2730,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                      this.player = this.server.getPlayerList().respawn(this.player, false, Entity.RemovalReason.KILLED, RespawnReason.DEATH); // CraftBukkit
                      if (this.server.isHardcore()) {
diff --git a/patches/server/0535-ItemStack-repair-check-API.patch b/patches/server/0534-ItemStack-repair-check-API.patch
index 32e70257f8..ab9ccec1cd 100644
--- a/patches/server/0535-ItemStack-repair-check-API.patch
+++ b/patches/server/0534-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 fd36c8c62503e4ce035d51b0cc4e8dd55e66cc5d..dec695198708838fd77285ba818e82861da49a98 100644
+index f833fcead688180daf7039e09dce46fde924043c..07de1316b65e71ab0a372f1a51ae3bc6953d6530 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -526,6 +526,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0536-More-Enchantment-API.patch b/patches/server/0535-More-Enchantment-API.patch
index a3bf8f8e7e..a3bf8f8e7e 100644
--- a/patches/server/0536-More-Enchantment-API.patch
+++ b/patches/server/0535-More-Enchantment-API.patch
diff --git a/patches/server/0537-Move-range-check-for-block-placing-up.patch b/patches/server/0536-Move-range-check-for-block-placing-up.patch
index dde316210a..4269998b6e 100644
--- a/patches/server/0537-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0536-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index baa01aaeeb710f160c470702649356e5be124fa9..0ac4cb57f379b2b96391ab651fc75bc599ddc928 100644
+index 9781047aa5e0a6e6bc9f9c43a1eb347b6ecdff66..39e74591d3aaa7fecb0ed6f4213a5f4c60360b0e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1745,6 +1745,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0538-Add-Mob-lookAt-API.patch b/patches/server/0537-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0538-Add-Mob-lookAt-API.patch
+++ b/patches/server/0537-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0539-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0538-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 5a8b0c1cb5..5a8b0c1cb5 100644
--- a/patches/server/0539-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0538-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0540-Add-Unix-domain-socket-support.patch b/patches/server/0539-Add-Unix-domain-socket-support.patch
index ee31c33cc5..7c44f07cea 100644
--- a/patches/server/0540-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0539-Add-Unix-domain-socket-support.patch
@@ -87,7 +87,7 @@ index d6d7f1c446ba5507f67038ff27775ba75156f4a7..c63c194c44646e6bc1a5942655278701
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0ac4cb57f379b2b96391ab651fc75bc599ddc928..757f0aa42ee945fda11d05864405f9ecb5208226 100644
+index 39e74591d3aaa7fecb0ed6f4213a5f4c60360b0e..568f5d7165521304c7a92f32984a1d605d545ad5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2550,6 +2550,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0541-Add-EntityInsideBlockEvent.patch b/patches/server/0540-Add-EntityInsideBlockEvent.patch
index 0e0939b39f..0b2938737c 100644
--- a/patches/server/0541-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0540-Add-EntityInsideBlockEvent.patch
@@ -125,7 +125,7 @@ index 2ad77d7666cc9a5101b3da58f07f497409676a26..11486419dd98a013c7387d3d73f322a9
              BlockEntity tileentity = world.getBlockEntity(pos);
  
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index e2d6693da4abe6204c0ecb5e924a3903fa80ab7d..cff3e9869340f1ffb7093431cbe1ac5e67792a4e 100644
+index a9c7a74b38a57c118c1ad67a77ba6f2e5c05d91e..28fba1448309805fc3d687de6bc8454d2c85fcd3 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 @@ -63,6 +63,7 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
@@ -197,7 +197,7 @@ index 5f778ea22efa76ced1ba4455d50b94b3519113fc..7c67efa6e344870b764eb39d55081903
              // CraftBukkit start
              if (entity.mayInteract(world, pos)) {
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index ab1cbcf5ef1ebffd39373bacb2b0983d2c8fa15a..caa22afb0781671b901c23ebcc89e5bb0d2bd615 100644
+index a4e1c878dc7677e8ccc7c568ab455e85513d86cb..e2969b49494c55c3705312361ee8083b05ef569e 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -107,6 +107,7 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/server/0542-Improve-item-default-attribute-API.patch b/patches/server/0541-Improve-item-default-attribute-API.patch
index ecbcd11bb8..359537fc19 100644
--- a/patches/server/0542-Improve-item-default-attribute-API.patch
+++ b/patches/server/0541-Improve-item-default-attribute-API.patch
@@ -65,7 +65,7 @@ index 66d773cadb74f9176e6cf68a565568034f52ec63..a1f2b9d40d374e8cdbaf916b25fa74b6
          return defaultAttributes.build();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index dec695198708838fd77285ba818e82861da49a98..17fc3d78f1f5002d8f9cb2113706a2cc6a6c821f 100644
+index 07de1316b65e71ab0a372f1a51ae3bc6953d6530..c09c494ebe7a0c13b8bce4234a23a92c300153f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -385,7 +385,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0543-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0542-Add-cause-to-Weather-ThunderChangeEvents.patch
index 2807ad861f..2807ad861f 100644
--- a/patches/server/0543-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0542-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0544-More-Lidded-Block-API.patch b/patches/server/0543-More-Lidded-Block-API.patch
index 437434c525..437434c525 100644
--- a/patches/server/0544-More-Lidded-Block-API.patch
+++ b/patches/server/0543-More-Lidded-Block-API.patch
diff --git a/patches/server/0545-Limit-item-frame-cursors-on-maps.patch b/patches/server/0544-Limit-item-frame-cursors-on-maps.patch
index d710b59685..d710b59685 100644
--- a/patches/server/0545-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0544-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0546-Add-PlayerKickEvent-causes.patch b/patches/server/0545-Add-PlayerKickEvent-causes.patch
index 94d1dc687c..f86ceaf4df 100644
--- a/patches/server/0546-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0545-Add-PlayerKickEvent-causes.patch
@@ -218,7 +218,7 @@ index 24bf661e76fb421a8be565d9ea68edf7205254d2..feb529adf2168025c785ab92d95a3246
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 757f0aa42ee945fda11d05864405f9ecb5208226..f098997bab367e50781e3062fd2de73454a711a3 100644
+index 568f5d7165521304c7a92f32984a1d605d545ad5..b30c71ad0cc2602d2c026433a94c9ca45977855e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -349,7 +349,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -382,7 +382,7 @@ index 757f0aa42ee945fda11d05864405f9ecb5208226..f098997bab367e50781e3062fd2de734
              return;
          }
          // Spigot End
-@@ -2694,7 +2694,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2693,7 +2693,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              }
                          }
  
@@ -391,7 +391,7 @@ index 757f0aa42ee945fda11d05864405f9ecb5208226..f098997bab367e50781e3062fd2de734
                          ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", ServerGamePacketListenerImpl.this.player.getName().getString());
                      }
                  });
-@@ -3091,7 +3091,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3090,7 +3090,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Paper start - auto recipe limit
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -400,7 +400,7 @@ index 757f0aa42ee945fda11d05864405f9ecb5208226..f098997bab367e50781e3062fd2de734
                  return;
              }
          }
-@@ -3333,7 +3333,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3332,7 +3332,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          if (!Objects.equals(profilepublickey_a, profilepublickey_a1)) {
              if (profilepublickey_a != null && profilepublickey_a1.expiresAt().isBefore(profilepublickey_a.expiresAt())) {
@@ -409,7 +409,7 @@ index 757f0aa42ee945fda11d05864405f9ecb5208226..f098997bab367e50781e3062fd2de734
              } else {
                  try {
                      SignatureValidator signaturevalidator = this.server.getProfileKeySignatureValidator();
-@@ -3346,7 +3346,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3345,7 +3345,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
                      ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
diff --git a/patches/server/0547-Add-PufferFishStateChangeEvent.patch b/patches/server/0546-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0547-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0546-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0548-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0547-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 12c519eefe..12c519eefe 100644
--- a/patches/server/0548-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0547-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0549-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0548-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0549-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0548-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0550-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0549-Add-option-to-fix-items-merging-through-walls.patch
index 636797089d..636797089d 100644
--- a/patches/server/0550-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0549-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0551-Add-BellRevealRaiderEvent.patch b/patches/server/0550-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0551-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0550-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0552-Fix-invulnerable-end-crystals.patch b/patches/server/0551-Fix-invulnerable-end-crystals.patch
index 57cba19656..57cba19656 100644
--- a/patches/server/0552-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0551-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0553-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0552-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0553-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0552-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0554-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0553-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0554-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0553-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0555-Line-Of-Sight-Changes.patch b/patches/server/0554-Line-Of-Sight-Changes.patch
index 1e1018607b..14cbad6db3 100644
--- a/patches/server/0555-Line-Of-Sight-Changes.patch
+++ b/patches/server/0554-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d2bb6d312e67462e36cffb8de26b88e3050d0518..85f3dcdc8349683cb79ce1d9fe56eff02af2a7a7 100644
+index 5b0ff701bd9dd9ccd9596a68732241d689b530d5..a3a19f288643ce290c1e2119ba794f2409e83ed0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3755,7 +3755,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0556-add-per-world-spawn-limits.patch b/patches/server/0555-add-per-world-spawn-limits.patch
index 2af34cd439..2af34cd439 100644
--- a/patches/server/0556-add-per-world-spawn-limits.patch
+++ b/patches/server/0555-add-per-world-spawn-limits.patch
diff --git a/patches/server/0557-Fix-potions-splash-events.patch b/patches/server/0556-Fix-potions-splash-events.patch
index 27cedac8c8..27cedac8c8 100644
--- a/patches/server/0557-Fix-potions-splash-events.patch
+++ b/patches/server/0556-Fix-potions-splash-events.patch
diff --git a/patches/server/0558-Add-more-LimitedRegion-API.patch b/patches/server/0557-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0558-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0557-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0559-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0558-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 8f8228a1d4..8f8228a1d4 100644
--- a/patches/server/0559-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0558-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0560-Missing-Entity-API.patch b/patches/server/0559-Missing-Entity-API.patch
index 2537e57c32..2537e57c32 100644
--- a/patches/server/0560-Missing-Entity-API.patch
+++ b/patches/server/0559-Missing-Entity-API.patch
diff --git a/patches/server/0561-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0560-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0561-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0560-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0562-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0561-Use-getChunkIfLoadedImmediately-in-places.patch
index b2446b7c2b..b2446b7c2b 100644
--- a/patches/server/0562-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0561-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0563-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0562-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0563-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0562-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0564-Add-PlayerArmSwingEvent.patch b/patches/server/0563-Add-PlayerArmSwingEvent.patch
index ac8cbf34d7..8e77eadc23 100644
--- a/patches/server/0564-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0563-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f098997bab367e50781e3062fd2de73454a711a3..9095e6eb99cb00af976ffa48ecbbc69a0c9c931c 100644
+index b30c71ad0cc2602d2c026433a94c9ca45977855e..3b20dce53403e241261f270f0a9e32f12b9e368a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2412,7 +2412,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0565-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0564-Fix-kick-event-leave-message-not-being-sent.patch
index e417ff0549..04ae800110 100644
--- a/patches/server/0565-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0564-Fix-kick-event-leave-message-not-being-sent.patch
@@ -55,7 +55,7 @@ index feb529adf2168025c785ab92d95a3246e73c0236..b43f87ff4b9853b5d4bbea5ff9686d64
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9095e6eb99cb00af976ffa48ecbbc69a0c9c931c..de07fd466c9ac79d6f8122c619f2b4be65f31f69 100644
+index 3b20dce53403e241261f270f0a9e32f12b9e368a..08c4d0b79dc1c6e51105487b96e9333a5dd904d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1894,6 +1894,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0566-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0565-Don-t-apply-cramming-damage-to-players.patch
index f23c0c584f..f23c0c584f 100644
--- a/patches/server/0566-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0565-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0567-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0566-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0567-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0566-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0568-Add-missing-forceDrop-toggles.patch b/patches/server/0567-Add-missing-forceDrop-toggles.patch
index e11380293a..e11380293a 100644
--- a/patches/server/0568-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0567-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0569-Stinger-API.patch b/patches/server/0568-Stinger-API.patch
index 766da8df45..766da8df45 100644
--- a/patches/server/0569-Stinger-API.patch
+++ b/patches/server/0568-Stinger-API.patch
diff --git a/patches/server/0570-Add-System.out-err-catcher.patch b/patches/server/0569-Add-System.out-err-catcher.patch
index 905517df95..738711cfd7 100644
--- a/patches/server/0570-Add-System.out-err-catcher.patch
+++ b/patches/server/0569-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 691ad3df67ff32528ac18c2927e96c91db25741e..c57428b235f7bc0444ba0024d05c7c15b5e74fc4 100644
+index 46a763c111e97c60f44f1a3bb35bedcc33f97817..1fd9a651e469fcf46752e97bc42d68961b0f2df0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -307,6 +307,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0571-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0570-Prevent-AFK-kick-while-watching-end-credits.patch
index 73cf011e9d..42e8c37d20 100644
--- a/patches/server/0571-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0570-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dd728c297335581ad69c94f768ec5201b7879264..93a9ef3fc5620c622ce0dfb010c6dafad8fcdb71 100644
+index 08c4d0b79dc1c6e51105487b96e9333a5dd904d7..44d1cd3e6047590a989a2b85c759be4c64125a47 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -397,7 +397,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0572-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0571-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0572-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0571-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0573-Add-PlayerSetSpawnEvent.patch b/patches/server/0572-Add-PlayerSetSpawnEvent.patch
index 15c8e734d8..15c8e734d8 100644
--- a/patches/server/0573-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0572-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0574-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0573-Make-hoppers-respect-inventory-max-stack-size.patch
index c5b4e66926..c5b4e66926 100644
--- a/patches/server/0574-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0573-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0575-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0574-Optimize-entity-tracker-passenger-checks.patch
index 0dd7d25ba3..0dd7d25ba3 100644
--- a/patches/server/0575-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0574-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0576-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0575-Config-option-for-Piglins-guarding-chests.patch
index 8e2094a53d..8e2094a53d 100644
--- a/patches/server/0576-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0575-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0577-Add-EntityDamageItemEvent.patch b/patches/server/0576-Add-EntityDamageItemEvent.patch
index e289bb08f8..e289bb08f8 100644
--- a/patches/server/0577-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0576-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0578-Optimize-indirect-passenger-iteration.patch b/patches/server/0577-Optimize-indirect-passenger-iteration.patch
index 5fccdecbf4..dc1758edec 100644
--- a/patches/server/0578-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0577-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1ca18b0c4af08c998636bb3938a3dfdfb1d80cf0..e09b5be9bf40e4df1f58c40d5a39f5d667145903 100644
+index da184893d617311a43f9ce176a965f8417a2876d..9844550e4ed6c150250b165acc26d52ec9401184 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3889,20 +3889,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0579-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0578-Configurable-item-frame-map-cursor-update-interval.patch
index a6389cdcbb..a6389cdcbb 100644
--- a/patches/server/0579-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0578-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0580-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0579-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0580-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0579-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0581-Add-BlockBreakBlockEvent.patch b/patches/server/0580-Add-BlockBreakBlockEvent.patch
index 4bc0c5116f..4bc0c5116f 100644
--- a/patches/server/0581-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0580-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0582-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0581-Option-to-prevent-data-components-copy-in-smithing-r.patch
index 7246d24edd..7246d24edd 100644
--- a/patches/server/0582-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0581-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0583-More-CommandBlock-API.patch b/patches/server/0582-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0583-More-CommandBlock-API.patch
+++ b/patches/server/0582-More-CommandBlock-API.patch
diff --git a/patches/server/0584-Add-missing-team-sidebar-display-slots.patch b/patches/server/0583-Add-missing-team-sidebar-display-slots.patch
index 3b0dfacf08..3b0dfacf08 100644
--- a/patches/server/0584-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0583-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0585-Add-back-EntityPortalExitEvent.patch b/patches/server/0584-Add-back-EntityPortalExitEvent.patch
index 4cf88b1a01..fcaf6caca5 100644
--- a/patches/server/0585-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0584-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e09b5be9bf40e4df1f58c40d5a39f5d667145903..e8098a2f8f8bfe9260290cab11b2045c9f4098dd 100644
+index 9844550e4ed6c150250b165acc26d52ec9401184..836356ecb3c91fd7886ac9ae83f1cc835469e198 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3363,7 +3363,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0586-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0585-Add-methods-to-find-targets-for-lightning-strikes.patch
index ca096b9dd9..ca096b9dd9 100644
--- a/patches/server/0586-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0585-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0587-Get-entity-default-attributes.patch b/patches/server/0586-Get-entity-default-attributes.patch
index f90946ef42..0364d2381c 100644
--- a/patches/server/0587-Get-entity-default-attributes.patch
+++ b/patches/server/0586-Get-entity-default-attributes.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..ec9ebd2d539333293c51b7edfa18f18b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 17fc3d78f1f5002d8f9cb2113706a2cc6a6c821f..98f60520ced0a68dc1e35999b9eaea405a9799ed 100644
+index c09c494ebe7a0c13b8bce4234a23a92c300153f9..95a6f26f75efda7db41db9091107502e8d4e0453 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -538,6 +538,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0588-Left-handed-API.patch b/patches/server/0587-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0588-Left-handed-API.patch
+++ b/patches/server/0587-Left-handed-API.patch
diff --git a/patches/server/0589-Add-more-advancement-API.patch b/patches/server/0588-Add-more-advancement-API.patch
index ed610abf5d..ed610abf5d 100644
--- a/patches/server/0589-Add-more-advancement-API.patch
+++ b/patches/server/0588-Add-more-advancement-API.patch
diff --git a/patches/server/0590-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0589-Add-ItemFactory-getSpawnEgg-API.patch
index c4fffcd5cc..c4fffcd5cc 100644
--- a/patches/server/0590-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0589-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0591-Add-critical-damage-API.patch b/patches/server/0590-Add-critical-damage-API.patch
index dd78b506dd..dd78b506dd 100644
--- a/patches/server/0591-Add-critical-damage-API.patch
+++ b/patches/server/0590-Add-critical-damage-API.patch
diff --git a/patches/server/0592-Fix-issues-with-mob-conversion.patch b/patches/server/0591-Fix-issues-with-mob-conversion.patch
index 1b4597fe00..1b4597fe00 100644
--- a/patches/server/0592-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0591-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0593-Add-hasCollision-methods-to-various-places.patch b/patches/server/0592-Add-hasCollision-methods-to-various-places.patch
index 1acc4729a7..1acc4729a7 100644
--- a/patches/server/0593-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/server/0592-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/server/0594-Goat-ram-API.patch b/patches/server/0593-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0594-Goat-ram-API.patch
+++ b/patches/server/0593-Goat-ram-API.patch
diff --git a/patches/server/0595-Add-API-for-resetting-a-single-score.patch b/patches/server/0594-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0595-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0594-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0596-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0595-Add-Raw-Byte-Entity-Serialization.patch
index bec15720e6..3ad09b5cc5 100644
--- a/patches/server/0596-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0595-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e8098a2f8f8bfe9260290cab11b2045c9f4098dd..5928117dbec4d4cce4a85444658947d4596b5bc0 100644
+index 836356ecb3c91fd7886ac9ae83f1cc835469e198..f21bf6c8bbf30c59f1588c2105dbd7f80c07a0f1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2144,6 +2144,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -50,7 +50,7 @@ index 7c04eb9e7eb5ff728465b46e3739eb2598ef1204..6fab713531665298d3b03e7960a17ecb
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 98f60520ced0a68dc1e35999b9eaea405a9799ed..5ba8ce0f8c516567f38a6f95662bde71086e6ae4 100644
+index 95a6f26f75efda7db41db9091107502e8d4e0453..0e849b49329054005c20a5773de2ff15bf3f6e5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -488,7 +488,33 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0597-Vanilla-command-permission-fixes.patch b/patches/server/0596-Vanilla-command-permission-fixes.patch
index a9f23f8a53..a9f23f8a53 100644
--- a/patches/server/0597-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0596-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0598-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0597-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 22f86aa476..22f86aa476 100644
--- a/patches/server/0598-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0597-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0599-Fix-GameProfileCache-concurrency.patch b/patches/server/0598-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0599-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0598-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0600-Improve-and-expand-AsyncCatcher.patch b/patches/server/0599-Improve-and-expand-AsyncCatcher.patch
index c61b62c621..aa1ddf28cc 100644
--- a/patches/server/0600-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0599-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dd96075fbffb9d912310d7c3d8a1348ade25c3ef..3762cd8bfd1544df5f5a2eefbd0490fe0c656cff 100644
+index 44d1cd3e6047590a989a2b85c759be4c64125a47..926c0a5f4eaaa8fb650905216d2303fb476d3fa5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1577,6 +1577,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0601-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0600-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 14b8095c8b..80492474ae 100644
--- a/patches/server/0601-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0600-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,7 +278,7 @@ index 58ea6a1f95a09c22125a8262b1b221004ebce0e4..ea6533c1ac218aa075da3401807a06fc
          BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c57428b235f7bc0444ba0024d05c7c15b5e74fc4..9707b24da58fdc56732d6372038055e8676e9e0d 100644
+index 1fd9a651e469fcf46752e97bc42d68961b0f2df0..d6ff15c56fe72ec8a04471cca6146bb90b371ece 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2329,6 +2329,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0602-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0601-Sanitize-ResourceLocation-error-logging.patch
index 602f0d3b27..602f0d3b27 100644
--- a/patches/server/0602-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0601-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0603-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0602-Manually-inline-methods-in-BlockPosition.patch
index 77b9a47ac1..77b9a47ac1 100644
--- a/patches/server/0603-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0602-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0604-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0603-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0604-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0603-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0605-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0604-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 23f6d7b245..23f6d7b245 100644
--- a/patches/server/0605-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0604-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0606-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0605-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 48449be461..48449be461 100644
--- a/patches/server/0606-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0605-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0607-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0606-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0607-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0606-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0608-Time-scoreboard-search.patch b/patches/server/0607-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0608-Time-scoreboard-search.patch
+++ b/patches/server/0607-Time-scoreboard-search.patch
diff --git a/patches/server/0609-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0608-Oprimise-map-impl-for-tracked-players.patch
index dcfacfefe7..dcfacfefe7 100644
--- a/patches/server/0609-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0608-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0610-Add-missing-InventoryType.patch b/patches/server/0609-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0610-Add-missing-InventoryType.patch
+++ b/patches/server/0609-Add-missing-InventoryType.patch
diff --git a/patches/server/0611-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0610-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0611-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0610-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0612-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0611-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 2cd406fbc0..2cd406fbc0 100644
--- a/patches/server/0612-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0611-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0613-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0612-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0613-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0612-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0614-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0613-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 90b29a13b4..39f096a88d 100644
--- a/patches/server/0614-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0613-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 987ad7f7130c45a4b3843e186b6a5662859a06ae..5169ca504b3b820e1b3b54af482dc709e2dee863 100644
+index 926c0a5f4eaaa8fb650905216d2303fb476d3fa5..1e806fd16ca5f90bdb4f71dea008d7936eb82562 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -748,6 +748,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0615-Add-packet-limiter-config.patch b/patches/server/0614-Add-packet-limiter-config.patch
index a6bd6521f4..a6bd6521f4 100644
--- a/patches/server/0615-Add-packet-limiter-config.patch
+++ b/patches/server/0614-Add-packet-limiter-config.patch
diff --git a/patches/server/0616-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0615-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 0b139a1e02..0b139a1e02 100644
--- a/patches/server/0616-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0615-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0617-Ensure-valid-vehicle-status.patch b/patches/server/0616-Ensure-valid-vehicle-status.patch
index 3607b7b1f6..f8ce44340d 100644
--- a/patches/server/0617-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0616-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0d5870ef02467d88cfeccf5aa953fcbcdf43117f..da53f7d65e5625d7aa8b4a17e8c6194ecd0ef4ea 100644
+index 6648af4d8d795637fae444dc85803b399592fd7d..25ca370c0b19eca529fc2c980c50e899013f0897 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -574,7 +574,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0618-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0617-Prevent-softlocked-end-exit-portal-generation.patch
index ddf9bf2d23..9e8d9491cb 100644
--- a/patches/server/0618-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0617-Prevent-softlocked-end-exit-portal-generation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent softlocked end exit portal generation
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 0455c5fd2bb7955a0f343468b4bea760d6d35310..e5927f378789e1d8b83ca5c84d657e0e637cc575 100644
+index 460744ec3a1abe9a2d9d16c2ec521c52c7f8db95..98d1c097fdbbc8080624f365634e0812a5eea5ac 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -468,6 +468,11 @@ public class EndDragonFight {
diff --git a/patches/server/0619-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0618-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0619-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0618-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0620-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0619-Don-t-log-debug-logging-being-disabled.patch
index 8e733b1cea..8e733b1cea 100644
--- a/patches/server/0620-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0619-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0621-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0620-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0621-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0620-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0622-Preserve-overstacked-loot.patch b/patches/server/0621-Preserve-overstacked-loot.patch
index bd657ec906..bd657ec906 100644
--- a/patches/server/0622-Preserve-overstacked-loot.patch
+++ b/patches/server/0621-Preserve-overstacked-loot.patch
diff --git a/patches/server/0623-Update-head-rotation-in-missing-places.patch b/patches/server/0622-Update-head-rotation-in-missing-places.patch
index 186e138124..a1c7566dc6 100644
--- a/patches/server/0623-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0622-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5928117dbec4d4cce4a85444658947d4596b5bc0..f199bd164867ce592fbd7dd0f4a94f95b82c21e9 100644
+index f21bf6c8bbf30c59f1588c2105dbd7f80c07a0f1..e34260c80d19869c9bec5ba67f7ce7db9d13a1f1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1844,6 +1844,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0624-prevent-unintended-light-block-manipulation.patch b/patches/server/0623-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0624-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0623-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0625-Fix-CraftCriteria-defaults-map.patch b/patches/server/0624-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0625-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0624-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0626-Fix-upstreams-block-state-factories.patch b/patches/server/0625-Fix-upstreams-block-state-factories.patch
index bfb0aa8f8a..bfb0aa8f8a 100644
--- a/patches/server/0626-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0625-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0627-Configurable-feature-seeds.patch b/patches/server/0626-Configurable-feature-seeds.patch
index 27997ba7c0..27997ba7c0 100644
--- a/patches/server/0627-Configurable-feature-seeds.patch
+++ b/patches/server/0626-Configurable-feature-seeds.patch
diff --git a/patches/server/0628-Add-root-admin-user-detection.patch b/patches/server/0627-Add-root-admin-user-detection.patch
index abe2f3b5ae..abe2f3b5ae 100644
--- a/patches/server/0628-Add-root-admin-user-detection.patch
+++ b/patches/server/0627-Add-root-admin-user-detection.patch
diff --git a/patches/server/0629-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0628-don-t-attempt-to-teleport-dead-entities.patch
index c8a83e584f..2c5a22066f 100644
--- a/patches/server/0629-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0628-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f199bd164867ce592fbd7dd0f4a94f95b82c21e9..909fa8d8f8ca6eddf6d01e0b8dd4384fc381e579 100644
+index e34260c80d19869c9bec5ba67f7ce7db9d13a1f1..35c0591f9d981f1cf7da4d1dea108a8bb3e46c7a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -705,7 +705,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0630-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0629-Prevent-excessive-velocity-through-repeated-crits.patch
index b9094798f2..545fc13e37 100644
--- a/patches/server/0630-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0629-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4714931fd5218df160e39f013278b7996cc5eca6..45493e09843e5a3c4511f7f1b36cfec9468a0391 100644
+index 6625d0b4cec8e5660c0dbd7965130495e3c94682..7e61fa6c2b25296b793e1059868764338ce4430d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2773,17 +2773,29 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0631-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0630-Remove-client-side-code-using-deprecated-for-removal.patch
index 4aed4f1f3a..4aed4f1f3a 100644
--- a/patches/server/0631-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0630-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0632-Fix-Spigot-growth-modifiers.patch b/patches/server/0631-Fix-Spigot-growth-modifiers.patch
index 35160b163d..35160b163d 100644
--- a/patches/server/0632-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0631-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0633-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0632-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0633-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0632-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0634-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0633-Add-PlayerItemFrameChangeEvent.patch
index e047726740..e047726740 100644
--- a/patches/server/0634-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0633-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0635-Optimize-HashMapPalette.patch b/patches/server/0634-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0635-Optimize-HashMapPalette.patch
+++ b/patches/server/0634-Optimize-HashMapPalette.patch
diff --git a/patches/server/0636-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0635-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 8f7f6be080..8f7f6be080 100644
--- a/patches/server/0636-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0635-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0637-Add-more-Campfire-API.patch b/patches/server/0636-Add-more-Campfire-API.patch
index 012ca1cc7d..012ca1cc7d 100644
--- a/patches/server/0637-Add-more-Campfire-API.patch
+++ b/patches/server/0636-Add-more-Campfire-API.patch
diff --git a/patches/server/0638-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0637-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 80c053acc6..80c053acc6 100644
--- a/patches/server/0638-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0637-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0639-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0638-Forward-CraftEntity-in-teleport-command.patch
index f2a0a947bb..8e2568f110 100644
--- a/patches/server/0639-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0638-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 909fa8d8f8ca6eddf6d01e0b8dd4384fc381e579..d72573022ea2881df43aa37e647168036f7fc4d6 100644
+index 35c0591f9d981f1cf7da4d1dea108a8bb3e46c7a..9f40cc481ded9279319d92fe5a0a9278a3f5d9c2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3353,6 +3353,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0640-Improve-scoreboard-entries.patch b/patches/server/0639-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0640-Improve-scoreboard-entries.patch
+++ b/patches/server/0639-Improve-scoreboard-entries.patch
diff --git a/patches/server/0641-Entity-powdered-snow-API.patch b/patches/server/0640-Entity-powdered-snow-API.patch
index 8cba17f571..8cba17f571 100644
--- a/patches/server/0641-Entity-powdered-snow-API.patch
+++ b/patches/server/0640-Entity-powdered-snow-API.patch
diff --git a/patches/server/0642-Add-API-for-item-entity-health.patch b/patches/server/0641-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0642-Add-API-for-item-entity-health.patch
+++ b/patches/server/0641-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0643-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0642-Configurable-max-block-light-for-monster-spawning.patch
index d0fb0003dc..d0fb0003dc 100644
--- a/patches/server/0643-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0642-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0644-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0643-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0644-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0643-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0645-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0644-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 026f793541..026f793541 100644
--- a/patches/server/0645-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0644-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0646-Bucketable-API.patch b/patches/server/0645-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0646-Bucketable-API.patch
+++ b/patches/server/0645-Bucketable-API.patch
diff --git a/patches/server/0647-Validate-usernames.patch b/patches/server/0646-Validate-usernames.patch
index 788e0c2a0d..ca5df38a53 100644
--- a/patches/server/0647-Validate-usernames.patch
+++ b/patches/server/0646-Validate-usernames.patch
@@ -32,7 +32,7 @@ index baedae23865ea80c6546d1f6f439e1d7712258b9..e9cd90b6bb2f57d605323add43f12962
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d4fa173cebcef5fa86e5d077c2bad8e831392bf0..9563fc34579992b74451f32e8cbb24b19d1ee19e 100644
+index bc5088b4b8a60dcd87eb9a7e0858a5c45bd9a7d4..2b104326f718bdfa263554c60ead798659ab5fa0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -670,7 +670,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0648-Make-water-animal-spawn-height-configurable.patch b/patches/server/0647-Make-water-animal-spawn-height-configurable.patch
index 14f75d9b89..14f75d9b89 100644
--- a/patches/server/0648-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0647-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0649-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0648-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 1fc592f8ed..84ec6ee0bd 100644
--- a/patches/server/0649-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0648-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index 3c947dc0aea06d66a00aeca51355ea41e8d98f88..60a77bd04489ee592ec61d3d739cb306
                  chunkgenerator = new NoiseBasedChunkGenerator(worldChunkManager, cga.settings);
              } else if (chunkgenerator instanceof FlatLevelSource cpf) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9707b24da58fdc56732d6372038055e8676e9e0d..05dbcff299d42dc05e3a8db0265fb607197731e7 100644
+index d6ff15c56fe72ec8a04471cca6146bb90b371ece..dd88ac36749cf13ef0d7a9cd86fa7f7c2b41e509 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1306,7 +1306,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0650-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0649-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0650-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0649-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0651-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0650-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0651-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0650-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0652-Multiple-Entries-with-Scoreboards.patch b/patches/server/0651-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0652-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0651-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0653-Reset-placed-block-on-exception.patch b/patches/server/0652-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0653-Reset-placed-block-on-exception.patch
+++ b/patches/server/0652-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0654-Add-configurable-height-for-slime-spawn.patch b/patches/server/0653-Add-configurable-height-for-slime-spawn.patch
index 5ed7f1549d..5ed7f1549d 100644
--- a/patches/server/0654-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0653-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0655-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0654-Fix-xp-reward-for-baby-zombies.patch
index a4fec4e0f2..a4fec4e0f2 100644
--- a/patches/server/0655-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0654-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0656-Multi-Block-Change-API-Implementation.patch b/patches/server/0655-Multi-Block-Change-API-Implementation.patch
index edfcf23bd1..50211358cb 100644
--- a/patches/server/0656-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0655-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213
          buf.writeLong(this.sectionPos.asLong());
          buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37f220976b1f1b0a423d7354e6730b6ad8096495..4b7b812a0203ef8a586c0e0cee10c41935487309 100644
+index 2f9c5d6825795b6dc8074d04bec944f93ac71a5a..252309281f440e9b7a6be3118363c4d97e5dd767 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -930,6 +930,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0657-Fix-NotePlayEvent.patch b/patches/server/0656-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0657-Fix-NotePlayEvent.patch
+++ b/patches/server/0656-Fix-NotePlayEvent.patch
diff --git a/patches/server/0658-Freeze-Tick-Lock-API.patch b/patches/server/0657-Freeze-Tick-Lock-API.patch
index db6bd70b8f..53ce7ac212 100644
--- a/patches/server/0658-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0657-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d72573022ea2881df43aa37e647168036f7fc4d6..d3971bc8a1cedaaffa89bb6eedb45742aa7c1d34 100644
+index 9f40cc481ded9279319d92fe5a0a9278a3f5d9c2..7d9ebc71b794d40246cbd43ff4de5795970e7ebe 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -411,6 +411,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -46,7 +46,7 @@ index d72573022ea2881df43aa37e647168036f7fc4d6..d3971bc8a1cedaaffa89bb6eedb45742
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 45493e09843e5a3c4511f7f1b36cfec9468a0391..a02df3b6fd908b16dbe5a3be77174bfb82a5f35f 100644
+index 7e61fa6c2b25296b793e1059868764338ce4430d..04dc54607df503a26cec8f4696db0dc057a15670 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3497,7 +3497,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0659-More-PotionEffectType-API.patch b/patches/server/0658-More-PotionEffectType-API.patch
index 1bbb96d291..1bbb96d291 100644
--- a/patches/server/0659-More-PotionEffectType-API.patch
+++ b/patches/server/0658-More-PotionEffectType-API.patch
diff --git a/patches/server/0660-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 82d25835a6..82d25835a6 100644
--- a/patches/server/0660-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0661-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0660-API-for-creating-command-sender-which-forwards-feedb.patch
index a9655fbaec..9f8601f4a1 100644
--- a/patches/server/0661-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0660-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 05dbcff299d42dc05e3a8db0265fb607197731e7..e56894f16c49085c2de819334f6d0591c0ee8313 100644
+index dd88ac36749cf13ef0d7a9cd86fa7f7c2b41e509..45dd21e5d51b8eb5df09dcdfc2d942cffb6284b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2160,6 +2160,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0662-Add-missing-structure-set-seed-configs.patch b/patches/server/0661-Add-missing-structure-set-seed-configs.patch
index 12c137b53e..12c137b53e 100644
--- a/patches/server/0662-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0661-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0663-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0662-Fix-cancelled-powdered-snow-bucket-placement.patch
index 1080cc2e2e..1080cc2e2e 100644
--- a/patches/server/0663-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0662-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0664-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0663-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 4486f4e79e..8844bbcac3 100644
--- a/patches/server/0664-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0663-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e56894f16c49085c2de819334f6d0591c0ee8313..4baa784788dba2e3bbb83ed59e003d07646abfc5 100644
+index 45dd21e5d51b8eb5df09dcdfc2d942cffb6284b4..8fb85ebcb1fe747d631dc7e5556b2424d853af90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2337,6 +2337,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0665-Add-GameEvent-tags.patch b/patches/server/0664-Add-GameEvent-tags.patch
index e3189c431f..d2c5a67f7f 100644
--- a/patches/server/0665-Add-GameEvent-tags.patch
+++ b/patches/server/0664-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4baa784788dba2e3bbb83ed59e003d07646abfc5..2cf3e1082e7d88d5450b44e99becc9db2c14a4d4 100644
+index 8fb85ebcb1fe747d631dc7e5556b2424d853af90..ff91b2e2afb58fd4919639a338b6d7c2ba9707a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2686,6 +2686,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0666-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0665-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b22ddd6951..b22ddd6951 100644
--- a/patches/server/0666-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0665-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0667-Furnace-RecipesUsed-API.patch b/patches/server/0666-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0667-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0666-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0668-Configurable-sculk-sensor-listener-range.patch b/patches/server/0667-Configurable-sculk-sensor-listener-range.patch
index 99ff902efa..99ff902efa 100644
--- a/patches/server/0668-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0667-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0669-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0668-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0669-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0668-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0670-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0669-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 3d41fa27d1..3d41fa27d1 100644
--- a/patches/server/0670-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0669-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0671-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0670-Put-world-into-worldlist-before-initing-the-world.patch
index e0e72ba1ff..84f731728d 100644
--- a/patches/server/0671-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0670-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index aa1fbbe55e3dc8fd6bbf021806c66686f8de3d9a..04286e907ff14cc8c45dbfc6ab12f520
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2cf3e1082e7d88d5450b44e99becc9db2c14a4d4..6f6d4a82c350864a60f084eb341d59cf025cde77 100644
+index ff91b2e2afb58fd4919639a338b6d7c2ba9707a2..236900b58167e66ce8575a0b83d746b3233bf1be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1332,10 +1332,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0672-Custom-Potion-Mixes.patch b/patches/server/0671-Custom-Potion-Mixes.patch
index 89fb9f45a5..5f68a0891b 100644
--- a/patches/server/0672-Custom-Potion-Mixes.patch
+++ b/patches/server/0671-Custom-Potion-Mixes.patch
@@ -282,7 +282,7 @@ index c8f9972ad1c2330908cc840d426f29c20b242ca8..a2fafef89d5354e2cb02f56728109099
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6f6d4a82c350864a60f084eb341d59cf025cde77..ee6bdc985e8396e873bfd5c1f1d0046e2e830784 100644
+index 236900b58167e66ce8575a0b83d746b3233bf1be..2431361e771a18e2631ac0493e9501d9e8a99d54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -308,6 +308,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0673-Force-close-world-loading-screen.patch b/patches/server/0672-Force-close-world-loading-screen.patch
index 28475526c4..d63c80e4e2 100644
--- a/patches/server/0673-Force-close-world-loading-screen.patch
+++ b/patches/server/0672-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9563fc34579992b74451f32e8cbb24b19d1ee19e..2916328a5b94783e68688756b5ad7685f180e27f 100644
+index 2b104326f718bdfa263554c60ead798659ab5fa0..22c1bf5989065016364505a0665a5205fd8528b5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -394,6 +394,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0674-Fix-falling-block-spawn-methods.patch b/patches/server/0673-Fix-falling-block-spawn-methods.patch
index 978a204209..978a204209 100644
--- a/patches/server/0674-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0673-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0675-Expose-furnace-minecart-push-values.patch b/patches/server/0674-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0675-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0674-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0676-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0675-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 4698298019..4698298019 100644
--- a/patches/server/0676-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0675-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0677-More-Projectile-API.patch b/patches/server/0676-More-Projectile-API.patch
index 280d31b759..280d31b759 100644
--- a/patches/server/0677-More-Projectile-API.patch
+++ b/patches/server/0676-More-Projectile-API.patch
diff --git a/patches/server/0678-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0677-Fix-swamp-hut-cat-generation-deadlock.patch
index 6aa68bdd5c..6aa68bdd5c 100644
--- a/patches/server/0678-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0677-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0679-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0678-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 97f05cf771..0ceb6b0ce1 100644
--- a/patches/server/0679-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0678-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5169ca504b3b820e1b3b54af482dc709e2dee863..f26d092e50e5f1e320ba2e3a264573ad862aca26 100644
+index 1e806fd16ca5f90bdb4f71dea008d7936eb82562..76c9feb5e1389eb929571de74ececd4a4f384453 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -484,6 +484,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0680-Implement-getComputedBiome-API.patch b/patches/server/0679-Implement-getComputedBiome-API.patch
index 41624673a7..41624673a7 100644
--- a/patches/server/0680-Implement-getComputedBiome-API.patch
+++ b/patches/server/0679-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0681-Make-some-itemstacks-nonnull.patch b/patches/server/0680-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0681-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0680-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0682-Implement-enchantWithLevels-API.patch b/patches/server/0681-Implement-enchantWithLevels-API.patch
index 7bf61f04ba..7bf61f04ba 100644
--- a/patches/server/0682-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0681-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0683-Fix-saving-in-unloadWorld.patch b/patches/server/0682-Fix-saving-in-unloadWorld.patch
index 34ffb09d94..329e6c920e 100644
--- a/patches/server/0683-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0682-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ee6bdc985e8396e873bfd5c1f1d0046e2e830784..d80691928310059ab9d834ebf050c0214fbdd8bc 100644
+index 2431361e771a18e2631ac0493e9501d9e8a99d54..ea069053feb7a2b99cfea52537d5759893b552a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1381,7 +1381,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0684-Buffer-OOB-setBlock-calls.patch b/patches/server/0683-Buffer-OOB-setBlock-calls.patch
index 7bc7bd4823..7bc7bd4823 100644
--- a/patches/server/0684-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0683-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0685-Add-TameableDeathMessageEvent.patch b/patches/server/0684-Add-TameableDeathMessageEvent.patch
index b2ed688a59..1531307bd4 100644
--- a/patches/server/0685-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0684-Add-TameableDeathMessageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add TameableDeathMessageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 0eebf7ce352e7d811bd5798bf19c399e61affb09..5405792eea1d90492183faa23367f13b88cd1721 100644
+index 7b7bc1a205dfacbe5709011b6b6799e75af9e4cc..4c5b0b1a71ec5ba0e8dcd5ef52bf667e9bb30be9 100644
 --- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 +++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 @@ -241,7 +241,12 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
diff --git a/patches/server/0686-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0685-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 58f3e0a3d9..58f3e0a3d9 100644
--- a/patches/server/0686-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0685-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0687-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0686-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 7e36336db0..ad38317db7 100644
--- a/patches/server/0687-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0686-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index da53f7d65e5625d7aa8b4a17e8c6194ecd0ef4ea..e87c005cf0e82ce56ca99dd40c1dea161faeedda 100644
+index 25ca370c0b19eca529fc2c980c50e899013f0897..f31eb944465e9011d8aad398eb60bafb44203ad5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -959,12 +959,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0688-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0687-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 1782fbc238..ba6ce8567a 100644
--- a/patches/server/0688-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0687-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d3971bc8a1cedaaffa89bb6eedb45742aa7c1d34..76182523c12f885cb42af1efa82f8e251e901195 100644
+index 7d9ebc71b794d40246cbd43ff4de5795970e7ebe..3bb7e0f6a02b9b1726b8c878271d89a9c6d56c12 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2687,7 +2687,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0689-cache-resource-keys.patch b/patches/server/0688-cache-resource-keys.patch
index 7f3b6ce992..7f3b6ce992 100644
--- a/patches/server/0689-cache-resource-keys.patch
+++ b/patches/server/0688-cache-resource-keys.patch
diff --git a/patches/server/0690-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0689-Allow-changing-the-EnderDragon-podium.patch
index 4c615ac132..4c615ac132 100644
--- a/patches/server/0690-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0689-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0691-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0690-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 265f2bbdbb..265f2bbdbb 100644
--- a/patches/server/0691-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0690-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0692-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0691-Prevent-tile-entity-copies-loading-chunks.patch
index f14c496562..50f78f59ad 100644
--- a/patches/server/0692-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0691-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a94c253758200ee91a911783a9505214ddd984ba..6091462cbdecfac5e6bcc92e6bbb45a680f03b05 100644
+index 76c9feb5e1389eb929571de74ececd4a4f384453..7c1a94980cf49d37be442e1b62de36d4395bcf2a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3201,7 +3201,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3200,7 +3200,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  BlockPos blockposition = BlockEntity.getPosFromTag(customdata.getUnsafe());
  
                  if (this.player.level().isLoaded(blockposition)) {
diff --git a/patches/server/0693-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0692-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 8da1a5ddd1..8da1a5ddd1 100644
--- a/patches/server/0693-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0692-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0694-Expand-PlayerItemDamageEvent.patch b/patches/server/0693-Expand-PlayerItemDamageEvent.patch
index d550002186..d550002186 100644
--- a/patches/server/0694-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0693-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0695-WorldCreator-keepSpawnLoaded.patch b/patches/server/0694-WorldCreator-keepSpawnLoaded.patch
index 283377b0ad..3582da2d5c 100644
--- a/patches/server/0695-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0694-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d80691928310059ab9d834ebf050c0214fbdd8bc..c5f736ad83c0296c3291ad71278598eb00db436c 100644
+index ea069053feb7a2b99cfea52537d5759893b552a8..d356c69f7059ee12e736f829788f53d62d00516e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1324,7 +1324,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0696-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0695-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0696-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0695-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0697-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0696-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index ed6f344427..ed6f344427 100644
--- a/patches/server/0697-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0696-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0698-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0697-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index b73fc3193a..b73fc3193a 100644
--- a/patches/server/0698-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0697-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0699-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0698-Fire-CauldronLevelChange-on-initial-fill.patch
index 07f836b363..07f836b363 100644
--- a/patches/server/0699-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0698-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0700-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0699-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0700-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0699-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0701-Add-PlayerStopUsingItemEvent.patch b/patches/server/0700-Add-PlayerStopUsingItemEvent.patch
index 735b98addf..ac53d2916a 100644
--- a/patches/server/0701-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0700-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a02df3b6fd908b16dbe5a3be77174bfb82a5f35f..fa9512da351ef92a8606b3e68ee060dac4c63346 100644
+index 04dc54607df503a26cec8f4696db0dc057a15670..4a9abb2457b175c640d1e59de161fa2370053613 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4073,6 +4073,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0702-Don-t-tick-markers.patch b/patches/server/0701-Don-t-tick-markers.patch
index 98a89bf35d..2f7a18f647 100644
--- a/patches/server/0702-Don-t-tick-markers.patch
+++ b/patches/server/0701-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index 67fcba634f8183bb33834ac3b2c3dcfb8d87129e..777b789fdcdf297309cfb36fc7f77e3f
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3c947dc0aea06d66a00aeca51355ea41e8d98f88..ec2996d306d3466867e94bb6e4707f2b5fe13af2 100644
+index 60a77bd04489ee592ec61d3d739cb3062c1eefbb..492e8a2ff5618c45bfffa3284f03be14ff162ce8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2160,6 +2160,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0703-Expand-FallingBlock-API.patch b/patches/server/0702-Expand-FallingBlock-API.patch
index 84c7821142..84c7821142 100644
--- a/patches/server/0703-Expand-FallingBlock-API.patch
+++ b/patches/server/0702-Expand-FallingBlock-API.patch
diff --git a/patches/server/0704-Add-support-for-Proxy-Protocol.patch b/patches/server/0703-Add-support-for-Proxy-Protocol.patch
index aca878218f..aca878218f 100644
--- a/patches/server/0704-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0703-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0705-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0704-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0705-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0704-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0706-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0705-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0706-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0705-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0707-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0706-Sanitize-sent-BlockEntity-NBT.patch
index 152674ac06..152674ac06 100644
--- a/patches/server/0707-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0706-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0708-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0707-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0708-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0707-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0709-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0708-Prevent-entity-loading-causing-async-lookups.patch
index fca7a0fd8f..52647af7c4 100644
--- a/patches/server/0709-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0708-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 76182523c12f885cb42af1efa82f8e251e901195..c95cb2a05f0520a9e1f7be31f9b08f06a6e8f2ae 100644
+index 3bb7e0f6a02b9b1726b8c878271d89a9c6d56c12..de483cc77931fcb1d8bb9b1bcfd6606706490fba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -714,6 +714,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0710-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0709-Throw-exception-on-world-create-while-being-ticked.patch
index f99074702f..ab8863889a 100644
--- a/patches/server/0710-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0709-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index 8142e4a238066404f3d1685f9cee1a2b91cdd371..acdba56f025fe729398c5549175baad8
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5f736ad83c0296c3291ad71278598eb00db436c..92f3435fa4f8d37cc75939426a567dab4fa32707 100644
+index d356c69f7059ee12e736f829788f53d62d00516e..f1422bd50cd10f64c9c73e3ac3a93ff9e94d6265 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -916,6 +916,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0711-Dont-resent-entity-on-art-update.patch b/patches/server/0710-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0711-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0710-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0712-Add-WardenAngerChangeEvent.patch b/patches/server/0711-Add-WardenAngerChangeEvent.patch
index 41f4251548..41f4251548 100644
--- a/patches/server/0712-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0711-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0713-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0712-Add-option-for-strict-advancement-dimension-checks.patch
index 488f84c884..488f84c884 100644
--- a/patches/server/0713-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0712-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0714-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0713-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0714-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0713-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0715-Nameable-Banner-API.patch b/patches/server/0714-Nameable-Banner-API.patch
index da3d804d8f..da3d804d8f 100644
--- a/patches/server/0715-Nameable-Banner-API.patch
+++ b/patches/server/0714-Nameable-Banner-API.patch
diff --git a/patches/server/0716-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0715-Don-t-broadcast-messages-to-command-blocks.patch
index e5dee87a16..f97c37339b 100644
--- a/patches/server/0716-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0715-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index 8c2dcc4134d96351cee75773214f3f47e71533e9..e6bfcc50cdf728216084bc00a5bb8b6b
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 92f3435fa4f8d37cc75939426a567dab4fa32707..29f5da02f69717d8cf5bb480473023655c6d2617 100644
+index f1422bd50cd10f64c9c73e3ac3a93ff9e94d6265..0274b574e80e133ec1b5033ae09450d2d57db894 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1923,7 +1923,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0717-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0716-Prevent-empty-items-from-being-added-to-world.patch
index c9e7ae9955..53f5579791 100644
--- a/patches/server/0717-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0716-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ec2996d306d3466867e94bb6e4707f2b5fe13af2..43d54a7fab4b5d46bf4ca319519a39fda1fc264f 100644
+index 492e8a2ff5618c45bfffa3284f03be14ff162ce8..b88a7f580b4138ceb262f3d398e78fdc2e6b018c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1235,6 +1235,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0718-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0717-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index c2e21a749e..c2e21a749e 100644
--- a/patches/server/0718-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0717-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0719-Add-Player-getFishHook.patch b/patches/server/0718-Add-Player-getFishHook.patch
index 7ab8083ac7..7ab8083ac7 100644
--- a/patches/server/0719-Add-Player-getFishHook.patch
+++ b/patches/server/0718-Add-Player-getFishHook.patch
diff --git a/patches/server/0720-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0719-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0720-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0719-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0721-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0720-Add-various-missing-EntityDropItemEvent-calls.patch
index 6177362922..2a92fcdc52 100644
--- a/patches/server/0721-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0720-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c95cb2a05f0520a9e1f7be31f9b08f06a6e8f2ae..43a2570196619bd239170de586626a7112066430 100644
+index de483cc77931fcb1d8bb9b1bcfd6606706490fba..180a86c419cad9873c53a49c8881ced647a753e0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2557,6 +2557,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0722-Fix-Bee-flower-NPE.patch b/patches/server/0721-Fix-Bee-flower-NPE.patch
index db6e1b0ad9..db6e1b0ad9 100644
--- a/patches/server/0722-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0721-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0723-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0722-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index da1e0bead1..67b7b9467e 100644
--- a/patches/server/0723-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0722-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6091462cbdecfac5e6bcc92e6bbb45a680f03b05..e804e08e8b99d10b513972bd42a1257a66baeff4 100644
+index 7c1a94980cf49d37be442e1b62de36d4395bcf2a..4fa49daf58723827366f611e006e77448cc73a0b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2383,7 +2383,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0724-More-Teleport-API.patch b/patches/server/0723-More-Teleport-API.patch
index ccfe8ed6d0..f7c39c1cf3 100644
--- a/patches/server/0724-More-Teleport-API.patch
+++ b/patches/server/0723-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e804e08e8b99d10b513972bd42a1257a66baeff4..857f6dedacf0533856e26b0a9a6f8e25c1f7bad9 100644
+index 4fa49daf58723827366f611e006e77448cc73a0b..f05297a2b349734b9700a0e977ee9b2bba030d65 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1565,11 +1565,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0725-Add-EntityPortalReadyEvent.patch b/patches/server/0724-Add-EntityPortalReadyEvent.patch
index 3b5704098f..56705093a3 100644
--- a/patches/server/0725-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0724-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index caa22afb0781671b901c23ebcc89e5bb0d2bd615..a530276b0123dee5680d7e09ad3d2f0414909c91 100644
+index e2969b49494c55c3705312361ee8083b05ef569e..417a9ab28d247d5fbb3f1097fdeccab7ad2a793b 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -133,6 +133,14 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/server/0726-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0725-Don-t-use-level-random-in-entity-constructors.patch
index cb41bd38c5..cb41bd38c5 100644
--- a/patches/server/0726-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0725-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0727-Send-block-entities-after-destroy-prediction.patch b/patches/server/0726-Send-block-entities-after-destroy-prediction.patch
index 5c6437afa0..c039e444e1 100644
--- a/patches/server/0727-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0726-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 4d024956156aefde7df308642dfd0a40779e0633..6abecaac8407b992d208a9108e11fd49
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 857f6dedacf0533856e26b0a9a6f8e25c1f7bad9..3637eebdf9841b97e2086ce611af27c052ac0461 100644
+index f05297a2b349734b9700a0e977ee9b2bba030d65..ca32e5aa6e77ca1bab886e7b6a778ec931ac4e4c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1711,8 +1711,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0728-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0727-Warn-on-plugins-accessing-faraway-chunks.patch
index a0023ba6e1..a0023ba6e1 100644
--- a/patches/server/0728-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0727-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0729-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0728-Custom-Chat-Completion-Suggestions-API.patch
index 45789f37e1..91d951761e 100644
--- a/patches/server/0729-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0728-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d2f6fb41b16468bf03675b3a331c707e21f8c9ce..5f3045630197f6d515bc66f7fa8014814dbfd8a7 100644
+index 78c11d99b6dfdf742dbe24f7b3c2ddbcfd433fd6..41e000981d175f121ad92aff47260b8ed76ceb62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -691,6 +691,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0730-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0729-Add-and-fix-missing-BlockFadeEvents.patch
index 062bad35bb..062bad35bb 100644
--- a/patches/server/0730-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0729-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0731-Collision-API.patch b/patches/server/0730-Collision-API.patch
index f8bf3193f8..f8bf3193f8 100644
--- a/patches/server/0731-Collision-API.patch
+++ b/patches/server/0730-Collision-API.patch
diff --git a/patches/server/0732-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0731-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index f661ad8722..f661ad8722 100644
--- a/patches/server/0732-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0731-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0733-Block-Ticking-API.patch b/patches/server/0732-Block-Ticking-API.patch
index 9e5247f35f..9e5247f35f 100644
--- a/patches/server/0733-Block-Ticking-API.patch
+++ b/patches/server/0732-Block-Ticking-API.patch
diff --git a/patches/server/0734-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0733-Add-Velocity-IP-Forwarding-Support.patch
index ef2c3507a8..dbfd8565c9 100644
--- a/patches/server/0734-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0733-Add-Velocity-IP-Forwarding-Support.patch
@@ -228,7 +228,7 @@ index e9cd90b6bb2f57d605323add43f12962bd7cb843..0fc30ce511f449d2a3ddab28c86f7e38
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 29f5da02f69717d8cf5bb480473023655c6d2617..f63d6b4d759fbbc5f5c5dd6b39179af93f49d10f 100644
+index 0274b574e80e133ec1b5033ae09450d2d57db894..c049c6046e3acd2262c7a474db351ae761457a0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -845,7 +845,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0735-Add-NamespacedKey-biome-methods.patch b/patches/server/0734-Add-NamespacedKey-biome-methods.patch
index 2d26388547..1b67c6785e 100644
--- a/patches/server/0735-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0734-Add-NamespacedKey-biome-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5ba8ce0f8c516567f38a6f95662bde71086e6ae4..24cb9d97bb04a4fe60c46055520ec324fbf6fa3b 100644
+index 0e849b49329054005c20a5773de2ff15bf3f6e5d..39066b1d8df7f784e4c90b5fd47505ef65db307c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -578,6 +578,21 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0736-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0735-Fix-plugin-loggers-on-server-shutdown.patch
index 3a9d6b48df..6f6ce54a0d 100644
--- a/patches/server/0736-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0735-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index acdba56f025fe729398c5549175baad8e6818f62..3aba668f9a34cabc26063c61660ab22f
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ba95452f99e542638c3a3f7bbfdf6e79849014c5..618f4b2e1d012b647b3e7bf359c8ecdd7f159e63 100644
+index 168cbb239ac5d632908f2b0aca82cbcfdc35651f..c1e88c31910e96ef07cece05046c0b55e708b52d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -19,6 +19,12 @@ public class Main {
diff --git a/patches/server/0737-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0736-Stop-large-look-changes-from-crashing-the-server.patch
index 93357dd58b..93357dd58b 100644
--- a/patches/server/0737-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0736-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0738-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0737-Fire-EntityChangeBlockEvent-in-more-places.patch
index bafa064971..bafa064971 100644
--- a/patches/server/0738-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0737-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0739-Missing-eating-regain-reason.patch b/patches/server/0738-Missing-eating-regain-reason.patch
index af804e161b..af804e161b 100644
--- a/patches/server/0739-Missing-eating-regain-reason.patch
+++ b/patches/server/0738-Missing-eating-regain-reason.patch
diff --git a/patches/server/0740-Missing-effect-cause.patch b/patches/server/0739-Missing-effect-cause.patch
index f9c09496b6..f9c09496b6 100644
--- a/patches/server/0740-Missing-effect-cause.patch
+++ b/patches/server/0739-Missing-effect-cause.patch
diff --git a/patches/server/0741-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0740-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0741-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0740-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0742-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0741-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 1472e064ab..1472e064ab 100644
--- a/patches/server/0742-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0741-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0743-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0742-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0743-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0742-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0744-Configurable-chat-thread-limit.patch b/patches/server/0743-Configurable-chat-thread-limit.patch
index 57178397ba..57178397ba 100644
--- a/patches/server/0744-Configurable-chat-thread-limit.patch
+++ b/patches/server/0743-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0745-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0744-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index aaf56a3c17..aaf56a3c17 100644
--- a/patches/server/0745-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0744-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0746-fix-Jigsaw-block-kicking-user.patch b/patches/server/0745-fix-Jigsaw-block-kicking-user.patch
index 6e1aef94c8..6e1aef94c8 100644
--- a/patches/server/0746-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0745-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0747-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0746-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0747-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0746-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0748-Add-getDrops-to-BlockState.patch b/patches/server/0747-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0748-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0747-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0749-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0748-Fix-a-bunch-of-vanilla-bugs.patch
index 197bab1c24..42c78ff9fa 100644
--- a/patches/server/0749-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0748-Fix-a-bunch-of-vanilla-bugs.patch
@@ -98,7 +98,7 @@ index 071e9ef3680c5dc492c6142ccd05f6788ebc3035..61fda6927f060cdf8bcfddaaa08bbbe2
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 43d54a7fab4b5d46bf4ca319519a39fda1fc264f..4924e19c3fdafb3bb3f0550b16f8acf08e436c67 100644
+index b88a7f580b4138ceb262f3d398e78fdc2e6b018c..1edad85fc5c199dcab66497fa758e48dd14aec8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -777,7 +777,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -124,7 +124,7 @@ index 6abecaac8407b992d208a9108e11fd4954a4106f..03d89f326d320c5d778c3d1e2db7d6b8
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b0a1f6cf2cc96a2ddc8232f929c134501d99411e..84add5cc89ec912389500b6140a39d6b7ddc9e86 100644
+index be842c81ae6c6ec64a233f126d7221a37d66439c..b54e8da2209d99696e12c65a23323a68b7da272b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -260,7 +260,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0750-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0749-Remove-unnecessary-onTrackingStart-during-navigation.patch
index bbff07c888..4de44632f0 100644
--- a/patches/server/0750-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0749-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4924e19c3fdafb3bb3f0550b16f8acf08e436c67..66f795168d3e120506aafa3cade78e6e8dcd8619 100644
+index 1edad85fc5c199dcab66497fa758e48dd14aec8c..faacbdcce7de32f4e3e4a9528ea59808ccaee70b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2184,7 +2184,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0751-Fix-custom-piglin-loved-items.patch b/patches/server/0750-Fix-custom-piglin-loved-items.patch
index a09a51f7ea..a09a51f7ea 100644
--- a/patches/server/0751-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0750-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0752-EntityPickupItemEvent-fixes.patch b/patches/server/0751-EntityPickupItemEvent-fixes.patch
index 91c0eac860..91c0eac860 100644
--- a/patches/server/0752-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0751-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0753-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0752-Correctly-handle-interactions-with-items-on-cooldown.patch
index 0622f3fbf7..0622f3fbf7 100644
--- a/patches/server/0753-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0752-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0754-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0753-Add-PlayerInventorySlotChangeEvent.patch
index 559e666820..0f6a75faa3 100644
--- a/patches/server/0754-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0753-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 10ad431d66fcf603f672611759fccb1e2e41cffe..18da22b7f4775e7e5008ab9f78cb6bb0091205c6 100644
+index ad3896dd524acb573adffdfb38b13dd699539cef..3dbaa3c6b75a0f8bfdef42d210f2ac6f560cde3d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -352,6 +352,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -35,7 +35,7 @@ index 10ad431d66fcf603f672611759fccb1e2e41cffe..18da22b7f4775e7e5008ab9f78cb6bb0
              @Override
              public void dataChanged(AbstractContainerMenu handler, int property, int value) {}
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 00031a013d8e1e9f40bc1ef9491da6df3b061d5f..ea84d4549815ddfd2829cb2fd3885ddd1114bfa8 100644
+index b8d8aad81f54f7f43c01da075e63ec9173750bec..f7b9849819c185cd89533aca1f6d34398ffc1077 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -302,7 +302,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0755-Elder-Guardian-appearance-API.patch b/patches/server/0754-Elder-Guardian-appearance-API.patch
index 8f007ec892..18f10a019a 100644
--- a/patches/server/0755-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0754-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5f3045630197f6d515bc66f7fa8014814dbfd8a7..2ec75a25de34b68e7c14416a06facce6a169bac7 100644
+index 41e000981d175f121ad92aff47260b8ed76ceb62..dd8f74da064530d21e834139cd5b5cb1daf905a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3298,6 +3298,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0756-Allow-changing-bed-s-occupied-property.patch b/patches/server/0755-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0756-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0755-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0757-Add-entity-knockback-API.patch b/patches/server/0756-Add-entity-knockback-API.patch
index e69cd1ea90..e69cd1ea90 100644
--- a/patches/server/0757-Add-entity-knockback-API.patch
+++ b/patches/server/0756-Add-entity-knockback-API.patch
diff --git a/patches/server/0758-Detect-headless-JREs.patch b/patches/server/0757-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0758-Detect-headless-JREs.patch
+++ b/patches/server/0757-Detect-headless-JREs.patch
diff --git a/patches/server/0759-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0758-fix-entity-vehicle-collision-event-not-called.patch
index e39b0eaf22..e39b0eaf22 100644
--- a/patches/server/0759-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0758-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0760-Add-EntityToggleSitEvent.patch b/patches/server/0759-Add-EntityToggleSitEvent.patch
index 28d2cdd4b0..0ed0b95562 100644
--- a/patches/server/0760-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0759-Add-EntityToggleSitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityToggleSitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 5405792eea1d90492183faa23367f13b88cd1721..8a4f15964449a40ae4fffc5d16b7789d61c4c594 100644
+index 4c5b0b1a71ec5ba0e8dcd5ef52bf667e9bb30be9..87c669517baa923ffa7392e400e7344e81fc9406 100644
 --- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 +++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 @@ -86,7 +86,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
diff --git a/patches/server/0761-Add-fire-tick-delay-option.patch b/patches/server/0760-Add-fire-tick-delay-option.patch
index 2ad454d1c6..2ad454d1c6 100644
--- a/patches/server/0761-Add-fire-tick-delay-option.patch
+++ b/patches/server/0760-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0762-Add-Moving-Piston-API.patch b/patches/server/0761-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0762-Add-Moving-Piston-API.patch
+++ b/patches/server/0761-Add-Moving-Piston-API.patch
diff --git a/patches/server/0763-Ignore-impossible-spawn-tick.patch b/patches/server/0762-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0763-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0762-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0764-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
index 2fe35c8b32..2fe35c8b32 100644
--- a/patches/server/0764-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/server/0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0765-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 77c18397b3..cd0b3b2cc7 100644
--- a/patches/server/0765-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 43a2570196619bd239170de586626a7112066430..655a0f2328b641ce41c64e9bb1456e05a4342197 100644
+index 180a86c419cad9873c53a49c8881ced647a753e0..1aa3396a33e24f3849725769fe58b57374ee7611 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3193,6 +3193,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0766-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0765-Add-PrePlayerAttackEntityEvent.patch
index b0f3a07890..b0f3a07890 100644
--- a/patches/server/0766-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0765-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0767-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0766-ensure-reset-EnderDragon-boss-event-name.patch
index 47272d2095..e2a769583d 100644
--- a/patches/server/0767-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0766-ensure-reset-EnderDragon-boss-event-name.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ensure reset EnderDragon boss event name
 Fix MC-257487
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index e5927f378789e1d8b83ca5c84d657e0e637cc575..0100d3f4cb2c1d3e2e052ee109aea707029d0c10 100644
+index 98d1c097fdbbc8080624f365634e0812a5eea5ac..bf39f006efef529db697ed4dccbd1657a2673b79 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -73,6 +73,7 @@ public class EndDragonFight {
diff --git a/patches/server/0768-Add-Player-Warden-Warning-API.patch b/patches/server/0767-Add-Player-Warden-Warning-API.patch
index 84244f79e4..4d0bbf78c3 100644
--- a/patches/server/0768-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0767-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2ec75a25de34b68e7c14416a06facce6a169bac7..cdcdb55f896bb4128f258bf2aee91dc60100b6de 100644
+index dd8f74da064530d21e834139cd5b5cb1daf905a9..171547b3affbd6ea79c833c58a2ea0ae58da3138 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3303,6 +3303,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0769-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0768-More-vanilla-friendly-methods-to-update-trades.patch
index 5c30d5f82c..5c30d5f82c 100644
--- a/patches/server/0769-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0768-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0770-Add-paper-dumplisteners-command.patch b/patches/server/0769-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0770-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0769-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0771-check-global-player-list-where-appropriate.patch b/patches/server/0770-check-global-player-list-where-appropriate.patch
index 3afedde0df..94286fbda9 100644
--- a/patches/server/0771-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0770-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 66f795168d3e120506aafa3cade78e6e8dcd8619..cff225eab588248f1e6487a4a33da006672b3ba4 100644
+index faacbdcce7de32f4e3e4a9528ea59808ccaee70b..07f7752651095abdd9e9408a419aed7d78173d3a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2300,4 +2300,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -24,7 +24,7 @@ index 66f795168d3e120506aafa3cade78e6e8dcd8619..cff225eab588248f1e6487a4a33da006
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e6335a55d87444d56d6f20dfc51cc4fc797de2cf..ec656b2505c143e453b540e3e0a2cbfa0b370cd3 100644
+index 9c8e23f92a4cf902b060af4ce74777753e32f207..c1d0ee65a0390c37f12d68bb8fdb2f20d30a8391 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3723,7 +3723,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0772-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0771-Fix-async-entity-add-due-to-fungus-trees.patch
index 2a7830d952..2a7830d952 100644
--- a/patches/server/0772-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0771-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0773-ItemStack-damage-API.patch b/patches/server/0772-ItemStack-damage-API.patch
index 2f71087902..2f71087902 100644
--- a/patches/server/0773-ItemStack-damage-API.patch
+++ b/patches/server/0772-ItemStack-damage-API.patch
diff --git a/patches/server/0774-Friction-API.patch b/patches/server/0773-Friction-API.patch
index dfa1fdc21b..cae3c2376e 100644
--- a/patches/server/0774-Friction-API.patch
+++ b/patches/server/0773-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ec656b2505c143e453b540e3e0a2cbfa0b370cd3..fd0e44ea6ff2868b06c8f0af14be998d95f9f46b 100644
+index c1d0ee65a0390c37f12d68bb8fdb2f20d30a8391..7d7d5dcb9866dc84d385d82602d0fa58602ad23c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -285,6 +285,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0775-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0774-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0775-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0774-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0776-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0775-Fix-premature-player-kicks-on-shutdown.patch
index d3dbe3d230..d3dbe3d230 100644
--- a/patches/server/0776-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0775-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0777-Sync-offhand-slot-in-menus.patch b/patches/server/0776-Sync-offhand-slot-in-menus.patch
index 482895a894..f613fba84b 100644
--- a/patches/server/0777-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0776-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 18da22b7f4775e7e5008ab9f78cb6bb0091205c6..7604aef2e03e7d688e7b6504283ed631488ec2d6 100644
+index 3dbaa3c6b75a0f8bfdef42d210f2ac6f560cde3d..96dff63230e8cda1f5e548d914c119bd64b5ac33 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -321,6 +321,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -26,7 +26,7 @@ index 18da22b7f4775e7e5008ab9f78cb6bb0091205c6..7604aef2e03e7d688e7b6504283ed631
              public void sendSlotChange(AbstractContainerMenu handler, int slot, ItemStack stack) {
                  ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(handler.containerId, handler.incrementStateId(), slot, stack));
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index ea84d4549815ddfd2829cb2fd3885ddd1114bfa8..85fb19177690ea7235c10f64789066599db08b05 100644
+index f7b9849819c185cd89533aca1f6d34398ffc1077..0e380151b038e2133013eb7d73621cf247b5b954 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -200,6 +200,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0778-Player-Entity-Tracking-Events.patch b/patches/server/0777-Player-Entity-Tracking-Events.patch
index 8871c9b19f..ceec0058a6 100644
--- a/patches/server/0778-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0777-Player-Entity-Tracking-Events.patch
@@ -21,7 +21,7 @@ index 61fda6927f060cdf8bcfddaaa08bbbe2c514c630..dca6087dc4e1c177c3dfdae01f140cf8
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 655a0f2328b641ce41c64e9bb1456e05a4342197..3c410f22c92a64b50d77b22c4b3027d51bcd7e05 100644
+index 1aa3396a33e24f3849725769fe58b57374ee7611..3c7175b015262ed354d9a9ae237aff6d34cec713 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3868,7 +3868,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0779-Limit-pet-look-distance.patch b/patches/server/0778-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0779-Limit-pet-look-distance.patch
+++ b/patches/server/0778-Limit-pet-look-distance.patch
diff --git a/patches/server/0780-fix-Instruments.patch b/patches/server/0779-fix-Instruments.patch
index 3c7adaddd6..1426590363 100644
--- a/patches/server/0780-fix-Instruments.patch
+++ b/patches/server/0779-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cdcdb55f896bb4128f258bf2aee91dc60100b6de..fc0db6deca6ff3b8e083fccd312e6ff3b5a78616 100644
+index 171547b3affbd6ea79c833c58a2ea0ae58da3138..3e0018c512cad3127a59b54ab008afb6847d82b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -768,7 +768,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0781-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 420107d5c3..420107d5c3 100644
--- a/patches/server/0781-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0782-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0782-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0783-Add-BlockLockCheckEvent.patch b/patches/server/0782-Add-BlockLockCheckEvent.patch
index 31fba739ae..31fba739ae 100644
--- a/patches/server/0783-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0782-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0784-Add-Sneaking-API-for-Entities.patch b/patches/server/0783-Add-Sneaking-API-for-Entities.patch
index aaee22c056..aaee22c056 100644
--- a/patches/server/0784-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0783-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0785-Improve-logging-and-errors.patch b/patches/server/0784-Improve-logging-and-errors.patch
index 2b5cda2c15..242788d9b6 100644
--- a/patches/server/0785-Improve-logging-and-errors.patch
+++ b/patches/server/0784-Improve-logging-and-errors.patch
@@ -52,10 +52,10 @@ index aa39bdb0a4ba8fedf5052ea9700afa7d4d2a4300..b4af03c4bdd1ce0861f36c3b75fc7e89
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3637eebdf9841b97e2086ce611af27c052ac0461..a5e1d26bd0cb063b9bbc525eafaf7039ab84708f 100644
+index ca32e5aa6e77ca1bab886e7b6a778ec931ac4e4c..d3071a289ef1e9f9a82af29c118cef1f899e5ed3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3399,7 +3399,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3398,7 +3398,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
diff --git a/patches/server/0786-Improve-PortalEvents.patch b/patches/server/0785-Improve-PortalEvents.patch
index 888317113e..bb191a7362 100644
--- a/patches/server/0786-Improve-PortalEvents.patch
+++ b/patches/server/0785-Improve-PortalEvents.patch
@@ -18,7 +18,7 @@ index 96dff63230e8cda1f5e548d914c119bd64b5ac33..7270b6fa96bae937663c0fea77887e21
                  Bukkit.getServer().getPluginManager().callEvent(tpEvent);
                  if (tpEvent.isCancelled() || tpEvent.getTo() == null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3c410f22c92a64b50d77b22c4b3027d51bcd7e05..1c4ec9049d84adbeb26b7abda82836f8ce0ff0ba 100644
+index 3c7175b015262ed354d9a9ae237aff6d34cec713..303f3656be5e9049cd195030c457df9a7c718b66 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3527,7 +3527,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -78,7 +78,7 @@ index 28fba1448309805fc3d687de6bc8454d2c85fcd3..a35a426cc7778a51523f26057b5d61b8
              boolean flag = resourcekey == Level.END;
              BlockPos blockposition1 = flag ? ServerLevel.END_SPAWN_POINT : worldserver1.getSharedSpawnPos();
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index a530276b0123dee5680d7e09ad3d2f0414909c91..1722188fbfccd233625db540ddcaf646762fd023 100644
+index 417a9ab28d247d5fbb3f1097fdeccab7ad2a793b..0fdbcab175b51a8b77646e0e4a267d987b133a35 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -110,8 +110,9 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/server/0787-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0786-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0787-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0786-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0788-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0787-Add-missing-SpigotConfig-logCommands-check.patch
index 4c67b4d5f2..0b802d3789 100644
--- a/patches/server/0788-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0787-Add-missing-SpigotConfig-logCommands-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 Co-authored-by: david <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a5e1d26bd0cb063b9bbc525eafaf7039ab84708f..3ca5fc1ec2e97164e2f905d9a8a3cbaa0ed23c64 100644
+index d3071a289ef1e9f9a82af29c118cef1f899e5ed3..b53e82d47cc90d9d0e96cb5b1e6219850606f681 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2057,7 +2057,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0789-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0789-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0790-Flying-Fall-Damage.patch b/patches/server/0789-Flying-Fall-Damage.patch
index 1731871405..d82a7d6a41 100644
--- a/patches/server/0790-Flying-Fall-Damage.patch
+++ b/patches/server/0789-Flying-Fall-Damage.patch
@@ -26,7 +26,7 @@ index ad334f149fe1b44d4ebe48489dcd2811ff1b5cd0..950ce40d268d89ff3c503116081db6c9
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fc0db6deca6ff3b8e083fccd312e6ff3b5a78616..78ab37d1359e1d44bd921428038c733b77171cd2 100644
+index 3e0018c512cad3127a59b54ab008afb6847d82b6..88d55a5da818665799ae957e1e5e53a406bcdef2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2581,6 +2581,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0791-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 7951b277f6..80118a6499 100644
--- a/patches/server/0791-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1c4ec9049d84adbeb26b7abda82836f8ce0ff0ba..015004598010b272474169a019d39476949a3a33 100644
+index 303f3656be5e9049cd195030c457df9a7c718b66..34e175b28f7c9120b58fc8e2b65ca978c7f301b5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -942,6 +942,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0792-config-for-disabling-entity-tag-tags.patch b/patches/server/0791-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0792-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0791-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0793-Use-single-player-info-update-packet-on-join.patch b/patches/server/0792-Use-single-player-info-update-packet-on-join.patch
index 2d4fec688e..3d726e4e58 100644
--- a/patches/server/0793-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0792-Use-single-player-info-update-packet-on-join.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ca5fc1ec2e97164e2f905d9a8a3cbaa0ed23c64..111daa178ae9ad5a53266cf7e460f1213f9c5a88 100644
+index b53e82d47cc90d9d0e96cb5b1e6219850606f681..8992e708a94206261be1abbe90483b82bf1adad8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3437,7 +3437,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3436,7 +3436,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
          this.chatMessageChain.append(() -> {
              this.player.setChatSession(session);
diff --git a/patches/server/0794-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0793-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 8f9bf2cb24..c1db8cbcae 100644
--- a/patches/server/0794-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0793-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fd0e44ea6ff2868b06c8f0af14be998d95f9f46b..7ad469bf4b88f9e33ad4aaebe18e41d25769444e 100644
+index 7d7d5dcb9866dc84d385d82602d0fa58602ad23c..c749c45cb49444347f8e9c0c4689aa44f96b40bb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1632,7 +1632,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0795-Win-Screen-API.patch b/patches/server/0794-Win-Screen-API.patch
index 7ab535106b..9089ea0503 100644
--- a/patches/server/0795-Win-Screen-API.patch
+++ b/patches/server/0794-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 78ab37d1359e1d44bd921428038c733b77171cd2..384165d6747c61d0d306fa63773cbca560dfae9b 100644
+index 88d55a5da818665799ae957e1e5e53a406bcdef2..34c16525d9393a3f111e3df387b55d28b875cb06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1305,6 +1305,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0796-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0795-Remove-CraftItemStack-setAmount-null-assignment.patch
index 5b5c421ff2..5b5c421ff2 100644
--- a/patches/server/0796-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0795-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0797-Fix-force-opening-enchantment-tables.patch b/patches/server/0796-Fix-force-opening-enchantment-tables.patch
index db009af8c8..db009af8c8 100644
--- a/patches/server/0797-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0796-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0798-Add-Entity-Body-Yaw-API.patch b/patches/server/0797-Add-Entity-Body-Yaw-API.patch
index 53523e2ba9..53523e2ba9 100644
--- a/patches/server/0798-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0797-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0799-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0799-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0800-Add-EntityFertilizeEggEvent.patch b/patches/server/0799-Add-EntityFertilizeEggEvent.patch
index f940f43c54..f940f43c54 100644
--- a/patches/server/0800-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0799-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0801-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 99130d8f1a..99130d8f1a 100644
--- a/patches/server/0801-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0802-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0802-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0803-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0802-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0803-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0802-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0804-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0803-Fix-advancement-triggers-for-entity-damage.patch
index 4ebe570740..ea0459da7d 100644
--- a/patches/server/0804-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0803-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index 2ebbf7954dc5e0d6c9d53327d05b725eec310086..c5bd2e90ad74ba08910f65a2e07b6f76
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7ad469bf4b88f9e33ad4aaebe18e41d25769444e..ffc0fcd7c2075b44585bd754494f2f7c07788f47 100644
+index c749c45cb49444347f8e9c0c4689aa44f96b40bb..3bd9eaf4f0537167ed27c666e805fbf65c640445 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2388,7 +2388,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0805-Fix-text-display-error-on-spawn.patch b/patches/server/0804-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0805-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0804-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0806-Fix-inventories-returning-null-Locations.patch b/patches/server/0805-Fix-inventories-returning-null-Locations.patch
index 23413d6b03..23413d6b03 100644
--- a/patches/server/0806-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0805-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0807-Add-Shearable-API.patch b/patches/server/0806-Add-Shearable-API.patch
index 069dcbaf2e..069dcbaf2e 100644
--- a/patches/server/0807-Add-Shearable-API.patch
+++ b/patches/server/0806-Add-Shearable-API.patch
diff --git a/patches/server/0808-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0807-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 254a94df3a..254a94df3a 100644
--- a/patches/server/0808-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0807-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0809-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0809-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0810-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0809-Treat-sequence-violations-like-they-should-be.patch
index d8156489e2..45b8f02ad1 100644
--- a/patches/server/0810-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0809-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 111daa178ae9ad5a53266cf7e460f1213f9c5a88..14256242c87a167dc35025f3d53e778a83adaadd 100644
+index 8992e708a94206261be1abbe90483b82bf1adad8..7599ce41ceb70cca8c329c21e52b4360a06ced2e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1976,6 +1976,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0811-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0810-Prevent-causing-expired-keys-from-impacting-new-join.patch
index ee5e9c9da0..1de5b56b69 100644
--- a/patches/server/0811-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0810-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -26,7 +26,7 @@ index 68c062cbaa030d62d97c9c003651f8fc17a00a6b..6247a21c9c391abf1f6db3482c659593
          UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())),
          UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())),
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 14256242c87a167dc35025f3d53e778a83adaadd..8130db188a7014cff572743b06ca14806bbacdc2 100644
+index 7599ce41ceb70cca8c329c21e52b4360a06ced2e..1ea86a8a1ddb64bf71e2b3794bd0599dd8753681 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -295,6 +295,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -51,7 +51,7 @@ index 14256242c87a167dc35025f3d53e778a83adaadd..8130db188a7014cff572743b06ca1480
      }
  
      private int getMaximumFlyingTicks(Entity vehicle) {
-@@ -3435,6 +3443,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3434,6 +3442,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      private void resetPlayerChatState(RemoteChatSession session) {
          this.chatSession = session;
diff --git a/patches/server/0812-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index b0096b0c97..3306163498 100644
--- a/patches/server/0812-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cff225eab588248f1e6487a4a33da006672b3ba4..a27fd023e4f9b6ee113f6b3ed21b4c5aeb7ce15d 100644
+index 07f7752651095abdd9e9408a419aed7d78173d3a..fd4d1cab675b7b423ac0fdf9a8c9f472ddc68c36 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1372,6 +1372,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0813-Use-array-for-gamerule-storage.patch b/patches/server/0812-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0813-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0812-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0814-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0813-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0814-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0813-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0815-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0814-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0815-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0814-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0816-Add-Mob-Experience-reward-API.patch b/patches/server/0815-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0816-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0815-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0817-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0816-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0817-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0816-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0818-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0818-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0819-More-accurate-isInOpenWater-impl.patch b/patches/server/0818-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0819-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0818-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0820-Expand-PlayerItemMendEvent.patch b/patches/server/0819-Expand-PlayerItemMendEvent.patch
index 6c302fd085..6c302fd085 100644
--- a/patches/server/0820-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0819-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0821-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0820-Refresh-ProjectileSource-for-projectiles.patch
index 2b15911588..4a5117fd04 100644
--- a/patches/server/0821-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0820-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 015004598010b272474169a019d39476949a3a33..435185dafb833b484f252965302e329cde444c2f 100644
+index 34e175b28f7c9120b58fc8e2b65ca978c7f301b5..cd362a91ad31dbae94fdb5a8c71839576f397ea1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -390,6 +390,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -26,7 +26,7 @@ index 015004598010b272474169a019d39476949a3a33..435185dafb833b484f252965302e329c
      public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
      public boolean persistentInvisibility = false;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index d147f3cc1af28c384005c1c20e37bb588588c88d..5f7d152f41eb85f17bcded4bc8099b998e5a338b 100644
+index dd53501d39113c4b0b5950bad70a5c667c0781c5..4b71538d5e921af89c4b13200484d4767e4dd6f9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -57,14 +57,31 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0822-Add-transient-modifier-API.patch b/patches/server/0821-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0822-Add-transient-modifier-API.patch
+++ b/patches/server/0821-Add-transient-modifier-API.patch
diff --git a/patches/server/0823-Fix-block-place-logic.patch b/patches/server/0822-Fix-block-place-logic.patch
index accea4ee7c..accea4ee7c 100644
--- a/patches/server/0823-Fix-block-place-logic.patch
+++ b/patches/server/0822-Fix-block-place-logic.patch
diff --git a/patches/server/0824-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 42a45f0c62..e37c1ac015 100644
--- a/patches/server/0824-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7c52ae813bfe47983ca94f4daf68f17e899949da..7cb7443aa60b9a552d8d9b67ddbf8b3e54af24e8 100644
+index e6588a7fc03df4036b38f9a2011e7a716ff111f4..748489c375517368ab5a62f61d86ccdf91304d97 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -571,7 +571,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0825-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0824-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0825-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0824-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0826-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 90edb8680f..51cff24583 100644
--- a/patches/server/0826-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f63d6b4d759fbbc5f5c5dd6b39179af93f49d10f..ed6210d2490f8584c21537eaa380d990fb73e03d 100644
+index c049c6046e3acd2262c7a474db351ae761457a0e..085e7ebd5e34b6f7c41b2847641bad9d03fb9d96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -355,7 +355,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0827-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0826-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0827-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0826-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0828-Fix-sniffer-removeExploredLocation.patch b/patches/server/0827-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0828-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0827-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0829-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0828-Add-method-to-remove-all-active-potion-effects.patch
index eb810dfef5..eb810dfef5 100644
--- a/patches/server/0829-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0828-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0830-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0830-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0831-Add-event-for-player-editing-sign.patch b/patches/server/0830-Add-event-for-player-editing-sign.patch
index 8c26ae27ea..f2582476f3 100644
--- a/patches/server/0831-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0830-Add-event-for-player-editing-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7cb7443aa60b9a552d8d9b67ddbf8b3e54af24e8..1016541b8f01cdb45ae96fbb777c6c38598fcc35 100644
+index 748489c375517368ab5a62f61d86ccdf91304d97..0a6db77afa392e6ab47f970d5665804c8f6cbf7b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -550,7 +550,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0832-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0831-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0832-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0831-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0833-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0832-Fix-cmd-permission-levels-for-command-blocks.patch
index 5167eee08c..5167eee08c 100644
--- a/patches/server/0833-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0832-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0834-Add-option-to-disable-block-updates.patch b/patches/server/0833-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0834-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0833-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0835-Call-missing-BlockDispenseEvent.patch b/patches/server/0834-Call-missing-BlockDispenseEvent.patch
index 1ee26b1b62..1ee26b1b62 100644
--- a/patches/server/0835-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0834-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0836-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0835-Don-t-load-chunks-for-supporting-block-checks.patch
index 71e919a9a5..db2c15729d 100644
--- a/patches/server/0836-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0835-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 435185dafb833b484f252965302e329cde444c2f..3dd70063ab5434e5f57da6ae084316aa6570b7d5 100644
+index cd362a91ad31dbae94fdb5a8c71839576f397ea1..8e252b930247293e0fbcf350111403ee716cfffa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1185,7 +1185,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0837-Optimize-player-lookups-for-beacons.patch b/patches/server/0836-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0837-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0836-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0838-More-Sign-Block-API.patch b/patches/server/0837-More-Sign-Block-API.patch
index 3be6f4e353..3be6f4e353 100644
--- a/patches/server/0838-More-Sign-Block-API.patch
+++ b/patches/server/0837-More-Sign-Block-API.patch
diff --git a/patches/server/0839-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0838-fix-item-meta-for-tadpole-buckets.patch
index 43d485644b..b367979963 100644
--- a/patches/server/0839-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0838-fix-item-meta-for-tadpole-buckets.patch
@@ -30,7 +30,7 @@ index 27af7ca9d62bdb4a24be5af139c181d7bc271ba5..3ff0340c40e9dc9a6e690de15ccade7a
              Material.GLOW_ITEM_FRAME,
              Material.PAINTING
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 0715f43f3f8235d28a12b9d49d78c765a946c53f..b6da1c2902139d4c7b01ac7b3407d4f6ac3990e2 100644
+index c0b7bb970bfd1ccd3bc071a77c47b374094a2fb6..3a9e5c6d781e9c24e040ebf95325f005ec9e8a3c 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -208,6 +208,27 @@ public class ItemMetaTest extends AbstractTestingBase {
diff --git a/patches/server/0840-Fix-BanList-API.patch b/patches/server/0839-Fix-BanList-API.patch
index b3274235b6..0b3b2d80aa 100644
--- a/patches/server/0840-Fix-BanList-API.patch
+++ b/patches/server/0839-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e7235efba6b68917a646083c150655cb42a738e5..32e1830464395cb1f462777f3fb14e766c5e3217 100644
+index d7437bdfca45ee89cef23c6466c3d7d8a3f5c8d6..eb8c3b1c55e7ab9c1304d30a3da911b5051b259c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1747,23 +1747,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0841-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0840-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0841-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0840-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0842-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0841-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0842-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0841-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0843-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0843-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0844-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0843-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 8199743d6f..8199743d6f 100644
--- a/patches/server/0844-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0843-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0845-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0845-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0846-Add-whitelist-events.patch b/patches/server/0845-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0846-Add-whitelist-events.patch
+++ b/patches/server/0845-Add-whitelist-events.patch
diff --git a/patches/server/0847-Implement-PlayerFailMoveEvent.patch b/patches/server/0846-Implement-PlayerFailMoveEvent.patch
index 1bed027fcc..2cff748306 100644
--- a/patches/server/0847-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0846-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8130db188a7014cff572743b06ca14806bbacdc2..a8d6d032605d2da10c84c71fca67998705ff27ff 100644
+index 1ea86a8a1ddb64bf71e2b3794bd0599dd8753681..90c236e31ca30341c0061a602fc7816f6b61a3fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1260,8 +1260,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -91,7 +91,7 @@ index 8130db188a7014cff572743b06ca14806bbacdc2..a8d6d032605d2da10c84c71fca679987
                                  this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet()); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                                  this.player.doCheckFallDamage(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5, packet.isOnGround());
                              } else {
-@@ -3466,4 +3496,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3465,4 +3495,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          InteractionResult run(ServerPlayer player, Entity entity, InteractionHand hand);
      }
diff --git a/patches/server/0848-Folia-scheduler-and-owned-region-API.patch b/patches/server/0847-Folia-scheduler-and-owned-region-API.patch
index 33197e551c..3b6c47e313 100644
--- a/patches/server/0848-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0847-Folia-scheduler-and-owned-region-API.patch
@@ -1173,7 +1173,7 @@ index a72b278826be1d0da79ca619ea9a9a437fa9c54b..2dfa9c4c0c2ef489649944eed89d8c77
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 944c727fd7770fe4c06af67304005664a7ab9e8a..f9dcbf7d51680e8dfdda1350e0632dec675f3d44 100644
+index d210df131bac0604eb44e7a772ec48089c043746..b8e79cf272f0a87b0fc0c0f61d325ec780b0f6b5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -640,6 +640,7 @@ public abstract class PlayerList {
@@ -1185,7 +1185,7 @@ index 944c727fd7770fe4c06af67304005664a7ab9e8a..f9dcbf7d51680e8dfdda1350e0632dec
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3dd70063ab5434e5f57da6ae084316aa6570b7d5..0c145c6c53e486bc44cf83579b18add60777f47d 100644
+index 8e252b930247293e0fbcf350111403ee716cfffa..f81a576084ccceb2b02e8d8cd57442efc7ff1e9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -254,11 +254,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1251,7 +1251,7 @@ index 3dd70063ab5434e5f57da6ae084316aa6570b7d5..0c145c6c53e486bc44cf83579b18add6
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed6210d2490f8584c21537eaa380d990fb73e03d..3e78a420ea183f4044873bb1fd89e9b9749032b8 100644
+index 085e7ebd5e34b6f7c41b2847641bad9d03fb9d96..161e3e440e90dcc23a8b82b1f1856a095e5a9a7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -310,6 +310,76 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0849-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0848-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0849-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0848-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0850-API-for-updating-recipes-on-clients.patch b/patches/server/0849-API-for-updating-recipes-on-clients.patch
index 08d622fad8..1c22c9054a 100644
--- a/patches/server/0850-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0849-API-for-updating-recipes-on-clients.patch
@@ -39,7 +39,7 @@ index b8e79cf272f0a87b0fc0c0f61d325ec780b0f6b5..1eed5ebf96f8e8889d5af346d45a401b
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fffdb6db002ce36ecd60bd8f916c878ac8423fed..d7b495643914d651d7b8b04e9a5595ff1e05e4e2 100644
+index 161e3e440e90dcc23a8b82b1f1856a095e5a9a7f..b2e230ed6f86bd53e360192352c4c5dee0323fb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1174,6 +1174,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0851-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0850-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0851-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0850-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0852-Only-capture-actual-tree-growth.patch b/patches/server/0851-Only-capture-actual-tree-growth.patch
index c8bdd0bb61..202a25604c 100644
--- a/patches/server/0852-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0851-Only-capture-actual-tree-growth.patch
@@ -17,7 +17,7 @@ index 78951f50188528718cdb3dbbaabe3f9f2760ffe3..7826e2a52da47914aca39fef958b8f39
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1016541b8f01cdb45ae96fbb777c6c38598fcc35..11c507b399f97c4c0bbe220e8a3c1cdb851c8a0a 100644
+index 0a6db77afa392e6ab47f970d5665804c8f6cbf7b..7cc9ded0e53bc1c6313ab720c852b1b0163ba951 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -466,6 +466,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0853-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0852-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0853-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0852-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0854-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0853-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0854-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0853-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0855-Use-correct-seed-on-api-world-load.patch b/patches/server/0854-Use-correct-seed-on-api-world-load.patch
index c94e81abb9..8b0db66674 100644
--- a/patches/server/0855-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0854-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e81ec7b81302ea5eb5fe75117a7aacbb8b88d0a6..e77a8a77e1b2d5b91083fab6287467fd947092ee 100644
+index b2e230ed6f86bd53e360192352c4c5dee0323fb6..3135e6de5915d8253892e0b642587ef53e0e5b4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1396,7 +1396,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0856-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0856-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0857-Cache-map-ids-on-item-frames.patch b/patches/server/0856-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0857-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0856-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0858-Fix-custom-statistic-criteria-creation.patch b/patches/server/0857-Fix-custom-statistic-criteria-creation.patch
index bd32b5af31..a3e8b66e3a 100644
--- a/patches/server/0858-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0857-Fix-custom-statistic-criteria-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 24cb9d97bb04a4fe60c46055520ec324fbf6fa3b..398068e8ffa77ac7199baf7aaab5b60c9dc639f5 100644
+index 39066b1d8df7f784e4c90b5fd47505ef65db307c..2d5cb690c332732d1d2a9e78918cd5e8595b37e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -593,6 +593,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0859-Bandaid-fix-for-Effect.patch b/patches/server/0858-Bandaid-fix-for-Effect.patch
index c26c05a460..d0958234c1 100644
--- a/patches/server/0859-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0858-Bandaid-fix-for-Effect.patch
@@ -81,7 +81,7 @@ index cb28a7504e809a8b1e8ab6e34e14e414c542055f..28458a499702989d640d88de8fa7e886
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 32e1830464395cb1f462777f3fb14e766c5e3217..9cf67deacf9d01e3835705260a358513987fc3ba 100644
+index eb8c3b1c55e7ab9c1304d30a3da911b5051b259c..e14522b159d36c3f4cb18f285d16d262e6ca1035 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -917,7 +917,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0860-SculkCatalyst-bloom-API.patch b/patches/server/0859-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0860-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0859-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0861-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0860-API-for-an-entity-s-scoreboard-name.patch
index ac804a3ed5..ac804a3ed5 100644
--- a/patches/server/0861-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0860-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0862-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0861-Deprecate-and-replace-methods-with-old-StructureType.patch
index c40f681341..253aafa7b4 100644
--- a/patches/server/0862-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0861-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e77a8a77e1b2d5b91083fab6287467fd947092ee..7ea2676397025bdbe20f88ec122bd6d545dcf959 100644
+index 3135e6de5915d8253892e0b642587ef53e0e5b4f..819ad0ff87de2b7f131d7c7bb5faa5f923613997 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2001,6 +2001,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0863-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 200d3d6a57..4026c5f3f9 100644
--- a/patches/server/0863-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 46bb2031141b88416f2df1fb8bca76638ef66dae..7ad73ec156417a5c8b826744f1c3ceefc0b129ce 100644
+index 90c236e31ca30341c0061a602fc7816f6b61a3fe..2719ecb3f31138df6f53a7cab33aacc55f6e3428 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -820,6 +820,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0864-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0863-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0864-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0863-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0865-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0864-Fire-entity-death-event-for-ender-dragon.patch
index 66624e354c..66624e354c 100644
--- a/patches/server/0865-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0864-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0866-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0865-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 4757876863..4757876863 100644
--- a/patches/server/0866-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0865-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0867-Add-Listing-API-for-Player.patch b/patches/server/0866-Add-Listing-API-for-Player.patch
index f33015a234..400b0f504b 100644
--- a/patches/server/0867-Add-Listing-API-for-Player.patch
+++ b/patches/server/0866-Add-Listing-API-for-Player.patch
@@ -82,7 +82,7 @@ index 6247a21c9c391abf1f6db3482c659593e4f29355..9ccca41bf23efadba5329cc584bbcdca
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1b83d8f723410c405746faa59783e6ba7a66fd56..eec536d493575f593dd71c63944b047566f3822d 100644
+index 1eed5ebf96f8e8889d5af346d45a401b282bab21..4b597ed9a71908ecec3b6da5b6a4a735cf22498b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -359,14 +359,22 @@ public abstract class PlayerList {
@@ -119,7 +119,7 @@ index 1b83d8f723410c405746faa59783e6ba7a66fd56..eec536d493575f593dd71c63944b0475
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9cf67deacf9d01e3835705260a358513987fc3ba..78dcc656807cafa52707ef4139fe6176f6f16021 100644
+index e14522b159d36c3f4cb18f285d16d262e6ca1035..b250efdcfbdfc211a63060146e3e5a22527b7117 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -201,6 +201,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0868-Configurable-Region-Compression-Format.patch b/patches/server/0867-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0868-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0867-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0868-Add-BlockFace-to-BlockDamageEvent.patch
index 28fdbf6dc6..28fdbf6dc6 100644
--- a/patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0868-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0870-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0869-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0870-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0869-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0871-Expand-Pose-API.patch b/patches/server/0870-Expand-Pose-API.patch
index 2cb1e5311f..1a9699d342 100644
--- a/patches/server/0871-Expand-Pose-API.patch
+++ b/patches/server/0870-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0c145c6c53e486bc44cf83579b18add60777f47d..e6e9fc2a91bdc2f4fdf4ffe723b85b9b61daf273 100644
+index f81a576084ccceb2b02e8d8cd57442efc7ff1e9f..84d283cd637b5c84a8682acec503b0e3831d1684 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -425,6 +425,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0872-More-DragonBattle-API.patch b/patches/server/0871-More-DragonBattle-API.patch
index f505ebe14d..b7b58f6c99 100644
--- a/patches/server/0872-More-DragonBattle-API.patch
+++ b/patches/server/0871-More-DragonBattle-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals
 public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 0100d3f4cb2c1d3e2e052ee109aea707029d0c10..10683807a273be95a40794a7b562a15fc5dec2cc 100644
+index bf39f006efef529db697ed4dccbd1657a2673b79..4a0479fcff94bf6a1f239c1f694202345cdea1d4 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -441,6 +441,24 @@ public class EndDragonFight {
diff --git a/patches/server/0873-Add-PlayerPickItemEvent.patch b/patches/server/0872-Add-PlayerPickItemEvent.patch
index b9ddd8ed60..c94490c272 100644
--- a/patches/server/0873-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0872-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ad73ec156417a5c8b826744f1c3ceefc0b129ce..0ed03a8ec85d8491d96c7b3ac3feff805a773539 100644
+index 2719ecb3f31138df6f53a7cab33aacc55f6e3428..adf9357363465fd7a8c9e0d51b80b9f61d531a01 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -935,8 +935,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0874-Allow-trident-custom-damage.patch b/patches/server/0873-Allow-trident-custom-damage.patch
index 95137bd7d5..95137bd7d5 100644
--- a/patches/server/0874-Allow-trident-custom-damage.patch
+++ b/patches/server/0873-Allow-trident-custom-damage.patch
diff --git a/patches/server/0875-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0874-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0875-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0874-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0876-Optimize-nearest-structure-border-iteration.patch b/patches/server/0875-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0876-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0875-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0877-Implement-OfflinePlayer-isConnected.patch b/patches/server/0876-Implement-OfflinePlayer-isConnected.patch
index 96316a2a2a..acca20cfce 100644
--- a/patches/server/0877-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0876-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 4d654c4f0b6210a9841427789ba70ce5d1d308be..9d93130f23addb18b97d7f5ec013faef
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 78dcc656807cafa52707ef4139fe6176f6f16021..a2dd33a9bb61427005e1edb1dcb1dfa23030d0ee 100644
+index b250efdcfbdfc211a63060146e3e5a22527b7117..a65200854d8a0dba635b0f403f6c0a8442fbf19f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -256,6 +256,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0878-Fix-inventory-desync.patch b/patches/server/0877-Fix-slot-desync.patch
index ca00484251..17d0c4b2c9 100644
--- a/patches/server/0878-Fix-inventory-desync.patch
+++ b/patches/server/0877-Fix-slot-desync.patch
@@ -1,11 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <[email protected]>
 Date: Wed, 23 Aug 2023 13:22:09 -0700
-Subject: [PATCH] Fix inventory desync
+Subject: [PATCH] Fix slot desync
 
+General patch fixing slot desyncs between the server and client that
+result from cancelled events/paper introduced logic.
+
+Co-authored-by: Minecrell <[email protected]>
+Co-authored-by: Newwind <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7604aef2e03e7d688e7b6504283ed631488ec2d6..dc4a01f433bab7e8ecf6a156b748a0db784130e5 100644
+index 7270b6fa96bae937663c0fea77887e21fbd0eb57..530728cd4b258444f6efe064903b521f4b23cd04 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -400,6 +400,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -16,8 +21,26 @@ index 7604aef2e03e7d688e7b6504283ed631488ec2d6..dc4a01f433bab7e8ecf6a156b748a0db
      public void resendItemInHands() {
          this.containerMenu.findSlot(this.getInventory(), this.getInventory().selected).ifPresent(s -> {
              this.containerSynchronizer.sendSlotChange(this.containerMenu, s, this.getMainHandItem());
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index adf9357363465fd7a8c9e0d51b80b9f61d531a01..5541de6364b9982ae95e0a952167ae09084f65cf 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -2729,10 +2729,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                 // Refresh the current entity metadata
+                                 entity.refreshEntityData(ServerGamePacketListenerImpl.this.player);
+                                 // SPIGOT-7136 - Allays
+-                                if (entity instanceof Allay) {
++                                if (entity instanceof Allay || entity instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync
+                                     ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList())));
+-                                    ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote();
+                                 }
++
++                                ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory
+                             }
+ 
+                             if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6e9fc2a91bdc2f4fdf4ffe723b85b9b61daf273..2e80d503d92f0b4f3d15e2bdd39ed55277d0c460 100644
+index 84d283cd637b5c84a8682acec503b0e3831d1684..bd0e205c760414784ae483452fd02292939dcb5c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2638,8 +2638,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0879-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0878-Add-titleOverride-to-InventoryOpenEvent.patch
index 707a896b95..707a896b95 100644
--- a/patches/server/0879-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0878-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0880-Configure-sniffer-egg-hatch-time.patch b/patches/server/0879-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0880-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0879-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0881-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0880-Do-crystal-portal-proximity-check-before-entity-look.patch
index b64a33079d..ee3855f2b8 100644
--- a/patches/server/0881-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0880-Do-crystal-portal-proximity-check-before-entity-look.patch
@@ -34,7 +34,7 @@ index 273bb38f14b8af08d123e02742d365fb5d91cdf5..5f51e64cb0611a4ba6bdcdcacbcba106
                      }
  
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 10683807a273be95a40794a7b562a15fc5dec2cc..aa7e8cdcc1979397fc60a8517f2f504bce84f19f 100644
+index 4a0479fcff94bf6a1f239c1f694202345cdea1d4..84300f2f7b7be4f5281edd8e263646dbcbb3ba07 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -560,6 +560,12 @@ public class EndDragonFight {
diff --git a/patches/server/0882-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0881-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0882-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0881-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0883-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0882-Add-slot-sanity-checks-in-container-clicks.patch
index 1b9227be71..a0cde98097 100644
--- a/patches/server/0883-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0882-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d14cb295fa3a3a2aa14efd58cccdaa9471955548..50f2834b803fb646ff177e56e1c3b1b11c033c83 100644
+index 5541de6364b9982ae95e0a952167ae09084f65cf..e0983cfdfddaf59b29d2b8106c3c34b14191cfa8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2986,6 +2986,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0884-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0883-Call-BlockRedstoneEvents-for-lecterns.patch
index b2cf0ce209..2c76754071 100644
--- a/patches/server/0884-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0883-Call-BlockRedstoneEvents-for-lecterns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call BlockRedstoneEvents for lecterns
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-index 5ff1e755301336a4e6ec6757510d0c595eacd7a6..f420989056c5c86c94333361f1733fd4b7488283 100644
+index 751ff3d51f8ae57f847c3acf7a7cd663a6ae1c68..0c52e1f8bc233bb66e53f4c69e1d8757382bbe81 100644
 --- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
 @@ -179,6 +179,16 @@ public class LecternBlock extends BaseEntityBlock {
diff --git a/patches/server/0885-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0884-Allow-proper-checking-of-empty-item-stacks.patch
index c578a2c3c2..c578a2c3c2 100644
--- a/patches/server/0885-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0884-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0886-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0885-Fix-silent-equipment-change-for-mobs.patch
index 793470108f..793470108f 100644
--- a/patches/server/0886-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0885-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0887-Fix-spigot-s-Forced-Stats.patch b/patches/server/0886-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0887-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0886-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0888-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0887-Add-missing-InventoryHolders-to-inventories.patch
index abdf8c8bea..d058564174 100644
--- a/patches/server/0888-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0887-Add-missing-InventoryHolders-to-inventories.patch
@@ -57,7 +57,7 @@ index 6632cf24ebe6d147950a1fdb876660937da86b73..d04bf7d06855022c973073fb84c5d3d6
      public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) {
          this.bukkitOwner = owner;
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 428e454116804c27496cfbf796edd44780890d33..4c7e91977fa590abfe7eb3704d8008ed6d4e3ab3 100644
+index afd8f48bd41d2cac413c292f7988c903da1dc700..8a1035c0aa859f67a6806c183d96a88ddf760baa 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -991,4 +991,15 @@ public abstract class AbstractContainerMenu {
@@ -206,7 +206,7 @@ index be840717e180b6b5abd14db6cc9263349737f9a3..7de5e47f9a54263734eeef855a2dc07e
              public void setChanged() {
                  super.setChanged();
 diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-index f76ef029132c6a08d4e70585bc440eccdc626b16..7d7b4e53682107a1a75a7aa205be1e6bfdc8c551 100644
+index dc23b646e55bb66e0aa584d82b75b4b3d233276a..2c0e182f7b03ed0f87c259af4df9c4e52106220d 100644
 --- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
 @@ -73,7 +73,7 @@ public class LoomMenu extends AbstractContainerMenu {
diff --git a/patches/server/0889-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0889-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0890-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0889-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0890-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0889-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0891-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0891-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0892-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0892-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0893-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0892-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0893-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0892-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0894-Fix-missing-map-initialize-event-call.patch b/patches/server/0893-Fix-missing-map-initialize-event-call.patch
index 1ee21864ad..c95f6abbf7 100644
--- a/patches/server/0894-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0893-Fix-missing-map-initialize-event-call.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a27fd023e4f9b6ee113f6b3ed21b4c5aeb7ce15d..c5e404dcdab14dc0b972aa3286b05e21d9ea67e0 100644
+index fd4d1cab675b7b423ac0fdf9a8c9f472ddc68c36..60c75f7c4258efb26c2595ca7724b08d3c046c9d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1662,13 +1662,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0895-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0894-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0895-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0894-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0896-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0895-Fix-UnsafeValues-loadAdvancement.patch
index bee9e36bfe..c1cfc35cc9 100644
--- a/patches/server/0896-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0895-Fix-UnsafeValues-loadAdvancement.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 398068e8ffa77ac7199baf7aaab5b60c9dc639f5..9449fe944c7a06a8fdeaf0a0dfc7280950fdb6db 100644
+index 2d5cb690c332732d1d2a9e78918cd5e8595b37e9..5cbcfef31e2acdf27fc52f466ee70d9146d0228d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -302,9 +302,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0897-Add-player-idle-duration-API.patch b/patches/server/0896-Add-player-idle-duration-API.patch
index 0c646e1e0a..5f04d05fbe 100644
--- a/patches/server/0897-Add-player-idle-duration-API.patch
+++ b/patches/server/0896-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a2dd33a9bb61427005e1edb1dcb1dfa23030d0ee..f474b6f880b8d03d6b6a29203509ac0fdd9faaf1 100644
+index a65200854d8a0dba635b0f403f6c0a8442fbf19f..c1449a0c2b6d3612f88c0aeea2e9b6d6bd18146e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3419,6 +3419,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0898-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0897-Don-t-check-if-we-can-see-non-visible-entities.patch
index 1383a41799..1383a41799 100644
--- a/patches/server/0898-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0897-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0899-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0898-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0899-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0898-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0900-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index fdde374c47..a266132ac4 100644
--- a/patches/server/0900-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f474b6f880b8d03d6b6a29203509ac0fdd9faaf1..51b524d3c7cd5e0f59056c1fd8f71171732945b8 100644
+index c1449a0c2b6d3612f88c0aeea2e9b6d6bd18146e..eb179d731e4ce7e0d12a9d3bf8d0649f150e7218 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1127,7 +1127,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0901-Optimize-VarInts.patch b/patches/server/0900-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0901-Optimize-VarInts.patch
+++ b/patches/server/0900-Optimize-VarInts.patch
diff --git a/patches/server/0902-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f0fcc8b9eb..f0fcc8b9eb 100644
--- a/patches/server/0902-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0903-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0902-Add-predicate-for-blocks-when-raytracing.patch
index 43a753b5c2..43a753b5c2 100644
--- a/patches/server/0903-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0902-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0904-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0903-Broadcast-take-item-packets-with-collector-as-source.patch
index 25d46b180a..d065041118 100644
--- a/patches/server/0904-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0903-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ffc0fcd7c2075b44585bd754494f2f7c07788f47..2ad88bc281861f53b5d65ce81448a334849ffff0 100644
+index 3bd9eaf4f0537167ed27c666e805fbf65c640445..e8a5bd0341115094a729914611430c9f28c77d84 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3749,7 +3749,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0905-Expand-LingeringPotion-API.patch b/patches/server/0904-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0905-Expand-LingeringPotion-API.patch
+++ b/patches/server/0904-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0906-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index da48750747..da48750747 100644
--- a/patches/server/0906-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0907-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0906-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0907-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0906-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0908-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0907-Fix-several-issues-with-EntityBreedEvent.patch
index 6a97d9fb9e..6a97d9fb9e 100644
--- a/patches/server/0908-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0907-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0909-Add-UUID-attribute-modifier-API.patch b/patches/server/0908-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0909-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0908-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0910-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0909-Fix-missing-event-call-for-entity-teleport-API.patch
index d567759368..d567759368 100644
--- a/patches/server/0910-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0909-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0911-Lazily-create-LootContext-for-criterions.patch b/patches/server/0910-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0911-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0910-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0912-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0911-Don-t-fire-sync-events-during-worldgen.patch
index 707f704c08..836822315d 100644
--- a/patches/server/0912-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0911-Don-t-fire-sync-events-during-worldgen.patch
@@ -19,7 +19,7 @@ where generation happened directly to a ServerLevel and the
 entity still has the flag set.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c5e404dcdab14dc0b972aa3286b05e21d9ea67e0..aaaf5b91402a1562311dfdc287193a1aefbaf9a7 100644
+index 60c75f7c4258efb26c2595ca7724b08d3c046c9d..34ece37aee68e4d8eeaa919e8bd489a672756049 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1224,6 +1224,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,7 +31,7 @@ index c5e404dcdab14dc0b972aa3286b05e21d9ea67e0..aaaf5b91402a1562311dfdc287193a1a
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2e80d503d92f0b4f3d15e2bdd39ed55277d0c460..25890e244d8909fdd6f48e148209107a30e3382e 100644
+index bd0e205c760414784ae483452fd02292939dcb5c..f163cb3c75e90b96b3794a7e0c5b803268814c8c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -624,7 +624,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -68,7 +68,7 @@ index 5fb3279342506611882b5780cfbee0371919c93c..b98f9246b60daf31460f41ce214dfa7c
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2ad88bc281861f53b5d65ce81448a334849ffff0..2cbb4ff57117382791eefa4881fc0b328c77d58a 100644
+index e8a5bd0341115094a729914611430c9f28c77d84..b28e2d35df067e5f526d8990d633ca4a6d6c453b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1138,6 +1138,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0913-Add-Structure-check-API.patch b/patches/server/0912-Add-Structure-check-API.patch
index 6f901b1c7f..6f901b1c7f 100644
--- a/patches/server/0913-Add-Structure-check-API.patch
+++ b/patches/server/0912-Add-Structure-check-API.patch
diff --git a/patches/server/0914-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 32e393d2a8..32e393d2a8 100644
--- a/patches/server/0914-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0915-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0914-Restore-vanilla-entity-drops-behavior.patch
index 45356521db..765b6340a4 100644
--- a/patches/server/0915-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0914-Restore-vanilla-entity-drops-behavior.patch
@@ -37,7 +37,7 @@ index b65d816bb9feb18ecf74e10e9728c302e5657587..62ec627e80b87a92a2a51ba9fc3626a6
          loot.addAll(this.drops);
          this.drops.clear(); // SPIGOT-5188: make sure to clear
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 25890e244d8909fdd6f48e148209107a30e3382e..33274654dd7faed3642770fc1d94718f0c28bd26 100644
+index f163cb3c75e90b96b3794a7e0c5b803268814c8c..57e7938bc605f320ed5303fcbc617b4d32ba42b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2562,6 +2562,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0916-Dont-resend-blocks-on-interactions.patch b/patches/server/0915-Dont-resend-blocks-on-interactions.patch
index 822d354138..ce903f155f 100644
--- a/patches/server/0916-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0915-Dont-resend-blocks-on-interactions.patch
@@ -149,7 +149,7 @@ index 6caed156ed0cfe0017d578f58cb963ee68272d78..321188173918d0d60858a258400dfd68
                      return false;
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 11c507b399f97c4c0bbe220e8a3c1cdb851c8a0a..ebe470ca361ec5747a843b60d82f567d41d7c9fa 100644
+index 7cc9ded0e53bc1c6313ab720c852b1b0163ba951..e22d6f787d73fda00bc0961bd3279da2a8ab56e3 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -500,10 +500,12 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0917-add-more-scoreboard-API.patch b/patches/server/0916-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0917-add-more-scoreboard-API.patch
+++ b/patches/server/0916-add-more-scoreboard-API.patch
diff --git a/patches/server/0918-Improve-Registry.patch b/patches/server/0917-Improve-Registry.patch
index bebb963725..bebb963725 100644
--- a/patches/server/0918-Improve-Registry.patch
+++ b/patches/server/0917-Improve-Registry.patch
diff --git a/patches/server/0919-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 75efe1d68f..c899162e3b 100644
--- a/patches/server/0919-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -39,7 +39,7 @@ index 306b55276189099bbbc8f2c86ad7428381fcf58c..278e22985ecda6653ce01a29209eb515
                              this.teleportTo(to.getX(), to.getY(), to.getZ());
                          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 8a4f15964449a40ae4fffc5d16b7789d61c4c594..06f74d3aeb35844cbb540a5fcd0da2644556da55 100644
+index 87c669517baa923ffa7392e400e7344e81fc9406..9aee0569447d351729c26eedbe24d5defe620162 100644
 --- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 +++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 @@ -303,7 +303,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
diff --git a/patches/server/0920-Add-experience-points-API.patch b/patches/server/0919-Add-experience-points-API.patch
index 92be0f2b48..4abb3e0697 100644
--- a/patches/server/0920-Add-experience-points-API.patch
+++ b/patches/server/0919-Add-experience-points-API.patch
@@ -18,7 +18,7 @@ index 950ce40d268d89ff3c503116081db6c9ccd65329..454b29d8c9e42e328933aa578f49d28f
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 51b524d3c7cd5e0f59056c1fd8f71171732945b8..1490d15f1ffa83653b20a4bb47584c4c554a3384 100644
+index eb179d731e4ce7e0d12a9d3bf8d0649f150e7218..20398155e5018140c7a014718a6aa9d82d624572 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1921,6 +1921,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0921-Add-drops-to-shear-events.patch b/patches/server/0920-Add-drops-to-shear-events.patch
index b19f491bf1..b19f491bf1 100644
--- a/patches/server/0921-Add-drops-to-shear-events.patch
+++ b/patches/server/0920-Add-drops-to-shear-events.patch
diff --git a/patches/server/0922-Add-PlayerShieldDisableEvent.patch b/patches/server/0921-Add-PlayerShieldDisableEvent.patch
index 5bbd9b6ff6..5bbd9b6ff6 100644
--- a/patches/server/0922-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0921-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0923-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0922-Validate-ResourceLocation-in-NBT-reading.patch
index f833c01807..cbc781cb3b 100644
--- a/patches/server/0923-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0922-Validate-ResourceLocation-in-NBT-reading.patch
@@ -84,7 +84,7 @@ index 278e22985ecda6653ce01a29209eb51506c48438..474868d362d855423f74fd604c1050cf
  
          if (nbt.contains("Brain", 10)) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7e26c530783b63f9abbd3a016196e6be06dcd822..fc929c2d306a18e52e41fa4d1ee0badd1ed0bb91 100644
+index cf1f6a0081f0dbcf43842ec23accf6c3ae9b79d8..58ff5b4df2124901df757315e42b2490a7da7415 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -603,7 +603,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
diff --git a/patches/server/0924-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0923-Properly-handle-experience-dropping-on-block-break.patch
index c5ffca5d89..c5ffca5d89 100644
--- a/patches/server/0924-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0923-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0925-Fixup-NamespacedKey-handling.patch b/patches/server/0924-Fixup-NamespacedKey-handling.patch
index ac021fa175..ac021fa175 100644
--- a/patches/server/0925-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0924-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0926-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0925-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0926-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0925-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0927-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index a6036eeb42..a6036eeb42 100644
--- a/patches/server/0927-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0928-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 42c7c99313..ace1ed6898 100644
--- a/patches/server/0928-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -37,7 +37,7 @@ index 6139361c0e733f981506abdd7101e5ca20eeb88f..49b35fab8ee98a384ee12d36bbe2ac81
              CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
          }
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 4c7e91977fa590abfe7eb3704d8008ed6d4e3ab3..32910f677b0522ac8ec513fa0d00b714b52cfae4 100644
+index 8a1035c0aa859f67a6806c183d96a88ddf760baa..46159a127d910028c62ada90ff2d2dccc3b62fc3 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -768,6 +768,14 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0929-Add-ShulkerDuplicateEvent.patch b/patches/server/0928-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0929-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0928-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0930-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0929-Add-api-for-spawn-egg-texture-colors.patch
index bc65a0c926..f8a65ad281 100644
--- a/patches/server/0930-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0929-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 9449fe944c7a06a8fdeaf0a0dfc7280950fdb6db..87e5ce7b30efe8ec99191208636b1420e4d002a1 100644
+index 5cbcfef31e2acdf27fc52f466ee70d9146d0228d..9ea1ce24d831a828ae3c9c9863aef12e46dd501d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -637,6 +637,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0931-Add-Lifecycle-Event-system.patch b/patches/server/0930-Add-Lifecycle-Event-system.patch
index cb31df174d..0b23164106 100644
--- a/patches/server/0931-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0930-Add-Lifecycle-Event-system.patch
@@ -719,7 +719,7 @@ index 2e96308696e131f3f013469a395e5ddda2c5d529..65a66e484c1c39c5f41d97db52f31c67
                  } catch (Throwable e) {
                      LOGGER.error("Failed to run bootstrapper for %s. This plugin will not be loaded.".formatted(provider.getSource()), e);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7ea2676397025bdbe20f88ec122bd6d545dcf959..61c19b1005dc387d671fd72331a8774c4c16c7ed 100644
+index 819ad0ff87de2b7f131d7c7bb5faa5f923613997..7ad17b9c3fa6b2865c8dbd824f84ae33a1dd1e9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1047,6 +1047,11 @@ public final class CraftServer implements Server {
@@ -735,7 +735,7 @@ index 7ea2676397025bdbe20f88ec122bd6d545dcf959..61c19b1005dc387d671fd72331a8774c
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 87e5ce7b30efe8ec99191208636b1420e4d002a1..09cba6563ae754f51cfb352ba63e097fc2bd9b65 100644
+index 9ea1ce24d831a828ae3c9c9863aef12e46dd501d..ef56c54bd724137c1efbbac574e54027d7f7f5bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -646,6 +646,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0932-ItemStack-Tooltip-API.patch b/patches/server/0931-ItemStack-Tooltip-API.patch
index 8858ce7085..bdec7c8b91 100644
--- a/patches/server/0932-ItemStack-Tooltip-API.patch
+++ b/patches/server/0931-ItemStack-Tooltip-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack Tooltip API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 09cba6563ae754f51cfb352ba63e097fc2bd9b65..364202607498b376422d02d91965430e90d21fec 100644
+index ef56c54bd724137c1efbbac574e54027d7f7f5bc..9739f2d97ea64452a92f254cb2d0e1274c691944 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -622,6 +622,21 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0933-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0932-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0933-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0932-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0934-Add-FluidState-API.patch b/patches/server/0933-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0934-Add-FluidState-API.patch
+++ b/patches/server/0933-Add-FluidState-API.patch
diff --git a/patches/server/0935-add-number-format-api.patch b/patches/server/0934-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0935-add-number-format-api.patch
+++ b/patches/server/0934-add-number-format-api.patch
diff --git a/patches/server/0936-improve-BanList-types.patch b/patches/server/0935-improve-BanList-types.patch
index 9e9699167e..408fdc3fbe 100644
--- a/patches/server/0936-improve-BanList-types.patch
+++ b/patches/server/0935-improve-BanList-types.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] improve BanList types
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61c19b1005dc387d671fd72331a8774c4c16c7ed..b72a71d6a37956b0f4ca74c2ed8eaf044cac4b81 100644
+index 7ad17b9c3fa6b2865c8dbd824f84ae33a1dd1e9e..121e9cf395f16ba8422f77a73f3f3fbe0ae9b225 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2254,6 +2254,21 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0937-Expanded-Hopper-API.patch b/patches/server/0936-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0937-Expanded-Hopper-API.patch
+++ b/patches/server/0936-Expanded-Hopper-API.patch
diff --git a/patches/server/0938-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0937-Add-BlockBreakProgressUpdateEvent.patch
index 3e5409551e..3481a288ee 100644
--- a/patches/server/0938-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0937-Add-BlockBreakProgressUpdateEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockBreakProgressUpdateEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index aaaf5b91402a1562311dfdc287193a1aefbaf9a7..fd6e0f1a67f56e3b5fe97894919c7e4e1b90c4e8 100644
+index 34ece37aee68e4d8eeaa919e8bd489a672756049..dcd024afef50c90974723632c879258fb1dda073 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1320,6 +1320,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0939-Deprecate-ItemStack-setType.patch b/patches/server/0938-Deprecate-ItemStack-setType.patch
index e0a6acc747..e0a6acc747 100644
--- a/patches/server/0939-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0938-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0940-Add-CartographyItemEvent.patch b/patches/server/0939-Add-CartographyItemEvent.patch
index 56bcd6e6ea..f7aaa15a4d 100644
--- a/patches/server/0940-Add-CartographyItemEvent.patch
+++ b/patches/server/0939-Add-CartographyItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CartographyItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 50f2834b803fb646ff177e56e1c3b1b11c033c83..39488b8547ccf19759ffbd5a38cbe3612253a4eb 100644
+index e0983cfdfddaf59b29d2b8106c3c34b14191cfa8..a106587df34ac463bb2aee661b789ee38cf14e20 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3108,6 +3108,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0941-More-Raid-API.patch b/patches/server/0940-More-Raid-API.patch
index e218d301b5..e218d301b5 100644
--- a/patches/server/0941-More-Raid-API.patch
+++ b/patches/server/0940-More-Raid-API.patch
diff --git a/patches/server/0942-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0941-Add-onboarding-message-for-initial-server-start.patch
index d3fb21c7a3..d3fb21c7a3 100644
--- a/patches/server/0942-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0941-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0943-Configurable-max-block-fluid-ticks.patch b/patches/server/0942-Configurable-max-block-fluid-ticks.patch
index 780b696029..2d7a50b998 100644
--- a/patches/server/0943-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0942-Configurable-max-block-fluid-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max block/fluid ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fd6e0f1a67f56e3b5fe97894919c7e4e1b90c4e8..c97292f22a3402dbd59cef4af554954dc1d4f91a 100644
+index dcd024afef50c90974723632c879258fb1dda073..81f0a0dfefd9e1698548a68679dab0974921c37a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -501,9 +501,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0944-Fix-bees-aging-inside-hives.patch b/patches/server/0943-Fix-bees-aging-inside-hives.patch
index 400ede1160..400ede1160 100644
--- a/patches/server/0944-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0943-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0945-Disable-memory-reserve-allocating.patch b/patches/server/0944-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0945-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0944-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0946-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0946-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0947-Fix-DamageSource-API.patch b/patches/server/0946-Fix-DamageSource-API.patch
index 2028016bcd..234e784901 100644
--- a/patches/server/0947-Fix-DamageSource-API.patch
+++ b/patches/server/0946-Fix-DamageSource-API.patch
@@ -84,7 +84,7 @@ index caf1d79e2bbdd257a5439e2973653747e678805f..e34584e4780f343d6c946af5377088d5
  
      public DamageSource sonicBoom(Entity attacker) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 33274654dd7faed3642770fc1d94718f0c28bd26..cf43f02aa705fdd71ebcdc9d028bacae73a11f42 100644
+index 57e7938bc605f320ed5303fcbc617b4d32ba42b8..ef05c75d86ce3a7e4d4438dcd6f98c778568634a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3262,7 +3262,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0948-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 8e09c4fb05..8e09c4fb05 100644
--- a/patches/server/0948-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0949-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0948-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5351dde83c..5351dde83c 100644
--- a/patches/server/0949-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0948-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0950-Improve-tag-parser-handling.patch b/patches/server/0949-Improve-tag-parser-handling.patch
index ba0144b9df..e1f7ac55cd 100644
--- a/patches/server/0950-Improve-tag-parser-handling.patch
+++ b/patches/server/0949-Improve-tag-parser-handling.patch
@@ -248,7 +248,7 @@ index 898b19887ed34c87003fc63cb5905df2ba6234a5..b47eeb23055b135d5567552ba983bfbc
  
      private void write(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d4803b966301ac732c9ca9e53fba1d28ff9878bf..c32487782a02cfa1f9d594a28c45121f4eeaa29c 100644
+index a106587df34ac463bb2aee661b789ee38cf14e20..e1576a2fa906d2337480c250f390dcaeb22a0420 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -766,6 +766,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0951-Item-Mutation-Fixes.patch b/patches/server/0950-Item-Mutation-Fixes.patch
index bad3be61f9..bad3be61f9 100644
--- a/patches/server/0951-Item-Mutation-Fixes.patch
+++ b/patches/server/0950-Item-Mutation-Fixes.patch
diff --git a/patches/server/0952-Per-world-ticks-per-spawn-settings.patch b/patches/server/0951-Per-world-ticks-per-spawn-settings.patch
index 0d7c9ea5b4..0d7c9ea5b4 100644
--- a/patches/server/0952-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0951-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0953-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0952-Properly-track-the-changed-item-from-dispense-events.patch
index 2dc797fea7..2dc797fea7 100644
--- a/patches/server/0953-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0952-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0954-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 12dc4db2ff..12dc4db2ff 100644
--- a/patches/server/0954-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0955-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0954-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0955-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0954-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0956-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0955-Add-config-for-mobs-immune-to-default-effects.patch
index 5989f9bd5f..5989f9bd5f 100644
--- a/patches/server/0956-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0955-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0957-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0956-Deep-clone-nbt-tags-in-PDC.patch
index f559f0cd9d..f559f0cd9d 100644
--- a/patches/server/0957-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0956-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0958-Support-old-UUID-format-for-NBT.patch b/patches/server/0957-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0958-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0957-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0959-Fix-shield-disable-inconsistency.patch b/patches/server/0958-Fix-shield-disable-inconsistency.patch
index 25f666c8ec..624805ae3f 100644
--- a/patches/server/0959-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0958-Fix-shield-disable-inconsistency.patch
@@ -8,7 +8,7 @@ it will not disable the shield if the attacker is holding
 an axe item.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cbf076c5fa69d32ad3c8ea759cd9d405b60f8663..8072d31525d9c7890804bb879893f1a69820e32d 100644
+index 474868d362d855423f74fd604c1050cf33ba27f3..5954476f7cbec585f142ee209e91d5b70bb7a8a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2349,7 +2349,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0960-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0959-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0960-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0959-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0961-Fix-ItemFlags.patch b/patches/server/0960-Fix-ItemFlags.patch
index 46e55a9780..46e55a9780 100644
--- a/patches/server/0961-Fix-ItemFlags.patch
+++ b/patches/server/0960-Fix-ItemFlags.patch
diff --git a/patches/server/0962-Fix-Player-setBlockUpdate.patch b/patches/server/0961-Fix-Player-setBlockUpdate.patch
index af479baa93..7986fb5a2b 100644
--- a/patches/server/0962-Fix-Player-setBlockUpdate.patch
+++ b/patches/server/0961-Fix-Player-setBlockUpdate.patch
@@ -18,7 +18,7 @@ index 397eb1a101bd60f49dbb2fa8eddf28f6f233167f..e28bc898786542f695017ff0a0366768
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1490d15f1ffa83653b20a4bb47584c4c554a3384..29c5855b9d31e803eb856584b92dfd35f6fad39a 100644
+index 20398155e5018140c7a014718a6aa9d82d624572..6d1fd0b76e18a268e79fd862a98a41b3dfe1fe68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1118,6 +1118,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0963-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0962-Fix-helmet-damage-reduction-inconsistencies.patch
index a9182bdd0a..a9182bdd0a 100644
--- a/patches/server/0963-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0962-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0964-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 865466307d..97824d33ba 100644
--- a/patches/server/0964-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Revert to vanilla handling of LivingEntity#actuallyHurt
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8072d31525d9c7890804bb879893f1a69820e32d..7b019553d88a4294fad1107c5f28ba3fff985d63 100644
+index 5954476f7cbec585f142ee209e91d5b70bb7a8a6..43f1ac121a234085bf168c075f82594c67f72b2c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1425,7 +1425,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0965-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0964-improve-checking-handled-tags-in-itemmeta.patch
index 3bc62d037f..3bc62d037f 100644
--- a/patches/server/0965-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0964-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0966-General-ItemMeta-fixes.patch b/patches/server/0965-General-ItemMeta-fixes.patch
index 17b7102b0e..17b7102b0e 100644
--- a/patches/server/0966-General-ItemMeta-fixes.patch
+++ b/patches/server/0965-General-ItemMeta-fixes.patch
diff --git a/patches/server/0967-Expose-hasColor-to-leather-armor.patch b/patches/server/0966-Expose-hasColor-to-leather-armor.patch
index fb4dc944de..fb4dc944de 100644
--- a/patches/server/0967-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0966-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0968-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0967-Added-API-to-get-player-ha-proxy-address.patch
index 3b19743dfc..b6dcd8397a 100644
--- a/patches/server/0968-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0967-Added-API-to-get-player-ha-proxy-address.patch
@@ -35,7 +35,7 @@ index 96355e1da8feb6687ea0069dda4a82fcd7e25e8a..1f696644b958538e9f5d568a2e4bba69
                                  } else {
                                      super.channelRead(ctx, msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 29c5855b9d31e803eb856584b92dfd35f6fad39a..12010a078542b7e89f0f4c0e7983eb15e75c4f1f 100644
+index 6d1fd0b76e18a268e79fd862a98a41b3dfe1fe68..63b8e0e95e960d3a5e2f321896346b9c69f1bcc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -265,7 +265,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0969-More-Chest-Block-API.patch b/patches/server/0968-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0969-More-Chest-Block-API.patch
+++ b/patches/server/0968-More-Chest-Block-API.patch
diff --git a/patches/server/0970-Print-data-component-type-on-encoding-error.patch b/patches/server/0969-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0970-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0969-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0971-Brigadier-based-command-API.patch b/patches/server/0970-Brigadier-based-command-API.patch
index 4267ee72c5..99c38c5d46 100644
--- a/patches/server/0971-Brigadier-based-command-API.patch
+++ b/patches/server/0970-Brigadier-based-command-API.patch
@@ -2356,7 +2356,7 @@ index b4af03c4bdd1ce0861f36c3b75fc7e89d701c46a..0761d5bc5f2813bb4a9f664ac7a05b97
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ef5832259de0a78292b52829dca8e2e3d3836595..94b4375f303b6376fa2a59b075146db5bbdd19c8 100644
+index e1576a2fa906d2337480c250f390dcaeb22a0420..e952366acb16c4bc57832222c4695abeb399e1cf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2407,33 +2407,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2406,7 +2406,7 @@ index ef5832259de0a78292b52829dca8e2e3d3836595..94b4375f303b6376fa2a59b075146db5
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 36997d8d15c23587317b4c115726892980a9086e..43a94a67b337f40522c25cc2252a6a5e1294ca0b 100644
+index 121e9cf395f16ba8422f77a73f3f3fbe0ae9b225..d8b842bfd1507ace84943ff1f9ddc6ea153e54db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -272,11 +272,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0972-Fix-issues-with-Recipe-API.patch b/patches/server/0971-Fix-issues-with-Recipe-API.patch
index bb85dca687..bb85dca687 100644
--- a/patches/server/0972-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0971-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0973-Fix-equipment-slot-and-group-API.patch b/patches/server/0972-Fix-equipment-slot-and-group-API.patch
index a843a57c9f..7e3f35d33c 100644
--- a/patches/server/0973-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0972-Fix-equipment-slot-and-group-API.patch
@@ -52,7 +52,7 @@ index 9d74577af071954e1e37201a96368c1360076209..eafa54c870c3e2aef30c3f9f96f51660
                  throw new IllegalArgumentException("Not implemented. This is a bug");
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 18d2531bade0bdd3da7116679b38a687c2f664ca..5a3162740b572f55431fbe3d9d41c5cb38ad338d 100644
+index 67181b215312f1f572d6ac5afd289c6540b12829..d5c45cc09b9d60c1650507ad6fedb27246291063 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1448,7 +1448,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0974-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0974-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0975-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0974-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 97aaa27e78..4c88ba5e4a 100644
--- a/patches/server/0975-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0974-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -209,18 +209,18 @@ index 0e7ace92522fbd4cef7b2c2b8a0f8b86c2cce192..1d849ce4e2c85f149af25318b8ffb6dc
              ((LivingEntity) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 94b4375f303b6376fa2a59b075146db5bbdd19c8..b9286e0784c8d1f99cf6ab58297a382fa3b8585e 100644
+index e952366acb16c4bc57832222c4695abeb399e1cf..f658780efd09992d383de84639b6a1a6c0ba9d7e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2731,7 +2731,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  entity.refreshEntityData(ServerGamePacketListenerImpl.this.player);
                                  // SPIGOT-7136 - Allays
-                                 if (entity instanceof Allay) {
+                                 if (entity instanceof Allay || entity instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync
 -                                    ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList())));
 +                                    ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()), true)); // Paper - sanitize
-                                     ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote();
                                  }
-                             }
+ 
+                                 ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 index 43f1ac121a234085bf168c075f82594c67f72b2c..0613ba9968968513549402f94e3b61dddd8c6beb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
diff --git a/patches/server/0976-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0975-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0976-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0975-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0977-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 42e5eac389..fa5579fdaa 100644
--- a/patches/server/0977-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cancelling BlockPlaceEvent calling onRemove
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f9a4bebb321207abb00b1af1c17ebda623cc950e..bb28e35c0d53fcc0145518123795d54ff59514a8 100644
+index 17923ab1ca4d8e04fbbac0471f88a856bbb92d10..b21204f4b6fb98f53e41e18f3f8b200c48d94c66 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -494,9 +494,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -33,7 +33,7 @@ index a2877f3eb206ab9ccb93e3606f1c9b3401def5d6..e5abde76c354c3dd9940dd4e5ae3fe8b
      public Map<BlockPos, BlockEntity> capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper - Retain block place order when capturing blockstates
      public List<ItemEntity> captureDrops;
 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 7f8983a2102787b13e5d28d6981055da6acd1012..602ad80c2b93d320bf2a25832d25a58cb8c72e4b 100644
+index 86eb9029969f4de3ada7be9e135e9764172b85f5..21946a93b6a2a3c79d15af1d6e7eabc537ba0125 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -345,7 +345,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0978-Add-missing-fishing-event-state.patch b/patches/server/0977-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0978-Add-missing-fishing-event-state.patch
+++ b/patches/server/0977-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0979-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 0632142ae0..1db6e8c484 100644
--- a/patches/server/0979-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate InvAction#HOTBAR_MOVE_AND_READD
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b9286e0784c8d1f99cf6ab58297a382fa3b8585e..50a8ea1af21c374215cbce85e16bbdebc346d49c 100644
+index f658780efd09992d383de84639b6a1a6c0ba9d7e..8cab1565efb11a46f5f2c44057a40d922ed72bde 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2997,14 +2997,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0980-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0980-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0981-Adopt-MaterialRerouting.patch b/patches/server/0980-Adopt-MaterialRerouting.patch
index e6473ef21a..e6473ef21a 100644
--- a/patches/server/0981-Adopt-MaterialRerouting.patch
+++ b/patches/server/0980-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0982-Suspicious-Effect-Entry-API.patch b/patches/server/0981-Suspicious-Effect-Entry-API.patch
index bc26031199..bc26031199 100644
--- a/patches/server/0982-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0981-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0983-check-if-itemstack-is-stackable-first.patch b/patches/server/0982-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0983-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0982-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0984-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0983-Fix-removing-recipes-from-RecipeIterator.patch
index 461c3eb854..461c3eb854 100644
--- a/patches/server/0984-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0983-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0985-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0984-Configurable-damage-tick-when-blocking-with-shield.patch
index 5854c4306d..24d7eefdb2 100644
--- a/patches/server/0985-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0984-Configurable-damage-tick-when-blocking-with-shield.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage tick when blocking with shield
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b5994949028bc5cd30d893a1a6b296991d8d1570..9adaf1269e3eea6c0b62b5127317be7bfd651330 100644
+index 0613ba9968968513549402f94e3b61dddd8c6beb..51c6f1e9f4b1c7eb7896c7f42c18cfd18a4f67da 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2411,7 +2411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0986-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0985-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0986-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0985-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0987-Moonrise-optimisation-patches.patch b/patches/server/0986-Moonrise-optimisation-patches.patch
index c06b11810a..c06b11810a 100644
--- a/patches/server/0987-Moonrise-optimisation-patches.patch
+++ b/patches/server/0986-Moonrise-optimisation-patches.patch
diff --git a/patches/server/0988-Rewrite-dataconverter-system.patch b/patches/server/0987-Rewrite-dataconverter-system.patch
index 1e689d81de..c973389ac9 100644
--- a/patches/server/0988-Rewrite-dataconverter-system.patch
+++ b/patches/server/0987-Rewrite-dataconverter-system.patch
@@ -29383,7 +29383,7 @@ index e69d805701def93466ad7fa94f019ec4610efb47..427ee4d6f12a7abd8da0c65e0b9081b2
              return DataFixTypes.WORLD_GEN_SETTINGS.updateToCurrentVersion(dataFixer, dynamic1, i);
          });
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d32d77bb2 100644
+index b54a3741cd3ba615c83c98985cb4b3c4c586ed7a..b148cf247acdd36f856d0495cde4cc5ad32b5a2f 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 @@ -137,7 +137,7 @@ public class PlayerDataStorage {
@@ -29396,7 +29396,7 @@ index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d
              return nbttagcompound;
          });
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 364202607498b376422d02d91965430e90d21fec..e182de47cc9c12f2d7051edd0ab3d2b4267f54b2 100644
+index 9739f2d97ea64452a92f254cb2d0e1274c691944..9e0d8fc51196ca07677f45e41614262036155e85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -505,7 +505,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0989-disable-forced-empty-world-ticks.patch b/patches/server/0988-disable-forced-empty-world-ticks.patch
index e3bca0910f..4e5fea24f6 100644
--- a/patches/server/0989-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0988-disable-forced-empty-world-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] disable forced empty world ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b2c5ead035f583585b79f7eba51d66da89bf1259..067697f6762b115b3d500a298532f69f286b5d6f 100644
+index 24d5e741aed1677d0df59c1455fbfc60a29e8e3c..c2189752a422f39428b2c0f1408f359f20c388e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -686,7 +686,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/0990-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 3046e40be7..3046e40be7 100644
--- a/patches/server/0990-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0991-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index b5c9d92ddb..ccc8786fd8 100644
--- a/patches/server/0991-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 067697f6762b115b3d500a298532f69f286b5d6f..6476a69d7d68998ecc398840e673952e61dcc647 100644
+index c2189752a422f39428b2c0f1408f359f20c388e5..dec865affbaaa71d09806143d13a854100b98f23 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2494,6 +2494,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/0992-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 38ce2a6066..505082cbed 100644
--- a/patches/server/0992-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9adaf1269e3eea6c0b62b5127317be7bfd651330..5deec2f7ab0f550b574b777f5a8eeb029f890dfd 100644
+index 51c6f1e9f4b1c7eb7896c7f42c18cfd18a4f67da..f749ad127afabbf43b871b29ce6c19956686e9ee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3774,7 +3774,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0993-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index f51a3d8642..f51a3d8642 100644
--- a/patches/server/0993-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0994-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0993-Allow-Saving-of-Oversized-Chunks.patch
index 4eef25929e..4eef25929e 100644
--- a/patches/server/0994-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0993-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0995-Flat-bedrock-generator-settings.patch b/patches/server/0994-Flat-bedrock-generator-settings.patch
index da68e7d65b..da68e7d65b 100644
--- a/patches/server/0995-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0994-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0996-Entity-Activation-Range-2.0.patch b/patches/server/0995-Entity-Activation-Range-2.0.patch
index 3c4ab1ac7c..8ce6ec4ca8 100644
--- a/patches/server/0996-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0995-Entity-Activation-Range-2.0.patch
@@ -17,7 +17,7 @@ Adds villagers as separate config
 public net.minecraft.world.entity.Entity isInsidePortal
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6476a69d7d68998ecc398840e673952e61dcc647..3880ca95731c82bf48bb460f4c59a2c61970930b 100644
+index dec865affbaaa71d09806143d13a854100b98f23..eadbf175c69b6bb2d0df723afac96a517ebf0d83 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -111,7 +111,7 @@ index 6476a69d7d68998ecc398840e673952e61dcc647..3880ca95731c82bf48bb460f4c59a2c6
          } 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 9928c5f0814aa2206dfe7540a3fe2465b4446359..32502664a82dda6220f8d9fa554105740e9bc99a 100644
+index 0d4e1a90dbdca72df5776b1294e87c85434e53ac..6043e9fafb6dca4134e0615f04c7a5cdd6bf1c2e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -418,6 +418,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -147,7 +147,7 @@ index 9928c5f0814aa2206dfe7540a3fe2465b4446359..32502664a82dda6220f8d9fa55410574
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index fc929c2d306a18e52e41fa4d1ee0badd1ed0bb91..ebd8e5ff9f80157dd6029456f165265d04932422 100644
+index 58ff5b4df2124901df757315e42b2490a7da7415..763abeea3f14f15c27d600e0bdae44b387687bb4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -232,6 +232,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
diff --git a/patches/server/0997-Optional-per-player-mob-spawns.patch b/patches/server/0996-Optional-per-player-mob-spawns.patch
index ebd9566469..bf24db7bb5 100644
--- a/patches/server/0997-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0996-Optional-per-player-mob-spawns.patch
@@ -70,7 +70,7 @@ index 9ccb3ffc375298fda4dca97803e65e39df8493eb..e18c3e08f9fbfe17c797c1f96dce1b86
                  int chunkRange = level.spigotConfig.mobSpawnRange;
                  chunkRange = (chunkRange > level.spigotConfig.viewDistance) ? (byte) level.spigotConfig.viewDistance : chunkRange;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e05bd64abb644fa38dbfe1fe97737eaf8f535970..720a77f7d935292564df3de5cd320d3f75dcd7f9 100644
+index 30f53916a9e49165bcfef2bea2c0b50a26f5a8a3..cb961d9051416626f499c1ca87107f1114433c94 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -276,6 +276,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
diff --git a/patches/server/0998-Anti-Xray.patch b/patches/server/0997-Anti-Xray.patch
index 7e3f9656a3..7e3f9656a3 100644
--- a/patches/server/0998-Anti-Xray.patch
+++ b/patches/server/0997-Anti-Xray.patch
diff --git a/patches/server/0999-Eigencraft-redstone-implementation.patch b/patches/server/0998-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/0999-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0998-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1000-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0999-Add-Alternate-Current-redstone-implementation.patch
index d3dea51359..f7fadd89b6 100644
--- a/patches/server/1000-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0999-Add-Alternate-Current-redstone-implementation.patch
@@ -2009,7 +2009,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4fea1670cb7b731145c0769cf9c2e2485bdd1d6b..3f1428b282987e1c4cd2fb5b035df5170cd09e00 100644
+index 1f611e7c877bf89f598148db69c1d4166b00f8ac..d223ecfbb0b8986507ce8b6728edbf7c8d818b7d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,6 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/1001-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 1c39518b9a..368253b458 100644
--- a/patches/server/1001-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -60,7 +60,7 @@ index e18c3e08f9fbfe17c797c1f96dce1b86fa41fab6..4a5dc7fd4eb1a7ab1ec371f0f107de88
                      spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 720a77f7d935292564df3de5cd320d3f75dcd7f9..dddd4fcdcd08e0221693071894818c7d3bae531b 100644
+index cb961d9051416626f499c1ca87107f1114433c94..8dc3ba983fd4c61e463867be8d224aa90424215a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -280,6 +280,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
diff --git a/patches/server/1002-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1001-Use-Velocity-compression-and-cipher-natives.patch
index 276343645a..276343645a 100644
--- a/patches/server/1002-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1001-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1003-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1002-Optimize-Collision-to-not-load-chunks.patch
index d67ae80a4b..dbc556f835 100644
--- a/patches/server/1003-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/1002-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 96eea87534b6e28a56c9eea0f30bfb41793440e7..24ff10c4ed69deed2ce9ba2583557541
          if (dimensiontransition.missingRespawnBlock()) {
              entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 32502664a82dda6220f8d9fa554105740e9bc99a..6b4a7930efabd29f00690a79e8080faaa9767190 100644
+index 6043e9fafb6dca4134e0615f04c7a5cdd6bf1c2e..e541a77381b03bd4dc648fc50aef77c304157fc0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -250,6 +250,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1004-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 65f5e3531e..65f5e3531e 100644
--- a/patches/server/1004-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1005-Optimize-Hoppers.patch b/patches/server/1004-Optimize-Hoppers.patch
index 9aaa15530d..7dfa38282a 100644
--- a/patches/server/1005-Optimize-Hoppers.patch
+++ b/patches/server/1004-Optimize-Hoppers.patch
@@ -62,7 +62,7 @@ index 4a4ce372dd105d07f58d7d93d856cb3969969806..fb3dcce4e1888f96fdd260740d9d9559
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index bb28e35c0d53fcc0145518123795d54ff59514a8..3254124180df02d787202f4b00a4c52d40c6e7cf 100644
+index b21204f4b6fb98f53e41e18f3f8b200c48d94c66..c133a52f96a783e81eac15621655ca1e3f6b6c25 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -809,10 +809,16 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/1006-Entity-load-save-limit-per-chunk.patch b/patches/server/1005-Entity-load-save-limit-per-chunk.patch
index 9a5959e34f..9a5959e34f 100644
--- a/patches/server/1006-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1005-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1007-Optimize-Voxel-Shape-Merging.patch b/patches/server/1006-Optimize-Voxel-Shape-Merging.patch
index 114ee7cb28..114ee7cb28 100644
--- a/patches/server/1007-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1006-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1008-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch
index b7d93a56b9..b7d93a56b9 100644
--- a/patches/server/1008-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1009-Remove-streams-from-hot-code.patch b/patches/server/1008-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1009-Remove-streams-from-hot-code.patch
+++ b/patches/server/1008-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1010-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1010-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1012-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
index 7892753fc2..7892753fc2 100644
--- a/patches/server/1012-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1013-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1012-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1013-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1012-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1014-API-for-checking-sent-chunks.patch b/patches/server/1013-API-for-checking-sent-chunks.patch
index f3f1bf8f5c..4b57b79874 100644
--- a/patches/server/1014-API-for-checking-sent-chunks.patch
+++ b/patches/server/1013-API-for-checking-sent-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for checking sent chunks
 
 
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
-index 7249b78e21b12117480a18f2d07d0c978fe42e56..ab18bbf87dfc1455ed185a5152dad6d236565ecc 100644
+index 852d75a73dae7448cbe1e2f5e164b235efa8a969..a608f57ebca98eda88ad749d0aad021678be54f9 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
 @@ -1078,5 +1078,10 @@ public final class RegionizedPlayerChunkLoader {
@@ -20,7 +20,7 @@ index 7249b78e21b12117480a18f2d07d0c978fe42e56..ab18bbf87dfc1455ed185a5152dad6d2
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2f56cbcc1d1af98f58c310ff8b4ce33cc950e977..992437a6e838f653f32d33b5b3f702c484640a97 100644
+index 1def2a09427de70646802fd876a5805489a3d129..a0d5082590ee03060f0dbb4770d196efc316c328 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3484,6 +3484,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1015-Check-distance-in-entity-interactions.patch b/patches/server/1014-Check-distance-in-entity-interactions.patch
index 64fd802e0e..d6e268091d 100644
--- a/patches/server/1015-Check-distance-in-entity-interactions.patch
+++ b/patches/server/1014-Check-distance-in-entity-interactions.patch
@@ -17,7 +17,7 @@ index 42d7ecfab6f72517904451d9df3f0404b176fdb2..0e38a641d8e537750166b56c57aca4a9
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5deec2f7ab0f550b574b777f5a8eeb029f890dfd..8a876b2d964b70b9ddd2d90bf8fbb983566ef747 100644
+index f749ad127afabbf43b871b29ce6c19956686e9ee..0eea726a703e7d5b128f39b31929963aa27d82cc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1437,7 +1437,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1016-Configurable-Sand-Duping.patch b/patches/server/1015-Configurable-Sand-Duping.patch
index cbc52697db..cbc52697db 100644
--- a/patches/server/1016-Configurable-Sand-Duping.patch
+++ b/patches/server/1015-Configurable-Sand-Duping.patch
diff --git a/patches/server/1017-Optimise-general-POI-access.patch b/patches/server/1016-Optimise-general-POI-access.patch
index b3636fe591..b3636fe591 100644
--- a/patches/server/1017-Optimise-general-POI-access.patch
+++ b/patches/server/1016-Optimise-general-POI-access.patch
diff --git a/patches/server/1018-Improve-performance-of-mass-crafts.patch b/patches/server/1017-Improve-performance-of-mass-crafts.patch
index 15701b21e0..15701b21e0 100644
--- a/patches/server/1018-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1017-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1019-Properly-resend-entities.patch b/patches/server/1018-Properly-resend-entities.patch
index 5758909403..a140617c6a 100644
--- a/patches/server/1019-Properly-resend-entities.patch
+++ b/patches/server/1018-Properly-resend-entities.patch
@@ -81,7 +81,7 @@ index e9dcdb1e09e84a9b451034ff4bdfa6eae2dd1c04..24b1715397ba8e6f5e9841a030d0e3d9
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 50a8ea1af21c374215cbce85e16bbdebc346d49c..1e17d05bb6b7254e4d55b1f33cea24e1c4ef42ae 100644
+index 8cab1565efb11a46f5f2c44057a40d922ed72bde..6a3b6d74831953d51d149dad81d6e91c20aa099d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1948,6 +1948,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -115,7 +115,7 @@ index 24ff10c4ed69deed2ce9ba25835575419165e2af..83759ce35c66e45d04eaa494bd8bc95e
          this.sendLevelInfo(player, worldserver1);
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6b4a7930efabd29f00690a79e8080faaa9767190..935f88542a10360ec21dfced9272313fcf1354ab 100644
+index e541a77381b03bd4dc648fc50aef77c304157fc0..34b67d7551c0ce354bc7bdb6a3581100c983ac47 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -684,13 +684,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1020-Registry-Modification-API.patch b/patches/server/1019-Registry-Modification-API.patch
index f478968684..6f8f0a19fa 100644
--- a/patches/server/1020-Registry-Modification-API.patch
+++ b/patches/server/1019-Registry-Modification-API.patch
@@ -1347,7 +1347,7 @@ index c2824cc07b761958a0df4b110bdfc53bd853b9e7..cacbb35d365c66881f2a42d099bb88c4
 +    // Paper end - RegistrySet API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e182de47cc9c12f2d7051edd0ab3d2b4267f54b2..02be833b259873c27bd629bb3148f2286f418bc3 100644
+index 9e0d8fc51196ca07677f45e41614262036155e85..82ebfd09e9baca0a31ee41c0e5228bce3c54e74f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -668,6 +668,21 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/1021-Add-registry-entry-and-builders.patch b/patches/server/1020-Add-registry-entry-and-builders.patch
index 7978bd6ce2..7978bd6ce2 100644
--- a/patches/server/1021-Add-registry-entry-and-builders.patch
+++ b/patches/server/1020-Add-registry-entry-and-builders.patch
diff --git a/patches/server/1022-Improved-Watchdog-Support.patch b/patches/server/1021-Improved-Watchdog-Support.patch
index 3c17cbaba2..798fa8624a 100644
--- a/patches/server/1022-Improved-Watchdog-Support.patch
+++ b/patches/server/1021-Improved-Watchdog-Support.patch
@@ -304,7 +304,7 @@ index 7d2896918ff5fed37e5de5a22c37b0c7f32634a8..d43b98bdfcb00603737a309c0fb7793d
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ca9b909a783733f2af1e36f4ac2fd463362b9685..c38c688417f769a6022dd40d6652b00e14c4df94 100644
+index 83759ce35c66e45d04eaa494bd8bc95e51e9836a..eb94c0a962de4dc389eb309d264b6e1c6c7229aa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -604,7 +604,7 @@ public abstract class PlayerList {
diff --git a/patches/server/1023-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1022-Proxy-ItemStack-to-CraftItemStack.patch
index 6ce5ce92ca..51d86f8f5b 100644
--- a/patches/server/1023-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/1022-Proxy-ItemStack-to-CraftItemStack.patch
@@ -184,7 +184,7 @@ index d03f4a767f6c7fe7d6bcef20e6676c39d9657584..bae3dd5fc67e6b3d98a5e63ffbf639c5
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-index 9c004e7cb46841d874ab997bf2e3b63ae763aec7..d7c8f26b21276d9ff1d5c7c9738cc1126ce7d4b9 100644
+index 6cc9d7a9e6d4bfdc27e52fc581b2bb832616f121..6930d0afb230a88aa813b02e4d55c95d3a049688 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
 @@ -678,4 +678,16 @@ public class MaterialRerouting {
@@ -205,7 +205,7 @@ index 9c004e7cb46841d874ab997bf2e3b63ae763aec7..d7c8f26b21276d9ff1d5c7c9738cc112
 +    // 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 02be833b259873c27bd629bb3148f2286f418bc3..41c34ffdf9d95a04ed55a1e09ebc78e8cf946777 100644
+index 82ebfd09e9baca0a31ee41c0e5228bce3c54e74f..28dbe30a98a6730839949bc9a6a90b78619ff84d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -683,6 +683,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/1024-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 430f84e5a5..430f84e5a5 100644
--- a/patches/server/1024-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/1025-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index 6e36d9a7b3..6e36d9a7b3 100644
--- a/patches/server/1025-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/1026-optimize-dirt-and-snow-spreading.patch b/patches/server/1025-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1026-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1025-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1027-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch
index e15a77ee75..e15a77ee75 100644
--- a/patches/server/1027-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1028-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch
index c402325cb5..c402325cb5 100644
--- a/patches/server/1028-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1029-fix-horse-inventories.patch b/patches/server/1028-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/1029-fix-horse-inventories.patch
+++ b/patches/server/1028-fix-horse-inventories.patch
diff --git a/patches/server/1030-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index 1b7439c07a..f6b8cc3f6b 100644
--- a/patches/server/1030-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch
@@ -12,7 +12,7 @@ This patch moves the invocation directly before the #actuallyHurt calls,
 respective invulnerable timings.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index aff6cd6b717b8fdff373be1db32d26f1305e2be9..d6699caad1909857793e34228cff78dd3b8b6f41 100644
+index 53e4ce13f0ce1a7609fdc82f0ae3f3dabef38c54..8276f4efd7a799b6e8b6e8c28e2565833c889647 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1459,12 +1459,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1031-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1030-Fix-entity-tracker-desync-when-new-players-are-added.patch
index f953c50390..a32ece8170 100644
--- a/patches/server/1031-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1030-Fix-entity-tracker-desync-when-new-players-are-added.patch
@@ -29,7 +29,7 @@ client will not tick the entity and thus not lerp the entity
 from its old position to its new position.
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java
-index 1a5e73fd97781f3903e5ef13aa0352c64fbc2cc1..4126d82e83810126eb4a41b4587dc993542f3793 100644
+index 854baa554da2215a656f976ae2973341c3b2d61c..792b9a72a610cc512a8920d61013b6ba02f71e47 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundAddEntityPacket.java
 @@ -42,9 +42,11 @@ public class ClientboundAddEntityPacket implements Packet<ClientGamePacketListen
diff --git a/patches/server/1032-Lag-compensation-ticks.patch b/patches/server/1031-Lag-compensation-ticks.patch
index ef9a724904..cea51f3b38 100644
--- a/patches/server/1032-Lag-compensation-ticks.patch
+++ b/patches/server/1031-Lag-compensation-ticks.patch
@@ -28,7 +28,7 @@ index 93ebdbfad4f9f300f31a124d8d4b36c4f5ce382c..a2875f7cdfb6b43ed59cff41ab4122a0
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3f1428b282987e1c4cd2fb5b035df5170cd09e00..415b7839544d269a562b2bceeaa416a1a89be96e 100644
+index d223ecfbb0b8986507ce8b6728edbf7c8d818b7d..9e1af229f52a8ac09833901ad53bd154fed34a4f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -485,6 +485,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -63,7 +63,7 @@ index 24b1715397ba8e6f5e9841a030d0e3d964356f89..cc01ead133cc6859ca5d7a1d0ac3c129
  
          if (this.hasDelayedDestroy) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d6699caad1909857793e34228cff78dd3b8b6f41..fe435d4a387bb28be6831cec0c8bb0a7c8b603a4 100644
+index 8276f4efd7a799b6e8b6e8c28e2565833c889647..ccd9dff20a60f019e0c320acfb526b8bf3e5f806 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3900,6 +3900,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1033-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1032-Detail-more-information-in-watchdog-dumps.patch
index 7497c32cc5..1806b418e3 100644
--- a/patches/server/1033-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1032-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index d0d36a57ec4896bcb74970f8fb24d8f3e17db133..e2c24813f59c2fd075c740ac1842a38f
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 415b7839544d269a562b2bceeaa416a1a89be96e..6d8a5c2b0d95828abbd99914d1d308522b89529f 100644
+index 9e1af229f52a8ac09833901ad53bd154fed34a4f..c5698b05cc3ea4cb1bc6789c30f2aab76748d491 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1199,7 +1199,26 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -122,7 +122,7 @@ index 415b7839544d269a562b2bceeaa416a1a89be96e..6d8a5c2b0d95828abbd99914d1d30852
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 935f88542a10360ec21dfced9272313fcf1354ab..490ee48346395fcbaf2eb0151e9248f18974fea6 100644
+index 34b67d7551c0ce354bc7bdb6a3581100c983ac47..e0827d8bb3fa17d4f590a5342ff41a514f623e68 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1086,8 +1086,43 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1034-Write-SavedData-IO-async.patch b/patches/server/1033-Write-SavedData-IO-async.patch
index 538d0fcba4..cceb676e45 100644
--- a/patches/server/1034-Write-SavedData-IO-async.patch
+++ b/patches/server/1033-Write-SavedData-IO-async.patch
@@ -24,7 +24,7 @@ index 4a5dc7fd4eb1a7ab1ec371f0f107de882f88149c..dcb5651d1d9b10b40430fb2f713beedf
  
      // CraftBukkit start - modelled on below
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6d8a5c2b0d95828abbd99914d1d308522b89529f..e50df5a1f3b89b3d0687d6584bdd977f8b71a3f6 100644
+index c5698b05cc3ea4cb1bc6789c30f2aab76748d491..2931e1dd0c8ae5ac1c9ec42f90dd5ab57595bf60 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1330,7 +1330,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/1035-Correctly-call-PlayerItemBreakEvent.patch b/patches/server/1034-Correctly-call-PlayerItemBreakEvent.patch
index 5dd198b395..378457e6e4 100644
--- a/patches/server/1035-Correctly-call-PlayerItemBreakEvent.patch
+++ b/patches/server/1034-Correctly-call-PlayerItemBreakEvent.patch
@@ -17,7 +17,7 @@ stack to not disrupt potential new vanilla changes that might depend on
 this behaviour.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3254124180df02d787202f4b00a4c52d40c6e7cf..d1340691d508c21c15237ec4a4626e9219d7c4f7 100644
+index c133a52f96a783e81eac15621655ca1e3f6b6c25..b6a2f3e4f22f36e75a1630bd456c2f471edbb398 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -731,8 +731,10 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/1036-Add-ItemType-getItemRarity.patch b/patches/server/1035-Add-ItemType-getItemRarity.patch
index 35ebf5036b..35ebf5036b 100644
--- a/patches/server/1036-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1035-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1037-Incremental-chunk-and-player-saving.patch b/patches/server/1036-Incremental-chunk-and-player-saving.patch
index 9506b40544..c027eb320b 100644
--- a/patches/server/1037-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1036-Incremental-chunk-and-player-saving.patch
@@ -56,7 +56,7 @@ index a2875f7cdfb6b43ed59cff41ab4122a08c4cc57f..45695abbeb0a6d47b31b23ba6c464f17
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
              this.runAllTasks();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e50df5a1f3b89b3d0687d6584bdd977f8b71a3f6..2fe9d9b38c01d04416843fdd48d3e33899b7de63 100644
+index 2931e1dd0c8ae5ac1c9ec42f90dd5ab57595bf60..c96f3dcd365bc140b1f4680ef6bd770c80f8eda1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1315,6 +1315,35 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/1038-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 114443675b..114443675b 100644
--- a/patches/server/1038-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1039-Bundle-spark.patch b/patches/server/1038-Bundle-spark.patch
index 2fe8f1d8e3..2fe8f1d8e3 100644
--- a/patches/server/1039-Bundle-spark.patch
+++ b/patches/server/1038-Bundle-spark.patch
diff --git a/patches/server/1040-Add-plugin-info-at-startup.patch b/patches/server/1039-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1040-Add-plugin-info-at-startup.patch
+++ b/patches/server/1039-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1041-Make-interaction-leniency-distance-configurable.patch b/patches/server/1040-Make-interaction-leniency-distance-configurable.patch
index 92cf570915..6e26624a13 100644
--- a/patches/server/1041-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/server/1040-Make-interaction-leniency-distance-configurable.patch
@@ -12,7 +12,7 @@ This value however may be too low in high latency environments.
 The patch exposes a new configuration option to configure said value.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1e17d05bb6b7254e4d55b1f33cea24e1c4ef42ae..16690c9f3c720139f552473da1bde2509b1aa094 100644
+index 6a3b6d74831953d51d149dad81d6e91c20aa099d..de57032cb2157b9d3e51582eb8b4d6515dfafbdd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2702,7 +2702,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1042-Fix-PickupStatus-getting-reset.patch b/patches/server/1041-Fix-PickupStatus-getting-reset.patch
index 2a772419ce..2a772419ce 100644
--- a/patches/server/1042-Fix-PickupStatus-getting-reset.patch
+++ b/patches/server/1041-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1043-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index f060e79368..c56c52b165 100644
--- a/patches/server/1043-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/server/1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Check for block type in SculkSensorBlock#canActivate
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
-index 9e928302817ee8e1cc8c7f3f1b351a0d5f3a7c2c..1db261f63aaf083b4d38f519f77abecbd942e999 100644
+index b45bc43b5a59a95c50bd756a981368c7fdadbd41..8d57c68d2f20f7c0d5c1be5d5b12e6926aad8c58 100644
 --- a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
 @@ -218,7 +218,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg
diff --git a/patches/server/1044-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 3ff8343ca9..3ff8343ca9 100644
--- a/patches/server/1044-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/server/1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/1045-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1044-Configuration-for-horizontal-only-item-merging.patch
index 1c45d3f2f0..1c45d3f2f0 100644
--- a/patches/server/1045-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/server/1044-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1046-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1045-Optimise-collision-checking-in-player-move-packet-ha.patch
index 317053f409..2a58848e4d 100644
--- a/patches/server/1046-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1045-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 16690c9f3c720139f552473da1bde2509b1aa094..9a77b6194fb92451a5db5ca3c5984a85da9fa5e2 100644
+index de57032cb2157b9d3e51582eb8b4d6515dfafbdd..156c185a08adc602715890506cbe959e1f085094 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -572,7 +572,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1047-Add-skipping-world-symlink-scan.patch b/patches/server/1046-Add-skipping-world-symlink-scan.patch
index edbbf7edf8..edbbf7edf8 100644
--- a/patches/server/1047-Add-skipping-world-symlink-scan.patch
+++ b/patches/server/1046-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1048-Add-even-more-Enchantment-API.patch b/patches/server/1047-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1048-Add-even-more-Enchantment-API.patch
+++ b/patches/server/1047-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1049-Leashable-API.patch b/patches/server/1048-Leashable-API.patch
index b93323b964..b93323b964 100644
--- a/patches/server/1049-Leashable-API.patch
+++ b/patches/server/1048-Leashable-API.patch
diff --git a/patches/server/1050-Fix-CraftBukkit-drag-system.patch b/patches/server/1049-Fix-CraftBukkit-drag-system.patch
index c347e07ded..899c547992 100644
--- a/patches/server/1050-Fix-CraftBukkit-drag-system.patch
+++ b/patches/server/1049-Fix-CraftBukkit-drag-system.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType
 public net.minecraft.world.inventory.AbstractContainerMenu resetQuickCraft()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9a77b6194fb92451a5db5ca3c5984a85da9fa5e2..b13057c0792067cc6b0abdf0d64a9be2cc9389a4 100644
+index 156c185a08adc602715890506cbe959e1f085094..7699793451e62d952403efb7ac5e77db6c4f5328 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3127,6 +3127,25 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1051-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index 052376aaeb..052376aaeb 100644
--- a/patches/server/1051-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/server/1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1052-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1051-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1052-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/server/1051-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1053-Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/server/1052-Properly-destroy-placed-blocks-on-the-end-platform.patch
index 9bbeddc476..9bbeddc476 100644
--- a/patches/server/1053-Properly-destroy-placed-blocks-on-the-end-platform.patch
+++ b/patches/server/1052-Properly-destroy-placed-blocks-on-the-end-platform.patch
diff --git a/patches/server/1054-Add-enchantment-seed-update-API.patch b/patches/server/1053-Add-enchantment-seed-update-API.patch
index f66f062401..f66f062401 100644
--- a/patches/server/1054-Add-enchantment-seed-update-API.patch
+++ b/patches/server/1053-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1055-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1054-Fix-synchronise-sending-chat-to-client-with-updating.patch
index 3ed1a7f75a..2634ffb89e 100644
--- a/patches/server/1055-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/server/1054-Fix-synchronise-sending-chat-to-client-with-updating.patch
@@ -9,7 +9,7 @@ In the case where multiple messages from different players are being processed i
 This also applies to the last seen state of the server, which becomes inconsistent in the same way as the message signature cache and would cause any messages sent to be rejected by the server too.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b13057c0792067cc6b0abdf0d64a9be2cc9389a4..1eb56c606712a84a96d1d678ce9070b3d46e5c01 100644
+index 7699793451e62d952403efb7ac5e77db6c4f5328..701e8ccc0c44cde8837afb31ab30d5de93da18ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2715,8 +2715,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl