673 files changed, 157 insertions, 189 deletions

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index f8a1046ab5..57e8a5c627 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -482,10 +482,10 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..57e6e857c84234bf0c137058ae35e6fb0e9b124f
+index 0000000000000000000000000000000000000000..7a53374319d5495253f277199114eaf43097456d
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -0,0 +1,309 @@
+@@ -0,0 +1,311 @@
 +package io.papermc.paper.configuration;
 +
 +import co.aikar.timings.MinecraftTimings;
@@ -635,6 +635,8 @@ index 0000000000000000000000000000000000000000..57e6e857c84234bf0c137058ae35e6fb
 +    public UnsupportedSettings unsupportedSettings;
 +
 +    public class UnsupportedSettings extends ConfigurationPart {
++        @Comment("This setting allows for exploits related to end portals, for example sand duping")
++        public boolean allowUnsafeEndPortalTeleportation = false;
 +        @Comment("This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.")
 +        public boolean allowPermanentBlockBreakExploits = false;
 +        @Comment("This setting controls if player should be able to use TNT duplication, but this also allows duplicating carpet, rails and potentially other items")
diff --git a/patches/server/0383-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
index 979e1e474e..979e1e474e 100644
--- a/patches/server/0383-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0382-Fix-sand-duping.patch b/patches/server/0382-Fix-sand-duping.patch
deleted file mode 100644
index f99be8b6c7..0000000000
--- a/patches/server/0382-Fix-sand-duping.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <[email protected]>
-Date: Fri, 12 Jun 2020 13:33:19 -0700
-Subject: [PATCH] Fix sand duping
-
-If the falling block dies during teleportation (entity#move), then we need
-to detect that by placing a check after the move.
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index c0477f913867c67809978a4f240303151d81e6ea..33cc2d1a4723ec07c4201eb6e0080d5e0281e1f0 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -132,6 +132,11 @@ public class FallingBlockEntity extends Entity {
- 
-     @Override
-     public void tick() {
-+        // Paper start - fix sand duping
-+        if (this.isRemoved()) {
-+            return;
-+        }
-+        // Paper end - fix sand duping
-         if (this.blockState.isAir()) {
-             this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
-         } else {
-@@ -143,6 +148,11 @@ public class FallingBlockEntity extends Entity {
-             }
- 
-             this.move(MoverType.SELF, this.getDeltaMovement());
-+            // Paper start - fix sand duping
-+            if (this.isRemoved()) {
-+                return;
-+            }
-+            // Paper end - fix sand duping
-             // Paper start - Configurable falling blocks height nerf
-             if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
-                 if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
diff --git a/patches/server/0384-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0383-Prevent-position-desync-causing-tp-exploit.patch
index 60bf017cb9..8681f50831 100644
--- a/patches/server/0384-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0383-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 874a1998b6aaff9f4c7818481298ad51e1adc525..67470ad0c09ae94e5fab775a28cdefdf1241c5fa 100644
+index c0907af0169862702a4f28985d141c0acb506f51..2eeeb1f1b07db439a68d70c55192aa9fb54f620c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1366,6 +1366,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0385-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0384-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0385-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0384-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0386-Improve-Arrow-API.patch b/patches/server/0385-Improve-Arrow-API.patch
index cbf5d4d815..cbf5d4d815 100644
--- a/patches/server/0386-Improve-Arrow-API.patch
+++ b/patches/server/0385-Improve-Arrow-API.patch
diff --git a/patches/server/0387-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0386-Add-PlayerRecipeBookClickEvent.patch
index 2a1e7d648e..2a1e7d648e 100644
--- a/patches/server/0387-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0386-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0388-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch
index cf5c2534f0..cf5c2534f0 100644
--- a/patches/server/0388-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0389-Add-permission-for-command-blocks.patch b/patches/server/0388-Add-permission-for-command-blocks.patch
index 6948cb2f18..6134ce4262 100644
--- a/patches/server/0389-Add-permission-for-command-blocks.patch
+++ b/patches/server/0388-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index e8b12b27e5ec74afb940f575e5ce78e5905d55f4..c3eb4b6372eed0b7eb636f495ce494b6
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 98826ba4ab062e029359968c221ba320b2d2daeb..e9a3edbb66c79664f35150f052b6ff3534d0904c 100644
+index 80b6871516c45291f63b1ae521dcdf34199fd9b4..d78d411879275f11f395b4f9c94b7aab88342236 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -778,7 +778,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0390-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index fb16bb47ac..fb16bb47ac 100644
--- a/patches/server/0390-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0391-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index d7c2053bcb..d7c2053bcb 100644
--- a/patches/server/0391-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0392-Paper-dumpitem-command.patch b/patches/server/0391-Paper-dumpitem-command.patch
index 23f5287194..23f5287194 100644
--- a/patches/server/0392-Paper-dumpitem-command.patch
+++ b/patches/server/0391-Paper-dumpitem-command.patch
diff --git a/patches/server/0393-Improve-Legacy-Component-serialization-size.patch b/patches/server/0392-Improve-Legacy-Component-serialization-size.patch
index 00450d094b..00450d094b 100644
--- a/patches/server/0393-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0392-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0394-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 45d64256b9..45d64256b9 100644
--- a/patches/server/0394-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0395-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0394-Add-BlockStateMeta-clearBlockState.patch
index 86efcbf634..86efcbf634 100644
--- a/patches/server/0395-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0394-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0396-Support-old-UUID-format-for-NBT.patch b/patches/server/0395-Support-old-UUID-format-for-NBT.patch
index 590d6d62e6..590d6d62e6 100644
--- a/patches/server/0396-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0395-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0397-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch
index 73fa3e1bc2..382b69e42d 100644
--- a/patches/server/0397-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index d4dba8c733c7560e5108b8d239b52e593f8debec..ea48f1119a940056c37d1d203437bfbf
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 629fa76e6c7c2ede36ab855bb3a7a65dfd601449..a3713c5ab624b8d54ddcd69ae7587346ebbaed69 100644
+index 7cf1153ae532a9d53ee85b05f77ed74b94cf5fbc..27be5da67801be6fd99c91576064e4be0b3f0d6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -485,7 +485,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0398-Do-not-accept-invalid-client-settings.patch b/patches/server/0397-Do-not-accept-invalid-client-settings.patch
index 95b9f4d59e..95b9f4d59e 100644
--- a/patches/server/0398-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0397-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0399-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0399-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0400-Add-entity-liquid-API.patch b/patches/server/0399-Add-entity-liquid-API.patch
index a13db460a4..a13db460a4 100644
--- a/patches/server/0400-Add-entity-liquid-API.patch
+++ b/patches/server/0399-Add-entity-liquid-API.patch
diff --git a/patches/server/0401-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0400-Update-itemstack-legacy-name-and-lore.patch
index 49a60bd241..49a60bd241 100644
--- a/patches/server/0401-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0400-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0402-Add-PrepareResultEvent.patch b/patches/server/0401-Add-PrepareResultEvent.patch
index 8426a573bd..8426a573bd 100644
--- a/patches/server/0402-Add-PrepareResultEvent.patch
+++ b/patches/server/0401-Add-PrepareResultEvent.patch
diff --git a/patches/server/0403-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index c744a5628c..c744a5628c 100644
--- a/patches/server/0403-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0404-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch
index d3111cf5b4..d3111cf5b4 100644
--- a/patches/server/0404-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0405-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch
index d3ee9cbba1..d3ee9cbba1 100644
--- a/patches/server/0405-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0406-Fix-SPIGOT-5989.patch b/patches/server/0405-Fix-SPIGOT-5989.patch
index fc6ae89551..fc6ae89551 100644
--- a/patches/server/0406-Fix-SPIGOT-5989.patch
+++ b/patches/server/0405-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0407-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 2e36f96bd3..2e36f96bd3 100644
--- a/patches/server/0407-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0408-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 5bf7411f05..5bf7411f05 100644
--- a/patches/server/0408-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0409-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index f1039e4bf0..f1039e4bf0 100644
--- a/patches/server/0409-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0410-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch
index d1999714a1..d1999714a1 100644
--- a/patches/server/0410-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0411-Fix-some-rails-connecting-improperly.patch b/patches/server/0410-Fix-some-rails-connecting-improperly.patch
index 85d4d5d18d..85d4d5d18d 100644
--- a/patches/server/0411-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0410-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0412-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0412-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0413-Brand-support.patch b/patches/server/0412-Brand-support.patch
index 5c4d8ed97e..bccbce58fe 100644
--- a/patches/server/0413-Brand-support.patch
+++ b/patches/server/0412-Brand-support.patch
@@ -57,7 +57,7 @@ index e69043316372d98b122ed3788fda79cdd36849e8..6597e6e9987ddb5906909c22704fdfb6
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6bddec130167af3d72555535045568ee941bb88..6e9fc623f5a56753e2c78c3ff63c6f4de7cbcccb 100644
+index 5ba0fa6fda6d496f7540185e6dc58439cc1e04f1..16d1338df730fd66c079b66117cbef91786f2146 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3056,6 +3056,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0414-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch
index 56a928d96f..c7055de757 100644
--- a/patches/server/0414-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9a9d119e76fca75a9e531f4bbd204ab8eb9a1263..bf581842476b8f554987b452c291a55a1dfc92c5 100644
+index c4db692fb5d952e4d185067388fd46ed0e1f1537..e07553c3ee28a2510c46a8188c8ce507f2567c80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -949,5 +949,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0415-Don-t-require-FACING-data.patch b/patches/server/0414-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0415-Don-t-require-FACING-data.patch
+++ b/patches/server/0414-Don-t-require-FACING-data.patch
diff --git a/patches/server/0416-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 066bed27a2..9c8dcfe23c 100644
--- a/patches/server/0416-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d2da284aa7284c5205e656c48262061980893be6..aa2f23c4f7d25d0f92ff025bb1840aff1b053fa3 100644
+index 9af1877321356348ad96b92ae8c5f4811bef50ac..2e42e09d3fa19e5a16374ee6ac1677dd2b2004f1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1726,9 +1726,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0417-Add-moon-phase-API.patch b/patches/server/0416-Add-moon-phase-API.patch
index 7a3bfa49f6..7a3bfa49f6 100644
--- a/patches/server/0417-Add-moon-phase-API.patch
+++ b/patches/server/0416-Add-moon-phase-API.patch
diff --git a/patches/server/0418-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 6f37b0bcc0..6f37b0bcc0 100644
--- a/patches/server/0418-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0419-Prevent-headless-pistons-from-being-created.patch b/patches/server/0418-Prevent-headless-pistons-from-being-created.patch
index c4ae7a0fb8..2dbb5ee5de 100644
--- a/patches/server/0419-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0418-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b03b4d366cae39081a7b70524e8615c986d76362..cd939ab6958e8eb632056d32f68e2fcae7735d64 100644
+index b057a67a416928ae30bd407b3da982b73ae3be03..2d1fe6af7923ad4a0143f2d3fd28abc85e6092c1 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -205,6 +205,15 @@ public class Explosion {
diff --git a/patches/server/0420-Add-BellRingEvent.patch b/patches/server/0419-Add-BellRingEvent.patch
index 58012313ff..58012313ff 100644
--- a/patches/server/0420-Add-BellRingEvent.patch
+++ b/patches/server/0419-Add-BellRingEvent.patch
diff --git a/patches/server/0421-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0420-Add-zombie-targets-turtle-egg-config.patch
index 240bf5e662..240bf5e662 100644
--- a/patches/server/0421-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0420-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0422-Buffer-joins-to-world.patch b/patches/server/0421-Buffer-joins-to-world.patch
index 35f2604677..35f2604677 100644
--- a/patches/server/0422-Buffer-joins-to-world.patch
+++ b/patches/server/0421-Buffer-joins-to-world.patch
diff --git a/patches/server/0423-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch
index c003ab2626..c003ab2626 100644
--- a/patches/server/0423-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0424-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch
index 910ff0e5d2..910ff0e5d2 100644
--- a/patches/server/0424-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0425-Add-more-Evoker-API.patch b/patches/server/0424-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0425-Add-more-Evoker-API.patch
+++ b/patches/server/0424-Add-more-Evoker-API.patch
diff --git a/patches/server/0426-Add-methods-to-get-translation-keys.patch b/patches/server/0425-Add-methods-to-get-translation-keys.patch
index d602369647..d602369647 100644
--- a/patches/server/0426-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0425-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0427-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch
index 9e6e476351..9e6e476351 100644
--- a/patches/server/0427-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0428-Cache-block-data-strings.patch b/patches/server/0427-Cache-block-data-strings.patch
index 92b4d334d6..92b4d334d6 100644
--- a/patches/server/0428-Cache-block-data-strings.patch
+++ b/patches/server/0427-Cache-block-data-strings.patch
diff --git a/patches/server/0429-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 92ccabf898..5fb2dcfe1f 100644
--- a/patches/server/0429-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index 789576f8b7b3001c243972b320b7dffbbf3baa5f..3b73565d295c09a5ab0d610338498f01
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dfea1879b8ab8d12bc7530ccf409f4d24978105d..a3d1f7ccac58cfec8f50dbdb3a620daa4894fffb 100644
+index 11a9142962637af5e26939a5eb8f35ba5f205793..f839ab6dea7f1efd59f22bcef91d4e279b1c232a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0430-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch
index 857657780a..857657780a 100644
--- a/patches/server/0430-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0431-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0431-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0432-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch
index f7a5dbb2e8..aa2f0131c1 100644
--- a/patches/server/0432-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index aa2f23c4f7d25d0f92ff025bb1840aff1b053fa3..a668e204946943bcc963ad41ea3029111267eef9 100644
+index 2e42e09d3fa19e5a16374ee6ac1677dd2b2004f1..283f686364691f54d9e9e925b33238526de74219 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1224,6 +1224,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0433-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 0710aed1e5..0710aed1e5 100644
--- a/patches/server/0433-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0434-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0434-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0435-Entity-isTicking.patch b/patches/server/0434-Entity-isTicking.patch
index 2d53b98026..2d53b98026 100644
--- a/patches/server/0435-Entity-isTicking.patch
+++ b/patches/server/0434-Entity-isTicking.patch
diff --git a/patches/server/0436-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index ad63085c7a..ad63085c7a 100644
--- a/patches/server/0436-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0437-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch
index 36f5a879a8..36f5a879a8 100644
--- a/patches/server/0437-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0438-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index b93dbed55c..3a8fa9719c 100644
--- a/patches/server/0438-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch
@@ -11,7 +11,7 @@ This ensures the crystals/pillars are in expected state when the dragon spawns.
 See #3522
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index cad7a1b28c9d7a3e67dbf0865cbf232ebd39a8d9..3953bbfdaf3e93468108d194c215e6242e14f067 100644
+index 1c716cf65d77e54ba8f90c8cf736e20c64f5df2e..f615b7f43f1444cf1e34b92cb0c05242a5dc26fd 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -472,6 +472,7 @@ public class EndDragonFight {
diff --git a/patches/server/0439-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch
index 5b7b0e19db..572b5d2307 100644
--- a/patches/server/0439-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4e37b9a495babec58f60b59db0e034d5e033b198..5e605b9bdb76ca0c9529e7351432578855cc7fa2 100644
+index 3b73565d295c09a5ab0d610338498f01c7b1520d..e08c3e0d09896da60cbec7923882bc2263de1bae 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -472,9 +472,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0440-Optimise-getType-calls.patch b/patches/server/0439-Optimise-getType-calls.patch
index 6dd01d7860..6dd01d7860 100644
--- a/patches/server/0440-Optimise-getType-calls.patch
+++ b/patches/server/0439-Optimise-getType-calls.patch
diff --git a/patches/server/0441-Villager-resetOffers.patch b/patches/server/0440-Villager-resetOffers.patch
index 6068c580b9..6068c580b9 100644
--- a/patches/server/0441-Villager-resetOffers.patch
+++ b/patches/server/0440-Villager-resetOffers.patch
diff --git a/patches/server/0442-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch
index db9341df0c..f568cd0d92 100644
--- a/patches/server/0442-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index caf2c9799aa5ddbd5caf160e2c8f2e8f0cdaa1f8..9879f9fd804f93faae4419add2c4c64fc6902ba1 100644
+index cb6c6e8c8fe744350a117f38e474ce8f5dd0a43a..1bb7cc9462cab7fbd09b944662711ae5bc5cf950 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,7 +154,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0443-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch
index 8d14eb1a05..8d14eb1a05 100644
--- a/patches/server/0443-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0444-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0443-Fix-item-locations-dropped-from-campfires.patch
index d96bf626d4..d96bf626d4 100644
--- a/patches/server/0444-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0443-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0445-Fix-bell-block-entity-memory-leak.patch b/patches/server/0444-Fix-bell-block-entity-memory-leak.patch
index 91b7136c9d..91b7136c9d 100644
--- a/patches/server/0445-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0444-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0446-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 741bc6d269..741bc6d269 100644
--- a/patches/server/0446-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0447-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0446-Add-getOfflinePlayerIfCached-String.patch
index d72a0cdabe..d72a0cdabe 100644
--- a/patches/server/0447-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0446-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0448-Add-ignore-discounts-API.patch b/patches/server/0447-Add-ignore-discounts-API.patch
index a0354c3ea6..a0354c3ea6 100644
--- a/patches/server/0448-Add-ignore-discounts-API.patch
+++ b/patches/server/0447-Add-ignore-discounts-API.patch
diff --git a/patches/server/0449-Toggle-for-removing-existing-dragon.patch b/patches/server/0448-Toggle-for-removing-existing-dragon.patch
index 410f6cec83..410f6cec83 100644
--- a/patches/server/0449-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0448-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0450-Fix-client-lag-on-advancement-loading.patch b/patches/server/0449-Fix-client-lag-on-advancement-loading.patch
index 4882b3fd23..4882b3fd23 100644
--- a/patches/server/0450-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0449-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0451-Item-no-age-no-player-pickup.patch b/patches/server/0450-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0451-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0450-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0452-Beacon-API-custom-effect-ranges.patch b/patches/server/0451-Beacon-API-custom-effect-ranges.patch
index 88e2a56086..88e2a56086 100644
--- a/patches/server/0452-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0451-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0453-Add-API-for-quit-reason.patch b/patches/server/0452-Add-API-for-quit-reason.patch
index b506a95e94..b506a95e94 100644
--- a/patches/server/0453-Add-API-for-quit-reason.patch
+++ b/patches/server/0452-Add-API-for-quit-reason.patch
diff --git a/patches/server/0454-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch
index e14e51ab48..e14e51ab48 100644
--- a/patches/server/0454-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0455-Expose-world-spawn-angle.patch b/patches/server/0454-Expose-world-spawn-angle.patch
index ccaebc75f6..ccaebc75f6 100644
--- a/patches/server/0455-Expose-world-spawn-angle.patch
+++ b/patches/server/0454-Expose-world-spawn-angle.patch
diff --git a/patches/server/0456-Add-Destroy-Speed-API.patch b/patches/server/0455-Add-Destroy-Speed-API.patch
index 3b44bc9efc..3b44bc9efc 100644
--- a/patches/server/0456-Add-Destroy-Speed-API.patch
+++ b/patches/server/0455-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0457-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 80a1eb67cb..55306da79d 100644
--- a/patches/server/0457-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6e9fc623f5a56753e2c78c3ff63c6f4de7cbcccb..ec4ebbdde676806c4b2348408a8004dd66cbc44b 100644
+index 16d1338df730fd66c079b66117cbef91786f2146..f9188664f868c0c55c92c0ec7ca43204d267b91e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2619,7 +2619,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0458-Add-LivingEntity-clearActiveItem.patch b/patches/server/0457-Add-LivingEntity-clearActiveItem.patch
index 642aedd9b6..54d5de0aa1 100644
--- a/patches/server/0458-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0457-Add-LivingEntity-clearActiveItem.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index bf581842476b8f554987b452c291a55a1dfc92c5..e71f71988790af1a09f65d73dd081490002b821c 100644
+index e07553c3ee28a2510c46a8188c8ce507f2567c80..aac0fb198fb912dc59dc56f449e586839600fa13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -916,6 +916,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0459-Add-PlayerItemCooldownEvent.patch b/patches/server/0458-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0459-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0458-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0460-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch
index dc7812a211..dc7812a211 100644
--- a/patches/server/0460-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0461-More-lightning-API.patch b/patches/server/0460-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0461-More-lightning-API.patch
+++ b/patches/server/0460-More-lightning-API.patch
diff --git a/patches/server/0462-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch
index 08c77e01c3..e615ac322f 100644
--- a/patches/server/0462-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2b962ef7f167cc3ee17d26b994b6ecc2916f6242..a0c4f6edc87d653bcbe23621bfcf9fbbd20b013d 100644
+index f33067ea049793d898def3c83bff5b36490f8232..3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1983,6 +1983,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0463-Add-missing-default-perms-for-commands.patch b/patches/server/0462-Add-missing-default-perms-for-commands.patch
index c2cc3ce8cc..c2cc3ce8cc 100644
--- a/patches/server/0463-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0462-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0464-Add-PlayerShearBlockEvent.patch b/patches/server/0463-Add-PlayerShearBlockEvent.patch
index 140bb100a4..140bb100a4 100644
--- a/patches/server/0464-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0463-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0465-Limit-recipe-packets.patch b/patches/server/0464-Limit-recipe-packets.patch
index e6120b59a6..e6120b59a6 100644
--- a/patches/server/0465-Limit-recipe-packets.patch
+++ b/patches/server/0464-Limit-recipe-packets.patch
diff --git a/patches/server/0466-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0465-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0466-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0465-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0467-Player-Chunk-Load-Unload-Events.patch b/patches/server/0466-Player-Chunk-Load-Unload-Events.patch
index 241610bb61..241610bb61 100644
--- a/patches/server/0467-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0466-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0468-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch
index e58939559a..e58939559a 100644
--- a/patches/server/0468-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0469-Expose-LivingEntity-hurt-direction.patch b/patches/server/0468-Expose-LivingEntity-hurt-direction.patch
index 73f36c0bb3..73f36c0bb3 100644
--- a/patches/server/0469-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0468-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0470-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 27ff4645d2..27ff4645d2 100644
--- a/patches/server/0470-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0471-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 50044a8342..50044a8342 100644
--- a/patches/server/0471-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0472-Add-TargetHitEvent.patch b/patches/server/0471-Add-TargetHitEvent.patch
index f623f8091b..f623f8091b 100644
--- a/patches/server/0472-Add-TargetHitEvent.patch
+++ b/patches/server/0471-Add-TargetHitEvent.patch
diff --git a/patches/server/0473-MC-4-Fix-item-position-desync.patch b/patches/server/0472-MC-4-Fix-item-position-desync.patch
index f1fa7d66d3..f1fa7d66d3 100644
--- a/patches/server/0473-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0472-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0474-Additional-Block-Material-API.patch b/patches/server/0473-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0474-Additional-Block-Material-API.patch
+++ b/patches/server/0473-Additional-Block-Material-API.patch
diff --git a/patches/server/0475-Fix-harming-potion-dupe.patch b/patches/server/0474-Fix-harming-potion-dupe.patch
index d7fda01e2c..d7fda01e2c 100644
--- a/patches/server/0475-Fix-harming-potion-dupe.patch
+++ b/patches/server/0474-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0476-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0476-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0477-Cache-burn-durations.patch b/patches/server/0476-Cache-burn-durations.patch
index 32d702d124..32d702d124 100644
--- a/patches/server/0477-Cache-burn-durations.patch
+++ b/patches/server/0476-Cache-burn-durations.patch
diff --git a/patches/server/0478-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 40171ab920..40171ab920 100644
--- a/patches/server/0478-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0479-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch
index e434023f48..e434023f48 100644
--- a/patches/server/0479-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0480-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch
index bad384da72..bad384da72 100644
--- a/patches/server/0480-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0481-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch
index 26bc4885cd..b4f8b3eada 100644
--- a/patches/server/0481-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 87ff69ffbd1e8fa3e88ce2561b56958c23040a10..730b30ee33f0fb2a98454080045608ff538c8c04 100644
+index 5190939658fce990e166b7c4f5998dd030a156e8..e5113e86836f9c21570705b1ad312d76e8162e5f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1760,7 +1760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0482-Zombie-API-breaking-doors.patch b/patches/server/0481-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0482-Zombie-API-breaking-doors.patch
+++ b/patches/server/0481-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0483-Fix-nerfed-slime-when-splitting.patch b/patches/server/0482-Fix-nerfed-slime-when-splitting.patch
index 91c9da2246..91c9da2246 100644
--- a/patches/server/0483-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0482-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0484-Add-EntityLoadCrossbowEvent.patch b/patches/server/0483-Add-EntityLoadCrossbowEvent.patch
index ae4000c9dc..ae4000c9dc 100644
--- a/patches/server/0484-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0483-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0485-Add-WorldGameRuleChangeEvent.patch b/patches/server/0484-Add-WorldGameRuleChangeEvent.patch
index 634bd091ff..634bd091ff 100644
--- a/patches/server/0485-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0484-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0486-Add-ServerResourcesReloadedEvent.patch b/patches/server/0485-Add-ServerResourcesReloadedEvent.patch
index b01f7c1460..b01f7c1460 100644
--- a/patches/server/0486-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0485-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0487-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch
index 4c4ee0656d..4c4ee0656d 100644
--- a/patches/server/0487-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0488-Add-BlockFailedDispenseEvent.patch b/patches/server/0487-Add-BlockFailedDispenseEvent.patch
index 6c46c1fc7e..6c46c1fc7e 100644
--- a/patches/server/0488-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0487-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0489-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0488-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0489-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0488-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0490-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch
index 382268afcd..382268afcd 100644
--- a/patches/server/0490-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0491-Configurable-door-breaking-difficulty.patch b/patches/server/0490-Configurable-door-breaking-difficulty.patch
index c0ec74016c..c0ec74016c 100644
--- a/patches/server/0491-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0490-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0492-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0491-Empty-commands-shall-not-be-dispatched.patch
index 7a48e3018e..7a48e3018e 100644
--- a/patches/server/0492-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0491-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0493-Remove-stale-POIs.patch b/patches/server/0492-Remove-stale-POIs.patch
index 1579631de9..ca376b9ba7 100644
--- a/patches/server/0493-Remove-stale-POIs.patch
+++ b/patches/server/0492-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a668e204946943bcc963ad41ea3029111267eef9..b93976abbc98c1beffe4b464735c9b5a71cb45a4 100644
+index 283f686364691f54d9e9e925b33238526de74219..a2113c01d8ea3da13efbf4f0b23460e7fa4e8c68 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1795,6 +1795,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0494-Fix-villager-boat-exploit.patch b/patches/server/0493-Fix-villager-boat-exploit.patch
index 1f01745885..1f01745885 100644
--- a/patches/server/0494-Fix-villager-boat-exploit.patch
+++ b/patches/server/0493-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0495-Add-sendOpLevel-API.patch b/patches/server/0494-Add-sendOpLevel-API.patch
index e5fdb1c643..e5fdb1c643 100644
--- a/patches/server/0495-Add-sendOpLevel-API.patch
+++ b/patches/server/0494-Add-sendOpLevel-API.patch
diff --git a/patches/server/0496-TODO-Registry-Modification-API.patch b/patches/server/0495-TODO-Registry-Modification-API.patch
index b47ca6aff7..b47ca6aff7 100644
--- a/patches/server/0496-TODO-Registry-Modification-API.patch
+++ b/patches/server/0495-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0497-Add-StructuresLocateEvent.patch b/patches/server/0496-Add-StructuresLocateEvent.patch
index 5f8804f44d..5f8804f44d 100644
--- a/patches/server/0497-Add-StructuresLocateEvent.patch
+++ b/patches/server/0496-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0498-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch
index f7b52564b1..c029c3a902 100644
--- a/patches/server/0498-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0497-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 745e22b78613f8c45f5432fb27e3b9c87cdf2313..baedc48d788d51799d2d3b1816aee2782ba35d25 100644
+index df389ebaaef8ef307adb6c604ce22a192a522ba4..fa5d634cefcf73afd3e090f91c4c589edb988352 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1848,6 +1848,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0499-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 95ecd8b67e..95ecd8b67e 100644
--- a/patches/server/0499-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0500-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch
index ba3a6a7f92..ba3a6a7f92 100644
--- a/patches/server/0500-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0501-Make-schedule-command-per-world.patch b/patches/server/0500-Make-schedule-command-per-world.patch
index f1854ba4c9..f1854ba4c9 100644
--- a/patches/server/0501-Make-schedule-command-per-world.patch
+++ b/patches/server/0500-Make-schedule-command-per-world.patch
diff --git a/patches/server/0502-Configurable-max-leash-distance.patch b/patches/server/0501-Configurable-max-leash-distance.patch
index 99a4a50ca9..99a4a50ca9 100644
--- a/patches/server/0502-Configurable-max-leash-distance.patch
+++ b/patches/server/0501-Configurable-max-leash-distance.patch
diff --git a/patches/server/0503-Add-BlockPreDispenseEvent.patch b/patches/server/0502-Add-BlockPreDispenseEvent.patch
index 7772764b33..7772764b33 100644
--- a/patches/server/0503-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0502-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0504-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch
index 0187e55e0c..0187e55e0c 100644
--- a/patches/server/0504-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0505-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch
index 25361d7e14..7d6769dff8 100644
--- a/patches/server/0505-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 46f286a68d04aced44acbb97041a74e2668c13d8..957af0553d4b794a1b26a6591dcc0165b0509c6a 100644
+index c4555320d1f283a41c47d08d68c2633717f6fda8..45b7efc85f2ec17288cad329c3a78483903c0ea2 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -407,7 +407,7 @@ public class EndDragonFight {
diff --git a/patches/server/0506-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0506-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0507-Expand-EntityUnleashEvent.patch b/patches/server/0506-Expand-EntityUnleashEvent.patch
index 5586344bbe..5586344bbe 100644
--- a/patches/server/0507-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0506-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0508-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0507-Reset-shield-blocking-on-dimension-change.patch
index b59a53ac0f..b59a53ac0f 100644
--- a/patches/server/0508-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0507-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0509-Add-DragonEggFormEvent.patch b/patches/server/0508-Add-DragonEggFormEvent.patch
index f90545d9df..b92df234cd 100644
--- a/patches/server/0509-Add-DragonEggFormEvent.patch
+++ b/patches/server/0508-Add-DragonEggFormEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add DragonEggFormEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 957af0553d4b794a1b26a6591dcc0165b0509c6a..1d5edcad4c5bfe48711cfce7c46a9c4606196ae3 100644
+index 45b7efc85f2ec17288cad329c3a78483903c0ea2..1c9bfcf595bcb247c3b9ffe8b0e0cfee0d0ba91f 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -407,8 +407,22 @@ public class EndDragonFight {
diff --git a/patches/server/0510-Add-EntityMoveEvent.patch b/patches/server/0509-Add-EntityMoveEvent.patch
index 54dd0d6264..54dd0d6264 100644
--- a/patches/server/0510-Add-EntityMoveEvent.patch
+++ b/patches/server/0509-Add-EntityMoveEvent.patch
diff --git a/patches/server/0511-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch
index c155d17a87..fbf9bd1483 100644
--- a/patches/server/0511-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f75722633789155af38184982ce6459a6ff1178e..bc7177bc0699e64933399a1ed0e66fee0663636d 100644
+index 125e3425af05541e5c848ee0e9390cea44a29302..0f6a34776482a7eef638911fe01db819962b3ce8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1369,6 +1369,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0512-Inline-shift-direction-fields.patch b/patches/server/0511-Inline-shift-direction-fields.patch
index 4f26750f0e..4f26750f0e 100644
--- a/patches/server/0512-Inline-shift-direction-fields.patch
+++ b/patches/server/0511-Inline-shift-direction-fields.patch
diff --git a/patches/server/0513-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch
index 65b594a18e..65b594a18e 100644
--- a/patches/server/0513-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0514-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0514-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0515-living-entity-allow-attribute-registration.patch b/patches/server/0514-living-entity-allow-attribute-registration.patch
index cc5fbf104d..6982e40447 100644
--- a/patches/server/0515-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0514-living-entity-allow-attribute-registration.patch
@@ -38,7 +38,7 @@ index ea48f1119a940056c37d1d203437bfbfdf13663b..8a678df56fcf30535957e111d81ad07b
 +    // Paper end - living entity allow attribute registration
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 06f25a9453bcc8f304cc83b599f8a54112a6ed01..72d9a9696c95374bed29e2e453c7750d0cf06170 100644
+index 3b2d54d7a365e268107c4abc5a15c996954e5e9c..c95c0580e0c3afe9730a1c3f2095b7970e7cc001 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -739,6 +739,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0516-fix-dead-slime-setSize-invincibility.patch b/patches/server/0515-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0516-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0515-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0517-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0517-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0518-Expose-Tracked-Players.patch b/patches/server/0517-Expose-Tracked-Players.patch
index e31f586e35..e31f586e35 100644
--- a/patches/server/0518-Expose-Tracked-Players.patch
+++ b/patches/server/0517-Expose-Tracked-Players.patch
diff --git a/patches/server/0519-Improve-ServerGUI.patch b/patches/server/0518-Improve-ServerGUI.patch
index ea0b4bbc77..ea0b4bbc77 100644
--- a/patches/server/0519-Improve-ServerGUI.patch
+++ b/patches/server/0518-Improve-ServerGUI.patch
diff --git a/patches/server/0520-fix-converting-txt-to-json-file.patch b/patches/server/0519-fix-converting-txt-to-json-file.patch
index 5f13006cc4..5f13006cc4 100644
--- a/patches/server/0520-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0519-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0521-Add-worldborder-events.patch b/patches/server/0520-Add-worldborder-events.patch
index f39382cd63..f39382cd63 100644
--- a/patches/server/0521-Add-worldborder-events.patch
+++ b/patches/server/0520-Add-worldborder-events.patch
diff --git a/patches/server/0522-Add-PlayerNameEntityEvent.patch b/patches/server/0521-Add-PlayerNameEntityEvent.patch
index eec1c1a2eb..eec1c1a2eb 100644
--- a/patches/server/0522-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0521-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0523-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0522-Prevent-grindstones-from-overstacking-items.patch
index d98bb3f1c4..d98bb3f1c4 100644
--- a/patches/server/0523-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0522-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0524-Add-recipe-to-cook-events.patch b/patches/server/0523-Add-recipe-to-cook-events.patch
index 75eb9efb8b..75eb9efb8b 100644
--- a/patches/server/0524-Add-recipe-to-cook-events.patch
+++ b/patches/server/0523-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0525-Add-Block-isValidTool.patch b/patches/server/0524-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0525-Add-Block-isValidTool.patch
+++ b/patches/server/0524-Add-Block-isValidTool.patch
diff --git a/patches/server/0526-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0525-Allow-using-signs-inside-spawn-protection.patch
index a749fc47e7..0eefa73f3f 100644
--- a/patches/server/0526-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0525-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 730b30ee33f0fb2a98454080045608ff538c8c04..437c642f0df201528eb2fcd49ae21b67db13df86 100644
+index e5113e86836f9c21570705b1ad312d76e8162e5f..f455c7ab48accf581a8ecdbc78a12b055dbd19fa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1752,7 +1752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0527-Expand-world-key-API.patch b/patches/server/0526-Expand-world-key-API.patch
index b4d1977540..b4d1977540 100644
--- a/patches/server/0527-Expand-world-key-API.patch
+++ b/patches/server/0526-Expand-world-key-API.patch
diff --git a/patches/server/0528-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch
index 9b38f8f90d..9b38f8f90d 100644
--- a/patches/server/0528-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0529-Item-Rarity-API.patch b/patches/server/0528-Item-Rarity-API.patch
index d0d483075a..d0d483075a 100644
--- a/patches/server/0529-Item-Rarity-API.patch
+++ b/patches/server/0528-Item-Rarity-API.patch
diff --git a/patches/server/0530-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch
index c5c564c74e..c5c564c74e 100644
--- a/patches/server/0530-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0531-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0530-forced-whitelist-use-configurable-kick-message.patch
index 48f96930a9..48f96930a9 100644
--- a/patches/server/0531-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0530-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0532-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 29c6375a71..ff433de537 100644
--- a/patches/server/0532-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 437c642f0df201528eb2fcd49ae21b67db13df86..b1a0711dbedaaf79aac49b8c594d47e997c2613d 100644
+index f455c7ab48accf581a8ecdbc78a12b055dbd19fa..0ff1e65df2b3c131ed65f8b769bbf369a76aa3d0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1187,7 +1187,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0533-Expose-protocol-version.patch b/patches/server/0532-Expose-protocol-version.patch
index e81a519f77..e81a519f77 100644
--- a/patches/server/0533-Expose-protocol-version.patch
+++ b/patches/server/0532-Expose-protocol-version.patch
diff --git a/patches/server/0534-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch
index c1c74a8470..c1c74a8470 100644
--- a/patches/server/0534-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0535-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 23fd145ca7..23fd145ca7 100644
--- a/patches/server/0535-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0536-Add-bypass-host-check.patch b/patches/server/0535-Add-bypass-host-check.patch
index b53ee2c2d8..b53ee2c2d8 100644
--- a/patches/server/0536-Add-bypass-host-check.patch
+++ b/patches/server/0535-Add-bypass-host-check.patch
diff --git a/patches/server/0537-Set-area-affect-cloud-rotation.patch b/patches/server/0536-Set-area-affect-cloud-rotation.patch
index 1904854b96..1904854b96 100644
--- a/patches/server/0537-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0536-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0538-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch
index 61a0d0fb11..61a0d0fb11 100644
--- a/patches/server/0538-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0539-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch
index bfdd2e8c45..bfdd2e8c45 100644
--- a/patches/server/0539-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0540-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0540-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0541-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch
index 8b29ccdead..8b29ccdead 100644
--- a/patches/server/0541-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0542-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch
index 2d2a115414..8a5876c2cb 100644
--- a/patches/server/0542-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b1a0711dbedaaf79aac49b8c594d47e997c2613d..8fcb3361c510cb1ef0b6405d0077c82ba155d586 100644
+index 0ff1e65df2b3c131ed65f8b769bbf369a76aa3d0..12b81d6dc04586d2491a382b6198f986b2b5bae1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1921,6 +1921,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0543-Add-PlayerDeepSleepEvent.patch b/patches/server/0542-Add-PlayerDeepSleepEvent.patch
index 4ae6ac9026..4ae6ac9026 100644
--- a/patches/server/0543-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0542-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0544-More-World-API.patch b/patches/server/0543-More-World-API.patch
index 7f887ba98d..7f887ba98d 100644
--- a/patches/server/0544-More-World-API.patch
+++ b/patches/server/0543-More-World-API.patch
diff --git a/patches/server/0545-Add-PlayerBedFailEnterEvent.patch b/patches/server/0544-Add-PlayerBedFailEnterEvent.patch
index 945dacae7c..945dacae7c 100644
--- a/patches/server/0545-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0544-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0546-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch
index ebc86dc755..ebc86dc755 100644
--- a/patches/server/0546-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0547-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 95d33b962c..95d33b962c 100644
--- a/patches/server/0547-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0548-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0547-Introduce-beacon-activation-deactivation-events.patch
index f793b533a2..f793b533a2 100644
--- a/patches/server/0548-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0547-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0549-Add-Channel-initialization-listeners.patch b/patches/server/0548-Add-Channel-initialization-listeners.patch
index 51eee16dd9..51eee16dd9 100644
--- a/patches/server/0549-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0548-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0550-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch
index f385186300..f385186300 100644
--- a/patches/server/0550-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0551-Add-more-WanderingTrader-API.patch b/patches/server/0550-Add-more-WanderingTrader-API.patch
index 6e3c9d60f5..6e3c9d60f5 100644
--- a/patches/server/0551-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0550-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0552-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0551-Add-EntityBlockStorage-clearEntities.patch
index 1297267437..1297267437 100644
--- a/patches/server/0552-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0551-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0553-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 4a803357b6..4a803357b6 100644
--- a/patches/server/0553-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0554-Add-HiddenPotionEffect-API.patch b/patches/server/0553-Add-HiddenPotionEffect-API.patch
index 5f9960d071..5f9960d071 100644
--- a/patches/server/0554-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0553-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0555-Inventory-close.patch b/patches/server/0554-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0555-Inventory-close.patch
+++ b/patches/server/0554-Inventory-close.patch
diff --git a/patches/server/0556-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 1d2850637b..1d2850637b 100644
--- a/patches/server/0556-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0557-Add-basic-Datapack-API.patch b/patches/server/0556-Add-basic-Datapack-API.patch
index 93aebb5a94..93aebb5a94 100644
--- a/patches/server/0557-Add-basic-Datapack-API.patch
+++ b/patches/server/0556-Add-basic-Datapack-API.patch
diff --git a/patches/server/0558-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0557-Add-environment-variable-to-disable-server-gui.patch
index 5cb0f04643..5cb0f04643 100644
--- a/patches/server/0558-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0557-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0559-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0558-Expand-PlayerGameModeChangeEvent.patch
index a994ea7bcf..12c30b462b 100644
--- a/patches/server/0559-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0558-Expand-PlayerGameModeChangeEvent.patch
@@ -144,7 +144,7 @@ index e12740f601acbe2b344d8e1fffc4bee2c752face..c9a8d04d1485a9493f6353beb7998801
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a9f30ba8d6d6e3d488f46b0bd79bf77b660c1b82..fa5bf1ef9cb4df06eabce00ccdd86a408ddaef8f 100644
+index f4cf8cc4cf085c621cc0d3e71f3ad10b8ef9f15a..2b8a85008b9562358265cfb28743f889159c21eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1562,7 +1562,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0560-ItemStack-repair-check-API.patch b/patches/server/0559-ItemStack-repair-check-API.patch
index daefbc2d1d..daefbc2d1d 100644
--- a/patches/server/0560-ItemStack-repair-check-API.patch
+++ b/patches/server/0559-ItemStack-repair-check-API.patch
diff --git a/patches/server/0561-More-Enchantment-API.patch b/patches/server/0560-More-Enchantment-API.patch
index 70329e2627..826f3c58ee 100644
--- a/patches/server/0561-More-Enchantment-API.patch
+++ b/patches/server/0560-More-Enchantment-API.patch
@@ -78,7 +78,7 @@ index 7aa4035a4df1ddcc71065034eafd569ca59be810..5b7579395e61684592758f408d61cffe
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 72d9a9696c95374bed29e2e453c7750d0cf06170..40fbd911943abd6f6cc7910b5179c196bb3fe8f8 100644
+index c95c0580e0c3afe9730a1c3f2095b7970e7cc001..aab6948060d8870729690449064b34e1b01c925e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -978,5 +978,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0562-Move-range-check-for-block-placing-up.patch b/patches/server/0561-Move-range-check-for-block-placing-up.patch
index 6ef0f8fe85..6ba529d1a6 100644
--- a/patches/server/0562-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0561-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c54a1c2bf8719791047eb9ccc6cbe26c7541f125..60acd12ab02a2a3c1fd788af2695b6a699646986 100644
+index c9a8d04d1485a9493f6353beb7998801e286923e..ba7f0f4e2840b88d8f53c5720752cfeed2493c49 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1738,6 +1738,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0563-Add-Mob-lookAt-API.patch b/patches/server/0562-Add-Mob-lookAt-API.patch
index ddfa31827a..ddfa31827a 100644
--- a/patches/server/0563-Add-Mob-lookAt-API.patch
+++ b/patches/server/0562-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0564-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 5ca75e86a3..5ca75e86a3 100644
--- a/patches/server/0564-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0565-Add-Unix-domain-socket-support.patch b/patches/server/0564-Add-Unix-domain-socket-support.patch
index 297b991d83..297b991d83 100644
--- a/patches/server/0565-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0564-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0566-Add-EntityInsideBlockEvent.patch b/patches/server/0565-Add-EntityInsideBlockEvent.patch
index a63f8ecbfe..a63f8ecbfe 100644
--- a/patches/server/0566-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0565-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0567-Attributes-API-for-item-defaults.patch b/patches/server/0566-Attributes-API-for-item-defaults.patch
index 65265cb696..65265cb696 100644
--- a/patches/server/0567-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0566-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0568-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch
index 04bbf4641a..f8ab56bacb 100644
--- a/patches/server/0568-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bc7177bc0699e64933399a1ed0e66fee0663636d..3f0745a9bfba35c0b133aa4bf2312e1b5eb640aa 100644
+index 0f6a34776482a7eef638911fe01db819962b3ce8..9e4453878246a22e320a6f8eb7aa08cb17438faf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -434,8 +434,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0569-More-Lidded-Block-API.patch b/patches/server/0568-More-Lidded-Block-API.patch
index d36768f000..d36768f000 100644
--- a/patches/server/0569-More-Lidded-Block-API.patch
+++ b/patches/server/0568-More-Lidded-Block-API.patch
diff --git a/patches/server/0570-Limit-item-frame-cursors-on-maps.patch b/patches/server/0569-Limit-item-frame-cursors-on-maps.patch
index 8b38d8900a..8b38d8900a 100644
--- a/patches/server/0570-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0569-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0571-Add-PlayerKickEvent-causes.patch b/patches/server/0570-Add-PlayerKickEvent-causes.patch
index cba228a0e1..cba228a0e1 100644
--- a/patches/server/0571-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0570-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0572-Add-PufferFishStateChangeEvent.patch b/patches/server/0571-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0572-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0571-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0573-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 8ac91b4842..8ac91b4842 100644
--- a/patches/server/0573-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0574-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 12b8b851c3..12b8b851c3 100644
--- a/patches/server/0574-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0575-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch
index 718a84a02c..718a84a02c 100644
--- a/patches/server/0575-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0576-Add-BellRevealRaiderEvent.patch b/patches/server/0575-Add-BellRevealRaiderEvent.patch
index 58719e8164..58719e8164 100644
--- a/patches/server/0576-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0575-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0577-Fix-invulnerable-end-crystals.patch b/patches/server/0576-Fix-invulnerable-end-crystals.patch
index 75347e76f0..75347e76f0 100644
--- a/patches/server/0577-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0576-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0578-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0577-Add-ElderGuardianAppearanceEvent.patch
index bd92518e4b..bd92518e4b 100644
--- a/patches/server/0578-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0577-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0579-Fix-dangerous-end-portal-logic.patch b/patches/server/0578-Fix-dangerous-end-portal-logic.patch
index b484f326da..3c92033da9 100644
--- a/patches/server/0579-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0578-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 fa5d634cefcf73afd3e090f91c4c589edb988352..6df66ba1bafa3c850372ff877c420a24c6356a2d 100644
+index fa5d634cefcf73afd3e090f91c4c589edb988352..e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -421,6 +421,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -55,15 +55,15 @@ index fa5d634cefcf73afd3e090f91c4c589edb988352..6df66ba1bafa3c850372ff877c420a24
              }
  
              this.processPortalCooldown();
-+            this.tickEndPortal(); // Paper - make end portalling safe
++            if (!io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation) this.tickEndPortal(); // Paper - make end portalling safe
          }
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 9ee2fd0914ff7836517ca143d51db6150967cb0e..a0c1db8cfebaa0344012cc0af18d6231cdcdcbb8 100644
+index 9ee2fd0914ff7836517ca143d51db6150967cb0e..4ba24bced9a2de4616a0418857d3738e0e322ea0 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -61,16 +61,10 @@ public class EndPortalBlock extends BaseEntityBlock {
+@@ -61,16 +61,13 @@ public class EndPortalBlock extends BaseEntityBlock {
                  // return; // CraftBukkit - always fire event in case plugins wish to change it
              }
  
@@ -74,12 +74,14 @@ index 9ee2fd0914ff7836517ca143d51db6150967cb0e..a0c1db8cfebaa0344012cc0af18d6231
 -            if (entity instanceof ServerPlayer) {
 -                ((ServerPlayer) entity).changeDimension(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
 -                return;
--            }
--            // CraftBukkit end
--            entity.changeDimension(worldserver);
 +            // Paper start - move all of this logic into portal tick
 +            entity.portalWorld = ((ServerLevel)world);
 +            entity.portalBlock = pos.immutable();
++            if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation) {
++                entity.tickEndPortal();
+             }
+-            // CraftBukkit end
+-            entity.changeDimension(worldserver);
 +            // Paper end - move all of this logic into portal tick
          }
  
diff --git a/patches/server/0580-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 53a98e7fb8..53a98e7fb8 100644
--- a/patches/server/0580-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0581-Make-item-validations-configurable.patch b/patches/server/0580-Make-item-validations-configurable.patch
index 3bbdbee6ea..e82f39807e 100644
--- a/patches/server/0581-Make-item-validations-configurable.patch
+++ b/patches/server/0580-Make-item-validations-configurable.patch
@@ -32,7 +32,7 @@ index e0d4798e244add64cbe43201604ad9d57701515f..c5d1ba7a1be3f102edcdfdc05fc50b30
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index a3713c5ab624b8d54ddcd69ae7587346ebbaed69..6c797f35a10e8491718f38eb08f31b1e6182a8d1 100644
+index 27be5da67801be6fd99c91576064e4be0b3f0d6c..7d3d32679bdfe373d89a28c3616da5069640d1bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -362,7 +362,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0582-Line-Of-Sight-Changes.patch b/patches/server/0581-Line-Of-Sight-Changes.patch
index e828baea33..e828baea33 100644
--- a/patches/server/0582-Line-Of-Sight-Changes.patch
+++ b/patches/server/0581-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0583-add-per-world-spawn-limits.patch b/patches/server/0582-add-per-world-spawn-limits.patch
index 5433a49ee8..5433a49ee8 100644
--- a/patches/server/0583-add-per-world-spawn-limits.patch
+++ b/patches/server/0582-add-per-world-spawn-limits.patch
diff --git a/patches/server/0584-Fix-potions-splash-events.patch b/patches/server/0583-Fix-potions-splash-events.patch
index 15190dbc0f..15190dbc0f 100644
--- a/patches/server/0584-Fix-potions-splash-events.patch
+++ b/patches/server/0583-Fix-potions-splash-events.patch
diff --git a/patches/server/0585-Add-more-LimitedRegion-API.patch b/patches/server/0584-Add-more-LimitedRegion-API.patch
index ff692d5181..ff692d5181 100644
--- a/patches/server/0585-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0584-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0586-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch
index e0ef67f1e5..e0ef67f1e5 100644
--- a/patches/server/0586-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0587-Missing-Entity-API.patch b/patches/server/0586-Missing-Entity-API.patch
index 1d25ac6396..1d25ac6396 100644
--- a/patches/server/0587-Missing-Entity-API.patch
+++ b/patches/server/0586-Missing-Entity-API.patch
diff --git a/patches/server/0588-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index f09bb60682..20f139446c 100644
--- a/patches/server/0588-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 28a0570988f93b21f530a6cca87efa429f83079d..6f4c8b6ac6f56d183796deaa0d3b5a23241e8348 100644
+index 2e1a0b3d2dee21d6deba62ec710d92efdf33e1a6..75ff85e3710d5e70a32fe39e8469c1f169fd2d46 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1096,7 +1096,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0589-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0589-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0590-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch
index 66dda54d6e..b45da09501 100644
--- a/patches/server/0590-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3f0745a9bfba35c0b133aa4bf2312e1b5eb640aa..af51a014156ade4d9c1b874a4c57a6de8849aea1 100644
+index 9e4453878246a22e320a6f8eb7aa08cb17438faf..60590ee30d2ff3b94c796bae2d7e9d9bc145fc0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -225,7 +225,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index 3f0745a9bfba35c0b133aa4bf2312e1b5eb640aa..af51a014156ade4d9c1b874a4c57a6de
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9879f9fd804f93faae4419add2c4c64fc6902ba1..9130ba6b008bab38212b162b4795cff63df5b957 100644
+index 1bb7cc9462cab7fbd09b944662711ae5bc5cf950..48e60e5ce01942fa5d30e043012e888989046cee 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -182,6 +182,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0591-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch
index 67851c6f82..67851c6f82 100644
--- a/patches/server/0591-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0592-Add-PlayerArmSwingEvent.patch b/patches/server/0591-Add-PlayerArmSwingEvent.patch
index a2db1e148c..d3f4757d38 100644
--- a/patches/server/0592-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0591-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f4c8b6ac6f56d183796deaa0d3b5a23241e8348..c0f29e612a69b33bd79d05c472fe72529a6fd14b 100644
+index 75ff85e3710d5e70a32fe39e8469c1f169fd2d46..bce87f55ad85837a17f783b5341ef5b64ab0ede0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2328,7 +2328,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0593-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch
index cbe89274cd..cbe89274cd 100644
--- a/patches/server/0593-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0594-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch
index 756da20f44..756da20f44 100644
--- a/patches/server/0594-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0595-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0594-Don-t-apply-cramming-damage-to-players.patch
index 0882572dff..0882572dff 100644
--- a/patches/server/0595-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0594-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0596-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch
index b90b81a68f..b90b81a68f 100644
--- a/patches/server/0596-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0597-Add-missing-forceDrop-toggles.patch b/patches/server/0596-Add-missing-forceDrop-toggles.patch
index 273710ee36..273710ee36 100644
--- a/patches/server/0597-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0596-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0598-Stinger-API.patch b/patches/server/0597-Stinger-API.patch
index a1a70741b4..262a4a8481 100644
--- a/patches/server/0598-Stinger-API.patch
+++ b/patches/server/0597-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8eb4b6c2752d68b866eab64263ede1d449ee2458..f288efe62c7280189359bba749a2dc3ec3f6ef49 100644
+index 9a7a670c1e99674e8a554342165b7b77001083fc..e1092bb514e01e978a8d624bd5a7cba5b4b5fe81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -338,6 +338,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0599-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 926fba2c7f..926fba2c7f 100644
--- a/patches/server/0599-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0600-Add-System.out-err-catcher.patch b/patches/server/0599-Add-System.out-err-catcher.patch
index c9b1688452..c9b1688452 100644
--- a/patches/server/0600-Add-System.out-err-catcher.patch
+++ b/patches/server/0599-Add-System.out-err-catcher.patch
diff --git a/patches/server/0601-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index e3b686c58c..e3b686c58c 100644
--- a/patches/server/0601-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0602-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch
index 0abb2b65fd..8ab33daef9 100644
--- a/patches/server/0602-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8b6f37463e35162d4b228b732a0283d57dc2f1b9..0fef0dda0586b70dc140406b55dba1d5e23c3c97 100644
+index 42c24ed58fab0f7ff9f58b2a65818f45a5b7cc06..2941445ea453e2fb88ea8de38c24bf755b93936a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0603-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch
index 5edf383235..5edf383235 100644
--- a/patches/server/0603-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0604-Add-PlayerSetSpawnEvent.patch b/patches/server/0603-Add-PlayerSetSpawnEvent.patch
index aae9495179..aae9495179 100644
--- a/patches/server/0604-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0603-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0605-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch
index 77dfd12340..77dfd12340 100644
--- a/patches/server/0605-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0606-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0605-Optimize-entity-tracker-passenger-checks.patch
index 0908da4471..0908da4471 100644
--- a/patches/server/0606-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0605-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0607-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0606-Config-option-for-Piglins-guarding-chests.patch
index 5b025d0fbb..5b025d0fbb 100644
--- a/patches/server/0607-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0606-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0608-Add-EntityDamageItemEvent.patch b/patches/server/0607-Add-EntityDamageItemEvent.patch
index 99df36aea0..99df36aea0 100644
--- a/patches/server/0608-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0607-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0609-Optimize-indirect-passenger-iteration.patch b/patches/server/0608-Optimize-indirect-passenger-iteration.patch
index cacff3bc5a..92ffa35c2c 100644
--- a/patches/server/0609-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0608-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 6df66ba1bafa3c850372ff877c420a24c6356a2d..53f5d5da6edb0874573347747e5e3ef4b712219f 100644
+index e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63..96ed3d345085c7d86643166fb4c124675e6b07d4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3842,20 +3842,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0610-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch
index 382372348e..382372348e 100644
--- a/patches/server/0610-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0611-Clear-bucket-NBT-after-dispense.patch b/patches/server/0610-Clear-bucket-NBT-after-dispense.patch
index 24eb614ec7..24eb614ec7 100644
--- a/patches/server/0611-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0610-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0612-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch
index 496056ab98..496056ab98 100644
--- a/patches/server/0612-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0613-Add-BlockBreakBlockEvent.patch b/patches/server/0612-Add-BlockBreakBlockEvent.patch
index d621301d17..d621301d17 100644
--- a/patches/server/0613-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0612-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0614-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 32a2c26212..32a2c26212 100644
--- a/patches/server/0614-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0615-More-CommandBlock-API.patch b/patches/server/0614-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0615-More-CommandBlock-API.patch
+++ b/patches/server/0614-More-CommandBlock-API.patch
diff --git a/patches/server/0616-Add-missing-team-sidebar-display-slots.patch b/patches/server/0615-Add-missing-team-sidebar-display-slots.patch
index 2a080ce725..2a080ce725 100644
--- a/patches/server/0616-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0615-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0617-Add-back-EntityPortalExitEvent.patch b/patches/server/0616-Add-back-EntityPortalExitEvent.patch
index 6a55175c75..5e091febda 100644
--- a/patches/server/0617-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0616-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 53f5d5da6edb0874573347747e5e3ef4b712219f..4e8d20807048066a0d69b4e120438c869d4a0a2a 100644
+index 96ed3d345085c7d86643166fb4c124675e6b07d4..822666e1199e0851136d88b2b556d8d17843d902 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3291,6 +3291,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0618-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch
index bd7a6b51d2..9958d9851d 100644
--- a/patches/server/0618-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index af51a014156ade4d9c1b874a4c57a6de8849aea1..c83f2be16953b5cc009ddef81fd082295f3b2f71 100644
+index 60590ee30d2ff3b94c796bae2d7e9d9bc145fc0d..14b3edc05a04f5049f994df5be68e4f01e8cf1ef 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -757,6 +757,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0619-Get-entity-default-attributes.patch b/patches/server/0618-Get-entity-default-attributes.patch
index a157e222b1..a157e222b1 100644
--- a/patches/server/0619-Get-entity-default-attributes.patch
+++ b/patches/server/0618-Get-entity-default-attributes.patch
diff --git a/patches/server/0620-Left-handed-API.patch b/patches/server/0619-Left-handed-API.patch
index d59098ccdf..d59098ccdf 100644
--- a/patches/server/0620-Left-handed-API.patch
+++ b/patches/server/0619-Left-handed-API.patch
diff --git a/patches/server/0621-Add-more-advancement-API.patch b/patches/server/0620-Add-more-advancement-API.patch
index 98836b6fe4..98836b6fe4 100644
--- a/patches/server/0621-Add-more-advancement-API.patch
+++ b/patches/server/0620-Add-more-advancement-API.patch
diff --git a/patches/server/0622-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch
index c1c7ed6a2c..c1c7ed6a2c 100644
--- a/patches/server/0622-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0623-Add-critical-damage-API.patch b/patches/server/0622-Add-critical-damage-API.patch
index 56413a796a..56413a796a 100644
--- a/patches/server/0623-Add-critical-damage-API.patch
+++ b/patches/server/0622-Add-critical-damage-API.patch
diff --git a/patches/server/0624-Fix-issues-with-mob-conversion.patch b/patches/server/0623-Fix-issues-with-mob-conversion.patch
index 657dd4ec5d..657dd4ec5d 100644
--- a/patches/server/0624-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0623-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0625-Add-isCollidable-methods-to-various-places.patch b/patches/server/0624-Add-isCollidable-methods-to-various-places.patch
index ce6e50fe3c..ce6e50fe3c 100644
--- a/patches/server/0625-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0624-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0626-Goat-ram-API.patch b/patches/server/0625-Goat-ram-API.patch
index 04a1b6c686..04a1b6c686 100644
--- a/patches/server/0626-Goat-ram-API.patch
+++ b/patches/server/0625-Goat-ram-API.patch
diff --git a/patches/server/0627-Add-API-for-resetting-a-single-score.patch b/patches/server/0626-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0627-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0626-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0628-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
index f4056c9b60..436c536f74 100644
--- a/patches/server/0628-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fae9aa88bc672b3ac17dcbbf077a57cd3254a723..6cb7a7642a2b02a85d6a0da0fc6e66f81844016a 100644
+index 822666e1199e0851136d88b2b556d8d17843d902..e6ef67a7a2eab5314c95e751895b4d4ce71c91b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2078,6 +2078,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0629-Vanilla-command-permission-fixes.patch b/patches/server/0628-Vanilla-command-permission-fixes.patch
index 25c28237d6..25c28237d6 100644
--- a/patches/server/0629-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0628-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0630-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index e55fef3b36..e55fef3b36 100644
--- a/patches/server/0630-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0631-Fix-GameProfileCache-concurrency.patch b/patches/server/0630-Fix-GameProfileCache-concurrency.patch
index 9c0776cd51..9c0776cd51 100644
--- a/patches/server/0631-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0630-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0632-Improve-and-expand-AsyncCatcher.patch b/patches/server/0631-Improve-and-expand-AsyncCatcher.patch
index 70908f281c..70908f281c 100644
--- a/patches/server/0632-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0631-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0633-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 5de3695498..5de3695498 100644
--- a/patches/server/0633-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0634-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0633-Sanitize-ResourceLocation-error-logging.patch
index 1359f8648a..1359f8648a 100644
--- a/patches/server/0634-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0633-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0635-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0634-Manually-inline-methods-in-BlockPosition.patch
index e97ce21f71..e97ce21f71 100644
--- a/patches/server/0635-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0634-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0636-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0636-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0637-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 4e0e3eb2b1..3834fdb183 100644
--- a/patches/server/0637-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -10,7 +10,7 @@ chunks did get inlined, but the standard CPS.getChunkAt
 method was not inlined.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9130ba6b008bab38212b162b4795cff63df5b957..c49ff35c92874273233ec53ed63aaff9c79edcd0 100644
+index 48e60e5ce01942fa5d30e043012e888989046cee..275c02d480cdf25ba0e735f4a43015ec0af238b3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -358,6 +358,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0638-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 538ac56665..538ac56665 100644
--- a/patches/server/0638-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0639-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0639-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0640-Time-scoreboard-search.patch b/patches/server/0639-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0640-Time-scoreboard-search.patch
+++ b/patches/server/0639-Time-scoreboard-search.patch
diff --git a/patches/server/0641-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0640-Oprimise-map-impl-for-tracked-players.patch
index 274e6f709e..c8c75040be 100644
--- a/patches/server/0641-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0640-Oprimise-map-impl-for-tracked-players.patch
@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5ef08156aa2e93e42eed586a4014c6208ddb20c1..63e7f41eaed3f22c1bc0191790ff0ad313dc4ffd 100644
+index 4c1dd470ac561f61d7f49adf90d273b1f293d296..f2d3dc066b00b685715eb5104234945c41a15f92 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1677,7 +1677,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0642-Add-missing-InventoryType.patch b/patches/server/0641-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0642-Add-missing-InventoryType.patch
+++ b/patches/server/0641-Add-missing-InventoryType.patch
diff --git a/patches/server/0643-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch
index b192406016..b192406016 100644
--- a/patches/server/0643-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0644-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index e4c9eb4f84..76d51d8295 100644
--- a/patches/server/0644-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f2015ffc83696b7ab6a552d4bb6fec1d8f6c6031..5ed27de9be5300b22cd29b57385e93e6e97ef361 100644
+index 10eb5c342930d2efd7d919f286fe8fa64cebaea4..03a9f82ac2af6cb64081c2bb758cb02a7ffd5b89 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2325,6 +2325,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0645-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0645-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0646-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index e21f5ec679..d80840a79c 100644
--- a/patches/server/0646-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0df4c822ad01f1ed0f8b858e4ca012a823c7f47..bf790227e9716a9f678bea1914430c1c65027468 100644
+index 666c6cb6f600973e1d84839aed715606279d4630..ace2cab310aa7d89e1b76bf5fdc9fd64f56b6cc7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -725,6 +725,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0647-Add-packet-limiter-config.patch b/patches/server/0646-Add-packet-limiter-config.patch
index dd045eca75..dd045eca75 100644
--- a/patches/server/0647-Add-packet-limiter-config.patch
+++ b/patches/server/0646-Add-packet-limiter-config.patch
diff --git a/patches/server/0648-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0648-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0649-Ensure-valid-vehicle-status.patch b/patches/server/0648-Ensure-valid-vehicle-status.patch
index 24e12fde1c..24e12fde1c 100644
--- a/patches/server/0649-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0648-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0650-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch
index 6a1c04bc8a..67312cbfe5 100644
--- a/patches/server/0650-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent softlocked end exit portal generation
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 1d5edcad4c5bfe48711cfce7c46a9c4606196ae3..59f6c3109b34719a7ed487ada5a8ce33ec458e87 100644
+index 1c9bfcf595bcb247c3b9ffe8b0e0cfee0d0ba91f..50071bec6825ec2b34662de14128070510d16afb 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -466,6 +466,11 @@ public class EndDragonFight {
diff --git a/patches/server/0651-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b766f53247..b766f53247 100644
--- a/patches/server/0651-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0652-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0651-Don-t-log-debug-logging-being-disabled.patch
index 8daedd938d..8daedd938d 100644
--- a/patches/server/0652-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0651-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0653-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0652-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0653-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0652-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0654-Preserve-overstacked-loot.patch b/patches/server/0653-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0654-Preserve-overstacked-loot.patch
+++ b/patches/server/0653-Preserve-overstacked-loot.patch
diff --git a/patches/server/0655-Update-head-rotation-in-missing-places.patch b/patches/server/0654-Update-head-rotation-in-missing-places.patch
index 11b6d2810b..d43abb0d8a 100644
--- a/patches/server/0655-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0654-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 6cb7a7642a2b02a85d6a0da0fc6e66f81844016a..cd6546b853e147bea8fba789e241674cc400b81e 100644
+index e6ef67a7a2eab5314c95e751895b4d4ce71c91b8..efdc94c6e57dcd5c122300f77ca0cc058651aa7e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1790,6 +1790,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0656-prevent-unintended-light-block-manipulation.patch b/patches/server/0655-prevent-unintended-light-block-manipulation.patch
index 90c181a20a..90c181a20a 100644
--- a/patches/server/0656-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0655-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0657-Fix-CraftCriteria-defaults-map.patch b/patches/server/0656-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0657-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0656-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0658-Fix-upstreams-block-state-factories.patch b/patches/server/0657-Fix-upstreams-block-state-factories.patch
index cd44e53b99..cd44e53b99 100644
--- a/patches/server/0658-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0657-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0659-Configurable-feature-seeds.patch b/patches/server/0658-Configurable-feature-seeds.patch
index 0cfc074f8f..0cfc074f8f 100644
--- a/patches/server/0659-Configurable-feature-seeds.patch
+++ b/patches/server/0658-Configurable-feature-seeds.patch
diff --git a/patches/server/0660-Add-root-admin-user-detection.patch b/patches/server/0659-Add-root-admin-user-detection.patch
index 74f125cf61..74f125cf61 100644
--- a/patches/server/0660-Add-root-admin-user-detection.patch
+++ b/patches/server/0659-Add-root-admin-user-detection.patch
diff --git a/patches/server/0661-Always-allow-item-changing-in-Fireball.patch b/patches/server/0660-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0661-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0660-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0662-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch
index fe234b451f..5eff5788eb 100644
--- a/patches/server/0662-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0661-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 cd6546b853e147bea8fba789e241674cc400b81e..c090a529eb6bfe3790f6b912ac3d296a43e52762 100644
+index efdc94c6e57dcd5c122300f77ca0cc058651aa7e..5691ce8e654b05d466f179f87b17cc627de98fcb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -718,7 +718,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0663-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch
index e77b1154c2..e77b1154c2 100644
--- a/patches/server/0663-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0664-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch
index 2ed18ebaeb..2ed18ebaeb 100644
--- a/patches/server/0664-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0665-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch
index fb78c572eb..fb78c572eb 100644
--- a/patches/server/0665-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0666-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 66da8d4997..66da8d4997 100644
--- a/patches/server/0666-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0667-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch
index 6224365ef1..6224365ef1 100644
--- a/patches/server/0667-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0668-Fix-Spigot-growth-modifiers.patch b/patches/server/0667-Fix-Spigot-growth-modifiers.patch
index 92cddad5f1..92cddad5f1 100644
--- a/patches/server/0668-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0667-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0669-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 9dbace63bd..9dbace63bd 100644
--- a/patches/server/0669-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0670-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch
index e46cc3be4c..e46cc3be4c 100644
--- a/patches/server/0670-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0671-Optimize-HashMapPalette.patch b/patches/server/0670-Optimize-HashMapPalette.patch
index a8cf001da1..a8cf001da1 100644
--- a/patches/server/0671-Optimize-HashMapPalette.patch
+++ b/patches/server/0670-Optimize-HashMapPalette.patch
diff --git a/patches/server/0672-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch
index 7c8b0a2c4a..7c8b0a2c4a 100644
--- a/patches/server/0672-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0673-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index f451e896f8..f451e896f8 100644
--- a/patches/server/0673-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0674-Add-more-Campfire-API.patch b/patches/server/0673-Add-more-Campfire-API.patch
index 1133eb93bf..1133eb93bf 100644
--- a/patches/server/0674-Add-more-Campfire-API.patch
+++ b/patches/server/0673-Add-more-Campfire-API.patch
diff --git a/patches/server/0675-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 4d74f60751..4d74f60751 100644
--- a/patches/server/0675-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0676-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch
index 06b0eac821..493db169a4 100644
--- a/patches/server/0676-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0675-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 47b87fa8c74dba9380fdfc067fea5ae1040e07d3..bab075f68079d5d6c608ef63dc02ae54209cf029 100644
+index 5691ce8e654b05d466f179f87b17cc627de98fcb..653b5bedf9b6132a5410be5f9c36a36cf99b6f68 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3263,6 +3263,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0677-Improve-scoreboard-entries.patch b/patches/server/0676-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0677-Improve-scoreboard-entries.patch
+++ b/patches/server/0676-Improve-scoreboard-entries.patch
diff --git a/patches/server/0678-Entity-powdered-snow-API.patch b/patches/server/0677-Entity-powdered-snow-API.patch
index 9976726fc5..9976726fc5 100644
--- a/patches/server/0678-Entity-powdered-snow-API.patch
+++ b/patches/server/0677-Entity-powdered-snow-API.patch
diff --git a/patches/server/0679-Add-API-for-item-entity-health.patch b/patches/server/0678-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0679-Add-API-for-item-entity-health.patch
+++ b/patches/server/0678-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0680-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch
index deae03d87c..deae03d87c 100644
--- a/patches/server/0680-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0681-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 00fea74b71..00fea74b71 100644
--- a/patches/server/0681-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0682-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch
index 3e88533e6f..3e88533e6f 100644
--- a/patches/server/0682-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0683-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0683-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0684-Fix-bees-aging-inside-hives.patch b/patches/server/0683-Fix-bees-aging-inside-hives.patch
index 2c8d2209d5..2c8d2209d5 100644
--- a/patches/server/0684-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0683-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0685-Bucketable-API.patch b/patches/server/0684-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0685-Bucketable-API.patch
+++ b/patches/server/0684-Bucketable-API.patch
diff --git a/patches/server/0686-Validate-usernames.patch b/patches/server/0685-Validate-usernames.patch
index a4e02c238d..a4e02c238d 100644
--- a/patches/server/0686-Validate-usernames.patch
+++ b/patches/server/0685-Validate-usernames.patch
diff --git a/patches/server/0687-Make-water-animal-spawn-height-configurable.patch b/patches/server/0686-Make-water-animal-spawn-height-configurable.patch
index e523ed36f4..e523ed36f4 100644
--- a/patches/server/0687-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0686-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0688-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 2d40d8b668..2d40d8b668 100644
--- a/patches/server/0688-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0689-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0689-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0690-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0690-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0691-Multiple-Entries-with-Scoreboards.patch b/patches/server/0690-Multiple-Entries-with-Scoreboards.patch
index 9bfd7660c6..9bfd7660c6 100644
--- a/patches/server/0691-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0690-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0692-Reset-placed-block-on-exception.patch b/patches/server/0691-Reset-placed-block-on-exception.patch
index b6bf08780c..b6bf08780c 100644
--- a/patches/server/0692-Reset-placed-block-on-exception.patch
+++ b/patches/server/0691-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0693-Add-configurable-height-for-slime-spawn.patch b/patches/server/0692-Add-configurable-height-for-slime-spawn.patch
index 08dbacd3f1..08dbacd3f1 100644
--- a/patches/server/0693-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0692-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0694-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0693-Fix-xp-reward-for-baby-zombies.patch
index f3c6e8841b..f3c6e8841b 100644
--- a/patches/server/0694-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0693-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0695-Multi-Block-Change-API-Implementation.patch b/patches/server/0694-Multi-Block-Change-API-Implementation.patch
index 13e338d236..86eb7ab941 100644
--- a/patches/server/0695-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0694-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b89f46aad11628a50d9f6c65caf52a558b9ee18..87b241a8b78b6fe0144e0d318e04da69a3101bc7 100644
+index 3c0be3eb7eb79fd2e62845d516f5d9a3c0f8403f..11e144bf561cc3c4dc1d8b712f915cc167f4d4ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -850,6 +850,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0696-Fix-NotePlayEvent.patch b/patches/server/0695-Fix-NotePlayEvent.patch
index 85437cdf17..85437cdf17 100644
--- a/patches/server/0696-Fix-NotePlayEvent.patch
+++ b/patches/server/0695-Fix-NotePlayEvent.patch
diff --git a/patches/server/0697-Freeze-Tick-Lock-API.patch b/patches/server/0696-Freeze-Tick-Lock-API.patch
index b2a2235c41..7ca49418f1 100644
--- a/patches/server/0697-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0696-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 bab075f68079d5d6c608ef63dc02ae54209cf029..8c12c385408371126306b75b2b633b4056d7ade3 100644
+index 653b5bedf9b6132a5410be5f9c36a36cf99b6f68..80d5a7a77fab3b978ee4a1a76b992eb666486792 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0698-More-PotionEffectType-API.patch b/patches/server/0697-More-PotionEffectType-API.patch
index e23c6e0c5f..e23c6e0c5f 100644
--- a/patches/server/0698-More-PotionEffectType-API.patch
+++ b/patches/server/0697-More-PotionEffectType-API.patch
diff --git a/patches/server/0699-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 1b86e32b63..1b86e32b63 100644
--- a/patches/server/0699-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0700-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch
index cceecc25ea..cceecc25ea 100644
--- a/patches/server/0700-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0701-Add-missing-structure-set-seed-configs.patch b/patches/server/0700-Add-missing-structure-set-seed-configs.patch
index b6627026af..b6627026af 100644
--- a/patches/server/0701-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0700-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0702-Implement-regenerateChunk.patch b/patches/server/0701-Implement-regenerateChunk.patch
index b65be58c1e..b65be58c1e 100644
--- a/patches/server/0702-Implement-regenerateChunk.patch
+++ b/patches/server/0701-Implement-regenerateChunk.patch
diff --git a/patches/server/0703-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch
index 80c4ffe9f2..80c4ffe9f2 100644
--- a/patches/server/0703-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0704-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 971d368008..971d368008 100644
--- a/patches/server/0704-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0705-Add-GameEvent-tags.patch b/patches/server/0704-Add-GameEvent-tags.patch
index 0a4355d93a..0a4355d93a 100644
--- a/patches/server/0705-Add-GameEvent-tags.patch
+++ b/patches/server/0704-Add-GameEvent-tags.patch
diff --git a/patches/server/0706-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 06c9d9f99a..06c9d9f99a 100644
--- a/patches/server/0706-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0707-Furnace-RecipesUsed-API.patch b/patches/server/0706-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0707-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0706-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0708-Configurable-sculk-sensor-listener-range.patch b/patches/server/0707-Configurable-sculk-sensor-listener-range.patch
index f4bdef4317..f4bdef4317 100644
--- a/patches/server/0708-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0707-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0709-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0708-Add-missing-block-data-mins-and-maxes.patch
index defc7411be..defc7411be 100644
--- a/patches/server/0709-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0708-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0710-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 903a710120..903a710120 100644
--- a/patches/server/0710-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0711-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch
index 998c2caea6..998c2caea6 100644
--- a/patches/server/0711-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0712-Fix-Entity-Position-Desync.patch b/patches/server/0711-Fix-Entity-Position-Desync.patch
index 1fe60a4f46..1fe60a4f46 100644
--- a/patches/server/0712-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0711-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0713-Custom-Potion-Mixes.patch b/patches/server/0712-Custom-Potion-Mixes.patch
index edb4c6d4f4..edb4c6d4f4 100644
--- a/patches/server/0713-Custom-Potion-Mixes.patch
+++ b/patches/server/0712-Custom-Potion-Mixes.patch
diff --git a/patches/server/0714-Force-close-world-loading-screen.patch b/patches/server/0713-Force-close-world-loading-screen.patch
index a62795f9be..a62795f9be 100644
--- a/patches/server/0714-Force-close-world-loading-screen.patch
+++ b/patches/server/0713-Force-close-world-loading-screen.patch
diff --git a/patches/server/0715-Fix-falling-block-spawn-methods.patch b/patches/server/0714-Fix-falling-block-spawn-methods.patch
index 5181c49b28..5181c49b28 100644
--- a/patches/server/0715-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0714-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0716-Expose-furnace-minecart-push-values.patch b/patches/server/0715-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0716-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0715-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0717-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index d80acbf9d0..d80acbf9d0 100644
--- a/patches/server/0717-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0718-More-Projectile-API.patch b/patches/server/0717-More-Projectile-API.patch
index ef828fda14..ef828fda14 100644
--- a/patches/server/0718-More-Projectile-API.patch
+++ b/patches/server/0717-More-Projectile-API.patch
diff --git a/patches/server/0719-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch
index bac78b77ff..bac78b77ff 100644
--- a/patches/server/0719-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0720-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 8d3a98a368..cf48604618 100644
--- a/patches/server/0720-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1fb3e89d6f7f9d048f083e80b1259480d4e67ef9..cd79aa53ec49c80ee3ddf79b7161637e66b688fd 100644
+index cf173a2315f3a97a89dc2aabe81be285abe73603..53a0ad0125e947537ed537b627d1b02c27f0a63d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -464,6 +464,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0721-Implement-getComputedBiome-API.patch b/patches/server/0720-Implement-getComputedBiome-API.patch
index 610d889706..851c8f573b 100644
--- a/patches/server/0721-Implement-getComputedBiome-API.patch
+++ b/patches/server/0720-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 5f4958d28b6d79fe9e589e4794d9a7e8ab67c8b3..42def68f0c682afe7628ff0b9a537e74d77e558c 100644
+index af14244caba22e750ee7baba03bb7ce267795b21..fbcf1320ef9c1817b24aa8724cd6cf07319c20b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -76,6 +76,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0722-Make-some-itemstacks-nonnull.patch b/patches/server/0721-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0722-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0721-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0723-Implement-enchantWithLevels-API.patch b/patches/server/0722-Implement-enchantWithLevels-API.patch
index ed80635228..ed80635228 100644
--- a/patches/server/0723-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0722-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0724-Fix-saving-in-unloadWorld.patch b/patches/server/0723-Fix-saving-in-unloadWorld.patch
index a844d1cd8e..a844d1cd8e 100644
--- a/patches/server/0724-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0723-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0725-Buffer-OOB-setBlock-calls.patch b/patches/server/0724-Buffer-OOB-setBlock-calls.patch
index ae47164389..ae47164389 100644
--- a/patches/server/0725-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0724-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0726-Add-TameableDeathMessageEvent.patch b/patches/server/0725-Add-TameableDeathMessageEvent.patch
index 58ea5cd5d1..58ea5cd5d1 100644
--- a/patches/server/0726-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0725-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0727-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 6d27ca622a..6d27ca622a 100644
--- a/patches/server/0727-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0728-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 185fdf4437..185fdf4437 100644
--- a/patches/server/0728-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0729-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch
index b763ae3b79..846f0c230c 100644
--- a/patches/server/0729-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0728-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 8c12c385408371126306b75b2b633b4056d7ade3..91242b075c7f5c07d06c2c89cab3fbdb069b61e9 100644
+index 80d5a7a77fab3b978ee4a1a76b992eb666486792..3d0f7310840742a5b16f0c0a7115dc0c90202919 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2580,7 +2580,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0730-cache-resource-keys.patch b/patches/server/0729-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0730-cache-resource-keys.patch
+++ b/patches/server/0729-cache-resource-keys.patch
diff --git a/patches/server/0731-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0730-Allow-changing-the-EnderDragon-podium.patch
index fc8eed08e4..fc8eed08e4 100644
--- a/patches/server/0731-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0730-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0732-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index aa5772fe8a..aa5772fe8a 100644
--- a/patches/server/0732-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0733-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch
index 209f21dc24..209f21dc24 100644
--- a/patches/server/0733-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0734-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch
index ce925b89b7..ce925b89b7 100644
--- a/patches/server/0734-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0735-Expand-PlayerItemDamageEvent.patch b/patches/server/0734-Expand-PlayerItemDamageEvent.patch
index bb173a36a5..bb173a36a5 100644
--- a/patches/server/0735-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0734-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0736-WorldCreator-keepSpawnLoaded.patch b/patches/server/0735-WorldCreator-keepSpawnLoaded.patch
index 97cbe705e8..97cbe705e8 100644
--- a/patches/server/0736-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0735-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0737-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index feadff040a..feadff040a 100644
--- a/patches/server/0737-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0738-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 9606b571be..9606b571be 100644
--- a/patches/server/0738-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0739-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 758be4b481..758be4b481 100644
--- a/patches/server/0739-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0740-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch
index 0ad967e4e4..0ad967e4e4 100644
--- a/patches/server/0740-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0741-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch
index 1d388d0504..1d388d0504 100644
--- a/patches/server/0741-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0742-Add-PlayerStopUsingItemEvent.patch b/patches/server/0741-Add-PlayerStopUsingItemEvent.patch
index fad59d6983..fad59d6983 100644
--- a/patches/server/0742-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0741-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0743-Don-t-tick-markers.patch b/patches/server/0742-Don-t-tick-markers.patch
index ae96fa4757..f920e6b436 100644
--- a/patches/server/0743-Don-t-tick-markers.patch
+++ b/patches/server/0742-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612d
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5ed27de9be5300b22cd29b57385e93e6e97ef361..196c776fdb20aac5a9ad5692c47f61c979e4ace0 100644
+index 03a9f82ac2af6cb64081c2bb758cb02a7ffd5b89..024f32155feb31365c8233f94b1e15ed85e929fb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2235,6 +2235,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0744-Expand-FallingBlock-API.patch b/patches/server/0743-Expand-FallingBlock-API.patch
index d0d49233fa..3f57a2d718 100644
--- a/patches/server/0744-Expand-FallingBlock-API.patch
+++ b/patches/server/0743-Expand-FallingBlock-API.patch
@@ -13,7 +13,7 @@ public net.minecraft.world.entity.item.FallingBlockEntity blockState
 Co-authored-by: Lukas Planz <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 33cc2d1a4723ec07c4201eb6e0080d5e0281e1f0..0aef6a8d51cb1351daaea16022f5cbb27ceaff0d 100644
+index c0477f913867c67809978a4f240303151d81e6ea..a52c2fc38fd97ffa1684270443646d605ec35830 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -67,6 +67,7 @@ public class FallingBlockEntity extends Entity {
@@ -24,7 +24,7 @@ index 33cc2d1a4723ec07c4201eb6e0080d5e0281e1f0..0aef6a8d51cb1351daaea16022f5cbb2
  
      public FallingBlockEntity(EntityType<? extends FallingBlockEntity> type, Level world) {
          super(type, world);
-@@ -179,7 +180,7 @@ public class FallingBlockEntity extends Entity {
+@@ -169,7 +170,7 @@ public class FallingBlockEntity extends Entity {
                  }
  
                  if (!this.onGround() && !flag1) {
@@ -33,7 +33,7 @@ index 33cc2d1a4723ec07c4201eb6e0080d5e0281e1f0..0aef6a8d51cb1351daaea16022f5cbb2
                          if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
                              this.spawnAtLocation((ItemLike) block);
                          }
-@@ -325,6 +326,7 @@ public class FallingBlockEntity extends Entity {
+@@ -315,6 +316,7 @@ public class FallingBlockEntity extends Entity {
          }
  
          nbt.putBoolean("CancelDrop", this.cancelDrop);
@@ -41,7 +41,7 @@ index 33cc2d1a4723ec07c4201eb6e0080d5e0281e1f0..0aef6a8d51cb1351daaea16022f5cbb2
      }
  
      @Override
-@@ -352,6 +354,11 @@ public class FallingBlockEntity extends Entity {
+@@ -342,6 +344,11 @@ public class FallingBlockEntity extends Entity {
              this.blockState = Blocks.SAND.defaultBlockState();
          }
  
diff --git a/patches/server/0745-Add-support-for-Proxy-Protocol.patch b/patches/server/0744-Add-support-for-Proxy-Protocol.patch
index 1580298fa5..278aa4c803 100644
--- a/patches/server/0745-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0744-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c6241f858209ed662d8720217d143340916024e9..7c563ef33d12b227856e65392905bffa5289285a 100644
+index e7ea6d57488cbde806b7d5febd48c42dfe3c5195..b5f31e210f2ca4bdfe9957d44780d89240da6269 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,7 @@ dependencies {
diff --git a/patches/server/0746-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch
index e67e0fc286..e67e0fc286 100644
--- a/patches/server/0746-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0747-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index ef7517367b..ef7517367b 100644
--- a/patches/server/0747-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0748-properly-read-and-store-sus-effect-duration.patch b/patches/server/0747-properly-read-and-store-sus-effect-duration.patch
index 94589408f4..94589408f4 100644
--- a/patches/server/0748-properly-read-and-store-sus-effect-duration.patch
+++ b/patches/server/0747-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/0749-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch
index f607c4b19b..f607c4b19b 100644
--- a/patches/server/0749-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0750-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch
index 33fd8e47d0..33fd8e47d0 100644
--- a/patches/server/0750-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0751-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch
index 7de6a022b5..c9ec6cc4c0 100644
--- a/patches/server/0751-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0750-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 a9bc659a89009f430105c8524688130a01baaecf..c02181318220d544aca15c030b54650404205519 100644
+index 3d0f7310840742a5b16f0c0a7115dc0c90202919..45712b358e97b65396f63b34c09debc1d42fdbb9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -727,6 +727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0752-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch
index 34fcf49e25..34fcf49e25 100644
--- a/patches/server/0752-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0753-Dont-resent-entity-on-art-update.patch b/patches/server/0752-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0753-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0752-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0754-Add-WardenAngerChangeEvent.patch b/patches/server/0753-Add-WardenAngerChangeEvent.patch
index 9344bd47cf..9344bd47cf 100644
--- a/patches/server/0754-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0753-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0755-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch
index 3dd4e6d490..3dd4e6d490 100644
--- a/patches/server/0755-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0756-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch
index 5db34c9fe3..5db34c9fe3 100644
--- a/patches/server/0756-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0757-Nameable-Banner-API.patch b/patches/server/0756-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0757-Nameable-Banner-API.patch
+++ b/patches/server/0756-Nameable-Banner-API.patch
diff --git a/patches/server/0758-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch
index fa6488648d..fa6488648d 100644
--- a/patches/server/0758-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0759-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch
index a3cccb274c..c3d0b8413a 100644
--- a/patches/server/0759-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 196c776fdb20aac5a9ad5692c47f61c979e4ace0..de822b99df2de08371f3a7a29bf8f3275650887c 100644
+index 024f32155feb31365c8233f94b1e15ed85e929fb..57f54e3399f9d2d7fecdae62858d20e50caf7afd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1231,6 +1231,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0760-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0760-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0761-Add-Player-getFishHook.patch b/patches/server/0760-Add-Player-getFishHook.patch
index d539d68f07..d539d68f07 100644
--- a/patches/server/0761-Add-Player-getFishHook.patch
+++ b/patches/server/0760-Add-Player-getFishHook.patch
diff --git a/patches/server/0762-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 8b8d15552f..8b8d15552f 100644
--- a/patches/server/0762-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0763-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch
index 16399035a0..ad1ba5c540 100644
--- a/patches/server/0763-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 766ffaa165afe799c027ffac3ffcfc04701d02ab..f56739b5a6a748f1a063a63bc31300dd75aaf8d7 100644
+index 45712b358e97b65396f63b34c09debc1d42fdbb9..e5b15ef69bedfd94398f1a8d7a84d0fbf3773919 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2491,6 +2491,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0764-Fix-Bee-flower-NPE.patch b/patches/server/0763-Fix-Bee-flower-NPE.patch
index 21a3d68e76..21a3d68e76 100644
--- a/patches/server/0764-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0763-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0765-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 2d342dd0a1..9c4e396ae4 100644
--- a/patches/server/0765-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 819894dabc8e28a499a6ab5420299e14ab072ff8..2f566e05dc100cde49d36e3392a86c7e20b32473 100644
+index de2b8ae62bdd9e97aa696768f84543cd4a6522cc..5775d071f714e7b9d959bfa94510b865f489e68e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2299,7 +2299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0766-More-Teleport-API.patch b/patches/server/0765-More-Teleport-API.patch
index aa88800118..aa88800118 100644
--- a/patches/server/0766-More-Teleport-API.patch
+++ b/patches/server/0765-More-Teleport-API.patch
diff --git a/patches/server/0767-Add-EntityPortalReadyEvent.patch b/patches/server/0766-Add-EntityPortalReadyEvent.patch
index 244db29cbb..1d064ea6c7 100644
--- a/patches/server/0767-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0766-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f56739b5a6a748f1a063a63bc31300dd75aaf8d7..3a938cd07ec5cec40a244a9a717376c75c26f12b 100644
+index e5b15ef69bedfd94398f1a8d7a84d0fbf3773919..45a7b217ab6ef3a7c4ad1c07824d7185d4847086 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2832,6 +2832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0768-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch
index ef3475e3a3..ef3475e3a3 100644
--- a/patches/server/0768-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0769-Send-block-entities-after-destroy-prediction.patch b/patches/server/0768-Send-block-entities-after-destroy-prediction.patch
index 5acf3fa9d7..c1bc860181 100644
--- a/patches/server/0769-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0768-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 8f4c9b99b638cfce8cc7c55f6369f62e757f4e48..f3389dc345d8b6e5389ae37848d9b268
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7a3293e1a911de494ac32b946d8f709a52d98cbe..1eae23b70659b729aaec9d1b5b4dedbefb30a29f 100644
+index 27eb4bc4d1276ea36b97d0faeed2acee8b7a64cc..b8f1549d1ea98a105577927a735bab331aff3840 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1704,8 +1704,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0770-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch
index 81ca2e88f6..cf8698ba32 100644
--- a/patches/server/0770-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c49ff35c92874273233ec53ed63aaff9c79edcd0..76deb93a1a1d3f93498176f32ef291e1299c588d 100644
+index 275c02d480cdf25ba0e735f4a43015ec0af238b3..2cbb3fcae6a8e26ee4bc2a9c88e64984da15ce86 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -345,7 +345,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0771-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch
index fa918c4450..f48547cc9c 100644
--- a/patches/server/0771-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0e5076529693f1b9f971600909ae353e021f0671..d866ad7fd91c64fd0fe6680a417678e3ef5ca41d 100644
+index f606250106f1bcf5870dff1167f2902f85f7784a..e278933f1b8fec3165ef088e2a15872cf34f1258 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -611,6 +611,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0772-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch
index 2813257f0f..2813257f0f 100644
--- a/patches/server/0772-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0773-Collision-API.patch b/patches/server/0772-Collision-API.patch
index c4952054b5..c4952054b5 100644
--- a/patches/server/0773-Collision-API.patch
+++ b/patches/server/0772-Collision-API.patch
diff --git a/patches/server/0774-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 8645146d61..8645146d61 100644
--- a/patches/server/0774-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0775-Block-Ticking-API.patch b/patches/server/0774-Block-Ticking-API.patch
index 9afbc4d4b1..9afbc4d4b1 100644
--- a/patches/server/0775-Block-Ticking-API.patch
+++ b/patches/server/0774-Block-Ticking-API.patch
diff --git a/patches/server/0776-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch
index 64983350da..64983350da 100644
--- a/patches/server/0776-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0777-Add-NamespacedKey-biome-methods.patch b/patches/server/0776-Add-NamespacedKey-biome-methods.patch
index bf854146f4..bf854146f4 100644
--- a/patches/server/0777-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0776-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0778-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch
index f27e838474..f27e838474 100644
--- a/patches/server/0778-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0779-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch
index 92ac8e787a..92ac8e787a 100644
--- a/patches/server/0779-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0780-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch
index 4c1d97360d..4c1d97360d 100644
--- a/patches/server/0780-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0781-Missing-eating-regain-reason.patch b/patches/server/0780-Missing-eating-regain-reason.patch
index ae0d770acd..d03459459f 100644
--- a/patches/server/0781-Missing-eating-regain-reason.patch
+++ b/patches/server/0780-Missing-eating-regain-reason.patch
@@ -18,7 +18,7 @@ index 1d0c424be2b67cad0f8bca85070a9c46a6b283da..f760ce7d9df79ef58f8963de3e901cba
                          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 869f60e9407ed1c5bee536ef91a21f4d11f8f964..16a5e1247a160a7ae3eba2bab9fde42dff5d62c6 100644
+index 95e5d1d707e610c930b6098a86c5162fd29bf602..be8e056f82e348d7cd14bb22a873207cddfb3044 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -384,7 +384,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
diff --git a/patches/server/0782-Missing-effect-cause.patch b/patches/server/0781-Missing-effect-cause.patch
index 6710474f4b..6710474f4b 100644
--- a/patches/server/0782-Missing-effect-cause.patch
+++ b/patches/server/0781-Missing-effect-cause.patch
diff --git a/patches/server/0783-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0783-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0784-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index d7fcd122ed..ff24a5400c 100644
--- a/patches/server/0784-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 60230ddeec41485e1e1b83614a6256d9ae2cb242..1aa4f09d93f36f523923281a6fb17dc184dbed86 100644
+index 1170cf9b3b61fae099ed8574888187cf4f20ffd1..e559af05c58b7d9c940cea9f48c0f4bd0aad756c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -546,8 +546,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0785-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0784-Call-BlockPhysicsEvent-more-often.patch
index 3fda4c8065..3fda4c8065 100644
--- a/patches/server/0785-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0784-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0786-Configurable-chat-thread-limit.patch b/patches/server/0785-Configurable-chat-thread-limit.patch
index 9296a47439..4ce6896216 100644
--- a/patches/server/0786-Configurable-chat-thread-limit.patch
+++ b/patches/server/0785-Configurable-chat-thread-limit.patch
@@ -22,10 +22,10 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 57e6e857c84234bf0c137058ae35e6fb0e9b124f..ffd52f6871161cd1f2d23040ed4493434a29b834 100644
+index 7a53374319d5495253f277199114eaf43097456d..7145c3776c85416240408b8e23a1d949da39bad9 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -283,7 +283,18 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -285,7 +285,18 @@ public class GlobalConfiguration extends ConfigurationPart {
  
              @PostProcess
              private void postProcess() {
diff --git a/patches/server/0787-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index ffb644e841..ffb644e841 100644
--- a/patches/server/0787-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0788-fix-Jigsaw-block-kicking-user.patch b/patches/server/0787-fix-Jigsaw-block-kicking-user.patch
index 3c04241bd6..3c04241bd6 100644
--- a/patches/server/0788-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0787-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0789-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 3344be8e00..2da3483da9 100644
--- a/patches/server/0789-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] use BlockFormEvent for mud converting into clay
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index 998e43e8dc6bd6b741bdcb77d2b75df8ab2feefc..06a9dd14c7f7954bf9327427de76965be8fe30f4 100644
+index d0e679745a794228bf62a9aa59422776760f3867..5835872df922b859a31b44e3723c67097f21a641 100644
 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 @@ -214,10 +214,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
diff --git a/patches/server/0790-Add-getDrops-to-BlockState.patch b/patches/server/0789-Add-getDrops-to-BlockState.patch
index 93f48ad578..93f48ad578 100644
--- a/patches/server/0790-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0789-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0791-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch
index abd857f514..abd857f514 100644
--- a/patches/server/0791-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0792-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 66236863d1..ea3e8cfcd2 100644
--- a/patches/server/0792-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 62feb9e2f8e0072bb180c65b4946281494a7dc1d..e7ed2d1160d412790b23550f9ae967179b7a61f4 100644
+index b804941c76582871813ba813b9eef2422e7e71f0..b5eda9931a82a667c25ca1a49980b01b042dc0cc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2263,7 +2263,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0793-Fix-custom-piglin-loved-items.patch b/patches/server/0792-Fix-custom-piglin-loved-items.patch
index 6a9dc8a7d4..6a9dc8a7d4 100644
--- a/patches/server/0793-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0792-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0794-EntityPickupItemEvent-fixes.patch b/patches/server/0793-EntityPickupItemEvent-fixes.patch
index b378f986f4..b378f986f4 100644
--- a/patches/server/0794-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0793-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0795-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch
index acbf650a19..acbf650a19 100644
--- a/patches/server/0795-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0796-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch
index 7c9e04e6e8..7c9e04e6e8 100644
--- a/patches/server/0796-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0797-Elder-Guardian-appearance-API.patch b/patches/server/0796-Elder-Guardian-appearance-API.patch
index 302f3da2c2..ee040588dd 100644
--- a/patches/server/0797-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0796-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d866ad7fd91c64fd0fe6680a417678e3ef5ca41d..6ea05945e26e517563ed359a5216739dd49c7631 100644
+index e278933f1b8fec3165ef088e2a15872cf34f1258..fb68934b8210bae3de5260d72d1a299c1f941044 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3215,6 +3215,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0798-Allow-changing-bed-s-occupied-property.patch b/patches/server/0797-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0798-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0797-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0799-Add-entity-knockback-API.patch b/patches/server/0798-Add-entity-knockback-API.patch
index 484391c1da..7086303073 100644
--- a/patches/server/0799-Add-entity-knockback-API.patch
+++ b/patches/server/0798-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1aa4f09d93f36f523923281a6fb17dc184dbed86..908b72e1d85dc3d6992e1aa3018ac4d4c88f6fcf 100644
+index e559af05c58b7d9c940cea9f48c0f4bd0aad756c..cb585a82e52697d84f3da25a150b663c8c286f58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1073,5 +1073,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0800-Detect-headless-JREs.patch b/patches/server/0799-Detect-headless-JREs.patch
index 98f0b6a330..98f0b6a330 100644
--- a/patches/server/0800-Detect-headless-JREs.patch
+++ b/patches/server/0799-Detect-headless-JREs.patch
diff --git a/patches/server/0801-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch
index 9fe5a7cf02..9fe5a7cf02 100644
--- a/patches/server/0801-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0802-Add-EntityToggleSitEvent.patch b/patches/server/0801-Add-EntityToggleSitEvent.patch
index 3db46de79b..3db46de79b 100644
--- a/patches/server/0802-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0801-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0803-Add-fire-tick-delay-option.patch b/patches/server/0802-Add-fire-tick-delay-option.patch
index b38e866fe5..b38e866fe5 100644
--- a/patches/server/0803-Add-fire-tick-delay-option.patch
+++ b/patches/server/0802-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0804-Add-Moving-Piston-API.patch b/patches/server/0803-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0804-Add-Moving-Piston-API.patch
+++ b/patches/server/0803-Add-Moving-Piston-API.patch
diff --git a/patches/server/0805-Ignore-impossible-spawn-tick.patch b/patches/server/0804-Ignore-impossible-spawn-tick.patch
index 116d0fd7f6..116d0fd7f6 100644
--- a/patches/server/0805-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0804-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0806-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch
index b78dda85fc..b78dda85fc 100644
--- a/patches/server/0806-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0807-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index 8a2c14c67d..8a2c14c67d 100644
--- a/patches/server/0807-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0808-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index e6135036e5..efc81025ac 100644
--- a/patches/server/0808-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3a938cd07ec5cec40a244a9a717376c75c26f12b..bdefbb1040cf7bcdcdf2f5b625ef854e3805f567 100644
+index 45a7b217ab6ef3a7c4ad1c07824d7185d4847086..ea65396e55476dc4e91fe2c26a5c5bd658184d5e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3111,6 +3111,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0809-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0808-Add-PrePlayerAttackEntityEvent.patch
index 7541ba69cb..7541ba69cb 100644
--- a/patches/server/0809-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0808-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0810-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch
index 18d504b2fd..07dc251b4d 100644
--- a/patches/server/0810-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ensure reset EnderDragon boss event name
 Fix MC-257487
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 59f6c3109b34719a7ed487ada5a8ce33ec458e87..b9b773d7dba559afe00b085ded3f020ea6b97c12 100644
+index 50071bec6825ec2b34662de14128070510d16afb..8737501e14792de13adf95da24fa6177bfb77946 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -73,6 +73,7 @@ public class EndDragonFight {
diff --git a/patches/server/0811-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 6f61c88362..6f61c88362 100644
--- a/patches/server/0811-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0812-Add-Player-Warden-Warning-API.patch b/patches/server/0811-Add-Player-Warden-Warning-API.patch
index e6584699bb..e38acd3ff2 100644
--- a/patches/server/0812-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0811-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6ea05945e26e517563ed359a5216739dd49c7631..ca71160491f11bc805a6cb1ad432a6ba4c756931 100644
+index fb68934b8210bae3de5260d72d1a299c1f941044..fc47eb2de7e8d39b3a053e5458529267cc86408d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3220,6 +3220,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0813-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch
index d992c79d48..d992c79d48 100644
--- a/patches/server/0813-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0814-Add-paper-dumplisteners-command.patch b/patches/server/0813-Add-paper-dumplisteners-command.patch
index ba293d1dad..ba293d1dad 100644
--- a/patches/server/0814-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0813-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0815-check-global-player-list-where-appropriate.patch b/patches/server/0814-check-global-player-list-where-appropriate.patch
index 9905886fc6..9905886fc6 100644
--- a/patches/server/0815-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0814-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0816-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch
index 2486d05f04..63a99ea749 100644
--- a/patches/server/0816-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index ff94af5be8de374f5cde2607eebbb23e65705581..209596e89307b9e1d0ff4c465876d29f
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 13afea4ecfefc7e3de26dc42b5316fe2c7554b5c..9dd6012556979514f9879f867138bc836c58ef3f 100644
+index 5680e9772a2d90e997d2d0aacdda9eddb7edef56..7c7dbd030ada8d2fab494b6a125664ddc3955639 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -257,10 +257,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0817-ItemStack-damage-API.patch b/patches/server/0816-ItemStack-damage-API.patch
index 6f851f92db..933e8cf6e8 100644
--- a/patches/server/0817-ItemStack-damage-API.patch
+++ b/patches/server/0816-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 908b72e1d85dc3d6992e1aa3018ac4d4c88f6fcf..77b32e520f80289a44d75ed0cde0b8bc3b3cecc3 100644
+index cb585a82e52697d84f3da25a150b663c8c286f58..7ba726584ce4a58654b8a8b9604f0cca762b3f42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1074,6 +1074,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0818-Friction-API.patch b/patches/server/0817-Friction-API.patch
index cb41b035bb..cb41b035bb 100644
--- a/patches/server/0818-Friction-API.patch
+++ b/patches/server/0817-Friction-API.patch
diff --git a/patches/server/0819-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a5a831fc6e..a5a831fc6e 100644
--- a/patches/server/0819-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0820-Fix-player-kick-on-shutdown.patch b/patches/server/0819-Fix-player-kick-on-shutdown.patch
index 0c36dc9398..0c36dc9398 100644
--- a/patches/server/0820-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0819-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0821-Sync-offhand-slot-in-menus.patch b/patches/server/0820-Sync-offhand-slot-in-menus.patch
index 19c9999a04..19c9999a04 100644
--- a/patches/server/0821-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0820-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0822-Player-Entity-Tracking-Events.patch b/patches/server/0821-Player-Entity-Tracking-Events.patch
index 358c0c0114..37d60f62c0 100644
--- a/patches/server/0822-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0821-Player-Entity-Tracking-Events.patch
@@ -21,7 +21,7 @@ index 43c8f6a0615f392cc560b2259b116cc9d5fba4e7..ca24463405f138deb882f319bf84696f
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bdefbb1040cf7bcdcdf2f5b625ef854e3805f567..a410ff9fbfc92d16a3720b8db9f3df554c66a9f0 100644
+index ea65396e55476dc4e91fe2c26a5c5bd658184d5e..e7b260c85ce8054f612089be5d39c5df35ab2d88 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3837,7 +3837,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0823-Limit-pet-look-distance.patch b/patches/server/0822-Limit-pet-look-distance.patch
index 915187e43e..915187e43e 100644
--- a/patches/server/0823-Limit-pet-look-distance.patch
+++ b/patches/server/0822-Limit-pet-look-distance.patch
diff --git a/patches/server/0824-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch
index 56f1ab09f3..56f1ab09f3 100644
--- a/patches/server/0824-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0825-fix-Instruments.patch b/patches/server/0824-fix-Instruments.patch
index 0795f113cc..fa96e40eb2 100644
--- a/patches/server/0825-fix-Instruments.patch
+++ b/patches/server/0824-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca71160491f11bc805a6cb1ad432a6ba4c756931..fee318e42bac5f06825352c16f9f03168d8ce271 100644
+index fc47eb2de7e8d39b3a053e5458529267cc86408d..1a0023472b9ba5bbc0ee1d16824219d94944bdf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -688,7 +688,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0826-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 0394a26686..0394a26686 100644
--- a/patches/server/0826-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0827-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index afdba86d79..afdba86d79 100644
--- a/patches/server/0827-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0828-Add-BlockLockCheckEvent.patch b/patches/server/0827-Add-BlockLockCheckEvent.patch
index 3ac83356d3..3ac83356d3 100644
--- a/patches/server/0828-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0827-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0829-Add-Sneaking-API-for-Entities.patch b/patches/server/0828-Add-Sneaking-API-for-Entities.patch
index 675c2e6539..675c2e6539 100644
--- a/patches/server/0829-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0828-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0830-Improve-logging-and-errors.patch b/patches/server/0829-Improve-logging-and-errors.patch
index fe00d91a4b..fe00d91a4b 100644
--- a/patches/server/0830-Improve-logging-and-errors.patch
+++ b/patches/server/0829-Improve-logging-and-errors.patch
diff --git a/patches/server/0831-Improve-PortalEvents.patch b/patches/server/0830-Improve-PortalEvents.patch
index c6f1e8fa27..c8e1fcfb1f 100644
--- a/patches/server/0831-Improve-PortalEvents.patch
+++ b/patches/server/0830-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a410ff9fbfc92d16a3720b8db9f3df554c66a9f0..82ddbe8e71bc2d1ee2be0e576d595fd462f9baab 100644
+index e7b260c85ce8054f612089be5d39c5df35ab2d88..c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3495,7 +3495,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0832-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch
index c4325b822a..c4325b822a 100644
--- a/patches/server/0832-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0833-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch
index c7b08d7fbe..a6135e7f58 100644
--- a/patches/server/0833-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a72af814b81ba3ca82476da47d68ae344bb2b63c..6b215d271a884bf60bbda5abc46657ddafdca1dc 100644
+index 45a68beff0c97ead5e9f1201b5fb9ef80c08b92b..994787f52ce9eb0b77889ed9bc8021183fa0cb7c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2060,7 +2060,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0834-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0834-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0835-Flying-Fall-Damage.patch b/patches/server/0834-Flying-Fall-Damage.patch
index be35e97f74..be35e97f74 100644
--- a/patches/server/0835-Flying-Fall-Damage.patch
+++ b/patches/server/0834-Flying-Fall-Damage.patch
diff --git a/patches/server/0836-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 87f093c66c..87f093c66c 100644
--- a/patches/server/0836-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index e880f7368d..02a7125dd4 100644
--- a/patches/server/0837-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5c37fb16d57bdffc4973b42a15f79b480ba65e5f..c394c60f4e6b216be332c3585fbfbc4f32f9db30 100644
+index c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8..d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -957,6 +957,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0838-config-for-disabling-entity-tag-tags.patch b/patches/server/0837-config-for-disabling-entity-tag-tags.patch
index 822a325fe5..822a325fe5 100644
--- a/patches/server/0838-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0837-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0839-Use-single-player-info-update-packet-on-join.patch b/patches/server/0838-Use-single-player-info-update-packet-on-join.patch
index ff64d83371..ff64d83371 100644
--- a/patches/server/0839-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0838-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0840-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 6aeabf242c..6aeabf242c 100644
--- a/patches/server/0840-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0841-Win-Screen-API.patch b/patches/server/0840-Win-Screen-API.patch
index 0cc81b1cb8..25f9952de7 100644
--- a/patches/server/0841-Win-Screen-API.patch
+++ b/patches/server/0840-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4f62bd701e2645ef37bcfda851723c6b51f5f3d5..04e5be79348733f5a6a8b1968b6887379fa65027 100644
+index 69917a56fc05f8c16a1302fe331993e8d49889b9..4996776287c58039507ad2eda9d59e3fd13c08a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1214,6 +1214,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0842-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch
index 8d4f6df398..8d4f6df398 100644
--- a/patches/server/0842-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0843-Fix-force-opening-enchantment-tables.patch b/patches/server/0842-Fix-force-opening-enchantment-tables.patch
index 70439d1f0f..70439d1f0f 100644
--- a/patches/server/0843-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0842-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0844-Add-Entity-Body-Yaw-API.patch b/patches/server/0843-Add-Entity-Body-Yaw-API.patch
index 1131f49d45..1131f49d45 100644
--- a/patches/server/0844-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0843-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0845-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0845-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0846-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch
index d580c7b237..acec71e5bc 100644
--- a/patches/server/0846-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 76deb93a1a1d3f93498176f32ef291e1299c588d..cb4be07de48cbb18d6b7cd79f57aae40cfcc8a56 100644
+index 2cbb3fcae6a8e26ee4bc2a9c88e64984da15ce86..5fcdb88dd2aa8c8c57d57935d15ea92c1015670e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -451,6 +451,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0847-Add-EntityFertilizeEggEvent.patch b/patches/server/0846-Add-EntityFertilizeEggEvent.patch
index f1e109f30c..f1e109f30c 100644
--- a/patches/server/0847-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0846-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0848-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 39cf518fa6..39cf518fa6 100644
--- a/patches/server/0848-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0849-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index a1fa4eea77..a1fa4eea77 100644
--- a/patches/server/0849-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0850-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0850-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0851-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch
index 60dd2d1db4..60dd2d1db4 100644
--- a/patches/server/0851-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0852-Fix-text-display-error-on-spawn.patch b/patches/server/0851-Fix-text-display-error-on-spawn.patch
index 7074ea7170..7074ea7170 100644
--- a/patches/server/0852-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0851-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0853-Fix-inventories-returning-null-Locations.patch b/patches/server/0852-Fix-inventories-returning-null-Locations.patch
index 763bde3953..763bde3953 100644
--- a/patches/server/0853-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0852-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0854-Add-Shearable-API.patch b/patches/server/0853-Add-Shearable-API.patch
index 8ab6feec02..f97657b8e1 100644
--- a/patches/server/0854-Add-Shearable-API.patch
+++ b/patches/server/0853-Add-Shearable-API.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..bcf254e3c81cf1e401bddc850fb24ad2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-index a41a85ad89a177759c97d661a89b8b5dc419db1b..1d78ae1db211a452a42fb4a7bef4cca4b7c71a1f 100644
+index cc69f471c623c65251ccf7015499d8dbdb70ffad..b453a47cadbda2e22262bcdc5454c4c6cf5b2583 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 @@ -14,7 +14,7 @@ import org.bukkit.entity.MushroomCow;
diff --git a/patches/server/0855-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 682696f502..682696f502 100644
--- a/patches/server/0855-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0856-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 576441539c..576441539c 100644
--- a/patches/server/0856-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0857-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0856-Treat-sequence-violations-like-they-should-be.patch
index 360f303ea0..d67cd31a14 100644
--- a/patches/server/0857-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0856-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 006c1fa70bd38a3db9844a77f3f5d22b0d083ddf..2e12d2f22485644bc2fc3d5235cfd3bc755f6c72 100644
+index a1196f79968c950fd9d92123bb4018f8d29c3a82..c9dab47fe3db73b31b40e071d37f1be63401c19d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0858-remove-duplicate-animate-packet-for-records.patch b/patches/server/0857-remove-duplicate-animate-packet-for-records.patch
index 9254f5b8cf..9254f5b8cf 100644
--- a/patches/server/0858-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0857-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0859-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 3649dc015b..3649dc015b 100644
--- a/patches/server/0859-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0860-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 88a92e8a06..b0714f833f 100644
--- a/patches/server/0860-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 711712f144d7b0e26d1248f53bf7ac3963c5df4a..09b0113df3b7c78b5cc62a1c32e71dc400385795 100644
+index 5f1a4a35d2179b7ff5a95390f82d65cacf4fd457..a6af6585aca50033f45138a4408218b056b8b785 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1368,6 +1368,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0861-Use-array-for-gamerule-storage.patch b/patches/server/0860-Use-array-for-gamerule-storage.patch
index 1a7c2006a5..1a7c2006a5 100644
--- a/patches/server/0861-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0860-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0862-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch
index 6740daf4d1..6740daf4d1 100644
--- a/patches/server/0862-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0863-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch
index 65ea83a2c1..65ea83a2c1 100644
--- a/patches/server/0863-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0864-Add-Mob-Experience-reward-API.patch b/patches/server/0863-Add-Mob-Experience-reward-API.patch
index 874d481524..874d481524 100644
--- a/patches/server/0864-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0863-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0865-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch
index fd04a38431..fd04a38431 100644
--- a/patches/server/0865-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0866-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 346c3fd86c..346c3fd86c 100644
--- a/patches/server/0866-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0867-More-accurate-isInOpenWater-impl.patch b/patches/server/0866-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0867-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0866-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0868-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 01fcd2b852..01fcd2b852 100644
--- a/patches/server/0868-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0869-Expand-PlayerItemMendEvent.patch b/patches/server/0868-Expand-PlayerItemMendEvent.patch
index 013c1be8fd..013c1be8fd 100644
--- a/patches/server/0869-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0868-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0870-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch
index d9ecc6ae32..1e23e270a4 100644
--- a/patches/server/0870-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c394c60f4e6b216be332c3585fbfbc4f32f9db30..5b612466db7c063bf0efbdaa3fcc575eb202ab21 100644
+index d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704..c173ecd1283331afcf4db010e65764e5ed6e1eff 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0871-Add-transient-modifier-API.patch b/patches/server/0870-Add-transient-modifier-API.patch
index 8144e5dc44..8144e5dc44 100644
--- a/patches/server/0871-Add-transient-modifier-API.patch
+++ b/patches/server/0870-Add-transient-modifier-API.patch
diff --git a/patches/server/0872-Fix-block-place-logic.patch b/patches/server/0871-Fix-block-place-logic.patch
index d94615de79..10b444c4dc 100644
--- a/patches/server/0872-Fix-block-place-logic.patch
+++ b/patches/server/0871-Fix-block-place-logic.patch
@@ -41,7 +41,7 @@ index 59c4550b4cb8b0317f5256efc9376265f4583b60..964d6af9eb9752b9e08f712c80b67bd9
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cb4be07de48cbb18d6b7cd79f57aae40cfcc8a56..b942e9f163fa342c58b74d1cd6ffe6bdbe4f691a 100644
+index 5fcdb88dd2aa8c8c57d57935d15ea92c1015670e..4fe0f8ba4a2b089f44808063e72dd994d6c73e0a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -560,17 +560,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0873-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 288b2c3711..288b2c3711 100644
--- a/patches/server/0873-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0874-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch
index 9054b42b6b..9054b42b6b 100644
--- a/patches/server/0874-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0875-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 954f7480a5..954f7480a5 100644
--- a/patches/server/0875-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0876-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0876-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0877-Fix-sniffer-removeExploredLocation.patch b/patches/server/0876-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0877-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0876-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0878-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch
index 73565fe49a..20554be569 100644
--- a/patches/server/0878-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4abfe34ee595fef3e1253090410c6309d3459a84..f1e4dfd203d455ec089cd2b5679c4083400dbc7f 100644
+index 3302d8e9b7c2c48b20dd257f4699b263d3bc52dc..3f952d1409118535f325f614f1a6507c40efa4d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -540,6 +540,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0879-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0879-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0880-Add-event-for-player-editing-sign.patch b/patches/server/0879-Add-event-for-player-editing-sign.patch
index 321cccc3d6..321cccc3d6 100644
--- a/patches/server/0880-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0879-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0881-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch
index decd7a346e..decd7a346e 100644
--- a/patches/server/0881-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0882-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch
index 8bc99edf2c..8bc99edf2c 100644
--- a/patches/server/0882-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0883-Add-option-to-disable-block-updates.patch b/patches/server/0882-Add-option-to-disable-block-updates.patch
index 5550b0c010..5550b0c010 100644
--- a/patches/server/0883-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0882-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0884-Call-missing-BlockDispenseEvent.patch b/patches/server/0883-Call-missing-BlockDispenseEvent.patch
index dc2929f750..dc2929f750 100644
--- a/patches/server/0884-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0883-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch
index f1dd778224..2fc45560a6 100644
--- a/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5b612466db7c063bf0efbdaa3fcc575eb202ab21..957165e1fce7ddd4c7b7e53a4db8f65739c0ff7f 100644
+index c173ecd1283331afcf4db010e65764e5ed6e1eff..626f2180b87daa1c00e97dc24b1a78aec4d9f033 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1200,7 +1200,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0886-Optimize-player-lookups-for-beacons.patch b/patches/server/0885-Optimize-player-lookups-for-beacons.patch
index 3b3d11c547..3b3d11c547 100644
--- a/patches/server/0886-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0885-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0887-Add-Sign-getInteractableSideFor.patch b/patches/server/0886-Add-Sign-getInteractableSideFor.patch
index c5009d0b42..c5009d0b42 100644
--- a/patches/server/0887-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0886-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0888-Array-backed-synched-entity-data.patch b/patches/server/0887-Array-backed-synched-entity-data.patch
index 2345458940..2345458940 100644
--- a/patches/server/0888-Array-backed-synched-entity-data.patch
+++ b/patches/server/0887-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0889-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0888-fix-item-meta-for-tadpole-buckets.patch
index 7dc82282e5..7dc82282e5 100644
--- a/patches/server/0889-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0888-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0890-Fix-BanList-API.patch b/patches/server/0889-Fix-BanList-API.patch
index 8d1fcf4c1a..ec8005e221 100644
--- a/patches/server/0890-Fix-BanList-API.patch
+++ b/patches/server/0889-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c7e0aa94a8c1f821f723f323b69bacfd2d2d8aa3..0f32750ec4bc85033c6da8a21f4ad3150112ece6 100644
+index e111017c3de7b374c702fed20a5e98557011ea06..748f49fd3fd4a3c1ed287d1eeed23ce5efecb8d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1655,23 +1655,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0891-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch
index bea2e1c86f..bea2e1c86f 100644
--- a/patches/server/0891-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0892-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0891-Fix-possible-NPE-on-painting-creation.patch
index a503b8ac40..a503b8ac40 100644
--- a/patches/server/0892-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0891-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0893-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 54c442e544..54c442e544 100644
--- a/patches/server/0893-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0894-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch
index cc8338c2f5..cc8338c2f5 100644
--- a/patches/server/0894-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0895-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 96b4aa8c41..96b4aa8c41 100644
--- a/patches/server/0895-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0896-Add-whitelist-events.patch b/patches/server/0895-Add-whitelist-events.patch
index 44cddb390d..44cddb390d 100644
--- a/patches/server/0896-Add-whitelist-events.patch
+++ b/patches/server/0895-Add-whitelist-events.patch
diff --git a/patches/server/0897-Implement-PlayerFailMoveEvent.patch b/patches/server/0896-Implement-PlayerFailMoveEvent.patch
index 67cf55983c..67cf55983c 100644
--- a/patches/server/0897-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0896-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0898-Folia-scheduler-and-owned-region-API.patch b/patches/server/0897-Folia-scheduler-and-owned-region-API.patch
index 77a7babe2c..ec5f0abb4d 100644
--- a/patches/server/0898-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0897-Folia-scheduler-and-owned-region-API.patch
@@ -1185,7 +1185,7 @@ index 0747b0042446271385371f1ca9c8fefdebd851b8..fade1e36037075aae968eb90bbfeac76
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a5c806431bca48f51aeedf52679dda27618af41b..35eb78717396de92db846d335fe8abce7ba3a117 100644
+index 626f2180b87daa1c00e97dc24b1a78aec4d9f033..abbd6a866b666978ce29211e4027f2b08b0c2e3d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -247,11 +247,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0899-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0899-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0900-API-for-updating-recipes-on-clients.patch b/patches/server/0899-API-for-updating-recipes-on-clients.patch
index 7fbba42341..7fbba42341 100644
--- a/patches/server/0900-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0899-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0901-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0900-Fix-rotation-when-spawning-display-entities.patch
index afe854d47e..afe854d47e 100644
--- a/patches/server/0901-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0900-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0902-Only-capture-actual-tree-growth.patch b/patches/server/0901-Only-capture-actual-tree-growth.patch
index 9255870831..96167911d0 100644
--- a/patches/server/0902-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0901-Only-capture-actual-tree-growth.patch
@@ -29,7 +29,7 @@ index 5a86b2c205250ddcd833a15accb27ca4a580eadd..9b4e20d4bfba2de08084f1d69cb2ebff
                      entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
                  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b942e9f163fa342c58b74d1cd6ffe6bdbe4f691a..cd19005d3f239a27a4ce764588c8df0b229035bf 100644
+index 4fe0f8ba4a2b089f44808063e72dd994d6c73e0a..6d98b910b1079f1b4a95c430e5500d55fbc68ec2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1372,4 +1372,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0903-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch
index ef72acd36e..ef72acd36e 100644
--- a/patches/server/0903-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0904-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch
index 0b50ce9b7b..0b50ce9b7b 100644
--- a/patches/server/0904-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0905-Use-correct-seed-on-api-world-load.patch b/patches/server/0904-Use-correct-seed-on-api-world-load.patch
index a39775a339..a39775a339 100644
--- a/patches/server/0905-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0904-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0906-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 6701e32f16..6701e32f16 100644
--- a/patches/server/0906-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0907-Cache-map-ids-on-item-frames.patch b/patches/server/0906-Cache-map-ids-on-item-frames.patch
index a65e4d7021..a65e4d7021 100644
--- a/patches/server/0907-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0906-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0908-Fix-custom-statistic-criteria-creation.patch b/patches/server/0907-Fix-custom-statistic-criteria-creation.patch
index a8aba99c9f..a8aba99c9f 100644
--- a/patches/server/0908-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0907-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0909-Bandaid-fix-for-Effect.patch b/patches/server/0908-Bandaid-fix-for-Effect.patch
index f8dd13a38f..92c731798f 100644
--- a/patches/server/0909-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0908-Bandaid-fix-for-Effect.patch
@@ -73,7 +73,7 @@ index 54cdb4b6a97250c1e15e2fce355e3699c9189948..457d5cdb510a11a069ac7f54a8ed95a7
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0f32750ec4bc85033c6da8a21f4ad3150112ece6..59dd4f06d33a0bb8e747857ee81f6465b7ed78b1 100644
+index 748f49fd3fd4a3c1ed287d1eeed23ce5efecb8d4..15817a84ad5db54ec299f933387f4ad1e0e74b33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -837,7 +837,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0910-SculkCatalyst-bloom-API.patch b/patches/server/0909-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0910-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0909-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0911-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch
index 1df4442214..1df4442214 100644
--- a/patches/server/0911-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0912-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch
index ff4c42a8ca..ff4c42a8ca 100644
--- a/patches/server/0912-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0913-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 73b317b26d..e3fb817061 100644
--- a/patches/server/0913-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3141681dc21f7a61fcc77bbf65975072b07c8970..5092aed16ad9ed049624030a6c26a8013e92ae56 100644
+index 93f5ec2c48bf4bdd4afc1e07ffcf1a34387ce6ac..81bc1e1cf5cd77f09560dbd0c277f77670d6cc56 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -792,6 +792,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0914-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch
index 025a223021..025a223021 100644
--- a/patches/server/0914-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0915-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch
index 46c12c1b61..46c12c1b61 100644
--- a/patches/server/0915-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0916-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 2856a1f09c..81dacf5aab 100644
--- a/patches/server/0916-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 601693243c11b06fe0bae0040bf79d95696cdb21..4793871db838aba8b0370ada299406d3fb904c14 100644
+index ca24463405f138deb882f319bf84696f52a1f606..aed4f4ac21b8ddc9c9ee7ce5151bbfc8bb6cf7f5 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1741,6 +1741,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0917-Add-Listing-API-for-Player.patch b/patches/server/0916-Add-Listing-API-for-Player.patch
index fa29159689..fa29159689 100644
--- a/patches/server/0917-Add-Listing-API-for-Player.patch
+++ b/patches/server/0916-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0918-Configurable-Region-Compression-Format.patch b/patches/server/0917-Configurable-Region-Compression-Format.patch
index 25a1d4bb16..25a1d4bb16 100644
--- a/patches/server/0918-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0917-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0919-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch
index 66bd2d2f29..66bd2d2f29 100644
--- a/patches/server/0919-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0920-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0919-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0920-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0919-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0921-Expand-Pose-API.patch b/patches/server/0920-Expand-Pose-API.patch
index 6667e21c82..660dffd43c 100644
--- a/patches/server/0921-Expand-Pose-API.patch
+++ b/patches/server/0920-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 14855cd35ce7607e74192a55722bd10660f1126b..361bdbb940a0da6821bcaf6037ddfe6bf61b36ac 100644
+index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8871739a1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -419,6 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0922-More-DragonBattle-API.patch b/patches/server/0921-More-DragonBattle-API.patch
index 991159cfb6..1ff4688b56 100644
--- a/patches/server/0922-More-DragonBattle-API.patch
+++ b/patches/server/0921-More-DragonBattle-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals
 public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index b9b773d7dba559afe00b085ded3f020ea6b97c12..adbe8ca78716114a3bc03136f02c631f30aff977 100644
+index 8737501e14792de13adf95da24fa6177bfb77946..b9c85289776971f90eb5749262a9014befe465f7 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -439,6 +439,24 @@ public class EndDragonFight {
diff --git a/patches/server/0923-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0922-Deep-clone-unhandled-nbt-tags.patch
index 5ecebf9875..0f522edd88 100644
--- a/patches/server/0923-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/0922-Deep-clone-unhandled-nbt-tags.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deep clone unhandled nbt tags
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 6c797f35a10e8491718f38eb08f31b1e6182a8d1..c425b21ddc12917ab9aa10869ff3aec622ce2d9a 100644
+index 7d3d32679bdfe373d89a28c3616da5069640d1bb..9137d6d56386111dfd072859df84e533580ee294 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -305,7 +305,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0924-Add-PlayerPickItemEvent.patch b/patches/server/0923-Add-PlayerPickItemEvent.patch
index 79578e9ee6..5ddf5f6a12 100644
--- a/patches/server/0924-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0923-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5092aed16ad9ed049624030a6c26a8013e92ae56..9d24b63c9a8a22cafac570421333f6edfd4fd5c6 100644
+index 81bc1e1cf5cd77f09560dbd0c277f77670d6cc56..270a76e932b76105a8a986b71ac8da8096368c73 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -907,8 +907,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0925-Allow-trident-custom-damage.patch b/patches/server/0924-Allow-trident-custom-damage.patch
index fb6397821e..fb6397821e 100644
--- a/patches/server/0925-Allow-trident-custom-damage.patch
+++ b/patches/server/0924-Allow-trident-custom-damage.patch
diff --git a/patches/server/0926-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch
index ab17992d38..ab17992d38 100644
--- a/patches/server/0926-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0927-Optimize-nearest-structure-border-iteration.patch b/patches/server/0926-Optimize-nearest-structure-border-iteration.patch
index e073d7a1df..e073d7a1df 100644
--- a/patches/server/0927-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0926-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0928-Implement-OfflinePlayer-isConnected.patch b/patches/server/0927-Implement-OfflinePlayer-isConnected.patch
index eecbaca15f..50c30ac481 100644
--- a/patches/server/0928-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0927-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 96408d505ce80799868ff84554a3b0b25adabb22..4a875bce9563f3b9351ebecde9b0eb12
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a8bdeb0c5045344983efe083aa3214be00c07cf1..1e36d9ef87507d1a771c605ec51c0f66d2cec089 100644
+index 458c7039bddf63a0affbf14c24ba73d66cc13fac..5b5167947c82ca66a89aab456a2eb5b523887d33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -243,6 +243,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0929-Fix-inventory-desync.patch b/patches/server/0928-Fix-inventory-desync.patch
index 4345fa9aa5..4345fa9aa5 100644
--- a/patches/server/0929-Fix-inventory-desync.patch
+++ b/patches/server/0928-Fix-inventory-desync.patch
diff --git a/patches/server/0930-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch
index 06ad83c295..06ad83c295 100644
--- a/patches/server/0930-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0931-Configure-sniffer-egg-hatch-time.patch b/patches/server/0930-Configure-sniffer-egg-hatch-time.patch
index b42c26e59c..b42c26e59c 100644
--- a/patches/server/0931-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0930-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0932-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch
index f71552dee5..43740a74f0 100644
--- a/patches/server/0932-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch
@@ -34,7 +34,7 @@ index ca1edc083847b47bb450b291723aca778a5912dc..e1696f6b77df4c8fceaece64701d4db7
                      }
  
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index adbe8ca78716114a3bc03136f02c631f30aff977..7e9c502a7bcda445333adc250a3106f33d38c128 100644
+index b9c85289776971f90eb5749262a9014befe465f7..d4f903c402765c6e8e1db99e148613748f530726 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -558,6 +558,12 @@ public class EndDragonFight {
diff --git a/patches/server/0933-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch
index e0235836a4..e0235836a4 100644
--- a/patches/server/0933-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0934-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch
index 269657c258..269657c258 100644
--- a/patches/server/0934-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0935-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch
index c5d3495f31..c5d3495f31 100644
--- a/patches/server/0935-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0936-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch
index eefdaefa4b..eefdaefa4b 100644
--- a/patches/server/0936-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0937-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0936-Fix-silent-equipment-change-for-mobs.patch
index f9d34b89ae..f9d34b89ae 100644
--- a/patches/server/0937-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0936-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0938-Fix-spigot-s-Forced-Stats.patch b/patches/server/0937-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0938-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0937-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0939-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch
index e6954fc31c..e6954fc31c 100644
--- a/patches/server/0939-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0940-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index a5090d6c00..a5090d6c00 100644
--- a/patches/server/0940-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0941-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0941-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0942-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index 8cd300599d..8cd300599d 100644
--- a/patches/server/0942-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/0943-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e2c7a15a63..e2c7a15a63 100644
--- a/patches/server/0943-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0944-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0944-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0945-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0945-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0946-Fix-missing-map-initialize-event-call.patch b/patches/server/0945-Fix-missing-map-initialize-event-call.patch
index 261c9631e8..20b3a50d58 100644
--- a/patches/server/0946-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0945-Fix-missing-map-initialize-event-call.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 09b0113df3b7c78b5cc62a1c32e71dc400385795..0e7811ae2a8731ae7475aabd2322e56ab364bc32 100644
+index a6af6585aca50033f45138a4408218b056b8b785..8235dace0f4a1090dfbd403db34231ccafe5f30e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1657,13 +1657,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0947-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0947-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0948-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch
index ab46cdf78a..ab46cdf78a 100644
--- a/patches/server/0948-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/0949-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index 3af04ed113..3af04ed113 100644
--- a/patches/server/0949-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/0950-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0949-Fix-UnsafeValues-loadAdvancement.patch
index 0de7a22d6d..0de7a22d6d 100644
--- a/patches/server/0950-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0949-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0951-Add-player-idle-duration-API.patch b/patches/server/0950-Add-player-idle-duration-API.patch
index 992aafd757..717b1d7291 100644
--- a/patches/server/0951-Add-player-idle-duration-API.patch
+++ b/patches/server/0950-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e36d9ef87507d1a771c605ec51c0f66d2cec089..6130e66bcacec92c067c423470f41865a64452d7 100644
+index 5b5167947c82ca66a89aab456a2eb5b523887d33..ff3db4efd2c10b3351453656937e88064267fb22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3337,6 +3337,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0952-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0951-Don-t-check-if-we-can-see-non-visible-entities.patch
index a360d2d0e0..1c1aa40a97 100644
--- a/patches/server/0952-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0951-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check if we can see non-visible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4793871db838aba8b0370ada299406d3fb904c14..886ddaf896c8385a744e9abe4dcd399bc693f60b 100644
+index aed4f4ac21b8ddc9c9ee7ce5151bbfc8bb6cf7f5..22558aa7f83191519ca21357925309119d0718c7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1752,7 +1752,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0953-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0952-Fix-NPE-in-SculkBloomEvent-world-access.patch
index b66e61a522..b66e61a522 100644
--- a/patches/server/0953-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0952-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0954-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index e01df45b17..72c810300c 100644
--- a/patches/server/0954-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6130e66bcacec92c067c423470f41865a64452d7..b88c71c4a1d4eb5c24d143a0d8ddff507df690f7 100644
+index ff3db4efd2c10b3351453656937e88064267fb22..0b34a90d275534a84bea7d7d9cce08b41ea7a698 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1047,7 +1047,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0955-Optimize-VarInts.patch b/patches/server/0954-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/0955-Optimize-VarInts.patch
+++ b/patches/server/0954-Optimize-VarInts.patch
diff --git a/patches/server/0956-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 9794102b95..9794102b95 100644
--- a/patches/server/0956-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0957-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0956-Add-predicate-for-blocks-when-raytracing.patch
index 2a30c191f6..2a30c191f6 100644
--- a/patches/server/0957-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0956-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0958-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0957-Broadcast-take-item-packets-with-collector-as-source.patch
index ad908f281c..ad908f281c 100644
--- a/patches/server/0958-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0957-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0959-Expand-LingeringPotion-API.patch b/patches/server/0958-Expand-LingeringPotion-API.patch
index abc4c72435..abc4c72435 100644
--- a/patches/server/0959-Expand-LingeringPotion-API.patch
+++ b/patches/server/0958-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0960-Add-MaterialTagsTest.patch b/patches/server/0959-Add-MaterialTagsTest.patch
index 34233ba1ca..34233ba1ca 100644
--- a/patches/server/0960-Add-MaterialTagsTest.patch
+++ b/patches/server/0959-Add-MaterialTagsTest.patch
diff --git a/patches/server/0961-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 69084fab3f..69084fab3f 100644
--- a/patches/server/0961-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0962-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0961-Add-hand-to-fish-event-for-all-player-interactions.patch
index 39764d836e..39764d836e 100644
--- a/patches/server/0962-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0961-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0963-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
index 2ef92033bd..2ef92033bd 100644
--- a/patches/server/0963-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0964-Add-UUID-attribute-modifier-API.patch b/patches/server/0963-Add-UUID-attribute-modifier-API.patch
index 37efcab4b6..37efcab4b6 100644
--- a/patches/server/0964-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0963-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0965-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
index 1d122c2f15..1d122c2f15 100644
--- a/patches/server/0965-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0966-Lazily-create-LootContext-for-criterions.patch b/patches/server/0965-Lazily-create-LootContext-for-criterions.patch
index 293dfbd694..293dfbd694 100644
--- a/patches/server/0966-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0965-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0967-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch
index 6aecc48aeb..0200563077 100644
--- a/patches/server/0967-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch
@@ -31,7 +31,7 @@ index 8235dace0f4a1090dfbd403db34231ccafe5f30e..9816913ad729fd39c173364b92e5db06
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 361bdbb940a0da6821bcaf6037ddfe6bf61b36ac..d85151689d3cd7db078b8e068b8be1934c99600e 100644
+index bbc3f09105b19eabd3ebb8b9589412b8871739a1..67dfb7b6a8825a87ff69b8c33efd1c040db12bf0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -637,7 +637,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0968-Add-Structure-check-API.patch b/patches/server/0967-Add-Structure-check-API.patch
index b291fdf604..b291fdf604 100644
--- a/patches/server/0968-Add-Structure-check-API.patch
+++ b/patches/server/0967-Add-Structure-check-API.patch
diff --git a/patches/server/0969-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index bd1de406e5..bbc3e41f85 100644
--- a/patches/server/0969-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index c425b21ddc12917ab9aa10869ff3aec622ce2d9a..536e80886c2393edaf526f460f49dae8c3b40295 100644
+index 9137d6d56386111dfd072859df84e533580ee294..5cd0fbac267f9c69c5de4c200a95860f5c56d42e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1174,7 +1174,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0970-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0969-Restore-vanilla-entity-drops-behavior.patch
index c6196c8cfe..c2f0a406f7 100644
--- a/patches/server/0970-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0969-Restore-vanilla-entity-drops-behavior.patch
@@ -50,7 +50,7 @@ index 7272dc058c575efee5ac2643ce41b7d12e346e89..ae5a2136a0e266d4c35190f5d3355299
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index abd50a7b5f85eb63d1f675626e2f68d28b82fdc1..46b4c07ec0907218382ee94849417ad5d1eb1066 100644
+index 67dfb7b6a8825a87ff69b8c33efd1c040db12bf0..198aeb71e958a3fa6f8eaa8f607120af483e597f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2496,6 +2496,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0971-Dont-resend-blocks-on-interactions.patch b/patches/server/0970-Dont-resend-blocks-on-interactions.patch
index 8a8a5bb4ed..8a8a5bb4ed 100644
--- a/patches/server/0971-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0970-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0972-add-more-scoreboard-API.patch b/patches/server/0971-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0972-add-more-scoreboard-API.patch
+++ b/patches/server/0971-add-more-scoreboard-API.patch
diff --git a/patches/server/0973-Improve-Registry.patch b/patches/server/0972-Improve-Registry.patch
index b3e7a17ff6..b3e7a17ff6 100644
--- a/patches/server/0973-Improve-Registry.patch
+++ b/patches/server/0972-Improve-Registry.patch
diff --git a/patches/server/0974-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 5ef39afe5c..5ef39afe5c 100644
--- a/patches/server/0974-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0975-Add-experience-points-API.patch b/patches/server/0974-Add-experience-points-API.patch
index 5256a6ae70..5256a6ae70 100644
--- a/patches/server/0975-Add-experience-points-API.patch
+++ b/patches/server/0974-Add-experience-points-API.patch
diff --git a/patches/server/0976-Add-drops-to-shear-events.patch b/patches/server/0975-Add-drops-to-shear-events.patch
index 57405a32c2..57405a32c2 100644
--- a/patches/server/0976-Add-drops-to-shear-events.patch
+++ b/patches/server/0975-Add-drops-to-shear-events.patch
diff --git a/patches/server/0977-Add-PlayerShieldDisableEvent.patch b/patches/server/0976-Add-PlayerShieldDisableEvent.patch
index a02011827d..a02011827d 100644
--- a/patches/server/0977-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0976-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0978-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0977-Validate-ResourceLocation-in-NBT-reading.patch
index 74748ab8d8..74748ab8d8 100644
--- a/patches/server/0978-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0977-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0979-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0978-Properly-handle-experience-dropping-on-block-break.patch
index ec81670c91..f7d4494ec0 100644
--- a/patches/server/0979-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0978-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,7 +7,7 @@ This causes spawnAfterBreak to spawn xp by default, removing the need to manuall
 For classes that use custom xp amounts, they can drop the resources with disabling
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cd19005d3f239a27a4ce764588c8df0b229035bf..d5290c97babfa9415bd52deb14610821f0fa2575 100644
+index 6d98b910b1079f1b4a95c430e5500d55fbc68ec2..c0ae70e3490b56aaa464460e3c41175b27136f6b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -625,7 +625,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0980-Fixup-NamespacedKey-handling.patch b/patches/server/0979-Fixup-NamespacedKey-handling.patch
index 14ddcf111d..14ddcf111d 100644
--- a/patches/server/0980-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0979-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0981-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0980-Expose-LootTable-of-DecoratedPot.patch
index 6d5e2738de..6d5e2738de 100644
--- a/patches/server/0981-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0980-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0982-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index d64cc30c77..d6756e53cf 100644
--- a/patches/server/0982-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,7 +18,7 @@ index 3c4ac79c094dc2fff7de94150a34b7bf814ac0de..38b56923a642afc1cb411480ba03cc78
      @VisibleForTesting
      static long encode(double value) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 886ddaf896c8385a744e9abe4dcd399bc693f60b..9dab2dd7fd77fa1006c903dc5d1f4f8339e10b91 100644
+index 22558aa7f83191519ca21357925309119d0718c7..d7c58ac9f9f4727cf13c0fd3bc370b10a2aba38f 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1735,10 +1735,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0983-Rewrite-dataconverter-system.patch b/patches/server/0982-Rewrite-dataconverter-system.patch
index 0d62473208..0d62473208 100644
--- a/patches/server/0983-Rewrite-dataconverter-system.patch
+++ b/patches/server/0982-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0984-Starlight.patch b/patches/server/0983-Starlight.patch
index 0604569c85..b4e6c66968 100644
--- a/patches/server/0984-Starlight.patch
+++ b/patches/server/0983-Starlight.patch
@@ -4492,7 +4492,7 @@ index facfdbb87e89f4db33ce13233c2ba4366d35c15b..807a6bb1026dac2c4cd0a50afe06fd62
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
      public int oldTicketLevel;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9dab2dd7fd77fa1006c903dc5d1f4f8339e10b91..3ae47b86b80f9156e71d1da83e492153f360d1b5 100644
+index d7c58ac9f9f4727cf13c0fd3bc370b10a2aba38f..ee16a8ef86705dc89b1cc300c06cf683431c7ef3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -125,7 +125,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0985-Rewrite-chunk-system.patch b/patches/server/0984-Rewrite-chunk-system.patch
index 946ea26ece..0d4fc72669 100644
--- a/patches/server/0985-Rewrite-chunk-system.patch
+++ b/patches/server/0984-Rewrite-chunk-system.patch
@@ -14439,7 +14439,7 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index ffd52f6871161cd1f2d23040ed4493434a29b834..a6f58b3457b7477015c5c6d969e7d83017dd3fa1 100644
+index 7145c3776c85416240408b8e23a1d949da39bad9..b53b6cc4463675096b061b3b65f14a4695c742e2 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -28,6 +28,45 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -14510,7 +14510,7 @@ index ffd52f6871161cd1f2d23040ed4493434a29b834..a6f58b3457b7477015c5c6d969e7d830
      public UnsupportedSettings unsupportedSettings;
  
      public class UnsupportedSettings extends ConfigurationPart {
-@@ -198,7 +222,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -200,7 +224,7 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          @PostProcess
          private void postProcess() {
@@ -19375,7 +19375,7 @@ index 640db9f71608310a64e09f1e3e677c01e6ccd98a..f2a7cb6ebed7a4b4019a09af2a025f62
                          if (flag1) {
                              ++this.converted;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 46b4c07ec0907218382ee94849417ad5d1eb1066..a3077daa43fe52b569c6bbddc7bee9ad1be08af7 100644
+index 198aeb71e958a3fa6f8eaa8f607120af483e597f..89db78c05118a64d1b73ac05381e24c825d3cf76 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -480,6 +480,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0986-incremental-chunk-and-player-saving.patch b/patches/server/0985-incremental-chunk-and-player-saving.patch
index c140932b29..c140932b29 100644
--- a/patches/server/0986-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0985-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index c41b836fad..622feb95fb 100644
--- a/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -29,7 +29,7 @@ index 369b54b96c682717ef93d05312714b4d30efaceb..beadef19ee136c27601f0d116a869673
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c9afe29bae7f339184f4f46d8f9828f5762d0a9c..5f98f3e1bc76076278cbe63d5fbb8ec75b3bf04b 100644
+index 0df6572c94854526899890fba7e9da681b729f47..207dd58cbceb5ac5c073526b40196f42fee77168 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -337,7 +337,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 811439226f..811439226f 100644
--- a/patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 9aded39822..9aded39822 100644
--- a/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 6ab7cbf215..6ab7cbf215 100644
--- a/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
index f6a81ca166..f6a81ca166 100644
--- a/patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch b/patches/server/0991-Fix-World-isChunkGenerated-calls.patch
index 1cec6fc43b..0b3eebad3f 100644
--- a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0991-Fix-World-isChunkGenerated-calls.patch
@@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5c1accb75655eadd4858ee24cdcdf9b200fbbcb2..42dde36273030494a6e7ff19e55d3b6a7da06fee 100644
+index 4549b32a3d848e4e84334e889dbc9c6b883fe621..07a9a11c7fa608e221c0f0e759c483b44de9fdd5 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -717,9 +717,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0993-Flat-bedrock-generator-settings.patch b/patches/server/0992-Flat-bedrock-generator-settings.patch
index 7e54f34f22..7e54f34f22 100644
--- a/patches/server/0993-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0992-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0994-Entity-Activation-Range-2.0.patch b/patches/server/0993-Entity-Activation-Range-2.0.patch
index 8dc0695bb6..c709e5d6cf 100644
--- a/patches/server/0994-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0993-Entity-Activation-Range-2.0.patch
@@ -111,7 +111,7 @@ index bd8c96e914b156284bdbb960f168e63e1f122920..abb4c32e8b35de332fa517523e8c598e
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1a91bffc016312e02408766cd9419610aca74b92..48c62366bd175665eb029f040ecfbab4eb7e45fd 100644
+index 89db78c05118a64d1b73ac05381e24c825d3cf76..dd785d11461541e8a93544142f7a3b4e43b2173d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -412,6 +412,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0995-Optional-per-player-mob-spawns.patch b/patches/server/0994-Optional-per-player-mob-spawns.patch
index 7347555f67..b80d633556 100644
--- a/patches/server/0995-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0994-Optional-per-player-mob-spawns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional per player mob spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 42dde36273030494a6e7ff19e55d3b6a7da06fee..0d552d4b967687e2bfb92b1e5106071460082409 100644
+index 07a9a11c7fa608e221c0f0e759c483b44de9fdd5..ccf0f7c7feaf47f451cec30ba02bea39ba192b3c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -288,9 +288,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0996-Anti-Xray.patch b/patches/server/0995-Anti-Xray.patch
index 65f22d8479..65f22d8479 100644
--- a/patches/server/0996-Anti-Xray.patch
+++ b/patches/server/0995-Anti-Xray.patch
diff --git a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 0997fb9da2..c9e2fc6398 100644
--- a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0d552d4b967687e2bfb92b1e5106071460082409..9037ba5197eed9d8e616fb65369f6b1a5ea9562c 100644
+index ccf0f7c7feaf47f451cec30ba02bea39ba192b3c..ac1a4ff5f83e53fa2983ff6e834775e51fba715e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -306,8 +306,25 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
index b4cb81ee27..106d5bd3fb 100644
--- a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 461c27292af06a5150de8ec263d0c8527e8c5278..37245ff682837e7e8c9647f4afe30f0d
              // CraftBukkit end
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 48c62366bd175665eb029f040ecfbab4eb7e45fd..87ed38858f3cea1da7a60e39da8b095b27d3a59c 100644
+index dd785d11461541e8a93544142f7a3b4e43b2173d..f8ce3c92597b9fb2b8743a08088f33a7bf237c5d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -242,6 +242,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 8e879a28af..8e879a28af 100644
--- a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1000-Entity-load-save-limit-per-chunk.patch b/patches/server/0999-Entity-load-save-limit-per-chunk.patch
index 69f16dddbf..69f16dddbf 100644
--- a/patches/server/1000-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0999-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1001-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1000-Fix-and-optimise-world-force-upgrading.patch
index e42149db91..aedbde4517 100644
--- a/patches/server/1001-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/1000-Fix-and-optimise-world-force-upgrading.patch
@@ -298,7 +298,7 @@ index 79de3c639795cfc0bd86f842446e2bb3ab71d23a..1dfafbe508b4e4598339f412e5fb9d92
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 927c7948e567764e8cf75c7ce486e1ea6c9a8d87..7694b7f299495a084ce71c5d04e5e690a75fe55b 100644
+index 29368a97c6348e2d1d6241db3d57e84b9537231a..23643b18e9352289ddad1eb1e04d1c3ada5570ad 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -181,6 +181,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1002-Improved-Watchdog-Support.patch b/patches/server/1001-Improved-Watchdog-Support.patch
index 3614cf6564..3614cf6564 100644
--- a/patches/server/1002-Improved-Watchdog-Support.patch
+++ b/patches/server/1001-Improved-Watchdog-Support.patch
diff --git a/patches/server/1003-Optimize-Voxel-Shape-Merging.patch b/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
index 2c47963e34..2c47963e34 100644
--- a/patches/server/1003-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1004-Write-SavedData-IO-async.patch b/patches/server/1003-Write-SavedData-IO-async.patch
index d7f6d3dea7..a61e63bdcc 100644
--- a/patches/server/1004-Write-SavedData-IO-async.patch
+++ b/patches/server/1003-Write-SavedData-IO-async.patch
@@ -44,7 +44,7 @@ index 5afbb5b307cc67d86dd916dc8f7521d5d021e056..4e0f80b26f1a1703184e38d739996b99
  
      // CraftBukkit start - modelled on below
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 811c9c7970dfef290acdf0bbd803b27ca81a4767..f24734f2a38eb5f2dc39f418a1f506a600127a79 100644
+index 6f497b95fd870a32c56590c00b2b39f88c51ecb9..4f2d30e8ffe228952db64d0122a8958e33f841fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1318,7 +1318,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1005-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 03bc5f00bb..ae7e0e0b35 100644
--- a/patches/server/1005-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 32775780df3e6f34961119f10c81462c0f729045..6894366ebedc461e1e6703317d83f91fb8d4f09b 100644
+index 217018dbdd78af4b89d9d4e7154956593dfa8dae..093c814d6835f20b1208236db96bb40b4611936c 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -191,6 +191,7 @@ public class Explosion {
@@ -25,7 +25,7 @@ index 32775780df3e6f34961119f10c81462c0f729045..6894366ebedc461e1e6703317d83f91f
  
                              if (!this.level.isInWorldBounds(blockposition)) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9149ddd3d950d1616ec3c85d54c494bcc6501e83..cb31b2f88e701dc9bb14ea5c568e4666f6cdc0b9 100644
+index 8485ee703f9c18557818ff735001f02e2d119604..5bf0cc83faf973b0072b06b7ec2f02b3ecda8a9b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -540,6 +540,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1006-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
index 16b412633c..395ef636c5 100644
--- a/patches/server/1006-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
@@ -236,7 +236,7 @@ index ac1a4ff5f83e53fa2983ff6e834775e51fba715e..284f9548d62f9230c668bb1adb8cb808
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 87ed38858f3cea1da7a60e39da8b095b27d3a59c..d5b92dbd98b62b0afd68543222858dca5981ecbd 100644
+index f8ce3c92597b9fb2b8743a08088f33a7bf237c5d..3282327f1a85155d671dd63f3e5bf9b636a3e893 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
index 269787b9ed..269787b9ed 100644
--- a/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1008-Remove-streams-from-hot-code.patch b/patches/server/1007-Remove-streams-from-hot-code.patch
index 75a38173c7..75a38173c7 100644
--- a/patches/server/1008-Remove-streams-from-hot-code.patch
+++ b/patches/server/1007-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1009-Eigencraft-redstone-implementation.patch b/patches/server/1008-Eigencraft-redstone-implementation.patch
index 1c66b34a01..1c66b34a01 100644
--- a/patches/server/1009-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1008-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1010-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 30e9a24146..30e9a24146 100644
--- a/patches/server/1010-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1011-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 14c24b80b2..14c24b80b2 100644
--- a/patches/server/1011-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/1012-Improve-boat-collision-performance.patch b/patches/server/1011-Improve-boat-collision-performance.patch
index 2754015b1c..2754015b1c 100644
--- a/patches/server/1012-Improve-boat-collision-performance.patch
+++ b/patches/server/1011-Improve-boat-collision-performance.patch
diff --git a/patches/server/1013-Optimise-general-POI-access.patch b/patches/server/1012-Optimise-general-POI-access.patch
index 9be40e9753..9be40e9753 100644
--- a/patches/server/1013-Optimise-general-POI-access.patch
+++ b/patches/server/1012-Optimise-general-POI-access.patch
diff --git a/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
index 52bdb3212c..52bdb3212c 100644
--- a/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1015-Execute-chunk-tasks-mid-tick.patch b/patches/server/1014-Execute-chunk-tasks-mid-tick.patch
index 5d56a6faba..8ea2ca205e 100644
--- a/patches/server/1015-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1014-Execute-chunk-tasks-mid-tick.patch
@@ -123,7 +123,7 @@ index 4e0f80b26f1a1703184e38d739996b9919699fec..2b33a3d8fdb86024acb2a3ee9d0a4a7d
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f24734f2a38eb5f2dc39f418a1f506a600127a79..3535f86b92c4e61fd84defbbf37e074690a30019 100644
+index 4f2d30e8ffe228952db64d0122a8958e33f841fa..160d340b6b9a054091897a728e4dbc73bb62ab96 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -216,6 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -151,7 +151,7 @@ index f24734f2a38eb5f2dc39f418a1f506a600127a79..3535f86b92c4e61fd84defbbf37e0746
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cb31b2f88e701dc9bb14ea5c568e4666f6cdc0b9..43052e3194812fe8d7aa6569c1c1c49d8ba25446 100644
+index 5bf0cc83faf973b0072b06b7ec2f02b3ecda8a9b..ba623bf42b859379f842447e08781a4006298c32 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -924,6 +924,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1016-Optimise-random-block-ticking.patch b/patches/server/1015-Optimise-random-block-ticking.patch
index 65d5fd3202..8e35b48622 100644
--- a/patches/server/1016-Optimise-random-block-ticking.patch
+++ b/patches/server/1015-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3535f86b92c4e61fd84defbbf37e074690a30019..bac2e7c8178696859ff2d38f1e095d86557fc306 100644
+index 160d340b6b9a054091897a728e4dbc73bb62ab96..9d18da228c6709e7665ba8babb6ee6d0b36b5dc5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -855,6 +855,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -324,7 +324,7 @@ index 6a98f66b7701e8af389ca9a1e9eb230a6100c838..dbdb6c432448b151fa4421f14235f8ba
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 43052e3194812fe8d7aa6569c1c1c49d8ba25446..1712cf22d987a87c427f042a89a9fff90203b079 100644
+index ba623bf42b859379f842447e08781a4006298c32..7693163f73ea2dc9cf357893e1545b11b2049aec 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1395,10 +1395,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1017-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index b294b05766..b294b05766 100644
--- a/patches/server/1017-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1018-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch
index ed8b42ddf6..7dd88079df 100644
--- a/patches/server/1018-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7c563ef33d12b227856e65392905bffa5289285a..376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf 100644
+index b5f31e210f2ca4bdfe9957d44780d89240da6269..241808d8619e17c0681f79acbbc98af5bf52dd89 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -40,6 +40,11 @@ dependencies {
diff --git a/patches/server/1019-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch
index 89df2f21ed..4f06eee45b 100644
--- a/patches/server/1019-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 9d18da228c6709e7665ba8babb6ee6d0b36b5dc5..af9f58328c09dddb2875f79128f906b8
  
      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 943a48fd8a95b8f28060ea1de9d021cf309dfd33..c3abc701e2c4458da63e40fbc51f235fc1cbd093 100644
+index 3282327f1a85155d671dd63f3e5bf9b636a3e893..2f3f1418b8ec765cfab5ece88972825d7d68cae5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1063,8 +1063,43 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1020-Collision-optimisations.patch b/patches/server/1019-Collision-optimisations.patch
index b05b9f0ec8..371f2b708c 100644
--- a/patches/server/1020-Collision-optimisations.patch
+++ b/patches/server/1019-Collision-optimisations.patch
@@ -2214,7 +2214,7 @@ index 594cb6ce4bfa6c42212000a1ed983ea95ee2c4bf..97b0119ac71284b3a223c089bec26d87
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c3abc701e2c4458da63e40fbc51f235fc1cbd093..45439b0cc4ea69e409fd41d4684403c0e0feab12 100644
+index 2f3f1418b8ec765cfab5ece88972825d7d68cae5..51097f1d04d981db2823e8647b546658b8fd27c1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1250,9 +1250,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1021-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch
index 165a84935b..76b0962ce2 100644
--- a/patches/server/1021-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f59b49a7e9884def9bc9f30dbd4c72dac2915c76..9a3d38365754cf40d8a18aabd1ad1cf27c576599 100644
+index e7f51d24868038179b0882c0e2cd4ce1f4fb56b7..a5bee627cd01d42c01751fef79d90062cc0c1603 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -552,7 +552,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1022-Fix-tripwire-state-inconsistency.patch b/patches/server/1021-Fix-tripwire-state-inconsistency.patch
index bce767ae73..bce767ae73 100644
--- a/patches/server/1022-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/1021-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/1023-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch
index 83872a3693..83872a3693 100644
--- a/patches/server/1023-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1024-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch
index 5d73e1dae4..ed82f9487d 100644
--- a/patches/server/1024-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch
@@ -2009,7 +2009,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5eaf8585df1f885f4a08fdd06ff4bb730961e400..ab2e84f85da7931e133ad5f0d2686cd1738f6ea1 100644
+index af9f58328c09dddb2875f79128f906b8b276ab88..c9405cbea1202e5603dde42637cf2a78592b92e1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2035,7 +2035,7 @@ index 5eaf8585df1f885f4a08fdd06ff4bb730961e400..ab2e84f85da7931e133ad5f0d2686cd1
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f21f1b3fcab47f18cbf26a9797b1b7b9a5dccfc9..19f23a6c8fb5c02843c27fb8a242ec9d0d1b538b 100644
+index 3afb280e401f8f1b22bf91472b0b70c4716ac95b..f476ba6c97944bdffae5aacae2e285d17541f46e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1887,4 +1887,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1025-optimize-dirt-and-snow-spreading.patch b/patches/server/1024-optimize-dirt-and-snow-spreading.patch
index 223dbd9a3e..223dbd9a3e 100644
--- a/patches/server/1025-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1024-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1026-Properly-resend-entities.patch b/patches/server/1025-Properly-resend-entities.patch
index a00f094df7..a00f094df7 100644
--- a/patches/server/1026-Properly-resend-entities.patch
+++ b/patches/server/1025-Properly-resend-entities.patch
diff --git a/patches/server/1027-Optimize-Hoppers.patch b/patches/server/1026-Optimize-Hoppers.patch
index 14afff5a29..14afff5a29 100644
--- a/patches/server/1027-Optimize-Hoppers.patch
+++ b/patches/server/1026-Optimize-Hoppers.patch
diff --git a/patches/server/1028-Improve-performance-of-mass-crafts.patch b/patches/server/1027-Improve-performance-of-mass-crafts.patch
index 640d0204e2..640d0204e2 100644
--- a/patches/server/1028-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1027-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1029-Actually-optimise-explosions.patch b/patches/server/1028-Actually-optimise-explosions.patch
index 679d55448b..bcb01ef768 100644
--- a/patches/server/1029-Actually-optimise-explosions.patch
+++ b/patches/server/1028-Actually-optimise-explosions.patch
@@ -34,7 +34,7 @@ The results indicate that this logic is 5 times faster than Vanilla
 and 2.3 times faster than Lithium.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 62f0db51e5d6dd36d618e7e890f30cc83af2fed3..695e90c35fc771bf101e04162ddcad1c6b698594 100644
+index 093c814d6835f20b1208236db96bb40b4611936c..b678da2cbb93cea7971bc3c4d324cfca18b0bc97 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -111,6 +111,271 @@ public class Explosion {
diff --git a/patches/server/1030-Optimise-chunk-tick-iteration.patch b/patches/server/1029-Optimise-chunk-tick-iteration.patch
index 600f4520b4..73a6088d00 100644
--- a/patches/server/1030-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1029-Optimise-chunk-tick-iteration.patch
@@ -108,7 +108,7 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..627a88ec8c3b215b19b55a6d461c8754
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7e5a8789e06a5ea1d2657ea8ee5c0460da92aaeb..5a7278b093e37b95fb005ad5cc3cac90ac36f8fb 100644
+index 284f9548d62f9230c668bb1adb8cb8084b7cef7c..12109446fc76a39faee6cda042ca48b3fd3809f4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -191,6 +191,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/1031-Lag-compensation-ticks.patch b/patches/server/1030-Lag-compensation-ticks.patch
index abff0e0dc9..abff0e0dc9 100644
--- a/patches/server/1031-Lag-compensation-ticks.patch
+++ b/patches/server/1030-Lag-compensation-ticks.patch
diff --git a/patches/server/1032-Optimise-nearby-player-retrieval.patch b/patches/server/1031-Optimise-nearby-player-retrieval.patch
index c6ab594786..c73abc51ad 100644
--- a/patches/server/1032-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1031-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5bbfb1af24e13a9e6a02ad8c36bb504a17f06398..6934e9dac0d69c043b73b7c46d59f2d39b37c67f 100644
+index 8a5abc320137d045acba0c87cef9f2912d78b6fb..6907d1be36fbdf0856c0e11983218d2fd1f9cb46 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -576,6 +576,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1033-Distance-manager-tick-timings.patch b/patches/server/1032-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1033-Distance-manager-tick-timings.patch
+++ b/patches/server/1032-Distance-manager-tick-timings.patch
diff --git a/patches/server/1034-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch
index 1bdb933b52..1bdb933b52 100644
--- a/patches/server/1034-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1035-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch
index 45738a19b2..45738a19b2 100644
--- a/patches/server/1035-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1036-Add-ShulkerDuplicateEvent.patch b/patches/server/1035-Add-ShulkerDuplicateEvent.patch
index 91ff8b7326..91ff8b7326 100644
--- a/patches/server/1036-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/1035-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/1037-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/1036-Add-api-for-spawn-egg-texture-colors.patch
index fcb89ff9a8..fcb89ff9a8 100644
--- a/patches/server/1037-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/1036-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/1038-Disable-memory-reserve-allocating.patch b/patches/server/1037-Disable-memory-reserve-allocating.patch
index bd18c240f0..bd18c240f0 100644
--- a/patches/server/1038-Disable-memory-reserve-allocating.patch
+++ b/patches/server/1037-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/1039-Improve-tag-parser-handling.patch b/patches/server/1038-Improve-tag-parser-handling.patch
index 7be702c88c..7be702c88c 100644
--- a/patches/server/1039-Improve-tag-parser-handling.patch
+++ b/patches/server/1038-Improve-tag-parser-handling.patch
diff --git a/patches/server/1040-Add-Lifecycle-Event-system.patch b/patches/server/1039-Add-Lifecycle-Event-system.patch
index bf79acac9c..bf79acac9c 100644
--- a/patches/server/1040-Add-Lifecycle-Event-system.patch
+++ b/patches/server/1039-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/1041-Conduit-API.patch b/patches/server/1040-Conduit-API.patch
index 9df9ff716b..9df9ff716b 100644
--- a/patches/server/1041-Conduit-API.patch
+++ b/patches/server/1040-Conduit-API.patch
diff --git a/patches/server/1042-ItemStack-Tooltip-API.patch b/patches/server/1041-ItemStack-Tooltip-API.patch
index 5d03327e9d..5d03327e9d 100644
--- a/patches/server/1042-ItemStack-Tooltip-API.patch
+++ b/patches/server/1041-ItemStack-Tooltip-API.patch
diff --git a/patches/server/1043-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/1042-Fix-possible-StackOverflowError-for-some-dispenses.patch
index c9638c6967..c9638c6967 100644
--- a/patches/server/1043-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/1042-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/1044-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/1043-Properly-track-the-changed-item-from-dispense-events.patch
index f01bec2a48..f01bec2a48 100644
--- a/patches/server/1044-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/1043-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/1045-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/1044-Add-getChunkSnapshot-includeLightData-parameter.patch
index bb830096ec..bb830096ec 100644
--- a/patches/server/1045-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/1044-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/1046-Add-FluidState-API.patch b/patches/server/1045-Add-FluidState-API.patch
index 93e022238d..153752df1d 100644
--- a/patches/server/1046-Add-FluidState-API.patch
+++ b/patches/server/1045-Add-FluidState-API.patch
@@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..c0c2805cb045cdd835b402776a6923fe
 +
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 9dd6012556979514f9879f867138bc836c58ef3f..1df2202277ab58d7de844f7bebc07e494a0ecdf3 100644
+index 7c7dbd030ada8d2fab494b6a125664ddc3955639..35f7de6b50d3adae7bdd0da5f779f0a466d25522 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -107,6 +107,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/1047-add-number-format-api.patch b/patches/server/1046-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/1047-add-number-format-api.patch
+++ b/patches/server/1046-add-number-format-api.patch
diff --git a/patches/server/1048-check-if-itemstack-is-stackable-first.patch b/patches/server/1047-check-if-itemstack-is-stackable-first.patch
index 3655bb3a13..3655bb3a13 100644
--- a/patches/server/1048-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/1047-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/1049-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 69eea7f52e..69eea7f52e 100644
--- a/patches/server/1049-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/1050-improve-BanList-types.patch b/patches/server/1049-improve-BanList-types.patch
index ad92622c45..ad92622c45 100644
--- a/patches/server/1050-improve-BanList-types.patch
+++ b/patches/server/1049-improve-BanList-types.patch
diff --git a/patches/server/1051-Configurable-max-block-fluid-ticks.patch b/patches/server/1050-Configurable-max-block-fluid-ticks.patch
index c1d19d41e3..c1d19d41e3 100644
--- a/patches/server/1051-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/1050-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/1052-disable-forced-empty-world-ticks.patch b/patches/server/1051-disable-forced-empty-world-ticks.patch
index 6f3fb1c6f0..6f3fb1c6f0 100644
--- a/patches/server/1052-disable-forced-empty-world-ticks.patch
+++ b/patches/server/1051-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/1053-Suspicious-Effect-Entry-API.patch b/patches/server/1052-Suspicious-Effect-Entry-API.patch
index 31c7a46ac6..31c7a46ac6 100644
--- a/patches/server/1053-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/1052-Suspicious-Effect-Entry-API.patch