Readd mc-4 fix

368 files changed, 71 insertions, 89 deletions

diff --git a/patches/removed/1.19/0542-MC-4-Fix-item-position-desync.patch b/patches/removed/1.19/0542-MC-4-Fix-item-position-desync.patch
deleted file mode 100644
index 40df824fa5..0000000000
--- a/patches/removed/1.19/0542-MC-4-Fix-item-position-desync.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <[email protected]>
-Date: Tue, 8 Dec 2020 20:24:52 -0600
-Subject: [PATCH] MC-4: Fix item position desync
-
-This fixes item position desync (MC-4) by running the item coordinates
-through the encode/decode methods of the packet that causes the precision
-loss, which forces the server to lose the same precision as the client
-keeping them in sync.
-
-1.19: entity tracking position changes
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ccc60a5465efa2b71fc2593d75af62c0b64fe66c..1adbceadd5df96e17796561a40eb7b760493440e 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -101,6 +101,11 @@ public class PaperConfig {
-         trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false);
-     }
- 
-+    public static boolean fixEntityPositionDesync = true;
-+    private static void fixEntityPositionDesync() {
-+        fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync);
-+    }
-+
-     public static void registerCommands() {
-         for (Map.Entry<String, Command> entry : commands.entrySet()) {
-             MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
-index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f900d72dab 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
-@@ -21,11 +21,11 @@ public abstract class ClientboundMoveEntityPacket implements Packet<ClientGamePa
-     protected final boolean hasPos;
- 
-     public static long entityToPacket(double coord) {
--        return Mth.lfloor(coord * 4096.0D);
-+        return Mth.lfloor(coord * 4096.0D); // Paper - check ItemEntity#setPosRaw on update
-     }
- 
-     public static double packetToEntity(long coord) {
--        return (double)coord / 4096.0D;
-+        return (double)coord / 4096.0D; // Paper - check ItemEntity#setPosRaw on update
-     }
- 
-     public Vec3 updateEntityPosition(Vec3 orig) {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 78dbc89bb247b2765bd2d7d81013d18dfe35539f..e53d8fe713a4c9920f40bf91d6453d36520b45f7 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3802,6 +3802,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
-     public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
-         // Paper end
-+        // Paper start - fix MC-4
-+        if (this instanceof ItemEntity) {
-+            if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) {
-+                // encode/decode from PacketPlayOutEntity
-+                x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
-+                y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
-+                z = Mth.lfloor(z * 4096.0D) * (1 / 4096.0D);
-+            }
-+        }
-+        // Paper end - fix MC-4
-         if (this.position.x != x || this.position.y != y || this.position.z != z) {
-             this.position = new Vec3(x, y, z);
-             int i = Mth.floor(x);
diff --git a/patches/server/0543-MC-4-Fix-item-position-desync.patch b/patches/server/0543-MC-4-Fix-item-position-desync.patch
new file mode 100644
index 0000000000..bc922606f0
--- /dev/null
+++ b/patches/server/0543-MC-4-Fix-item-position-desync.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Tue, 8 Dec 2020 20:24:52 -0600
+Subject: [PATCH] MC-4: Fix item position desync
+
+This fixes item position desync (MC-4) by running the item coordinates
+through the encode/decode methods of the packet that causes the precision
+loss, which forces the server to lose the same precision as the client
+keeping them in sync.
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
+index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c3879eceb21 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
++++ b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
+@@ -8,11 +8,11 @@ public class VecDeltaCodec {
+     public Vec3 base = Vec3.ZERO; // Paper
+ 
+     private static long encode(double value) {
+-        return Mth.lfloor(value * 4096.0D);
++        return Mth.lfloor(value * 4096.0D); // Paper - check ItemEntity#setPosRaw on update
+     }
+ 
+     private static double decode(long value) {
+-        return (double)value / 4096.0D;
++        return (double)value / 4096.0D; // Paper - check ItemEntity#setPosRaw on update
+     }
+ 
+     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 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..4f9a5837d66c1940385e94f80d865cde1c4cf2a2 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3888,6 +3888,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+     }
+     public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
+         // Paper end
++        // Paper start - fix MC-4
++        if (this instanceof ItemEntity) {
++            if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.fixEntityPositionDesync) {
++                // encode/decode from PacketPlayOutEntity
++                x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
++                y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
++                z = Mth.lfloor(z * 4096.0D) * (1 / 4096.0D);
++            }
++        }
++        // Paper end - fix MC-4
+         if (this.position.x != x || this.position.y != y || this.position.z != z) {
+             this.position = new Vec3(x, y, z);
+             int i = Mth.floor(x);
diff --git a/patches/server/0543-Additional-Block-Material-API-s.patch b/patches/server/0544-Additional-Block-Material-API-s.patch
index e93239aae5..e93239aae5 100644
--- a/patches/server/0543-Additional-Block-Material-API-s.patch
+++ b/patches/server/0544-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0544-Fix-harming-potion-dupe.patch b/patches/server/0545-Fix-harming-potion-dupe.patch
index d131d6c979..d131d6c979 100644
--- a/patches/server/0544-Fix-harming-potion-dupe.patch
+++ b/patches/server/0545-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 69d3ef793f..69d3ef793f 100644
--- a/patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0546-Cache-burn-durations.patch b/patches/server/0547-Cache-burn-durations.patch
index 35387cbe57..35387cbe57 100644
--- a/patches/server/0546-Cache-burn-durations.patch
+++ b/patches/server/0547-Cache-burn-durations.patch
diff --git a/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index b11735c5d7..b11735c5d7 100644
--- a/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
index 8967f3f735..8967f3f735 100644
--- a/patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
index 37ba0806a7..37ba0806a7 100644
--- a/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0551-Zombie-API-breaking-doors.patch b/patches/server/0552-Zombie-API-breaking-doors.patch
index 2b1fa20025..2b1fa20025 100644
--- a/patches/server/0551-Zombie-API-breaking-doors.patch
+++ b/patches/server/0552-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0552-Fix-nerfed-slime-when-splitting.patch b/patches/server/0553-Fix-nerfed-slime-when-splitting.patch
index 726d362dff..726d362dff 100644
--- a/patches/server/0552-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0553-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0553-Add-EntityLoadCrossbowEvent.patch b/patches/server/0554-Add-EntityLoadCrossbowEvent.patch
index 6ffab47e6e..6ffab47e6e 100644
--- a/patches/server/0553-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0554-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0554-Guardian-beam-workaround.patch b/patches/server/0555-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0554-Guardian-beam-workaround.patch
+++ b/patches/server/0555-Guardian-beam-workaround.patch
diff --git a/patches/server/0555-Added-WorldGameRuleChangeEvent.patch b/patches/server/0556-Added-WorldGameRuleChangeEvent.patch
index e521db51ae..e521db51ae 100644
--- a/patches/server/0555-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0556-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0556-Added-ServerResourcesReloadedEvent.patch b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch
index e746f414f6..e746f414f6 100644
--- a/patches/server/0556-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
index 4c1e7b2549..4c1e7b2549 100644
--- a/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0558-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
index 7eec9c45b6..7eec9c45b6 100644
--- a/patches/server/0558-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0559-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
index d8fd03b1c7..d8fd03b1c7 100644
--- a/patches/server/0559-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
index 9b172da84b..9b172da84b 100644
--- a/patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0561-Configurable-door-breaking-difficulty.patch b/patches/server/0562-Configurable-door-breaking-difficulty.patch
index 45e5e3e168..45e5e3e168 100644
--- a/patches/server/0561-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0562-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0562-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
index bb95c43e4a..bb95c43e4a 100644
--- a/patches/server/0562-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
index cb48ca3506..cb48ca3506 100644
--- a/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0564-Remove-stale-POIs.patch b/patches/server/0565-Remove-stale-POIs.patch
index e2797a5f15..e2797a5f15 100644
--- a/patches/server/0564-Remove-stale-POIs.patch
+++ b/patches/server/0565-Remove-stale-POIs.patch
diff --git a/patches/server/0565-Fix-villager-boat-exploit.patch b/patches/server/0566-Fix-villager-boat-exploit.patch
index 41111aa03e..41111aa03e 100644
--- a/patches/server/0565-Fix-villager-boat-exploit.patch
+++ b/patches/server/0566-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0566-Add-sendOpLevel-API.patch b/patches/server/0567-Add-sendOpLevel-API.patch
index a713774412..a713774412 100644
--- a/patches/server/0566-Add-sendOpLevel-API.patch
+++ b/patches/server/0567-Add-sendOpLevel-API.patch
diff --git a/patches/server/0567-Add-PaperRegistry.patch b/patches/server/0568-Add-PaperRegistry.patch
index 05b300bd23..05b300bd23 100644
--- a/patches/server/0567-Add-PaperRegistry.patch
+++ b/patches/server/0568-Add-PaperRegistry.patch
diff --git a/patches/server/0568-Add-StructuresLocateEvent.patch b/patches/server/0569-Add-StructuresLocateEvent.patch
index a2fbda08bb..a2fbda08bb 100644
--- a/patches/server/0568-Add-StructuresLocateEvent.patch
+++ b/patches/server/0569-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
index d10e251d45..d2a1ca36e2 100644
--- a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0570-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 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..7634e8a8859f6fbf68cc3f62c698ecb84264f9c0 100644
+index 4f9a5837d66c1940385e94f80d865cde1c4cf2a2..db6be2d9144fb1da9583833849f7b5518402c26d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1714,6 +1714,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 1af8b9fb5e..1af8b9fb5e 100644
--- a/patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
index 71ca8dddef..71ca8dddef 100644
--- a/patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0572-Make-schedule-command-per-world.patch b/patches/server/0573-Make-schedule-command-per-world.patch
index 60f5d1fc66..60f5d1fc66 100644
--- a/patches/server/0572-Make-schedule-command-per-world.patch
+++ b/patches/server/0573-Make-schedule-command-per-world.patch
diff --git a/patches/server/0573-Configurable-max-leash-distance.patch b/patches/server/0574-Configurable-max-leash-distance.patch
index ba76f79b7f..ba76f79b7f 100644
--- a/patches/server/0573-Configurable-max-leash-distance.patch
+++ b/patches/server/0574-Configurable-max-leash-distance.patch
diff --git a/patches/server/0574-Implement-BlockPreDispenseEvent.patch b/patches/server/0575-Implement-BlockPreDispenseEvent.patch
index 9f483091c6..9f483091c6 100644
--- a/patches/server/0574-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0575-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 2f90dea41c..2f90dea41c 100644
--- a/patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
index caffaecf90..caffaecf90 100644
--- a/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
index 1c6497d193..1c6497d193 100644
--- a/patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index faf88f1020..faf88f1020 100644
--- a/patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0579-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
index 3136003d65..3136003d65 100644
--- a/patches/server/0579-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0580-add-DragonEggFormEvent.patch b/patches/server/0581-add-DragonEggFormEvent.patch
index 40273bbb47..40273bbb47 100644
--- a/patches/server/0580-add-DragonEggFormEvent.patch
+++ b/patches/server/0581-add-DragonEggFormEvent.patch
diff --git a/patches/server/0581-EntityMoveEvent.patch b/patches/server/0582-EntityMoveEvent.patch
index 0aec7d28e3..0aec7d28e3 100644
--- a/patches/server/0581-EntityMoveEvent.patch
+++ b/patches/server/0582-EntityMoveEvent.patch
diff --git a/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
index 343f6700c3..343f6700c3 100644
--- a/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0583-Inline-shift-direction-fields.patch b/patches/server/0584-Inline-shift-direction-fields.patch
index d4353368a2..d4353368a2 100644
--- a/patches/server/0583-Inline-shift-direction-fields.patch
+++ b/patches/server/0584-Inline-shift-direction-fields.patch
diff --git a/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
index f3c5cbca90..f3c5cbca90 100644
--- a/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0586-living-entity-allow-attribute-registration.patch b/patches/server/0587-living-entity-allow-attribute-registration.patch
index 88cf7f15c6..88cf7f15c6 100644
--- a/patches/server/0586-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0587-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0587-fix-dead-slime-setSize-invincibility.patch b/patches/server/0588-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0587-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0588-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
index a54892a9ec..a54892a9ec 100644
--- a/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0590-Expose-Tracked-Players.patch b/patches/server/0591-Expose-Tracked-Players.patch
index 02b4d1e43e..02b4d1e43e 100644
--- a/patches/server/0590-Expose-Tracked-Players.patch
+++ b/patches/server/0591-Expose-Tracked-Players.patch
diff --git a/patches/server/0591-Remove-streams-from-SensorNearest.patch b/patches/server/0592-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0591-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0592-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0593-Improve-ServerGUI.patch b/patches/server/0594-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0593-Improve-ServerGUI.patch
+++ b/patches/server/0594-Improve-ServerGUI.patch
diff --git a/patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0595-fix-converting-txt-to-json-file.patch b/patches/server/0596-fix-converting-txt-to-json-file.patch
index a08d19612b..a08d19612b 100644
--- a/patches/server/0595-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0596-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0596-Add-worldborder-events.patch b/patches/server/0597-Add-worldborder-events.patch
index af0cf2d370..af0cf2d370 100644
--- a/patches/server/0596-Add-worldborder-events.patch
+++ b/patches/server/0597-Add-worldborder-events.patch
diff --git a/patches/server/0597-added-PlayerNameEntityEvent.patch b/patches/server/0598-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0597-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0598-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0598-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
index 3e79faf014..3e79faf014 100644
--- a/patches/server/0598-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0599-Add-recipe-to-cook-events.patch b/patches/server/0600-Add-recipe-to-cook-events.patch
index 61023ab91c..61023ab91c 100644
--- a/patches/server/0599-Add-recipe-to-cook-events.patch
+++ b/patches/server/0600-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0600-Add-Block-isValidTool.patch b/patches/server/0601-Add-Block-isValidTool.patch
index 95bf6c3432..95bf6c3432 100644
--- a/patches/server/0600-Add-Block-isValidTool.patch
+++ b/patches/server/0601-Add-Block-isValidTool.patch
diff --git a/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
index 99c0a46e2e..99c0a46e2e 100644
--- a/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0602-Expand-world-key-API.patch b/patches/server/0603-Expand-world-key-API.patch
index 261a152922..261a152922 100644
--- a/patches/server/0602-Expand-world-key-API.patch
+++ b/patches/server/0603-Expand-world-key-API.patch
diff --git a/patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0604-Item-Rarity-API.patch b/patches/server/0605-Item-Rarity-API.patch
index d26dcc93ec..d26dcc93ec 100644
--- a/patches/server/0604-Item-Rarity-API.patch
+++ b/patches/server/0605-Item-Rarity-API.patch
diff --git a/patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index a8810d8bca..a8810d8bca 100644
--- a/patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
index 766607080f..766607080f 100644
--- a/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
index 0a38c072e9..0a38c072e9 100644
--- a/patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
index 68e2f5b09c..68e2f5b09c 100644
--- a/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index d9963a995b..d9963a995b 100644
--- a/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0610-Entity-load-save-limit-per-chunk.patch b/patches/server/0611-Entity-load-save-limit-per-chunk.patch
index 64d4f515d8..64d4f515d8 100644
--- a/patches/server/0610-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0611-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0611-Expose-protocol-version.patch b/patches/server/0612-Expose-protocol-version.patch
index 5da137f698..5da137f698 100644
--- a/patches/server/0611-Expose-protocol-version.patch
+++ b/patches/server/0612-Expose-protocol-version.patch
diff --git a/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 52ac6d184b..52ac6d184b 100644
--- a/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
index f50ff561c4..f50ff561c4 100644
--- a/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index bd11a625a1..bd11a625a1 100644
--- a/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0615-Add-bypass-host-check.patch b/patches/server/0616-Add-bypass-host-check.patch
index 85854dc71d..85854dc71d 100644
--- a/patches/server/0615-Add-bypass-host-check.patch
+++ b/patches/server/0616-Add-bypass-host-check.patch
diff --git a/patches/server/0616-Set-area-affect-cloud-rotation.patch b/patches/server/0617-Set-area-affect-cloud-rotation.patch
index 08e992b45c..08e992b45c 100644
--- a/patches/server/0616-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0617-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
index 2a99c85e92..2a99c85e92 100644
--- a/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
index 0c37516dd7..0c37516dd7 100644
--- a/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
index df4e7b0b17..df4e7b0b17 100644
--- a/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
index 0246d2de0a..0246d2de0a 100644
--- a/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0623-Added-PlayerDeepSleepEvent.patch b/patches/server/0624-Added-PlayerDeepSleepEvent.patch
index 3d655f6013..3d655f6013 100644
--- a/patches/server/0623-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0624-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0624-More-World-API.patch b/patches/server/0625-More-World-API.patch
index c3e37d3592..c3e37d3592 100644
--- a/patches/server/0624-More-World-API.patch
+++ b/patches/server/0625-More-World-API.patch
diff --git a/patches/server/0625-Added-PlayerBedFailEnterEvent.patch b/patches/server/0626-Added-PlayerBedFailEnterEvent.patch
index ad6eaeb223..ad6eaeb223 100644
--- a/patches/server/0625-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0626-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
index e087955e37..e087955e37 100644
--- a/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index b2973e3d1e..b2973e3d1e 100644
--- a/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
index b3f265d709..b3f265d709 100644
--- a/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 15de103960..15de103960 100644
--- a/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0630-Add-Channel-initialization-listeners.patch b/patches/server/0631-Add-Channel-initialization-listeners.patch
index 57ff483455..57ff483455 100644
--- a/patches/server/0630-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0631-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
index 64a9abbcc7..64a9abbcc7 100644
--- a/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0632-Add-more-WanderingTrader-API.patch b/patches/server/0633-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0632-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0633-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
index 2bd0ddfa38..2bd0ddfa38 100644
--- a/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 1eae76c523..1eae76c523 100644
--- a/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 93202d9eb9..93202d9eb9 100644
--- a/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0636-Inventory-close.patch b/patches/server/0637-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0636-Inventory-close.patch
+++ b/patches/server/0637-Inventory-close.patch
diff --git a/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
index 5d47108775..5d47108775 100644
--- a/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 15c8339c99..15c8339c99 100644
--- a/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0639-Fix-CraftPotionBrewer-cache.patch b/patches/server/0640-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0639-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0640-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0640-Add-basic-Datapack-API.patch b/patches/server/0641-Add-basic-Datapack-API.patch
index 8b9ec85a93..8b9ec85a93 100644
--- a/patches/server/0640-Add-basic-Datapack-API.patch
+++ b/patches/server/0641-Add-basic-Datapack-API.patch
diff --git a/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
index 426508e900..426508e900 100644
--- a/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
index 85d9c55a4e..85d9c55a4e 100644
--- a/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0643-ItemStack-repair-check-API.patch b/patches/server/0644-ItemStack-repair-check-API.patch
index 553e56cb06..553e56cb06 100644
--- a/patches/server/0643-ItemStack-repair-check-API.patch
+++ b/patches/server/0644-ItemStack-repair-check-API.patch
diff --git a/patches/server/0644-More-Enchantment-API.patch b/patches/server/0645-More-Enchantment-API.patch
index 9068048df0..9068048df0 100644
--- a/patches/server/0644-More-Enchantment-API.patch
+++ b/patches/server/0645-More-Enchantment-API.patch
diff --git a/patches/server/0645-Move-range-check-for-block-placing-up.patch b/patches/server/0646-Move-range-check-for-block-placing-up.patch
index 3aed956bd9..3aed956bd9 100644
--- a/patches/server/0645-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0646-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
index 50ca9d48dc..50ca9d48dc 100644
--- a/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0647-Add-Mob-lookAt-API.patch b/patches/server/0648-Add-Mob-lookAt-API.patch
index 14378270ee..14378270ee 100644
--- a/patches/server/0647-Add-Mob-lookAt-API.patch
+++ b/patches/server/0648-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0648-Add-Unix-domain-socket-support.patch b/patches/server/0649-Add-Unix-domain-socket-support.patch
index 7b37194acb..7b37194acb 100644
--- a/patches/server/0648-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0649-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0649-Add-EntityInsideBlockEvent.patch b/patches/server/0650-Add-EntityInsideBlockEvent.patch
index 0ca02bfa9a..0ca02bfa9a 100644
--- a/patches/server/0649-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0650-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0650-Attributes-API-for-item-defaults.patch b/patches/server/0651-Attributes-API-for-item-defaults.patch
index ab2191630c..ab2191630c 100644
--- a/patches/server/0650-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0651-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
index 5690474f5e..5690474f5e 100644
--- a/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0652-More-Lidded-Block-API.patch b/patches/server/0653-More-Lidded-Block-API.patch
index 135fd68698..135fd68698 100644
--- a/patches/server/0652-More-Lidded-Block-API.patch
+++ b/patches/server/0653-More-Lidded-Block-API.patch
diff --git a/patches/server/0653-Limit-item-frame-cursors-on-maps.patch b/patches/server/0654-Limit-item-frame-cursors-on-maps.patch
index 4e2cd3bfa2..4e2cd3bfa2 100644
--- a/patches/server/0653-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0654-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0654-Add-PlayerKickEvent-causes.patch b/patches/server/0655-Add-PlayerKickEvent-causes.patch
index 17f4a12490..17f4a12490 100644
--- a/patches/server/0654-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0655-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0655-Add-PufferFishStateChangeEvent.patch b/patches/server/0656-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0655-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0656-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 0ebe5f6ad9..0ebe5f6ad9 100644
--- a/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 044e192a83..044e192a83 100644
--- a/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
index 4cde97de50..4cde97de50 100644
--- a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0659-Add-BellRevealRaiderEvent.patch b/patches/server/0660-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0659-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0660-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0660-Fix-invulnerable-end-crystals.patch b/patches/server/0661-Fix-invulnerable-end-crystals.patch
index e5ce326afa..e5ce326afa 100644
--- a/patches/server/0660-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0661-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
index 13c35cf8b6..13c35cf8b6 100644
--- a/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0662-Fix-dangerous-end-portal-logic.patch b/patches/server/0663-Fix-dangerous-end-portal-logic.patch
index f29fd98fb4..7ff34994ca 100644
--- a/patches/server/0662-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0663-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7634e8a8859f6fbf68cc3f62c698ecb84264f9c0..8813d1720879f8b75d1d1c5f4e8f4414c663bfd6 100644
+index db6be2d9144fb1da9583833849f7b5518402c26d..b5b949a29951b0d1cd1345a2a751eb413484b7e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -453,6 +453,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c46f8fbb65..c46f8fbb65 100644
--- a/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0664-Make-item-validations-configurable.patch b/patches/server/0665-Make-item-validations-configurable.patch
index 8c87e474af..8c87e474af 100644
--- a/patches/server/0664-Make-item-validations-configurable.patch
+++ b/patches/server/0665-Make-item-validations-configurable.patch
diff --git a/patches/server/0665-Line-Of-Sight-Changes.patch b/patches/server/0666-Line-Of-Sight-Changes.patch
index 0776c491ea..0776c491ea 100644
--- a/patches/server/0665-Line-Of-Sight-Changes.patch
+++ b/patches/server/0666-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0666-add-per-world-spawn-limits.patch b/patches/server/0667-add-per-world-spawn-limits.patch
index 2a6c716495..2a6c716495 100644
--- a/patches/server/0666-add-per-world-spawn-limits.patch
+++ b/patches/server/0667-add-per-world-spawn-limits.patch
diff --git a/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0668-Add-more-LimitedRegion-API.patch b/patches/server/0669-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0668-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0669-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 051858a0d9..051858a0d9 100644
--- a/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0670-Missing-Entity-Behavior-API.patch b/patches/server/0671-Missing-Entity-Behavior-API.patch
index 4d9eb765be..4d9eb765be 100644
--- a/patches/server/0670-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0671-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 65ae0f92e2..65ae0f92e2 100644
--- a/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 863796fe03..863796fe03 100644
--- a/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
index 3c341d470b..3c341d470b 100644
--- a/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
index c7d5ed0d5d..c7d5ed0d5d 100644
--- a/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0675-Adds-PlayerArmSwingEvent.patch b/patches/server/0676-Adds-PlayerArmSwingEvent.patch
index 5eba2f2187..5eba2f2187 100644
--- a/patches/server/0675-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0676-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
index dffce5874d..dffce5874d 100644
--- a/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
index 1f63968266..1f63968266 100644
--- a/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
index 7f39718ca5..7f39718ca5 100644
--- a/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
index 203d0a904d..203d0a904d 100644
--- a/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
index f64d6e096d..f64d6e096d 100644
--- a/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 34628f8969..34628f8969 100644
--- a/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0682-Stinger-API.patch b/patches/server/0683-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0682-Stinger-API.patch
+++ b/patches/server/0683-Stinger-API.patch
diff --git a/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index a58750b226..a58750b226 100644
--- a/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0684-Add-System.out-err-catcher.patch b/patches/server/0685-Add-System.out-err-catcher.patch
index 3a428a1748..3a428a1748 100644
--- a/patches/server/0684-Add-System.out-err-catcher.patch
+++ b/patches/server/0685-Add-System.out-err-catcher.patch
diff --git a/patches/server/0685-Fix-test-not-bootstrapping.patch b/patches/server/0686-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0685-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0686-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0687-Improve-boat-collision-performance.patch b/patches/server/0688-Improve-boat-collision-performance.patch
index 14e93cde69..14e93cde69 100644
--- a/patches/server/0687-Improve-boat-collision-performance.patch
+++ b/patches/server/0688-Improve-boat-collision-performance.patch
diff --git a/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
index 0a778bea7e..0a778bea7e 100644
--- a/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
index 6395f3f4a8..6395f3f4a8 100644
--- a/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0690-Add-PlayerSetSpawnEvent.patch b/patches/server/0691-Add-PlayerSetSpawnEvent.patch
index 3a125eb03c..3a125eb03c 100644
--- a/patches/server/0690-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0691-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
index b4d44f1e40..b4d44f1e40 100644
--- a/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
index 2d8bc7884b..d3fef67200 100644
--- a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 7881176a900daa3306c691454f688c1f79b73475..f3b69a434988b8546ddf820117ff00848e0af983 100644
+index ddc5b4849939a96b76611cfa1cd34c06c7acc0f8..5246d427973f34843046e59c198785c73fccec33 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -71,7 +71,7 @@ public class ServerEntity {
diff --git a/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
index c66e6ea022..c66e6ea022 100644
--- a/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0694-Added-EntityDamageItemEvent.patch b/patches/server/0695-Added-EntityDamageItemEvent.patch
index bff8b22585..bff8b22585 100644
--- a/patches/server/0694-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0695-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0695-Optimize-indirect-passenger-iteration.patch b/patches/server/0696-Optimize-indirect-passenger-iteration.patch
index a8f78d1095..b1d82335e5 100644
--- a/patches/server/0695-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0696-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 8813d1720879f8b75d1d1c5f4e8f4414c663bfd6..03f57e6891dd870d481e4b12e6ef3dc032e26db1 100644
+index b5b949a29951b0d1cd1345a2a751eb413484b7e3..f0dfc052cf1c33b422c3e08c88217e3c49ad32ee 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3594,26 +3594,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
index 418540c464..418540c464 100644
--- a/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
index 3a54245132..5e1d739a7c 100644
--- a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index f3b69a434988b8546ddf820117ff00848e0af983..8988561facae5c41dc64929d742316b104ddbbfa 100644
+index 5246d427973f34843046e59c198785c73fccec33..c84ec3b93f2783de7a2815f23a9f1de89c1ab109 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -100,7 +100,7 @@ public class ServerEntity {
diff --git a/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
index 10b64ca856..10b64ca856 100644
--- a/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0699-Clear-bucket-NBT-after-dispense.patch b/patches/server/0700-Clear-bucket-NBT-after-dispense.patch
index 52e26f4674..52e26f4674 100644
--- a/patches/server/0699-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0700-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
index ce9dc32309..ce9dc32309 100644
--- a/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0701-Add-BlockBreakBlockEvent.patch b/patches/server/0702-Add-BlockBreakBlockEvent.patch
index b139762722..b139762722 100644
--- a/patches/server/0701-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0702-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0703-More-CommandBlock-API.patch b/patches/server/0704-More-CommandBlock-API.patch
index 3cbd2436d3..3cbd2436d3 100644
--- a/patches/server/0703-More-CommandBlock-API.patch
+++ b/patches/server/0704-More-CommandBlock-API.patch
diff --git a/patches/server/0704-Add-missing-team-sidebar-display-slots.patch b/patches/server/0705-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0704-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0705-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0705-Add-back-EntityPortalExitEvent.patch b/patches/server/0706-Add-back-EntityPortalExitEvent.patch
index 0b3f2effaa..944522261d 100644
--- a/patches/server/0705-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0706-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 03f57e6891dd870d481e4b12e6ef3dc032e26db1..213b55b648b727ad605da62b691397c789279781 100644
+index f0dfc052cf1c33b422c3e08c88217e3c49ad32ee..7ebbfd7ba4e26539f45b59625a1138a5e053ede4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3095,6 +3095,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
index 34ab05cb34..34ab05cb34 100644
--- a/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0707-Get-entity-default-attributes.patch b/patches/server/0708-Get-entity-default-attributes.patch
index fe8d293a99..fe8d293a99 100644
--- a/patches/server/0707-Get-entity-default-attributes.patch
+++ b/patches/server/0708-Get-entity-default-attributes.patch
diff --git a/patches/server/0708-Left-handed-API.patch b/patches/server/0709-Left-handed-API.patch
index 8a6c26a272..8a6c26a272 100644
--- a/patches/server/0708-Left-handed-API.patch
+++ b/patches/server/0709-Left-handed-API.patch
diff --git a/patches/server/0709-Add-advancement-display-API.patch b/patches/server/0710-Add-advancement-display-API.patch
index dd860e3b4d..dd860e3b4d 100644
--- a/patches/server/0709-Add-advancement-display-API.patch
+++ b/patches/server/0710-Add-advancement-display-API.patch
diff --git a/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
index 1944914081..1944914081 100644
--- a/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0711-Add-critical-damage-API.patch b/patches/server/0712-Add-critical-damage-API.patch
index b20544edb7..b20544edb7 100644
--- a/patches/server/0711-Add-critical-damage-API.patch
+++ b/patches/server/0712-Add-critical-damage-API.patch
diff --git a/patches/server/0712-Fix-issues-with-mob-conversion.patch b/patches/server/0713-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0712-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0713-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0713-Add-isCollidable-methods-to-various-places.patch b/patches/server/0714-Add-isCollidable-methods-to-various-places.patch
index a553062120..a553062120 100644
--- a/patches/server/0713-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0714-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0714-Goat-ram-API.patch b/patches/server/0715-Goat-ram-API.patch
index 426746ea8f..426746ea8f 100644
--- a/patches/server/0714-Goat-ram-API.patch
+++ b/patches/server/0715-Goat-ram-API.patch
diff --git a/patches/server/0715-Add-API-for-resetting-a-single-score.patch b/patches/server/0716-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0715-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0716-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
index 3aea9a6b35..5121d09535 100644
--- a/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 213b55b648b727ad605da62b691397c789279781..5defa93d6016c383590b5cb882fdbb90700ba5d9 100644
+index 7ebbfd7ba4e26539f45b59625a1138a5e053ede4..e6ab931869bb44a2b70029b59140d0327b0898d7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1920,6 +1920,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0717-Vanilla-command-permission-fixes.patch b/patches/server/0718-Vanilla-command-permission-fixes.patch
index 8cdc94788c..8cdc94788c 100644
--- a/patches/server/0717-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0718-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0718-Make-CallbackExecutor-strict-again.patch b/patches/server/0719-Make-CallbackExecutor-strict-again.patch
index 2300cea316..2300cea316 100644
--- a/patches/server/0718-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0719-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index 169dae61cc..169dae61cc 100644
--- a/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 8625d2dd21..8625d2dd21 100644
--- a/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
index f152c64ae6..f152c64ae6 100644
--- a/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0722-Fix-GameProfileCache-concurrency.patch b/patches/server/0723-Fix-GameProfileCache-concurrency.patch
index 1c8bd06db3..1c8bd06db3 100644
--- a/patches/server/0722-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0723-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index babfe87415..babfe87415 100644
--- a/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index bfbc146549..bfbc146549 100644
--- a/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index c863630ea8..c863630ea8 100644
--- a/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index b4a4b8d8a4..b4a4b8d8a4 100644
--- a/patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 732e223de0..732e223de0 100644
--- a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index a8485996ae..a8485996ae 100644
--- a/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch
index 2a00379593..2a00379593 100644
--- a/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch
index 66923c8221..66923c8221 100644
--- a/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0732-Optimise-general-POI-access.patch b/patches/server/0733-Optimise-general-POI-access.patch
index b7014db094..b7014db094 100644
--- a/patches/server/0732-Optimise-general-POI-access.patch
+++ b/patches/server/0733-Optimise-general-POI-access.patch
diff --git a/patches/server/0733-Add-more-async-catchers.patch b/patches/server/0734-Add-more-async-catchers.patch
index 30eca154ba..30eca154ba 100644
--- a/patches/server/0733-Add-more-async-catchers.patch
+++ b/patches/server/0734-Add-more-async-catchers.patch
diff --git a/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
index 5b5e482cc7..d9b2fef058 100644
--- a/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
@@ -953,7 +953,7 @@ index ba3023c7dd5b3bcf66f829fe5dc9757f96d16b45..05ff7bcc79e617904903cf082f6687d2
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5defa93d6016c383590b5cb882fdbb90700ba5d9..9e0593c642186b1ef64432a20b41474ff51b7e15 100644
+index e6ab931869bb44a2b70029b59140d0327b0898d7..6536b992daf856ee84f4fce077d46061bebb90e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -484,6 +484,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0735-Optimise-chunk-tick-iteration.patch b/patches/server/0736-Optimise-chunk-tick-iteration.patch
index 5e46b00b72..5e46b00b72 100644
--- a/patches/server/0735-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0736-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0736-Execute-chunk-tasks-mid-tick.patch b/patches/server/0737-Execute-chunk-tasks-mid-tick.patch
index e6a7a57ca3..e6a7a57ca3 100644
--- a/patches/server/0736-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0737-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0737-Do-not-copy-visible-chunks.patch b/patches/server/0738-Do-not-copy-visible-chunks.patch
index 967f5cdca7..967f5cdca7 100644
--- a/patches/server/0737-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0738-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 06d2ade2a6..06d2ade2a6 100644
--- a/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
index 6cf6b743b6..6cf6b743b6 100644
--- a/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch
index 17b3bc428c..ac982a02a8 100644
--- a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch
@@ -123,7 +123,7 @@ index 572e635739cf43ddb4b4e51df59d4c2612b77034..d3470ba0b1732356d1082f23632dbe21
  
      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 9e0593c642186b1ef64432a20b41474ff51b7e15..85b55badc57ce6c062b87d87cc730d20bb9e27c0 100644
+index 6536b992daf856ee84f4fce077d46061bebb90e4..2013a0b402b0abcb0a47911cfaa8aa0ccf468f9b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -965,7 +965,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -193,9 +193,9 @@ index 9e0593c642186b1ef64432a20b41474ff51b7e15..85b55badc57ce6c062b87d87cc730d20
      }
  
      public void setDeltaMovement(double x, double y, double z) {
-@@ -4012,7 +4056,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
-         // Paper end
+@@ -4022,7 +4066,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+         }
+         // Paper end - fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
 +            synchronized (this.posLock) { // Paper
              this.position = new Vec3(x, y, z);
diff --git a/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch
index 0cab0f9b56..0cab0f9b56 100644
--- a/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0742-Distance-manager-tick-timings.patch b/patches/server/0743-Distance-manager-tick-timings.patch
index db94c0a980..db94c0a980 100644
--- a/patches/server/0742-Distance-manager-tick-timings.patch
+++ b/patches/server/0743-Distance-manager-tick-timings.patch
diff --git a/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 93bf134a0f..93bf134a0f 100644
--- a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0745-Add-packet-limiter-config.patch b/patches/server/0746-Add-packet-limiter-config.patch
index 882a6b6642..882a6b6642 100644
--- a/patches/server/0745-Add-packet-limiter-config.patch
+++ b/patches/server/0746-Add-packet-limiter-config.patch
diff --git a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
index 3c74067e00..3c74067e00 100644
--- a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 7f656dff77..7f656dff77 100644
--- a/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 17c273d2c0..17c273d2c0 100644
--- a/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0750-Time-scoreboard-search.patch b/patches/server/0751-Time-scoreboard-search.patch
index 6cdcc11346..6cdcc11346 100644
--- a/patches/server/0750-Time-scoreboard-search.patch
+++ b/patches/server/0751-Time-scoreboard-search.patch
diff --git a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
index b63f55bd81..b63f55bd81 100644
--- a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch
index 2ceb2cf971..2ceb2cf971 100644
--- a/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
index bb523f58c5..bb523f58c5 100644
--- a/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index bf79d6270e..bf79d6270e 100644
--- a/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0756-Optimise-random-block-ticking.patch b/patches/server/0757-Optimise-random-block-ticking.patch
index c27a32ab15..c27a32ab15 100644
--- a/patches/server/0756-Optimise-random-block-ticking.patch
+++ b/patches/server/0757-Optimise-random-block-ticking.patch
diff --git a/patches/server/0757-Optimise-non-flush-packet-sending.patch b/patches/server/0758-Optimise-non-flush-packet-sending.patch
index 4ac3de41b3..4ac3de41b3 100644
--- a/patches/server/0757-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0758-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0758-Optimise-nearby-player-lookups.patch b/patches/server/0759-Optimise-nearby-player-lookups.patch
index 5889ea2655..5889ea2655 100644
--- a/patches/server/0758-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0759-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0759-Optimise-WorldServer-notify.patch b/patches/server/0760-Optimise-WorldServer-notify.patch
index b3541ae066..b3541ae066 100644
--- a/patches/server/0759-Optimise-WorldServer-notify.patch
+++ b/patches/server/0760-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0760-Remove-streams-for-villager-AI.patch b/patches/server/0761-Remove-streams-for-villager-AI.patch
index 3af840ec77..3af840ec77 100644
--- a/patches/server/0760-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0761-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0761-Rewrite-dataconverter-system.patch b/patches/server/0762-Rewrite-dataconverter-system.patch
index adadd49386..adadd49386 100644
--- a/patches/server/0761-Rewrite-dataconverter-system.patch
+++ b/patches/server/0762-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
index dad040139a..dad040139a 100644
--- a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 7291e1cb36..7291e1cb36 100644
--- a/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index d601eb8884..d601eb8884 100644
--- a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch
index 3b0091079e..3b0091079e 100644
--- a/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 283d481666..283d481666 100644
--- a/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 7b2fa0c05c..7b2fa0c05c 100644
--- a/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index d592c8133d..d592c8133d 100644
--- a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 81bcca30af..81bcca30af 100644
--- a/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0771-Ensure-valid-vehicle-status.patch b/patches/server/0772-Ensure-valid-vehicle-status.patch
index 372e7884c1..372e7884c1 100644
--- a/patches/server/0771-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0772-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
index 2286afa5f2..2286afa5f2 100644
--- a/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch
index 83460a961a..83460a961a 100644
--- a/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index e11fa9c4b9..e11fa9c4b9 100644
--- a/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0777-Preserve-overstacked-loot.patch b/patches/server/0778-Preserve-overstacked-loot.patch
index e39eb87bbc..e39eb87bbc 100644
--- a/patches/server/0777-Preserve-overstacked-loot.patch
+++ b/patches/server/0778-Preserve-overstacked-loot.patch
diff --git a/patches/server/0778-Update-head-rotation-in-missing-places.patch b/patches/server/0779-Update-head-rotation-in-missing-places.patch
index 85d614b930..01bcbb25a0 100644
--- a/patches/server/0778-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0779-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 85b55badc57ce6c062b87d87cc730d20bb9e27c0..e107df89c2c645e93bf6c7fced3cf84c51490ef2 100644
+index 2013a0b402b0abcb0a47911cfaa8aa0ccf468f9b..4e1fc9c2a81a7e252a33f301198b9366dac03006 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1748,6 +1748,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0779-prevent-unintended-light-block-manipulation.patch b/patches/server/0780-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0779-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0780-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0780-Fix-CraftCriteria-defaults-map.patch b/patches/server/0781-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0780-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0781-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0781-Fix-upstreams-block-state-factories.patch b/patches/server/0782-Fix-upstreams-block-state-factories.patch
index 221799c0b1..221799c0b1 100644
--- a/patches/server/0781-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0782-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
index 2a0778c4c4..2a0778c4c4 100644
--- a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0783-Configurable-feature-seeds.patch b/patches/server/0784-Configurable-feature-seeds.patch
index 39ae263f66..39ae263f66 100644
--- a/patches/server/0783-Configurable-feature-seeds.patch
+++ b/patches/server/0784-Configurable-feature-seeds.patch
diff --git a/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 54bf3f7028..54bf3f7028 100644
--- a/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0785-Add-root-admin-user-detection.patch b/patches/server/0786-Add-root-admin-user-detection.patch
index b37abf6f87..b37abf6f87 100644
--- a/patches/server/0785-Add-root-admin-user-detection.patch
+++ b/patches/server/0786-Add-root-admin-user-detection.patch
diff --git a/patches/server/0786-Always-allow-item-changing-in-Fireball.patch b/patches/server/0787-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0786-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0787-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch
index 9a0a0b284c..40de2a3ff4 100644
--- a/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0788-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 e107df89c2c645e93bf6c7fced3cf84c51490ef2..1faaf2ffc7ba32e13f2d1c60d26ddfd8e5648df6 100644
+index 4e1fc9c2a81a7e252a33f301198b9366dac03006..7d25d2b2c4d334ec5bf78ea13eb8de743cb2e5fb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -773,7 +773,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
index b787bb9da8..b787bb9da8 100644
--- a/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
index a08f54ceee..a08f54ceee 100644
--- a/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0790-Rewrite-the-light-engine.patch b/patches/server/0791-Rewrite-the-light-engine.patch
index 9ffeb6c4d7..9ffeb6c4d7 100644
--- a/patches/server/0790-Rewrite-the-light-engine.patch
+++ b/patches/server/0791-Rewrite-the-light-engine.patch
diff --git a/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index cff1064117..cff1064117 100644
--- a/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 98fa76c076..98fa76c076 100644
--- a/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
index a6171c0cc8..a6171c0cc8 100644
--- a/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index 2cc76fc04c..2cc76fc04c 100644
--- a/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch
index f9ce7fc78c..f9ce7fc78c 100644
--- a/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0798-Add-player-health-update-API.patch b/patches/server/0799-Add-player-health-update-API.patch
index 58981109f9..58981109f9 100644
--- a/patches/server/0798-Add-player-health-update-API.patch
+++ b/patches/server/0799-Add-player-health-update-API.patch
diff --git a/patches/server/0799-Optimize-HashMapPalette.patch b/patches/server/0800-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0799-Optimize-HashMapPalette.patch
+++ b/patches/server/0800-Optimize-HashMapPalette.patch
diff --git a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
index acae9661a3..acae9661a3 100644
--- a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 025b005c0a..528de8a06a 100644
--- a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1215,7 +1215,7 @@ index d74d6669005d0669503253787636756a0c6590f4..6d013360d35c54d1493849b22c9d65b1
          }
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1faaf2ffc7ba32e13f2d1c60d26ddfd8e5648df6..82e22e1ad1059630547f16e405e5c553ace29a80 100644
+index 7d25d2b2c4d334ec5bf78ea13eb8de743cb2e5fb..615b0797c38ffbb3594905db90cbc495cc6df916 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1154,9 +1154,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
index 0eea1be6df..0eea1be6df 100644
--- a/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0803-Actually-unload-POI-data.patch b/patches/server/0804-Actually-unload-POI-data.patch
index dede3ce22d..dede3ce22d 100644
--- a/patches/server/0803-Actually-unload-POI-data.patch
+++ b/patches/server/0804-Actually-unload-POI-data.patch
diff --git a/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 4eb953eb31..4eb953eb31 100644
--- a/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0805-Update-Log4j.patch b/patches/server/0806-Update-Log4j.patch
index 8f1c4403e3..8f1c4403e3 100644
--- a/patches/server/0805-Update-Log4j.patch
+++ b/patches/server/0806-Update-Log4j.patch
diff --git a/patches/server/0806-Add-more-Campfire-API.patch b/patches/server/0807-Add-more-Campfire-API.patch
index 5381096620..5381096620 100644
--- a/patches/server/0806-Add-more-Campfire-API.patch
+++ b/patches/server/0807-Add-more-Campfire-API.patch
diff --git a/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 7c333b5f55..7c333b5f55 100644
--- a/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0808-Fix-tripwire-state-inconsistency.patch b/patches/server/0809-Fix-tripwire-state-inconsistency.patch
index d567618d3d..d567618d3d 100644
--- a/patches/server/0808-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0809-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
index 1f9012a293..1f9012a293 100644
--- a/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch
index 8eeff80392..d59633599e 100644
--- a/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0811-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 82e22e1ad1059630547f16e405e5c553ace29a80..71702c915e9519f85904af0e652e692bb1ba596f 100644
+index 615b0797c38ffbb3594905db90cbc495cc6df916..e0dec7b8acf2ed18bc9d0d60cb12329d9d5c1161 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3259,6 +3259,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0811-Improve-scoreboard-entries.patch b/patches/server/0812-Improve-scoreboard-entries.patch
index 313567a730..313567a730 100644
--- a/patches/server/0811-Improve-scoreboard-entries.patch
+++ b/patches/server/0812-Improve-scoreboard-entries.patch
diff --git a/patches/server/0812-Entity-powdered-snow-API.patch b/patches/server/0813-Entity-powdered-snow-API.patch
index c25aea37be..c25aea37be 100644
--- a/patches/server/0812-Entity-powdered-snow-API.patch
+++ b/patches/server/0813-Entity-powdered-snow-API.patch
diff --git a/patches/server/0813-Add-API-for-item-entity-health.patch b/patches/server/0814-Add-API-for-item-entity-health.patch
index d923270a18..d923270a18 100644
--- a/patches/server/0813-Add-API-for-item-entity-health.patch
+++ b/patches/server/0814-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
index bc2b04963d..bc2b04963d 100644
--- a/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch
index 3430e3062a..3430e3062a 100644
--- a/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 698fbc2d5e..698fbc2d5e 100644
--- a/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
index b44bde85fd..b44bde85fd 100644
--- a/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0819-Fix-bees-aging-inside-hives.patch b/patches/server/0820-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0819-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0820-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0820-Bucketable-API.patch b/patches/server/0821-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0820-Bucketable-API.patch
+++ b/patches/server/0821-Bucketable-API.patch
diff --git a/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch
index a5edd3fe44..a5edd3fe44 100644
--- a/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0822-Validate-usernames.patch b/patches/server/0823-Validate-usernames.patch
index 78de6397ed..78de6397ed 100644
--- a/patches/server/0822-Validate-usernames.patch
+++ b/patches/server/0823-Validate-usernames.patch
diff --git a/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0824-Make-water-animal-spawn-height-configurable.patch b/patches/server/0825-Make-water-animal-spawn-height-configurable.patch
index dea45f0b70..dea45f0b70 100644
--- a/patches/server/0824-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0825-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 5dfd917e9e..5dfd917e9e 100644
--- a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
index de155852d0..de155852d0 100644
--- a/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0828-Multiple-Entries-with-Scoreboards.patch b/patches/server/0829-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0828-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0829-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0829-Reset-placed-block-on-exception.patch b/patches/server/0830-Reset-placed-block-on-exception.patch
index abdf99f132..abdf99f132 100644
--- a/patches/server/0829-Reset-placed-block-on-exception.patch
+++ b/patches/server/0830-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0830-Add-configurable-height-for-slime-spawn.patch b/patches/server/0831-Add-configurable-height-for-slime-spawn.patch
index a05bae35ee..a05bae35ee 100644
--- a/patches/server/0830-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0831-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index bfa71584c5..bfa71584c5 100644
--- a/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch
index 42920471c5..42920471c5 100644
--- a/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0833-Kick-on-main-for-illegal-chars.patch b/patches/server/0834-Kick-on-main-for-illegal-chars.patch
index 1292e7298c..1292e7298c 100644
--- a/patches/server/0833-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0834-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0834-Multi-Block-Change-API-Implementation.patch b/patches/server/0835-Multi-Block-Change-API-Implementation.patch
index 1f7099b131..1f7099b131 100644
--- a/patches/server/0834-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0835-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0835-Fix-NotePlayEvent.patch b/patches/server/0836-Fix-NotePlayEvent.patch
index 83040e523a..83040e523a 100644
--- a/patches/server/0835-Fix-NotePlayEvent.patch
+++ b/patches/server/0836-Fix-NotePlayEvent.patch
diff --git a/patches/server/0836-Freeze-Tick-Lock-API.patch b/patches/server/0837-Freeze-Tick-Lock-API.patch
index d09d17ad30..25f6a1e9f8 100644
--- a/patches/server/0836-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0837-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 71702c915e9519f85904af0e652e692bb1ba596f..ef40762094cc862716e1f8219cdbbf53bfde97b5 100644
+index e0dec7b8acf2ed18bc9d0d60cb12329d9d5c1161..1ee13fb0518406382468af125253286996670ec6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -391,6 +391,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0837-Dolphin-API.patch b/patches/server/0838-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0837-Dolphin-API.patch
+++ b/patches/server/0838-Dolphin-API.patch
diff --git a/patches/server/0838-More-PotionEffectType-API.patch b/patches/server/0839-More-PotionEffectType-API.patch
index 5d8c4415d3..5d8c4415d3 100644
--- a/patches/server/0838-More-PotionEffectType-API.patch
+++ b/patches/server/0839-More-PotionEffectType-API.patch
diff --git a/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 2bbcd10eb9..2bbcd10eb9 100644
--- a/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
index c911253e44..c911253e44 100644
--- a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0841-Add-config-for-stronghold-seed.patch b/patches/server/0842-Add-config-for-stronghold-seed.patch
index c8249beb60..c8249beb60 100644
--- a/patches/server/0841-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0842-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0842-Implement-regenerateChunk.patch b/patches/server/0843-Implement-regenerateChunk.patch
index 81b580c897..81b580c897 100644
--- a/patches/server/0842-Implement-regenerateChunk.patch
+++ b/patches/server/0843-Implement-regenerateChunk.patch
diff --git a/patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch
index 7e974e4627..7e974e4627 100644
--- a/patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
index d0db4013fe..d0db4013fe 100644
--- a/patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 0f92ac8a00..0f92ac8a00 100644
--- a/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0846-Add-GameEvent-tags.patch b/patches/server/0847-Add-GameEvent-tags.patch
index 4b0ef43c96..4b0ef43c96 100644
--- a/patches/server/0846-Add-GameEvent-tags.patch
+++ b/patches/server/0847-Add-GameEvent-tags.patch
diff --git a/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index c2468d0789..c2468d0789 100644
--- a/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0848-Replace-ticket-level-propagator.patch b/patches/server/0849-Replace-ticket-level-propagator.patch
index 8959b46f3f..8959b46f3f 100644
--- a/patches/server/0848-Replace-ticket-level-propagator.patch
+++ b/patches/server/0849-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0849-Furnace-RecipesUsed-API.patch b/patches/server/0850-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0849-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0850-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0850-Configurable-sculk-sensor-listener-range.patch b/patches/server/0851-Configurable-sculk-sensor-listener-range.patch
index f19796285a..f19796285a 100644
--- a/patches/server/0850-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0851-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0851-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch
index 83ba5f6bc1..83ba5f6bc1 100644
--- a/patches/server/0851-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 8cf38f6378..8cf38f6378 100644
--- a/patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
index 9539f18738..9539f18738 100644
--- a/patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0854-Fix-Entity-Position-Desync.patch b/patches/server/0855-Fix-Entity-Position-Desync.patch
index f4b0a0dc54..f4b0a0dc54 100644
--- a/patches/server/0854-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0855-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0855-Custom-Potion-Mixes.patch b/patches/server/0856-Custom-Potion-Mixes.patch
index 239cdcd4bd..239cdcd4bd 100644
--- a/patches/server/0855-Custom-Potion-Mixes.patch
+++ b/patches/server/0856-Custom-Potion-Mixes.patch
diff --git a/patches/server/0856-Replace-player-chunk-loader-system.patch b/patches/server/0857-Replace-player-chunk-loader-system.patch
index 0d6cda2f77..0d6cda2f77 100644
--- a/patches/server/0856-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0857-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0857-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch
index 4b8e71e081..4b8e71e081 100644
--- a/patches/server/0857-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0858-Fix-World-locateNearestStructure.patch b/patches/server/0859-Fix-World-locateNearestStructure.patch
index faa9e08609..faa9e08609 100644
--- a/patches/server/0858-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0859-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0859-Force-close-world-loading-screen.patch b/patches/server/0860-Force-close-world-loading-screen.patch
index 672783b749..672783b749 100644
--- a/patches/server/0859-Force-close-world-loading-screen.patch
+++ b/patches/server/0860-Force-close-world-loading-screen.patch
diff --git a/patches/server/0860-Fix-falling-block-spawn-methods.patch b/patches/server/0861-Fix-falling-block-spawn-methods.patch
index be536e6a3d..be536e6a3d 100644
--- a/patches/server/0860-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0861-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0861-Expose-furnace-minecart-push-values.patch b/patches/server/0862-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0861-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0862-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index a9cdda7a75..a9cdda7a75 100644
--- a/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0863-Fix-save-problems-on-shutdown.patch b/patches/server/0864-Fix-save-problems-on-shutdown.patch
index c331284d5c..c331284d5c 100644
--- a/patches/server/0863-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0864-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0864-More-Projectile-API.patch b/patches/server/0865-More-Projectile-API.patch
index 6fbb0c86b1..6fbb0c86b1 100644
--- a/patches/server/0864-More-Projectile-API.patch
+++ b/patches/server/0865-More-Projectile-API.patch
diff --git a/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch
index df73aa2280..df73aa2280 100644
--- a/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 3a5dcccbc7..3a5dcccbc7 100644
--- a/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0867-Implement-getComputedBiome-API.patch b/patches/server/0868-Implement-getComputedBiome-API.patch
index b6a274bb77..b6a274bb77 100644
--- a/patches/server/0867-Implement-getComputedBiome-API.patch
+++ b/patches/server/0868-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0868-Make-some-itemstacks-nonnull.patch b/patches/server/0869-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0868-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0869-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index fe6855e900..fe6855e900 100644
--- a/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0870-Implement-enchantWithLevels-API.patch b/patches/server/0871-Implement-enchantWithLevels-API.patch
index 204d4534fb..204d4534fb 100644
--- a/patches/server/0870-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0871-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0871-Fix-saving-in-unloadWorld.patch b/patches/server/0872-Fix-saving-in-unloadWorld.patch
index 04816f47ab..04816f47ab 100644
--- a/patches/server/0871-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0872-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0872-Buffer-OOB-setBlock-calls.patch b/patches/server/0873-Buffer-OOB-setBlock-calls.patch
index 2c96f312d6..2c96f312d6 100644
--- a/patches/server/0872-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0873-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0873-Add-TameableDeathMessageEvent.patch b/patches/server/0874-Add-TameableDeathMessageEvent.patch
index 8bbbaffa2c..8bbbaffa2c 100644
--- a/patches/server/0873-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0874-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
index 8ecf55d257..8ecf55d257 100644
--- a/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
+++ b/patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch
index d0799ab6f1..d0799ab6f1 100644
--- a/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 8139b0a5c8..4bfc99a5d0 100644
--- a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0877-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 ef40762094cc862716e1f8219cdbbf53bfde97b5..302c41a92ede8be4a02ea3ddfdfb1fa1999155f7 100644
+index 1ee13fb0518406382468af125253286996670ec6..f360f69256054b84cd5fc9094c5ff6833b5fa1b0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2667,6 +2667,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0877-Guard-against-invalid-entity-positions.patch b/patches/server/0878-Guard-against-invalid-entity-positions.patch
index a635100f1e..b384b406a4 100644
--- a/patches/server/0877-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0878-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 302c41a92ede8be4a02ea3ddfdfb1fa1999155f7..87644f9f8e7ee1f0e2745f0d1344b78e26581fe5 100644
+index f360f69256054b84cd5fc9094c5ff6833b5fa1b0..9d2cac140f939559eba9149ce13334f8f178c962 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4171,11 +4171,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -41,5 +41,5 @@ index 302c41a92ede8be4a02ea3ddfdfb1fa1999155f7..87644f9f8e7ee1f0e2745f0d1344b78e
 +        }
 +        // Paper end - block invalid positions
          // Paper end
-         if (this.position.x != x || this.position.y != y || this.position.z != z) {
-             synchronized (this.posLock) { // Paper
+         // Paper start - fix MC-4
+         if (this instanceof ItemEntity) {
diff --git a/patches/server/0878-cache-resource-keys.patch b/patches/server/0879-cache-resource-keys.patch
index 4234b8673f..4234b8673f 100644
--- a/patches/server/0878-cache-resource-keys.patch
+++ b/patches/server/0879-cache-resource-keys.patch
diff --git a/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch
index c1e79d18c7..c1e79d18c7 100644
--- a/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 7cec15c2aa..7cec15c2aa 100644
--- a/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index 4b39ce4dc3..4b39ce4dc3 100644
--- a/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch
index 097ddac20d..097ddac20d 100644
--- a/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 3f13a2e598..3f13a2e598 100644
--- a/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 951baf9062..951baf9062 100644
--- a/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch
index d9bbc271fe..d9bbc271fe 100644
--- a/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 02e3a789cb..02e3a789cb 100644
--- a/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0887-WorldCreator-keepSpawnLoaded.patch b/patches/server/0888-WorldCreator-keepSpawnLoaded.patch
index a9b4c92703..a9b4c92703 100644
--- a/patches/server/0887-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0888-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index d33dabf6c9..d33dabf6c9 100644
--- a/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 29c0010bfc..29c0010bfc 100644
--- a/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 8eacb2217e..8eacb2217e 100644
--- a/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch
index c0fcd53f55..c0fcd53f55 100644
--- a/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch
index aef5bd0551..aef5bd0551 100644
--- a/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0893-Add-PlayerStopUsingItemEvent.patch b/patches/server/0894-Add-PlayerStopUsingItemEvent.patch
index ad74b61933..ad74b61933 100644
--- a/patches/server/0893-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0894-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0894-FallingBlock-auto-expire-setting.patch b/patches/server/0895-FallingBlock-auto-expire-setting.patch
index a7b0c20dd6..a7b0c20dd6 100644
--- a/patches/server/0894-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0895-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0895-Don-t-tick-markers.patch b/patches/server/0896-Don-t-tick-markers.patch
index 12934c4f8e..12934c4f8e 100644
--- a/patches/server/0895-Don-t-tick-markers.patch
+++ b/patches/server/0896-Don-t-tick-markers.patch
diff --git a/patches/server/0896-Do-not-accept-invalid-client-settings.patch b/patches/server/0897-Do-not-accept-invalid-client-settings.patch
index ebbfdae233..ebbfdae233 100644
--- a/patches/server/0896-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0897-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0897-Add-support-for-Proxy-Protocol.patch b/patches/server/0898-Add-support-for-Proxy-Protocol.patch
index ec97562d9e..ec97562d9e 100644
--- a/patches/server/0897-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0898-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch
index b11ce011a5..b11ce011a5 100644
--- a/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch
index 94cc4828bd..94cc4828bd 100644
--- a/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch
index 7ee45303d4..5a4efc26d6 100644
--- a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0902-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 87644f9f8e7ee1f0e2745f0d1344b78e26581fe5..ade1e37d20ef3021f73da6d1905cea76d3ff0aa7 100644
+index 9d2cac140f939559eba9149ce13334f8f178c962..41922c009f002a2ff27673743e29b32680961a14 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -782,6 +782,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch
index d79b7fb1b1..d79b7fb1b1 100644
--- a/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch
index f5519b6aef..f5519b6aef 100644
--- a/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0905-Add-Alternate-Current-redstone-implementation.patch
index 957818a4a0..957818a4a0 100644
--- a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0905-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0905-Dont-resent-entity-on-art-update.patch b/patches/server/0906-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0905-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0906-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0906-Untrash-chat-handling.patch b/patches/server/0907-Untrash-chat-handling.patch
index 5e7b38a1a0..5e7b38a1a0 100644
--- a/patches/server/0906-Untrash-chat-handling.patch
+++ b/patches/server/0907-Untrash-chat-handling.patch
diff --git a/patches/server/0907-Add-missing-spawn-eggs.patch b/patches/server/0908-Add-missing-spawn-eggs.patch
index 5be733c857..5be733c857 100644
--- a/patches/server/0907-Add-missing-spawn-eggs.patch
+++ b/patches/server/0908-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0909-Remove-invalid-signature-login-stacktrace.patch
index a4198ddfa7..a4198ddfa7 100644
--- a/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0909-Remove-invalid-signature-login-stacktrace.patch