Remove "fix-curing-zombie-villager-discount" exploit option (#9895)

546 files changed, 356 insertions, 354 deletions

diff --git a/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch b/patches/removed/0500-Fix-curing-zombie-villager-discount-exploit.patch
index e659267ea0..cabbab29ff 100644
--- a/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/removed/0500-Fix-curing-zombie-villager-discount-exploit.patch
@@ -7,6 +7,8 @@ This fixes the exploit used to gain absurd trading discounts with infecting
 and curing a villager on repeat by simply resetting the relevant part of
 the reputation when it is cured.
 
+This patch has been removed, as MC-181190 was fixed by mojang in 23w31a.
+
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 index f58be4e2529759cc64df2c70a69ef56eabbb762d..84cee8fb09f90424438de336f60d9388da1b39de 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index a099a9a322..d0e878423f 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -1254,10 +1254,10 @@ index 0000000000000000000000000000000000000000..9e8b8de907654050c51400286af971ca
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7562ca350
+index 0000000000000000000000000000000000000000..351fbbc577556ebbd62222615801a96b7c115822
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,78 @@
 +package io.papermc.paper.configuration;
 +
 +import org.spongepowered.configurate.NodePath;
@@ -1310,7 +1310,8 @@ index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7
 +        path("use-async-lighting"),
 +        path("tnt-explosion-volume"),
 +        path("entities", "spawning", "despawn-ranges", "soft"),
-+        path("entities", "spawning", "despawn-ranges", "hard")
++        path("entities", "spawning", "despawn-ranges", "hard"),
++        path("fixes", "fix-curing-zombie-villager-discount-exploit")
 +    };
 +
 +    NodePath[] REMOVED_GLOBAL_PATHS = {
@@ -1337,10 +1338,10 @@ index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..387a887d3aebb57da80bc36e36c2a7ea05cfd74f
+index 0000000000000000000000000000000000000000..ed79d30f33b2674863b2d73b1abdb48433c33412
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -0,0 +1,539 @@
+@@ -0,0 +1,538 @@
 +package io.papermc.paper.configuration;
 +
 +import com.google.common.collect.HashBasedTable;
@@ -1779,7 +1780,6 @@ index 0000000000000000000000000000000000000000..387a887d3aebb57da80bc36e36c2a7ea
 +        public boolean disableUnloadedChunkEnderpearlExploit = true;
 +        public boolean preventTntFromMovingInWater = false;
 +        public boolean splitOverstackedLoot = true;
-+        public boolean fixCuringZombieVillagerDiscountExploit = true;
 +        public IntOr.Disabled fallingBlockHeightNerf = IntOr.Disabled.DISABLED;
 +        public IntOr.Disabled tntEntityHeightNerf = IntOr.Disabled.DISABLED;
 +    }
diff --git a/patches/server/0501-Limit-recipe-packets.patch b/patches/server/0500-Limit-recipe-packets.patch
index 77284ad6e1..4b41c6795a 100644
--- a/patches/server/0501-Limit-recipe-packets.patch
+++ b/patches/server/0500-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d8174c67d31fa8b6730a80a8e2399eed5737f838..44dd71b7789a7e66a6d2a94c241b535a2f4cbb86 100644
+index e4c4984285162523285b19de2e0c81b076b9c33b..059d2521bb2b86ccafd4b51a014bc6822692d854 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0503-Player-Chunk-Load-Unload-Events.patch b/patches/server/0502-Player-Chunk-Load-Unload-Events.patch
index 504b607773..504b607773 100644
--- a/patches/server/0503-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0502-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0505-Expose-LivingEntity-hurt-direction.patch b/patches/server/0504-Expose-LivingEntity-hurt-direction.patch
index e5c1724c82..4ff58cbd93 100644
--- a/patches/server/0505-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0504-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 00d9dd5affd62ceb35bb783d6bcc9e1e600c0fb4..c44f8ed810b0c9a510d7e1c07987323a8a620ca4 100644
+index fb3f65feab6f5febf58be71f0b9b1a4381958f1d..6c498338d3918afb4f7ad5bac013f6dbb43594c2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -183,7 +183,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index 00d9dd5affd62ceb35bb783d6bcc9e1e600c0fb4..c44f8ed810b0c9a510d7e1c07987323a
      public boolean affectsSpawning = true;
      // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 05d9a9968588381aaa3aeb06ef4d18fed4085229..c9f4f496a92ff8465a21f22f326dc025aa8bd169 100644
+index d41e37afeab1e8bb098c6ed012b10b113c4a4715..408c23c8310c464baebfb1f4adafe56a01645a5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -36,7 +36,7 @@ index 05d9a9968588381aaa3aeb06ef4d18fed4085229..c9f4f496a92ff8465a21f22f326dc025
      public int getSleepTicks() {
          return this.getHandle().sleepCounter;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 66a4d3d3626e4382e07617d0af464e6fbd8a9427..a1e2d78fd9a57a59887419d356be8eab72045574 100644
+index a654f22a6c331cd69290b99e6c73f3ed611c58a5..810f06b3dc7148f9d71635981b3be79659fd0906 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -932,5 +932,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 30dbaa1c3a..e2a2d2a3a3 100644
--- a/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e18e733cd13b7b69170a839e78341f3f339afa09..58ca3b4cbd2626e80f4474753508e8990311771e 100644
+index a19979dac60552791b7a8dd4920ba75b525340ca..826bb30bd0075bb7827c13e43c2a1ce7a814f0ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -302,6 +302,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index d84f8bed22..429087e774 100644
--- a/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not crash from invalid ingredient lists in
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 629b79c6e59944994295768904c449733764cf99..3dfe2c483f76d0ba11674b3c4e05e33daebeedb5 100644
+index 66b7a2c9a7dc18a98bf2c3aac863a10cbc3ae9f9..73bc45000b5285ccf5b06e2f372d6c82bf843b82 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -261,7 +261,11 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
diff --git a/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 456c819cfa..d4c042a0ed 100644
--- a/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerTradeEvent and PlayerPurchaseEvent
 Co-authored-by: Alexander <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 3dfe2c483f76d0ba11674b3c4e05e33daebeedb5..5119d070dbb04f5a4f9c2def526e33e15ca8573f 100644
+index 73bc45000b5285ccf5b06e2f372d6c82bf843b82..5a591c439c5cef6b7e7e6f836ab813cb4f29b08c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -137,11 +137,24 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
diff --git a/patches/server/0509-Implement-TargetHitEvent.patch b/patches/server/0508-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0509-Implement-TargetHitEvent.patch
+++ b/patches/server/0508-Implement-TargetHitEvent.patch
diff --git a/patches/server/0510-MC-4-Fix-item-position-desync.patch b/patches/server/0509-MC-4-Fix-item-position-desync.patch
index 3de6712684..dcbd1a97ed 100644
--- a/patches/server/0510-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0509-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c35d22e4d54abcb16b7ec932729d2f177fd4a14b..3acaa05743373b818ba70a0229c6afe63bfd1a97 100644
+index 9068a9646a7e436a5a0d9ea9deb52b78a316ba4a..9d169d6504ee486127b22cd4e6429c4eb5b7ec0a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4248,6 +4248,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0511-Additional-Block-Material-API-s.patch b/patches/server/0510-Additional-Block-Material-API-s.patch
index 1526eefd6e..051b8a644d 100644
--- a/patches/server/0511-Additional-Block-Material-API-s.patch
+++ b/patches/server/0510-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index ef1e77729b12a9ee0b13fa283f8200cc0c3968ce..4239fa3d992722bd1d9184bb5c33ce5c14010052 100644
+index 848f089e559e4feb67dea9148291f70460da9e9d..1d637f5be518a054767154296fb7905bdbc175ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -439,6 +439,25 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0512-Fix-harming-potion-dupe.patch b/patches/server/0511-Fix-harming-potion-dupe.patch
index 7b2d745291..7b2d745291 100644
--- a/patches/server/0512-Fix-harming-potion-dupe.patch
+++ b/patches/server/0511-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 754c03c42c..754c03c42c 100644
--- a/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0514-Cache-burn-durations.patch b/patches/server/0513-Cache-burn-durations.patch
index c4372f6401..c4372f6401 100644
--- a/patches/server/0514-Cache-burn-durations.patch
+++ b/patches/server/0513-Cache-burn-durations.patch
diff --git a/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index bd783eafb5..bd783eafb5 100644
--- a/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..38593b84f5 100644
--- a/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch
index 4670eeb506..4670eeb506 100644
--- a/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0519-Zombie-API-breaking-doors.patch b/patches/server/0518-Zombie-API-breaking-doors.patch
index da4c6d2dce..50bb6965cf 100644
--- a/patches/server/0519-Zombie-API-breaking-doors.patch
+++ b/patches/server/0518-Zombie-API-breaking-doors.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Zombie API - breaking doors
 public net.minecraft.world.entity.monster.Zombie supportsBreakDoorGoal()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 1e303c3686e2fe4e05efe5a630dd2c1cb0f9edea..ed211b123354ece21dd8beae7192a26727f5124f 100644
+index 4412c913123f7521f449c98b60378e8d3b1671ce..46336111dcf62a29390e724b1879c84c697076e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -122,6 +122,11 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/patches/server/0520-Fix-nerfed-slime-when-splitting.patch b/patches/server/0519-Fix-nerfed-slime-when-splitting.patch
index d2beca8665..d2beca8665 100644
--- a/patches/server/0520-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0519-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0521-Add-EntityLoadCrossbowEvent.patch b/patches/server/0520-Add-EntityLoadCrossbowEvent.patch
index 07e5946fbf..07e5946fbf 100644
--- a/patches/server/0521-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0520-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch b/patches/server/0521-Added-WorldGameRuleChangeEvent.patch
index d6247847f5..f79f5393c5 100644
--- a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0521-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 6a1001cb708a7f779a801428d2b00fbcde888bc1..2e240ad721928a9a68370114ba61c218
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e0c3a5cf44a66d3df31871da57460bb648c8770b..31fda85d5da2cbf4af199fd2431b258592f14af4 100644
+index 56710af63bf432ab38c3a39ad3b734371bb429d7..9b4276290c99cbf9f618746d49746ee9b074744a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1846,8 +1846,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0523-Added-ServerResourcesReloadedEvent.patch b/patches/server/0522-Added-ServerResourcesReloadedEvent.patch
index ae3f1de8c5..490a9f39f8 100644
--- a/patches/server/0523-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0522-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e01e32c66afbc0719e3c47cb61e2e205876da884..6301152b4b3297e6f764f8bccf7394986fc6c76f 100644
+index 331cc75f4802b7c6a2903d506e58d887ba15921d..27c7c696647271ffed345e339822526730a9523b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch
index 54e0d6f0f9..9d7b4d29c5 100644
--- a/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -18,7 +18,7 @@ index dadb419a04b343d6ba59353c6caa1a50aa07b67f..6be9e8d693bbb084791d7b30a1891ddb
              LocalDate localdate = LocalDate.now();
              int i = localdate.get(ChronoField.DAY_OF_MONTH);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 760b880a11e8ece98b41f934f9a2441fd020ecd6..99918974b1b763610425fc3d44d8453bd5d0725a 100644
+index f99e4382b4b191d9bd673a4307c6641857b836ca..89515078590b2f2c7e73456b7ab5817f44039be5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -507,7 +507,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch
index 4269a73f28..4269a73f28 100644
--- a/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch
index 93e862a643..93e862a643 100644
--- a/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0528-Configurable-door-breaking-difficulty.patch b/patches/server/0527-Configurable-door-breaking-difficulty.patch
index 4aab6beaef..5338964e49 100644
--- a/patches/server/0528-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0527-Configurable-door-breaking-difficulty.patch
@@ -23,7 +23,7 @@ index 9fec5823d99d1ae8e41d9e21f7ddb8b8e94bf887..ad41bbbf5395ed18c2c9e1e692c7661a
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 99918974b1b763610425fc3d44d8453bd5d0725a..87d909c2a34543ebdfc5d76aff7611d2d51144fb 100644
+index 89515078590b2f2c7e73456b7ab5817f44039be5..bcf31d0b784241b4f2b71bced4a431763d538a69 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -100,7 +100,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch
index 9b41ebaaf7..9b41ebaaf7 100644
--- a/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0530-Remove-stale-POIs.patch b/patches/server/0529-Remove-stale-POIs.patch
index c89bd2b74a..ffd7e9574e 100644
--- a/patches/server/0530-Remove-stale-POIs.patch
+++ b/patches/server/0529-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 4ad4faf17dcedefc7add11af180d744a5c2f31a8..18a69ab85de7f23f5ff468307bf2669544eba8af 100644
+index fe376f3224ed4083d0bfc20911fc059d7b32e2c9..d24520f3c11fb93c470ad021ba4bdc5f2db43ac4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2065,6 +2065,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0531-Fix-villager-boat-exploit.patch b/patches/server/0530-Fix-villager-boat-exploit.patch
index fab5613f59..0663c12d9c 100644
--- a/patches/server/0531-Fix-villager-boat-exploit.patch
+++ b/patches/server/0530-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 303e207e6819e77cf489dd47fb9450c629b70975..709c37e41f566a8301ec26ca76eb28c44a9bf1cd 100644
+index 3f6e0319c1580dface0a175ebb93321ae4f45a35..9b56415f1a03423f29822839ce27bbdf33bb91d5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -585,6 +585,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0532-Add-sendOpLevel-API.patch b/patches/server/0531-Add-sendOpLevel-API.patch
index b6586f72bc..ae6be27473 100644
--- a/patches/server/0532-Add-sendOpLevel-API.patch
+++ b/patches/server/0531-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 709c37e41f566a8301ec26ca76eb28c44a9bf1cd..adc96e0c4f81375253b540a3b003a00e12888cbc 100644
+index 9b56415f1a03423f29822839ce27bbdf33bb91d5..89d18ae87029b82beea5e1bd69580f54f600696f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1080,6 +1080,11 @@ public abstract class PlayerList {
@@ -32,7 +32,7 @@ index 709c37e41f566a8301ec26ca76eb28c44a9bf1cd..adc96e0c4f81375253b540a3b003a00e
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ec38acdfdbac99fe3f0b40d37e59d8348fcb9c1f..467ab8fbb335617ef419b35c7881ca5606b3e541 100644
+index 192981678ad54bf1b71db4d1f15e6884e88ecebb..47f3bd3be8da2c79d3655823ac0f2f4a8f9d7efe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -640,6 +640,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0533-TODO-Registry-Modification-API.patch b/patches/server/0532-TODO-Registry-Modification-API.patch
index 613cd4823c..c247dad753 100644
--- a/patches/server/0533-TODO-Registry-Modification-API.patch
+++ b/patches/server/0532-TODO-Registry-Modification-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] TODO Registry Modification API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
-index 2d277092ea1e49d88129edeea619b1efa440c2e2..2530b09e6fc04c67ec18fcf4f786098bdba63552 100644
+index 5f40159ecb2e235ba5a821c33c9ec3ce72860a7a..004bfaa563d901e042bf31cfac2993188f1190ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
 @@ -62,6 +62,7 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
diff --git a/patches/server/0534-Add-StructuresLocateEvent.patch b/patches/server/0533-Add-StructuresLocateEvent.patch
index 465e85a5f2..47d435b995 100644
--- a/patches/server/0534-Add-StructuresLocateEvent.patch
+++ b/patches/server/0533-Add-StructuresLocateEvent.patch
@@ -76,7 +76,7 @@ index 4da303d7e15496f04f0e27bfb613176bc2a72b76..3c7920721914588a3e7eaf1faff46f73
          Map<StructurePlacement, Set<Holder<Structure>>> map = new Object2ObjectArrayMap();
          Iterator iterator = structures.iterator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
-index 2530b09e6fc04c67ec18fcf4f786098bdba63552..2c23b3b2c84f61b1c64ffe4f99c09299019cf9bf 100644
+index 004bfaa563d901e042bf31cfac2993188f1190ff..f527bfd1530e5605b80b05293b806530c3a96b7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
 @@ -63,6 +63,11 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
diff --git a/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch
index efa1626720..09bc1189ea 100644
--- a/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0534-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 3acaa05743373b818ba70a0229c6afe63bfd1a97..6277b3a553a6fe65a11d678701cb4615ec3e3cc6 100644
+index 9d169d6504ee486127b22cd4e6429c4eb5b7ec0a..968d231c8f6762a2f6177897c3b5f24864d60152 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1927,6 +1927,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 3f7c51ddfe..3f7c51ddfe 100644
--- a/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch
index 17e9def19b..17e9def19b 100644
--- a/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0538-Make-schedule-command-per-world.patch b/patches/server/0537-Make-schedule-command-per-world.patch
index 8e29559590..8e29559590 100644
--- a/patches/server/0538-Make-schedule-command-per-world.patch
+++ b/patches/server/0537-Make-schedule-command-per-world.patch
diff --git a/patches/server/0539-Configurable-max-leash-distance.patch b/patches/server/0538-Configurable-max-leash-distance.patch
index c1ac4b5634..c1ac4b5634 100644
--- a/patches/server/0539-Configurable-max-leash-distance.patch
+++ b/patches/server/0538-Configurable-max-leash-distance.patch
diff --git a/patches/server/0540-Implement-BlockPreDispenseEvent.patch b/patches/server/0539-Implement-BlockPreDispenseEvent.patch
index 7fb05f89fa..7fb05f89fa 100644
--- a/patches/server/0540-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0539-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 03d8cdf4c8..03d8cdf4c8 100644
--- a/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39e24e6044..39e24e6044 100644
--- a/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch
index 9750570e73..9750570e73 100644
--- a/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 93cff1f7ad..93cff1f7ad 100644
--- a/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch
index 8f6b89c32f..77d3f29709 100644
--- a/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9c74a7e1dc74873c16a0fc474de459ccec4d372d..1d7fe0e7d382d2f2aa5a38732cc6212d6c7a11e3 100644
+index bf637aae0dcd701dd31568b3c84851349c4c5a0a..86b870e8316d2c27861c85ee5a8f7ddd857e8297 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1242,6 +1242,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0546-add-DragonEggFormEvent.patch b/patches/server/0545-add-DragonEggFormEvent.patch
index e4c888b12d..e4c888b12d 100644
--- a/patches/server/0546-add-DragonEggFormEvent.patch
+++ b/patches/server/0545-add-DragonEggFormEvent.patch
diff --git a/patches/server/0547-EntityMoveEvent.patch b/patches/server/0546-EntityMoveEvent.patch
index d396303a91..1597623bc7 100644
--- a/patches/server/0547-EntityMoveEvent.patch
+++ b/patches/server/0546-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6301152b4b3297e6f764f8bccf7394986fc6c76f..e4a9d99e08d5ed033f20a916f791b9f989fa66fb 100644
+index 27c7c696647271ffed345e339822526730a9523b..ced37ae135b8b856665819a7b618f62f18bb0199 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1491,6 +1491,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 6301152b4b3297e6f764f8bccf7394986fc6c76f..e4a9d99e08d5ed033f20a916f791b9f9
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 18a69ab85de7f23f5ff468307bf2669544eba8af..e0a94d75ddf5cc0988876e7438fbcc449c608d37 100644
+index d24520f3c11fb93c470ad021ba4bdc5f2db43ac4..1f4226e340f4987d48218d8f4012401272a6dcb3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 18a69ab85de7f23f5ff468307bf2669544eba8af..e0a94d75ddf5cc0988876e7438fbcc44
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f767d1d98574fc847c495baee1bf369444443aad..d56c968a5af7358ec07ba44fa4c7e0dc0861c86a 100644
+index 7b68fd746338fadba2b3e9aee4df5fb965299f1a..002591d6cafd909783db95f000530d3b93a04ff6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3359,6 +3359,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch
index db56e9f1a6..2019b707c1 100644
--- a/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0547-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 e0a94d75ddf5cc0988876e7438fbcc449c608d37..0f59f5da41f3ab18148a7b44b0872632f03ad078 100644
+index 1f4226e340f4987d48218d8f4012401272a6dcb3..f6ee996e6d85e1ab886ffc941a4a8cc05857e4e0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1654,6 +1654,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0549-Inline-shift-direction-fields.patch b/patches/server/0548-Inline-shift-direction-fields.patch
index f0c71d61f2..f0c71d61f2 100644
--- a/patches/server/0549-Inline-shift-direction-fields.patch
+++ b/patches/server/0548-Inline-shift-direction-fields.patch
diff --git a/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch
index e811b5c0a7..18e781092c 100644
--- a/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f9628163c62d39b5ffc7139c110890fc1bccc223..9d49cdb3f40b4dada89001ba1b63963bc292bf46 100644
+index 5bc937175a00c836a3a855780e2b8fd9a0005c07..47ebaf72a087387f9832cfd83f748c8ef3e9c410 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -451,13 +451,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index a387813cdf..88e136bf5d 100644
--- a/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index addf3c442a085281a7ac06245ccd741f08ed7ccb..d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03 100644
+index 806dc15cec7d0ec082a2d3e512cd84edfbe6d9bf..3ceb5d83be20183da907915f70ba9e64369373a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -651,4 +651,15 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0552-living-entity-allow-attribute-registration.patch b/patches/server/0551-living-entity-allow-attribute-registration.patch
index 84f0585507..d9d31ae912 100644
--- a/patches/server/0552-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0551-living-entity-allow-attribute-registration.patch
@@ -38,7 +38,7 @@ index ea48f1119a940056c37d1d203437bfbfdf13663b..a3f989fd1775adbb84d197c51e22c188
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a1e2d78fd9a57a59887419d356be8eab72045574..fac638e0eab8c50e6afd0ceee6f9d051127221eb 100644
+index 810f06b3dc7148f9d71635981b3be79659fd0906..62700f1190bda9cb05514096e426eb3eeb87504c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -710,6 +710,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0553-fix-dead-slime-setSize-invincibility.patch b/patches/server/0552-fix-dead-slime-setSize-invincibility.patch
index 82acef5e68..494e56127e 100644
--- a/patches/server/0553-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0552-fix-dead-slime-setSize-invincibility.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix dead slime setSize invincibility
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index 9b219beb8922bf0701e538bcf874f0eb922f60bb..2b1211ee410a0246195053ad041eaa131f859bcd 100644
+index 3d9b7c0e128ea05bec5600c774e9685998b71cac..e48f7d1cbec4a2319745ba48a5d44ab9925214e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -16,7 +16,7 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
diff --git a/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0555-Expose-Tracked-Players.patch b/patches/server/0554-Expose-Tracked-Players.patch
index c2235d9c2f..d997a95f37 100644
--- a/patches/server/0555-Expose-Tracked-Players.patch
+++ b/patches/server/0554-Expose-Tracked-Players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cacefccf15d68759ec26548ac1c10ee97e251ac4..a63fb984e905e51dc100eba30cbd71cac173ae22 100644
+index 505ab2218c87961fd8c616a130de5b5e2e597eb4..d270d9ca6f1dea0ad4e6a919b58b845eebf3dc87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1368,5 +1368,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0556-Remove-streams-from-SensorNearest.patch b/patches/server/0555-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0556-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0555-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0557-Improve-ServerGUI.patch b/patches/server/0556-Improve-ServerGUI.patch
index cb4eed5f13..cb4eed5f13 100644
--- a/patches/server/0557-Improve-ServerGUI.patch
+++ b/patches/server/0556-Improve-ServerGUI.patch
diff --git a/patches/server/0558-fix-converting-txt-to-json-file.patch b/patches/server/0557-fix-converting-txt-to-json-file.patch
index 948c7cb6e4..786852a5f5 100644
--- a/patches/server/0558-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0557-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a661f8a83d4e57ca48bbf28dc668f8ff5fd29c91..b8bdafb97d2ca46887206b0aa144ee0c851c205d 100644
+index 6d7095a62f30b18bc8fb8dbc5a0f3331980b7140..2546136ecfc94a8220932a04993ffa46380aba7e 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -48,7 +48,7 @@ index a661f8a83d4e57ca48bbf28dc668f8ff5fd29c91..b8bdafb97d2ca46887206b0aa144ee0c
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index adc96e0c4f81375253b540a3b003a00e12888cbc..0958d43ae6a4ee42c944b72008d11c30262a732a 100644
+index 89d18ae87029b82beea5e1bd69580f54f600696f..8662ded9a7d7bf75dcec2c859f9e76d3d63a8b29 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -178,6 +178,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0559-Add-worldborder-events.patch b/patches/server/0558-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0559-Add-worldborder-events.patch
+++ b/patches/server/0558-Add-worldborder-events.patch
diff --git a/patches/server/0560-added-PlayerNameEntityEvent.patch b/patches/server/0559-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0560-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0559-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch
index dc68619ad1..896e20afba 100644
--- a/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent grindstones from overstacking items
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 03d3edadf39d4871a332808458870ea9479669c4..b56766ff0e61691294b40ea8c2370940c0e8b640 100644
+index 811d7415ae843347da374d73b4edfe89642d518a..24187a7ce812cb83a9a736bec8dce9e68ccc0798 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -198,13 +198,13 @@ public class GrindstoneMenu extends AbstractContainerMenu {
diff --git a/patches/server/0562-Add-recipe-to-cook-events.patch b/patches/server/0561-Add-recipe-to-cook-events.patch
index e7fabd3ae9..e7fabd3ae9 100644
--- a/patches/server/0562-Add-recipe-to-cook-events.patch
+++ b/patches/server/0561-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0563-Add-Block-isValidTool.patch b/patches/server/0562-Add-Block-isValidTool.patch
index f28e5d98e0..ff5e330151 100644
--- a/patches/server/0563-Add-Block-isValidTool.patch
+++ b/patches/server/0562-Add-Block-isValidTool.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 4239fa3d992722bd1d9184bb5c33ce5c14010052..5a6cc60d345dc146a2ce9bbd177b67a17bf5312b 100644
+index 1d637f5be518a054767154296fb7905bdbc175ec..a33e7114ac902ae66a31e0298e7c13af2d11b07c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -692,5 +692,9 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch
index b5c3a124e5..4f612be1e2 100644
--- a/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0563-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 760d49347b94d5d971aaed5be5fef3471e9758e8..5505b15ce0b7891b4d9329a8f4f7b7c12057c9e8 100644
+index 95cc9134244eb226480969674201cd234a055964..a4f10823242f412ccfece093ed0986512131c4ba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1725,7 +1725,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0565-Expand-world-key-API.patch b/patches/server/0564-Expand-world-key-API.patch
index bd45d36dbb..bd45d36dbb 100644
--- a/patches/server/0565-Expand-world-key-API.patch
+++ b/patches/server/0564-Expand-world-key-API.patch
diff --git a/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0567-Item-Rarity-API.patch b/patches/server/0566-Item-Rarity-API.patch
index 370339eb5f..370339eb5f 100644
--- a/patches/server/0567-Item-Rarity-API.patch
+++ b/patches/server/0566-Item-Rarity-API.patch
diff --git a/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch
index 5cc36baecf..7811bd17da 100644
--- a/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0958d43ae6a4ee42c944b72008d11c30262a732a..248fd1ff7a09cad178a87cb0d9b3be6c9d2f1473 100644
+index 8662ded9a7d7bf75dcec2c859f9e76d3d63a8b29..690bb831c41a344b284c16f2c44954f652784bdb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -578,6 +578,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch
index 6be6c5a54b..0d27e71091 100644
--- a/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4a9d99e08d5ed033f20a916f791b9f989fa66fb..6fbe95fea9faa830cde4ff8a8031d148223023e5 100644
+index ced37ae135b8b856665819a7b618f62f18bb0199..992aa1fa85f0b0240d317773be5086e64889996a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index e8b8c0ce59..e8b8c0ce59 100644
--- a/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0571-Expose-protocol-version.patch b/patches/server/0570-Expose-protocol-version.patch
index fad23f6e40..fad23f6e40 100644
--- a/patches/server/0571-Expose-protocol-version.patch
+++ b/patches/server/0570-Expose-protocol-version.patch
diff --git a/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch
index 1952b16087..80761df4ca 100644
--- a/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b8bdafb97d2ca46887206b0aa144ee0c851c205d..c6d8f705f684127f5ef328177f05713130d28db4 100644
+index 2546136ecfc94a8220932a04993ffa46380aba7e..0b5d6a544775fa68a1b33115c899ca7b00ba92d6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -229,7 +229,7 @@ index b8bdafb97d2ca46887206b0aa144ee0c851c205d..c6d8f705f684127f5ef328177f057131
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 14cd8ae69d9b25dc5edad4ff96ff4a9acb1f22cb..cd4ad8261e56365850068db1d83d6a8454026737 100644
+index 8f82041f0482df22a6a9ea38d50d56228131775d..12eeabafbad9da8796dc6fc383b732cf75bb7ddb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -18,9 +18,11 @@ import org.bukkit.event.server.TabCompleteEvent;
diff --git a/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 6979c0cf5a..9fed251180 100644
--- a/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d56c968a5af7358ec07ba44fa4c7e0dc0861c86a..b2a5b9c7502af235e7f31ffa45c0f4d501a5f459 100644
+index 002591d6cafd909783db95f000530d3b93a04ff6..9ce8052369e3279a89b55b56c476c1e1405c6570 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3857,6 +3857,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0574-Add-bypass-host-check.patch b/patches/server/0573-Add-bypass-host-check.patch
index 21a11f4ee1..21a11f4ee1 100644
--- a/patches/server/0574-Add-bypass-host-check.patch
+++ b/patches/server/0573-Add-bypass-host-check.patch
diff --git a/patches/server/0575-Set-area-affect-cloud-rotation.patch b/patches/server/0574-Set-area-affect-cloud-rotation.patch
index 963479559a..963479559a 100644
--- a/patches/server/0575-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0574-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch
index f31e2080d6..cb15f6a02e 100644
--- a/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c9f4f496a92ff8465a21f22f326dc025aa8bd169..268d0abadb1c6de78f7b2de964808ca7029970a8 100644
+index 408c23c8310c464baebfb1f4adafe56a01645a5a..e8e61fb73792f8f7fb0266df93dbaf552114b492 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -133,6 +133,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch
index 68c2cd3ffe..68c2cd3ffe 100644
--- a/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch
index 8f9c69cf16..fd7cafa884 100644
--- a/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch
@@ -27,7 +27,7 @@ index cb704cef3845727c465fe3ea7210a11545da56c8..6827979a5b270ced53b46ecb9eff5487
      private void setDropChance(net.minecraft.world.entity.EquipmentSlot slot, float chance) {
          Preconditions.checkArgument(this.entity.getHandle() instanceof Mob, "Cannot set drop chance for non-Mob entity");
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 4f6271f6cafcf49a0912e2ab6c77c3c820db0e5f..f89a1b1c1902b16f6640c9a95f5b72351b60ceda 100644
+index 23abd543cd8e3cbb49e4927aef59ed95d3465360..972fe4237461f07f78b60845b2ebfefb06698ded 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -353,4 +353,15 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
diff --git a/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..ecc0f6c3cd 100644
--- a/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch
index 8cb742badb..13ba5fd753 100644
--- a/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0579-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 7c3cbd489c9d7aaa678db47ebe8f27a3fc2aabc7..133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c 100644
+index b84cc507ee467e61e90a31da1ca8568f0d947f6b..b1f7227cb63491f5899b9b9d8413715924d1b967 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1894,6 +1894,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0581-Added-PlayerDeepSleepEvent.patch b/patches/server/0580-Added-PlayerDeepSleepEvent.patch
index e77b33f0bb..d2c5959056 100644
--- a/patches/server/0581-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0580-Added-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c44f8ed810b0c9a510d7e1c07987323a8a620ca4..dee00042a780b053cd094081874aad221abf1b2b 100644
+index 6c498338d3918afb4f7ad5bac013f6dbb43594c2..0d65e04efacef0bef245e6b5b21e430d90696c5d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -253,6 +253,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0582-More-World-API.patch b/patches/server/0581-More-World-API.patch
index 7a2d2c268b..649e3e23ac 100644
--- a/patches/server/0582-More-World-API.patch
+++ b/patches/server/0581-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1d97b5322182eecf42ca7f15e327d1ab1a49b7cc..55ddaa34eb9ec94b5e2e41b3c5f45003dedd7e6a 100644
+index 9b4276290c99cbf9f618746d49746ee9b074744a..def1c8a46d686f8be5837c76c15b7463dec553ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2092,6 +2092,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0583-Added-PlayerBedFailEnterEvent.patch b/patches/server/0582-Added-PlayerBedFailEnterEvent.patch
index dd4d2712ed..dd4d2712ed 100644
--- a/patches/server/0583-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0582-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch
index 8783bf2f94..69751ade08 100644
--- a/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c6d8f705f684127f5ef328177f05713130d28db4..f598c87dac7a2f852eb8a3948b5ba1a299e85492 100644
+index 0b5d6a544775fa68a1b33115c899ca7b00ba92d6..3c751c98de1d5a9b41ebd832be0ae317d4ac9362 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 6dac578ff6..7fd6ccefcc 100644
--- a/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 248fd1ff7a09cad178a87cb0d9b3be6c9d2f1473..11b44bf31cc0feae3c568bf100801633c0b34906 100644
+index 690bb831c41a344b284c16f2c44954f652784bdb..b4b1678edb87269aa35ab07c0d91d067ca9b0097 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -805,6 +805,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d28ff36b79 100644
--- a/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 8a6c10c1cb..0553fa6089 100644
--- a/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c..73f47741a6cc290bb672871aabea112b26d0e8c0 100644
+index b1f7227cb63491f5899b9b9d8413715924d1b967..1c795202f3b5be8f7ee41724258b509aa5b1947d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2628,7 +2628,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -18,7 +18,7 @@ index 133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c..73f47741a6cc290bb672871aabea112b
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 11b44bf31cc0feae3c568bf100801633c0b34906..8d7e99a331b21f2efbb60936974395b9c12ad5d6 100644
+index b4b1678edb87269aa35ab07c0d91d067ca9b0097..2726c54dc57e584352fde31f1638b0d1416b14ad 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -764,6 +764,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0588-Add-Channel-initialization-listeners.patch b/patches/server/0587-Add-Channel-initialization-listeners.patch
index 360d19718e..360d19718e 100644
--- a/patches/server/0588-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0587-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch
index d0ff308b9e..d0ff308b9e 100644
--- a/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0590-Add-more-WanderingTrader-API.patch b/patches/server/0589-Add-more-WanderingTrader-API.patch
index 5205274499..e7542c5ef9 100644
--- a/patches/server/0590-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0589-Add-more-WanderingTrader-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more WanderingTrader API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 5ea5f424c55f60bf63d3a4d3fe51362939f42f4c..1cef116b692ebdf3ade01cde533d1e5182a05a91 100644
+index 0321b4bb622930bfe57661b0e6b893d7635668fb..96115fe8a8c32ce5992d779b5db540b9d81e3b82 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -60,6 +60,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
@@ -33,7 +33,7 @@ index 5ea5f424c55f60bf63d3a4d3fe51362939f42f4c..1cef116b692ebdf3ade01cde533d1e51
          this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
          this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-index 758eb33c565999e6321b96ff0f733478ffbbd9cc..4a6700d7d2f40cf516054e2e3d09049f1ce4fd17 100644
+index 08194a78c2170e971ee8ff440b276ed3590e8c4a..0e597394a3dd08f022614fc9777302fea581eb55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
 @@ -28,4 +28,26 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
diff --git a/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch
index 2ff1e7a041..0488f4f727 100644
--- a/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityBlockStorage#clearEntities()
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index ea63802f2644bc2b5b3b0c72d7d09813cb68139d..82ad97800cb115cc4830337a59cc4608c1d4a7a0 100644
+index 5c89d824ef43792c34c9f2df5851ba8af503cbd9..9d4152f9fde93a832f263c793955d327f1e078f7 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -139,6 +139,11 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -21,7 +21,7 @@ index ea63802f2644bc2b5b3b0c72d7d09813cb68139d..82ad97800cb115cc4830337a59cc4608
          return (Integer) state.getValue(BeehiveBlock.HONEY_LEVEL);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-index d01aa63f97da4cc31c385325809911e79d012d40..2b906fccdb0a5ecddaf487ee931d05b511f84351 100644
+index 54fd63a9293c9d6a444a184be1dc08e4bd948a10..2e51fab98d95c93d2095f7be6dbb5d5474158bfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
 @@ -90,4 +90,11 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
diff --git a/patches/server/0592-Entity-load-save-limit-per-chunk.patch b/patches/server/0591-Entity-load-save-limit-per-chunk.patch
index f07dc4c039..f07dc4c039 100644
--- a/patches/server/0592-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0591-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 85efd06d0c..85efd06d0c 100644
--- a/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 6db9d8af69..87bbcb36ba 100644
--- a/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 7ae0ecc93a92edeb172d9ed0709c8f7f068cdf4e..2580e8e37cee802aa4f8f3ca5df2cc4914e28daf 100644
+index 97e91910c2c30b4f838e78794c9107bdfe8d7668..b52c4d659fa4ea1a9119f932a381c4982f158deb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -289,12 +289,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0595-Inventory-close.patch b/patches/server/0594-Inventory-close.patch
index 9e9df237f4..9e9df237f4 100644
--- a/patches/server/0595-Inventory-close.patch
+++ b/patches/server/0594-Inventory-close.patch
diff --git a/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..33c6b6d97f 100644
--- a/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0597-Add-basic-Datapack-API.patch b/patches/server/0596-Add-basic-Datapack-API.patch
index f18457ab30..39820340b7 100644
--- a/patches/server/0597-Add-basic-Datapack-API.patch
+++ b/patches/server/0596-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e57af8c8f4a1ddfcf9689c8d721b2e2dc887f0be..23a433f28a7185c86c129deec32b606079c13f9c 100644
+index 44d74515165f1ebce5fb5c875ba9c4a53eab9980..2bc30c803b311ac57323b4531556e4f5effb4437 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
index 15f4f2968a..15f4f2968a 100644
--- a/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
index d3be632fee..d3be632fee 100644
--- a/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0600-ItemStack-repair-check-API.patch b/patches/server/0599-ItemStack-repair-check-API.patch
index b82fb6d5dd..b82fb6d5dd 100644
--- a/patches/server/0600-ItemStack-repair-check-API.patch
+++ b/patches/server/0599-ItemStack-repair-check-API.patch
diff --git a/patches/server/0601-More-Enchantment-API.patch b/patches/server/0600-More-Enchantment-API.patch
index a065d8b7e3..fc96204583 100644
--- a/patches/server/0601-More-Enchantment-API.patch
+++ b/patches/server/0600-More-Enchantment-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Enchantment API
 public net.minecraft.world.item.enchantment.Enchantment slots
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 57decf4156f176ebcc988478c17856cbc555c5e4..3d0ce0803e1da8a2681a3cb41096ac942ece54a1 100644
+index 5b09e7e08c61b10044ac5f481bf10bb79feda8a3..06a857ae432fc81737b53a6d2b8742c1e80e5f8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment {
@@ -66,7 +66,7 @@ index 57decf4156f176ebcc988478c17856cbc555c5e4..3d0ce0803e1da8a2681a3cb41096ac94
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index fac638e0eab8c50e6afd0ceee6f9d051127221eb..65f516044128328e7729c971a4a299cc81d51b0a 100644
+index 62700f1190bda9cb05514096e426eb3eeb87504c..3d3f7198a6134ced5c2dd25e369cb4e8d8f45fd1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -949,5 +949,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0602-Move-range-check-for-block-placing-up.patch b/patches/server/0601-Move-range-check-for-block-placing-up.patch
index 64a3d3d2b1..4553cc1ba0 100644
--- a/patches/server/0602-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0601-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 3ad46fcf6706b41fde42abe4e008c5bc86def07c..37e78cda4a41efa4b82fb3c6293bb12597d6e720 100644
+index bca39612af8c9bed1e97697c42825fb7f128197c..ef66cd1bac6f80120c14c884d4de5036a3d1d9cc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1711,6 +1711,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
index cb7fbee987..cb7fbee987 100644
--- a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0604-Add-Mob-lookAt-API.patch b/patches/server/0603-Add-Mob-lookAt-API.patch
index b60d6b1767..1215b07374 100644
--- a/patches/server/0604-Add-Mob-lookAt-API.patch
+++ b/patches/server/0603-Add-Mob-lookAt-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob#lookAt API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 522b7cb1db22b02279b004916ad2a14447a6bbed..c90f9b519c82327b787d2920b3bb079efb0c7e8a 100644
+index 74843d1fa344497d35f05d0b04f650edd1e0f3a1..6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -99,5 +99,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0605-Add-Unix-domain-socket-support.patch b/patches/server/0604-Add-Unix-domain-socket-support.patch
index c1d9e612c9..c1d9e612c9 100644
--- a/patches/server/0605-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0604-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0606-Add-EntityInsideBlockEvent.patch b/patches/server/0605-Add-EntityInsideBlockEvent.patch
index aef98d33da..ca5eb3ba9f 100644
--- a/patches/server/0606-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0605-Add-EntityInsideBlockEvent.patch
@@ -53,7 +53,7 @@ index 42265fa901aeb2bb7a564cc94162a938208c1f90..ed36a378b79f62c3dce3da637a337595
          if (blockState.isAir()) {
              entity.onAboveBubbleCol(state.getValue(DRAG_DOWN));
 diff --git a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
-index d35618520daafb50de747f6bc200160ea17ef656..3e792514d042f05ff6848b7d6506472ace67b67a 100644
+index 56d5229dc4654fc9b2f50aee094cb595b49bcf44..a387246aeb5e03d9c5bac52b51180ae8fcfb1528 100644
 --- a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
 @@ -181,6 +181,7 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock {
@@ -233,7 +233,7 @@ index 89c86d10840bc8fa73465a6a548c48fab9ac55ea..34eb7ba1adb51e394bf46a6f643db352
              entity.makeStuckInBlock(state, new Vec3(0.800000011920929D, 0.75D, 0.800000011920929D));
              if (!world.isClientSide && (Integer) state.getValue(SweetBerryBushBlock.AGE) > 0 && (entity.xOld != entity.getX() || entity.zOld != entity.getZ())) {
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index 5e1133bf2cba55a6ec5559d8db41e1a3db582d06..4e2fb4ee8e46b3c363992ff23e26f5a648c5f003 100644
+index 5aa0653b85784ece5fe09ace5c63d2c91469c823..336ffc27ea75fd8fd037c20b931233dc611084f3 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 @@ -121,6 +121,7 @@ public class TripWireBlock extends Block {
diff --git a/patches/server/0607-Attributes-API-for-item-defaults.patch b/patches/server/0606-Attributes-API-for-item-defaults.patch
index 3b1bb9e3fd..3b1bb9e3fd 100644
--- a/patches/server/0607-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0606-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
index 9a9a933443..9a9a933443 100644
--- a/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0609-More-Lidded-Block-API.patch b/patches/server/0608-More-Lidded-Block-API.patch
index e65c6a26cb..e65c6a26cb 100644
--- a/patches/server/0609-More-Lidded-Block-API.patch
+++ b/patches/server/0608-More-Lidded-Block-API.patch
diff --git a/patches/server/0610-Limit-item-frame-cursors-on-maps.patch b/patches/server/0609-Limit-item-frame-cursors-on-maps.patch
index 64dc46158b..64dc46158b 100644
--- a/patches/server/0610-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0609-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0611-Add-PlayerKickEvent-causes.patch b/patches/server/0610-Add-PlayerKickEvent-causes.patch
index d90f5b0d02..d90f5b0d02 100644
--- a/patches/server/0611-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0610-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0612-Add-PufferFishStateChangeEvent.patch b/patches/server/0611-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0612-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0611-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 1dbdf33922..1dbdf33922 100644
--- a/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..e8ae16c851 100644
--- a/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
index 8f2e06ffef..8f2e06ffef 100644
--- a/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0616-Add-BellRevealRaiderEvent.patch b/patches/server/0615-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0616-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0615-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0617-Fix-invulnerable-end-crystals.patch b/patches/server/0616-Fix-invulnerable-end-crystals.patch
index 195d6b8a42..195d6b8a42 100644
--- a/patches/server/0617-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0616-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
index 93e8beb3d3..93e8beb3d3 100644
--- a/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0619-Fix-dangerous-end-portal-logic.patch b/patches/server/0618-Fix-dangerous-end-portal-logic.patch
index 0fc1eef84c..d83d8296e1 100644
--- a/patches/server/0619-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0618-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 6277b3a553a6fe65a11d678701cb4615ec3e3cc6..ec6b9781ea95057a202f9ff31cacdb7215923458 100644
+index 968d231c8f6762a2f6177897c3b5f24864d60152..bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -485,6 +485,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0621-Make-item-validations-configurable.patch b/patches/server/0620-Make-item-validations-configurable.patch
index c080248e33..c080248e33 100644
--- a/patches/server/0621-Make-item-validations-configurable.patch
+++ b/patches/server/0620-Make-item-validations-configurable.patch
diff --git a/patches/server/0622-Line-Of-Sight-Changes.patch b/patches/server/0621-Line-Of-Sight-Changes.patch
index 348480b8db..ba904ef595 100644
--- a/patches/server/0622-Line-Of-Sight-Changes.patch
+++ b/patches/server/0621-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b2a5b9c7502af235e7f31ffa45c0f4d501a5f459..fd910b23f4f761a8a1ca3da12a114d9138753f20 100644
+index 9ce8052369e3279a89b55b56c476c1e1405c6570..1c8742e272e984d9a093d049b9420036ffc284a1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3604,7 +3604,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -45,7 +45,7 @@ index 0e8cf9386fa8b869e3738ac408be2dc86b9a2d9b..c3a26a55f46737a470448c6554d6827b
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 65f516044128328e7729c971a4a299cc81d51b0a..7876e243d6389bdfc33a5bf7e18eb3b33256919b 100644
+index 3d3f7198a6134ced5c2dd25e369cb4e8d8f45fd1..7745c32b312a7f91e6919ccfb0871d765d0e06f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -583,6 +583,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0623-add-per-world-spawn-limits.patch b/patches/server/0622-add-per-world-spawn-limits.patch
index a8352ed49b..5a0bee4c61 100644
--- a/patches/server/0623-add-per-world-spawn-limits.patch
+++ b/patches/server/0622-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f74b030ead0aa5227adbc23f789756bd08f99931..0103f937e31b7e7b9af846ec80046654c80669df 100644
+index a50a9f239ef27807d876aca9b18fbbb1dfbb14fa..b69c0e32965b3ed5b3e41d7cdee6f07b572d2b7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -213,6 +213,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0624-Fix-potions-splash-events.patch b/patches/server/0623-Fix-potions-splash-events.patch
index e217ede002..e217ede002 100644
--- a/patches/server/0624-Fix-potions-splash-events.patch
+++ b/patches/server/0623-Fix-potions-splash-events.patch
diff --git a/patches/server/0625-Add-more-LimitedRegion-API.patch b/patches/server/0624-Add-more-LimitedRegion-API.patch
index 2a50497e38..2a50497e38 100644
--- a/patches/server/0625-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0624-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 71965c5192..71965c5192 100644
--- a/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0627-Missing-Entity-API.patch b/patches/server/0626-Missing-Entity-API.patch
index 04b4f8487e..04b4f8487e 100644
--- a/patches/server/0627-Missing-Entity-API.patch
+++ b/patches/server/0626-Missing-Entity-API.patch
diff --git a/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index bf3b5d3599..6d154d7e68 100644
--- a/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0627-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 9cd00fce9dadd65020de9c48524416d6d3c82bc4..e084a66544a91cad162b1c9abb4b8f6b982992d7 100644
+index 7f030cac8b3bc7d2d4b1c32ef5edc360473881f2..a1de622805f31e6de771b62cce94ad78dd8a526f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1095,7 +1095,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 62c862fdb8..46818e51e6 100644
--- a/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix return value of Block#applyBoneMeal always being false
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 5a6cc60d345dc146a2ce9bbd177b67a17bf5312b..4c4e242305edf7b8bfa6761cd7e8c9498982608c 100644
+index a33e7114ac902ae66a31e0298e7c13af2d11b07c..29be71311755de77ce854f874b1fe2b093b997cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -557,7 +557,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
index f9e82eef32..4bdc40acc5 100644
--- a/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0629-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 508b18f5e7dd6240a680e73be639d0cf9e4e5d07..31d30840ec0acfd0d666163f77c8deb0efced922 100644
+index 61b8ec1ba224551f6898f3e2abbb67992dbb7001..eb4ad9cfd2291b01fd09be2114b56502149fe049 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index 508b18f5e7dd6240a680e73be639d0cf9e4e5d07..31d30840ec0acfd0d666163f77c8deb0
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 51dc136b9a5006382de4b12275a9c2f299d5d1f9..7113fdf06bc526af62d08313f8c47e14a2f4b652 100644
+index b3833da06ec8882f09b01fc596eafe519f0873c1..eea2b7f9c566b5a21fa7da7d1321469a12c45b5a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -201,6 +201,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
index 915947a504..915947a504 100644
--- a/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0632-Adds-PlayerArmSwingEvent.patch b/patches/server/0631-Adds-PlayerArmSwingEvent.patch
index 318be80dc4..5aef5fc4e8 100644
--- a/patches/server/0632-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0631-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e084a66544a91cad162b1c9abb4b8f6b982992d7..7f94c6022f5889f47bdce98b3c8c95da53581a24 100644
+index a1de622805f31e6de771b62cce94ad78dd8a526f..c38d6ff1c4b22833ce8c99ec420741659becf4d2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2317,7 +2317,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
index 420b8af167..270f37cb14 100644
--- a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 963af930dc40b30d84c1e5d46be752ef74908a8a..d20fbe3c03e794bee0c29e251aba223953cfed15 100644
+index aa2185e46bd47748a0a2b092ab2caf134fa4fa69..a3672049abc81fa4d34443cf0303d23e0f86b284 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -266,7 +266,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 963af930dc40b30d84c1e5d46be752ef74908a8a..d20fbe3c03e794bee0c29e251aba2239
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fdbb163e57 100644
+index a0328cfbe4184a2c1dc895e96fa3fefbdc52bf09..598f807f0d0caac98b81e0e2991f1bd497c4534e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -76,6 +76,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -50,7 +50,7 @@ index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fd
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f94c6022f5889f47bdce98b3c8c95da53581a24..a6886bc4dd06675b6fc3b28d4611842b0fa4e411 100644
+index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba65e4dbbf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -96,7 +96,7 @@ index 7f94c6022f5889f47bdce98b3c8c95da53581a24..a6886bc4dd06675b6fc3b28d4611842b
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9a1f1548b7f095946edb105ddfd64932bf64a2df..14f3873d4bf43d5576a4c93b80d8a97841b23355 100644
+index 0139313fb1b06da9df19317748862700c1b5b6e9..e9b012889987d3c0fca2c90a4edee36b2c86cb88 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -551,6 +551,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
index be1d9fc586..6f53f12f33 100644
--- a/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c46e543cfe8fa5cef2e09c72b0cf82f66359482a..3ece54f48b1cda01a04d6b943e2b10a9ad8c2af5 100644
+index 1c8742e272e984d9a093d049b9420036ffc284a1..118f1c6a349ad49d87f14a1b8ae9ef64ccb1148a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1165,7 +1165,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
index 3c1d877b05..c668a16be5 100644
--- a/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect message for outdated client
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index ae6efc0b8fe1787300a4c6d223dfe48df861ecc6..73f12e176acc0a035d3283cf5ecebcb1b8b06b73 100644
+index 0b3d6b309ea653d44bcfcd6dd418f692e040c87b..c6bcf4a5d5c48e6f73b8e5d3662ec0d7c288c6c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -82,7 +82,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
index 2548874b36..99113340f6 100644
--- a/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d20fbe3c03e794bee0c29e251aba223953cfed15..47e7bc46d349e0f0000676948a5c251f555abeb1 100644
+index a3672049abc81fa4d34443cf0303d23e0f86b284..00adb106eea35b745e98e28e6b9e0affe2d00651 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 4a998000b2..4a998000b2 100644
--- a/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0639-Stinger-API.patch b/patches/server/0638-Stinger-API.patch
index 9e8f26a8d2..a7104402ba 100644
--- a/patches/server/0639-Stinger-API.patch
+++ b/patches/server/0638-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 7876e243d6389bdfc33a5bf7e18eb3b33256919b..59d0002c70e2dae6ab9cb896e0a80e16993e64f3 100644
+index 7745c32b312a7f91e6919ccfb0871d765d0e06f3..886f9b0a4cb4bd6d7341a1ea707565c4492f31d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 5f8b5b11ed..d3cf90c2af 100644
--- a/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
@@ -18,7 +18,7 @@ index 53515854d05a0c27a65f71193424236a21b11f5f..c368b437597edf7e165326727ae778a6
  
      public static int createNewSavedData(Level world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, ResourceKey<Level> dimension) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-index 70b365afc40f11d4da3aea2b5d6b2467f517deac..a74ea06e3a190916527ab2c85d13f1e34c08d50a 100644
+index 0c7280621cce9855dcc9569e0aefba77bfd555cb..0c7c67e1eea44487c52ebf650d35b3b43cd00c3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
 @@ -133,6 +133,7 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
diff --git a/patches/server/0641-Add-System.out-err-catcher.patch b/patches/server/0640-Add-System.out-err-catcher.patch
index 1f11b3d41a..6fd5f26dc3 100644
--- a/patches/server/0641-Add-System.out-err-catcher.patch
+++ b/patches/server/0640-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ab1c96a6d7e0d3f8bb651936256e9a66badf3355..2a5daa15b1095b20716e997c18fe68ac7d550da6 100644
+index 6a860029247e1575329975060fb9c2d7e8c9f033..675788beea6c9559d5764501e76d671abcba3f17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -305,6 +305,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30e..f4242ad30e 100644
--- a/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0643-Improve-boat-collision-performance.patch b/patches/server/0642-Improve-boat-collision-performance.patch
index 92f123e9ce..30906bd16a 100644
--- a/patches/server/0643-Improve-boat-collision-performance.patch
+++ b/patches/server/0642-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 5e9401f0c2de0743aca9237ee8c4dfba586cfdb9..25b2d7016b60ee9bad0a2fb4a2c7c8ee
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8ce2eae72048701f02026fc5309b406005900694..705a76c73233a29105f5cb2e50d4d200376a4c60 100644
+index 118f1c6a349ad49d87f14a1b8ae9ef64ccb1148a..eca3c85b2b24a59b6c3b316e2535f2a4354f50f9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1414,7 +1414,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
index 4f88cce17e..f97c806cf2 100644
--- a/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0643-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 a6886bc4dd06675b6fc3b28d4611842b0fa4e411..2f3fddf5427248c3283173afaed220f7a3fd9e31 100644
+index eabdaf85e904224f936154d415d183ba65e4dbbf..43e9f9ce338bd1cf803ad707d318cd2435231426 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
index 9fba827e12..9fba827e12 100644
--- a/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0646-Add-PlayerSetSpawnEvent.patch b/patches/server/0645-Add-PlayerSetSpawnEvent.patch
index b0c4474c88..b0c4474c88 100644
--- a/patches/server/0646-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0645-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
index 45531b8594..45531b8594 100644
--- a/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..524e1fabfb 100644
--- a/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
index 63865bec49..63865bec49 100644
--- a/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0650-Added-EntityDamageItemEvent.patch b/patches/server/0649-Added-EntityDamageItemEvent.patch
index 935084ef4b..935084ef4b 100644
--- a/patches/server/0650-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0649-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0651-Optimize-indirect-passenger-iteration.patch b/patches/server/0650-Optimize-indirect-passenger-iteration.patch
index 936797269e..a3a4dcc84e 100644
--- a/patches/server/0651-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0650-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 ec6b9781ea95057a202f9ff31cacdb7215923458..7812a23c779d4555caddd747f7ad8d96e6f08797 100644
+index bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae..cfc9732378772084cd0badabaccd3de934b39596 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3909,20 +3909,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..a1e4f933cb 100644
--- a/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
index 17a8a654c4..17a8a654c4 100644
--- a/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0654-Clear-bucket-NBT-after-dispense.patch b/patches/server/0653-Clear-bucket-NBT-after-dispense.patch
index 1f2a7cae78..1f2a7cae78 100644
--- a/patches/server/0654-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0653-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
index 48c5524ab8..48c5524ab8 100644
--- a/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0656-Add-BlockBreakBlockEvent.patch b/patches/server/0655-Add-BlockBreakBlockEvent.patch
index 2fd4cd307f..52a9d63ddc 100644
--- a/patches/server/0656-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0655-Add-BlockBreakBlockEvent.patch
@@ -33,7 +33,7 @@ index 36b196c8834c4eb873bfca0b12f1fc2b421ea071..9522e646529f3d849471931b4b3c0d13
      public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
          if (world instanceof ServerLevel) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 48ee146dea30f7d8c48c6bee7a1547ad2a69959d..195a08045d6705a47efa918fa0d3882ee9073ab4 100644
+index 929241e479a42011f073fb9d144739b6504132b1..b9896fd8e96a908637ce1edf9413166192903ce7 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -402,7 +402,7 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 1002fe00f7..1002fe00f7 100644
--- a/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0658-More-CommandBlock-API.patch b/patches/server/0657-More-CommandBlock-API.patch
index 162a84f2e6..65a5093980 100644
--- a/patches/server/0658-More-CommandBlock-API.patch
+++ b/patches/server/0657-More-CommandBlock-API.patch
@@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..0b42306f17bf8850a13a51067c2d19e7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
-index bdd0647d683565088e5cfcd43fb26f4b776db338..42c39c91d2b8e2bc32592adb8813f8a13936f34a 100644
+index 7f5d930b6bfaf9a0042f9be4be68f2cc111b304e..63f6b97d82c8b98eb1379b5c30f6c75eb22f7c23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
 @@ -5,7 +5,7 @@ import org.bukkit.World;
@@ -68,7 +68,7 @@ index bdd0647d683565088e5cfcd43fb26f4b776db338..42c39c91d2b8e2bc32592adb8813f8a1
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-index 66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5..2534abcdce426189ac15e0659ab62840b3d54762 100644
+index 92e21126a9347f1ee2279ab09bb6abf2344ad2e2..0ee159d488b15e571f9b19ec852fe279755696fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
 @@ -13,7 +13,7 @@ import org.bukkit.permissions.PermissionAttachment;
diff --git a/patches/server/0659-Add-missing-team-sidebar-display-slots.patch b/patches/server/0658-Add-missing-team-sidebar-display-slots.patch
index a9c7a8fa5b..446d882c45 100644
--- a/patches/server/0659-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0658-Add-missing-team-sidebar-display-slots.patch
@@ -52,7 +52,7 @@ index 73c5ffff70605b32188a9bb5fb6c0ee04cb66efe..711d227f5ee6d63356a94a0567968da4
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index cfaa85dc3d567bf0110e45fc4e4f24a406b41a45..313cd180cbad5727433daae4c15ffa4e1e948eaa 100644
+index 12972cf5876da72cc5d097aeedb13c9addd98add..e0c1131687fffd7f215505caafe6ef2292ac8672 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -239,6 +239,14 @@ public class Commodore
diff --git a/patches/server/0660-Add-back-EntityPortalExitEvent.patch b/patches/server/0659-Add-back-EntityPortalExitEvent.patch
index 020d493778..fa64daa44d 100644
--- a/patches/server/0660-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0659-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 7812a23c779d4555caddd747f7ad8d96e6f08797..406b2cf18466439f7984497cf5da2bef466de459 100644
+index cfc9732378772084cd0badabaccd3de934b39596..0dcc94b713593a298f09d489780f38298d5f4cc5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3365,6 +3365,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
index 827935032f..827935032f 100644
--- a/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0662-Get-entity-default-attributes.patch b/patches/server/0661-Get-entity-default-attributes.patch
index afd4c49b4d..afd4c49b4d 100644
--- a/patches/server/0662-Get-entity-default-attributes.patch
+++ b/patches/server/0661-Get-entity-default-attributes.patch
diff --git a/patches/server/0663-Left-handed-API.patch b/patches/server/0662-Left-handed-API.patch
index 367c9ed9bc..e75eb9ca95 100644
--- a/patches/server/0663-Left-handed-API.patch
+++ b/patches/server/0662-Left-handed-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index c90f9b519c82327b787d2920b3bb079efb0c7e8a..c526304d31fd9be1b3c895187f7d9fc45edf4866 100644
+index 6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5..40d277f2737f1a060c3047313289c73307948e73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -147,5 +147,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0664-Add-more-advancement-API.patch b/patches/server/0663-Add-more-advancement-API.patch
index ba79527126..c7966b2e3e 100644
--- a/patches/server/0664-Add-more-advancement-API.patch
+++ b/patches/server/0663-Add-more-advancement-API.patch
@@ -164,7 +164,7 @@ index 4aa8cda2bf72627b153e636a408fb3971caf2309..e29d7c6e1cef10a76c8630855fada11c
  
      private final DisplayInfo handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 313cd180cbad5727433daae4c15ffa4e1e948eaa..8f8b14cb845bf1ba28276b3e3c0d8f8c56106c7d 100644
+index e0c1131687fffd7f215505caafe6ef2292ac8672..51e60a68484b590906d83541e56f31305e683bc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -56,6 +56,7 @@ public class Commodore
diff --git a/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
index ed29983bdd..4fd7a361e7 100644
--- a/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
@@ -29,7 +29,7 @@ index aa90b0bc1ca3f79a38b39442bf87e376cd2d73ae..48a88dae70fdf2757537d4a90aa60046
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 8f8b14cb845bf1ba28276b3e3c0d8f8c56106c7d..d7495ea25713e959d106764054ce6642af497035 100644
+index 51e60a68484b590906d83541e56f31305e683bc0..1f30da05f0dd1d0f67ff7ec544e8f8455e2ef516 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -461,6 +461,16 @@ public class Commodore
diff --git a/patches/server/0666-Add-critical-damage-API.patch b/patches/server/0665-Add-critical-damage-API.patch
index 2485aabae6..2485aabae6 100644
--- a/patches/server/0666-Add-critical-damage-API.patch
+++ b/patches/server/0665-Add-critical-damage-API.patch
diff --git a/patches/server/0667-Fix-issues-with-mob-conversion.patch b/patches/server/0666-Fix-issues-with-mob-conversion.patch
index 237d313b89..237d313b89 100644
--- a/patches/server/0667-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0666-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0668-Add-isCollidable-methods-to-various-places.patch b/patches/server/0667-Add-isCollidable-methods-to-various-places.patch
index 587957d8af..8c0d3f840e 100644
--- a/patches/server/0668-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0667-Add-isCollidable-methods-to-various-places.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add isCollidable methods to various places
 public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 4c4e242305edf7b8bfa6761cd7e8c9498982608c..5fa6a77ccd01deb929d86efc227439f4f280ba53 100644
+index 29be71311755de77ce854f874b1fe2b093b997cf..6027b675ca032d7c8f6d43624dcfca69d26849ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -456,6 +456,11 @@ public class CraftBlock implements Block {
@@ -23,7 +23,7 @@ index 4c4e242305edf7b8bfa6761cd7e8c9498982608c..5fa6a77ccd01deb929d86efc227439f4
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index eb895090384b6ce0943e8286a3aae55506f4310a..1308720c6f3072a5442b93d495e03735419d59eb 100644
+index aca63719790429d3d7c7c59a1931a98221c70fc0..31bb92c026a4a2de0e8d3500f6ecf35b60d61fb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 @@ -331,4 +331,11 @@ public class CraftBlockState implements BlockState {
diff --git a/patches/server/0669-Goat-ram-API.patch b/patches/server/0668-Goat-ram-API.patch
index 443c58b4ee..443c58b4ee 100644
--- a/patches/server/0669-Goat-ram-API.patch
+++ b/patches/server/0668-Goat-ram-API.patch
diff --git a/patches/server/0670-Add-API-for-resetting-a-single-score.patch b/patches/server/0669-Add-API-for-resetting-a-single-score.patch
index 0983cd3cdf..7d45195961 100644
--- a/patches/server/0670-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0669-Add-API-for-resetting-a-single-score.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add API for resetting a single score
 It was only possible to reset all scores for a specific entry, instead of resetting only specific scores.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-index 024c138082d68291db161a9ca3d233ef27788097..e5898f391e18fe5da9affd9321d1f34bba0af2d0 100644
+index 510f5ce6c4ea16b5ef5b6942311aa6f43b0083be..552a548d5fc72707a3ab56595c1586c0cf70e836 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 @@ -68,4 +68,12 @@ final class CraftScore implements Score {
diff --git a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
index 9f8f4e9c4f..23ec0bc909 100644
--- a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0670-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 406b2cf18466439f7984497cf5da2bef466de459..7e461dae8e9a290fc54cb933ca8a880ae821ffa9 100644
+index 0dcc94b713593a298f09d489780f38298d5f4cc5..b248207e0dc52f8ac44a93a141e7e883b253a5ed 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2146,6 +2146,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -27,7 +27,7 @@ index 406b2cf18466439f7984497cf5da2bef466de459..7e461dae8e9a290fc54cb933ca8a880a
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2ea8b72ef450b60ec6d7ec10f3f94d2154e06670..3d9ee3a7305b0575387e719ac4062c4a355d63e8 100644
+index 0a29960fca388dd95710bdba19f37fde6be52073..b38e974ee4aa1577860e1b97cc4b05af3c9b1a39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1387,5 +1387,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0672-Vanilla-command-permission-fixes.patch b/patches/server/0671-Vanilla-command-permission-fixes.patch
index 6a9ac954d9..316475ab5c 100644
--- a/patches/server/0672-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0671-Vanilla-command-permission-fixes.patch
@@ -51,7 +51,7 @@ index 5fd7e5aa0644fda8e2f7f57eef9a6f0011534cb9..b201fd131864751bea1e926c6b23f974
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 6b991cd34644077d60269eeba6ce90dbfdf8fbb2..d6a4507f547893bf7f8318723b5f86cc779e47a2 100644
+index 35746f4fc45568c32497677b63a2a746c7a9ba94..13804bb81a13d51d2e9e55d8a477369ba20fc301 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -88,7 +88,23 @@ public final class VanillaCommandWrapper extends BukkitCommand {
diff --git a/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index ee020e825e..0949a12465 100644
--- a/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552c59e66fe 100644
+index 9fd3eca485fc71e5da142f8b6763e44691e3f41c..48513493d92ea0fe5e2cb4f021c843b10caab062 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1555,9 +1555,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -28,7 +28,7 @@ index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6b92189b6dddee7e632c142430eaa784d22adbca..c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91 100644
+index c358a078bdbb672b41f606cf83353fc35bcb4b15..0ee7c54e4e46bc35e5a7b01ddd408bdbe0e3d1c1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1617,6 +1617,18 @@ public class ServerPlayer extends Player {
@@ -51,7 +51,7 @@ index 6b92189b6dddee7e632c142430eaa784d22adbca..c6d56a225cdaffc0b08eb4805e6bdcb0
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 39f011a3c5e0eaa24ab95738329ba98aa07a5f36..b40961ad53437a5aa603f658ed56fca827de5716 100644
+index 8dd7a1405997a7e90aab01ca7c20a616b15ca761..85799b95bab12b5a060246f20364e9440e56a3ed 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -508,6 +508,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0674-Fix-GameProfileCache-concurrency.patch b/patches/server/0673-Fix-GameProfileCache-concurrency.patch
index 0337248104..0337248104 100644
--- a/patches/server/0674-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0673-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch b/patches/server/0674-Improve-and-expand-AsyncCatcher.patch
index d7b23540a8..810a3aa123 100644
--- a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0674-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2f3fddf5427248c3283173afaed220f7a3fd9e31..979515ce93ec0cb6589158ac0b1c54f9283f96b6 100644
+index 43e9f9ce338bd1cf803ad707d318cd2435231426..079c7ffa2b1ff8bbb5e51553ad94713d0339e9f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1543,6 +1543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -29,7 +29,7 @@ index 2f3fddf5427248c3283173afaed220f7a3fd9e31..979515ce93ec0cb6589158ac0b1c54f9
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 14d5d124c34a2092f7a0fc9e1e1305ac9b17ce81..a92345f1f7c4a4153fa55e2b23f4097faf90161d 100644
+index eca3c85b2b24a59b6c3b316e2535f2a4354f50f9..bbeb81980b847a65f8d57eb6caf26aae63ee2061 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1119,7 +1119,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -166,7 +166,7 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2ccfd2834db3571cbfed8b12e45a25dfa159e083..ea820fbbbe3f2df060253dd21813a978460cd705 100644
+index 886f9b0a4cb4bd6d7341a1ea707565c4492f31d4..03b1b9d8bf7b12343564ff6eb4fb865e4626b1e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 3201888a6b..3201888a6b 100644
--- a/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
index 989716f6fd..989716f6fd 100644
--- a/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0678-Optimise-general-POI-access.patch b/patches/server/0677-Optimise-general-POI-access.patch
index 332786d627..332786d627 100644
--- a/patches/server/0678-Optimise-general-POI-access.patch
+++ b/patches/server/0677-Optimise-general-POI-access.patch
diff --git a/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8c..0023c8bd8c 100644
--- a/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e97fc69558..e97fc69558 100644
--- a/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ad81d50205..007351ae6c 100644
--- a/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7113fdf06bc526af62d08313f8c47e14a2f4b652..0f16a962082cf8a213cb348b87683692f818c80a 100644
+index eea2b7f9c566b5a21fa7da7d1321469a12c45b5a..6bd9b680fa1e84d058ada2354fa6a5b876185dc4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -455,6 +455,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 5475ff2092..5475ff2092 100644
--- a/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
index d931ef54fa..d931ef54fa 100644
--- a/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0685-Time-scoreboard-search.patch b/patches/server/0684-Time-scoreboard-search.patch
index e6b092ac61..e2bd684e63 100644
--- a/patches/server/0685-Time-scoreboard-search.patch
+++ b/patches/server/0684-Time-scoreboard-search.patch
@@ -20,7 +20,7 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..678a31fb85947ee8807d02d0fe4e11a7
      private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index 8f20fa2bfbe037fbaa9f4c4c3341a3d9b9a711b5..628951be16da8f19f0e1a974a0b4efa86e873b99 100644
+index f06f011375b9be307a858ccb6579f74942b1d325..24c5e6e3dd41e72d22819964bc8e77f0ebc2d089 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager {
diff --git a/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..f005ae7e71 100644
--- a/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
index 75ece1bf8b..75ece1bf8b 100644
--- a/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0688-Execute-chunk-tasks-mid-tick.patch b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
index f4272a0512..3a0637b6e5 100644
--- a/patches/server/0688-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index 678a31fb85947ee8807d02d0fe4e11a73d2dafaa..0fc4feb00940079c4eb9554a3a48d19c
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7e4f3b7a5790292b3b8439fb4696d9d6cfec0167..6c02d5233c782b0e5049afdf84250687ae71dcde 100644
+index d74313b58b660f3c03b8a6db4f80b6b073b6b795..f7c1d07c95f7b67e32bd6679af88612aec74f54f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1285,6 +1285,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -106,7 +106,7 @@ index 7e4f3b7a5790292b3b8439fb4696d9d6cfec0167..6c02d5233c782b0e5049afdf84250687
 +    // Paper end - execute chunk tasks mid tick
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 7d7dc8246f44d6ffd46b05f917ffbdb9cc24372b..dbedc73039f53ddf042999524eec62f032a20d5d 100644
+index 4e58f31e4852a0811f85596653f6db630a75b069..8907396dc21dbfb31ff15286a7daa2110f6e34c0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -571,6 +571,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -126,7 +126,7 @@ index 7d7dc8246f44d6ffd46b05f917ffbdb9cc24372b..dbedc73039f53ddf042999524eec62f0
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 80f2a1204bee79daf0cae9310ce8d552c59e66fe..5c39bf8a3975e632a4f41938306d9b2eb77f335d 100644
+index 48513493d92ea0fe5e2cb4f021c843b10caab062..82867a6d6e2277355269712e9e45602fc7afac45 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -154,7 +154,7 @@ index 80f2a1204bee79daf0cae9310ce8d552c59e66fe..5c39bf8a3975e632a4f41938306d9b2e
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0f16a962082cf8a213cb348b87683692f818c80a..a21b2a100503b1fcceb700da11bef5866f3d178b 100644
+index 6bd9b680fa1e84d058ada2354fa6a5b876185dc4..795be71432c4d834004bcfb70a8d1927cf22bfda 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -918,6 +918,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0689-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
index 87347c9261..42fe98d24e 100644
--- a/patches/server/0689-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0688-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 1c4d30d7e732685f3fa1acff524eef9900ae7ca8..5c1b7795de57a2879230d2aef7563e4b8f1e30fd 100644
+index 290a231deb203eb46cb91eb23c28d8e9d49b0f34..b71be5e7e18f884cf35cc3a940c87e744e00f811 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1302,7 +1302,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
index 08ef0f3bc8..08ef0f3bc8 100644
--- a/patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0691-Optimise-random-block-ticking.patch b/patches/server/0690-Optimise-random-block-ticking.patch
index 981e905456..3587292de4 100644
--- a/patches/server/0691-Optimise-random-block-ticking.patch
+++ b/patches/server/0690-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 5c39bf8a3975e632a4f41938306d9b2eb77f335d..ab2ba79aa6ef36a86173e47abdac71a115693d02 100644
+index 82867a6d6e2277355269712e9e45602fc7afac45..59bc500d1dfabbd68cb0948b53f1a2f77378766c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -839,6 +839,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -319,7 +319,7 @@ index 652a8150f7343050b6da6c01f4e73a755138d491..5f57f13d50e051c621e401b63c0b55b3
  
      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 a21b2a100503b1fcceb700da11bef5866f3d178b..270ce3995229aa79074e981bb45e5480a5e924d4 100644
+index 795be71432c4d834004bcfb70a8d1927cf22bfda..5e7a53d1cae4c94a08fb89d7599d183de21cdfaa 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1380,10 +1380,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..0a7c36c977 100644
--- a/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
index 16ce321611..cc0f4ae232 100644
--- a/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
@@ -337,7 +337,7 @@ index 5f625acf04ddb56e3596d086252f9bfccfdb95f2..54c7f34ba3dc8466223e589702d0c93a
                  protected void initChannel(Channel channel) {
                      Connection.setInitialProtocolAttributes(channel);
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2580e8e37cee802aa4f8f3ca5df2cc4914e28daf..58321faf05c9fbeaf4b417e2749b190ad2a33f60 100644
+index b52c4d659fa4ea1a9119f932a381c4982f158deb..2e73c94f74be95a7d6ba58d5151c3090253bb9c6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -222,12 +222,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
index 642e3e16b9..316023491e 100644
--- a/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index 047fc7206131e0f36ab45d04e98b7a235431e342..6ac03dee902051a26493dba468d6a2f5
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ab2ba79aa6ef36a86173e47abdac71a115693d02..08027ef81e46a6346b2acedd82f66ffc2297559d 100644
+index 59bc500d1dfabbd68cb0948b53f1a2f77378766c..7580fbc59780161946d9dc65587b6c6aea81671b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1216,7 +1216,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -122,7 +122,7 @@ index ab2ba79aa6ef36a86173e47abdac71a115693d02..08027ef81e46a6346b2acedd82f66ffc
  
      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 7e461dae8e9a290fc54cb933ca8a880ae821ffa9..9fc1ef3d4d59ea2236f668495392520f19ef2145 100644
+index b248207e0dc52f8ac44a93a141e7e883b253a5ed..808bbccad26c6e0cd07e27d6f380ba1eafd8bd22 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -203,7 +203,7 @@ index 7e461dae8e9a290fc54cb933ca8a880ae821ffa9..9fc1ef3d4d59ea2236f668495392520f
              int j = Mth.floor(y);
              int k = Mth.floor(z);
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 7071327fab87d53e794374c701d7c2748c439aaa..50c72e5db369a180f425eaaa0411cb8871bc3463 100644
+index dca163ff5436f1007383c8261cac1ac7c0613f23..40dcdf6885e99b26283a9ea2bd4d4bf6ec358e71 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -22,6 +22,78 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
diff --git a/patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 429df0d968..429df0d968 100644
--- a/patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0697-Distance-manager-tick-timings.patch b/patches/server/0696-Distance-manager-tick-timings.patch
index c7179fd70d..c7179fd70d 100644
--- a/patches/server/0697-Distance-manager-tick-timings.patch
+++ b/patches/server/0696-Distance-manager-tick-timings.patch
diff --git a/patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 26b94b2d8b..2450152a70 100644
--- a/patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0697-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 08027ef81e46a6346b2acedd82f66ffc2297559d..b0d8d28aa4a5cd95671a90e3f9981c532726b8ca 100644
+index 7580fbc59780161946d9dc65587b6c6aea81671b..38931091d573059d7e265fd86a704b96f48bdc48 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2642,6 +2642,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
index 4f135f41df..f32c6d0bed 100644
--- a/patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
@@ -11,7 +11,7 @@ encountering a command node with ASK_SERVER suggestions, however a
 modified client can send this packet whenever it wants.
 
 diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
-index f3b93786f241d45c3f5b571cf8b7e5241c7b7edd..429a48cdbd30ac76046cd46a74309d4ece931802 100644
+index 94d1483bc6fe05c24720840ba861ebc6977f6062..c7cfb3b8ba3f64fb04dfebd5d724aa8d3f2698ab 100644
 --- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
 +++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
 @@ -596,10 +596,14 @@ public class CommandDispatcher<S> {
diff --git a/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 8f7c7094af..63f447f944 100644
--- a/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0699-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 979515ce93ec0cb6589158ac0b1c54f9283f96b6..3f88ea6ce570c1b86651e5095970c28cbf3c2a3d 100644
+index 079c7ffa2b1ff8bbb5e51553ad94713d0339e9f4..f1c0ff296b58aa020b00d6681ecf3cb4db09f561 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -734,6 +734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0701-Add-packet-limiter-config.patch b/patches/server/0700-Add-packet-limiter-config.patch
index 6b454b34dd..6b454b34dd 100644
--- a/patches/server/0701-Add-packet-limiter-config.patch
+++ b/patches/server/0700-Add-packet-limiter-config.patch
diff --git a/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 1914569c27..341421e59d 100644
--- a/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
@@ -11,7 +11,7 @@ This commit hence simply fixes this by using the proper body colour
 value when updating the pattern color.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
-index 581e0f4d68d6eb8eb04449586ffdba35e8b3ad2b..9a045a7793ec20334853a0e1c3529b31899214b3 100644
+index a4256ee1c1cd305d1253e7b8084d814428386369..67c56a4f643e1cb52139c8f3ffc4af0cf278339f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
 @@ -107,7 +107,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB
diff --git a/patches/server/0703-Ensure-valid-vehicle-status.patch b/patches/server/0702-Ensure-valid-vehicle-status.patch
index 45c65ee8af..608f09c5af 100644
--- a/patches/server/0703-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0702-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91..c9eb785457b606d8f7c4fe3f824fd6d0a1d1070e 100644
+index 0ee7c54e4e46bc35e5a7b01ddd408bdbe0e3d1c1..e45fc21532911aedacd99315386857e8e54ade32 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -569,7 +569,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
index df49391139..df49391139 100644
--- a/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
index 82e266f96e..2130840734 100644
--- a/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't log debug logging being disabled
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 3ac48dafe2300ff4cf4591569fec9ce4916503cd..612c3169c3463d702b85975e1db79ae6e47d60d0 100644
+index 1eafb92fdf3c6ddce5f5f847bd9034287e2d4b84..68602dfb171d47e47fd0710b4324013ef05214d0 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -382,7 +382,7 @@ public class SpigotConfig
diff --git a/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0708-Preserve-overstacked-loot.patch b/patches/server/0707-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0708-Preserve-overstacked-loot.patch
+++ b/patches/server/0707-Preserve-overstacked-loot.patch
diff --git a/patches/server/0709-Update-head-rotation-in-missing-places.patch b/patches/server/0708-Update-head-rotation-in-missing-places.patch
index 3abb11c491..77c31f1712 100644
--- a/patches/server/0709-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0708-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 9fc1ef3d4d59ea2236f668495392520f19ef2145..6b07bab1986e66d3e34c6ed3c54035bc8f0473da 100644
+index 808bbccad26c6e0cd07e27d6f380ba1eafd8bd22..69398b0cab962f506416802c20b7e7b76d09939b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1911,6 +1911,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0710-prevent-unintended-light-block-manipulation.patch b/patches/server/0709-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0710-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0709-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0711-Fix-CraftCriteria-defaults-map.patch b/patches/server/0710-Fix-CraftCriteria-defaults-map.patch
index 65eeffccea..3e79bd7fb7 100644
--- a/patches/server/0711-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0710-Fix-CraftCriteria-defaults-map.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftCriteria defaults map
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
-index a8728102499ec8a0b4946bcc9b59c16193731f8c..d849ef9a51dc901c8045d63218b8ee5fa5c7ee7a 100644
+index 441e2122f837712a21328eb7659cc9925ff9b6f8..8464531a4ee400834d25c23b1eb723f49be8689e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
 @@ -54,7 +54,7 @@ public final class CraftCriteria implements Criteria {
diff --git a/patches/server/0712-Fix-upstreams-block-state-factories.patch b/patches/server/0711-Fix-upstreams-block-state-factories.patch
index da98b563f3..da98b563f3 100644
--- a/patches/server/0712-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0711-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0713-Configurable-feature-seeds.patch b/patches/server/0712-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0713-Configurable-feature-seeds.patch
+++ b/patches/server/0712-Configurable-feature-seeds.patch
diff --git a/patches/server/0714-Add-root-admin-user-detection.patch b/patches/server/0713-Add-root-admin-user-detection.patch
index 00bf912738..8f7dec5ba1 100644
--- a/patches/server/0714-Add-root-admin-user-detection.patch
+++ b/patches/server/0713-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b9a4447e790f34fd8f88f353bf0e24a18a298ee6..c7894892afe97eb3cb453c37a2d9a23d811d70b8 100644
+index 51c924f051c25cac8172b0ddab83f3b7a69adfe6..5a0a34ea500607b1370df3e5ee4c1ad64f252449 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0715-Always-allow-item-changing-in-Fireball.patch b/patches/server/0714-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0715-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0714-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
index 3c62c6e020..9cc1f40ca7 100644
--- a/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0715-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 6b07bab1986e66d3e34c6ed3c54035bc8f0473da..0433887a9f6ad19fdd1f8780424a10b0ef3b4c0e 100644
+index 69398b0cab962f506416802c20b7e7b76d09939b..0fb3cb6a30810b386b6406481f0bd36eb834004c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
index 9573ff5d6b..3f080e05bc 100644
--- a/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d9f9eb379c6d00aa7be40d4889d8ee4fbffab357..ac66d2ee0608b079ac0f1809d9116242daf557c1 100644
+index bbeb81980b847a65f8d57eb6caf26aae63ee2061..1e0dfa8e04e02e552d9233c12be915778bb6e09c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2680,13 +2680,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
index db5dd67f1b..db5dd67f1b 100644
--- a/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
index c57379be37..c57379be37 100644
--- a/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 9658237f9b..2d07a04363 100644
--- a/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..8d2870c780c4c253f6570c7ef73f6e7c
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ac66d2ee0608b079ac0f1809d9116242daf557c1..f6b8518df044cd57eeafa84890920bba5c36c012 100644
+index 1e0dfa8e04e02e552d9233c12be915778bb6e09c..c2d06bd94c829e1e9cf00c20e5e2547c60d4b0ff 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3191,7 +3191,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
index 6553879c95..6553879c95 100644
--- a/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0722-Fix-Spigot-growth-modifiers.patch b/patches/server/0721-Fix-Spigot-growth-modifiers.patch
index c83c76a287..2535a2a265 100644
--- a/patches/server/0722-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0721-Fix-Spigot-growth-modifiers.patch
@@ -101,7 +101,7 @@ index 20fdd6cc35bec8f707a83fb682257f68163ed6fc..aca205d641b4a87d093b140585cf04fa
              this.grow(world, state, pos, 1);
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f..38da4cc3fe3be86e43432de942a1290fa8215474 100644
+index 11ac344ef113732fa717b67c51f76692b9b247e7..62c1434018be5b5fb70f7019b3c06d4d9200661d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -96,6 +96,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0725-Optimize-HashMapPalette.patch b/patches/server/0724-Optimize-HashMapPalette.patch
index 9e2b26701e..9e2b26701e 100644
--- a/patches/server/0725-Optimize-HashMapPalette.patch
+++ b/patches/server/0724-Optimize-HashMapPalette.patch
diff --git a/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
index 96dde1b0d3..4feabbc623 100644
--- a/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 38738fa0b19c665d5458286431db46dbe30dbb41..f436c42325a0dd90bd62f7358a3a9132ce02c192 100644
+index 146b5bd0a081afa8aee0e268bfaf8eb4390eacee..2aacf05d0f79a5418f31a5411b0d06e034f8a0da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2364,6 +2364,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0727-Collision-optimisations.patch b/patches/server/0726-Collision-optimisations.patch
index 97c209f43c..97c209f43c 100644
--- a/patches/server/0727-Collision-optimisations.patch
+++ b/patches/server/0726-Collision-optimisations.patch
diff --git a/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
index 8a8c38fd6a..9e795d10e4 100644
--- a/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0727-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 7bdb23b00cf04e54ba906d6ed10ef96cfb1a2b33..d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23 100644
+index 88c543881c8e7453fffc08e1d5a3226505a8889e..1a44358117e5f72789dd270ce4311f6c6a17bf6d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -534,7 +534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 3302cf5d13..3302cf5d13 100644
--- a/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0730-Add-more-Campfire-API.patch b/patches/server/0729-Add-more-Campfire-API.patch
index 5ba5d97bdf..61de925634 100644
--- a/patches/server/0730-Add-more-Campfire-API.patch
+++ b/patches/server/0729-Add-more-Campfire-API.patch
@@ -66,7 +66,7 @@ index 04b2697ee857e714b1202d02d093b0c60f079a6f..d80855b22dc10dbf697578d5f78664ed
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
-index 28e33d2921c779ee9e96865b0b6c6309a6c27a21..df8c2110d84341e822b7ad981f6c4fe2e1c71601 100644
+index 07556d0961569c1be62a697414bd4ec512b04ac0..cc641dc70dc12b902bd9cad93fffded9032f1e82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
 @@ -56,4 +56,40 @@ public class CraftCampfire extends CraftBlockEntityState<CampfireBlockEntity> im
diff --git a/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..5c74ea64c9 100644
--- a/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0732-Fix-tripwire-state-inconsistency.patch b/patches/server/0731-Fix-tripwire-state-inconsistency.patch
index eba71d4136..8c45070e31 100644
--- a/patches/server/0732-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0731-Fix-tripwire-state-inconsistency.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix tripwire state inconsistency
 This patch prevents updating and re-setting the tripwire when being removed in certain conditions
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index 4e2fb4ee8e46b3c363992ff23e26f5a648c5f003..7f60175bf671d282c11e9084670d2bb900968255 100644
+index 336ffc27ea75fd8fd037c20b931233dc611084f3..a4ceb86f2c1bbd7d76d07532ed8a512722b01381 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 @@ -74,7 +74,7 @@ public class TripWireBlock extends Block {
diff --git a/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
index 7738d9621a..cdfb7af3ef 100644
--- a/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0732-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 ede58a9d1f3245a0d8fd22f40731840877f4cabe..7bbe11ed8f42af737063a803769e29a59e127d1e 100644
+index cc5c122fe9e3528e3b120d00e0a3600ef947c664..27b07629aa36029e251ebbc3fb68466f02c0aab3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3527,6 +3527,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0734-Improve-scoreboard-entries.patch b/patches/server/0733-Improve-scoreboard-entries.patch
index 125efaf657..5c71b1a0dc 100644
--- a/patches/server/0734-Improve-scoreboard-entries.patch
+++ b/patches/server/0733-Improve-scoreboard-entries.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve scoreboard entries
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-index be3e1c4765ba891462e36ce5b6e35f16e3ec189a..d00e9ca05c36c2d1194024914bf935db0113d7fa 100644
+index 5a9adade82970d8101b946596370d104721ac086..58cd0a5fccb93b467ca5c31e9c9d5149cb85e30b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 @@ -145,6 +145,14 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective
@@ -52,7 +52,7 @@ index 052389310826ee6b97cf27dfd952e0101fb2d097..a8c5bfc54ed2b8bd873f124c7080d73f
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index baff11728120fda1740d5e15163760f50fe1cd1d..4d65d1a0dd52aaeeeef8acf2b0023f27257f60a2 100644
+index c0362c54d0d097ad6cd4616b3ab194e51258da1e..f0b59dd4b7c3d857f7aa7c8263c760f7a46c6e34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -304,6 +304,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
diff --git a/patches/server/0735-Entity-powdered-snow-API.patch b/patches/server/0734-Entity-powdered-snow-API.patch
index 8ea727a6aa..695d4ee581 100644
--- a/patches/server/0735-Entity-powdered-snow-API.patch
+++ b/patches/server/0734-Entity-powdered-snow-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Entity powdered snow API
 public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3d9ee3a7305b0575387e719ac4062c4a355d63e8..853561c0b3507808c70f4274812407d1ffb37504 100644
+index b38e974ee4aa1577860e1b97cc4b05af3c9b1a39..cd2b8fa364ce49054007468ee607bd9a8c741971 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1397,5 +1397,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -22,7 +22,7 @@ index 3d9ee3a7305b0575387e719ac4062c4a355d63e8..853561c0b3507808c70f4274812407d1
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index 956ddd955e6f9b2f02ef05b0e95150c9c90c3107..16e6325a944c1eb21dd5a3835aa8a00d238e7b5d 100644
+index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 @@ -45,4 +45,11 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
diff --git a/patches/server/0736-Add-API-for-item-entity-health.patch b/patches/server/0735-Add-API-for-item-entity-health.patch
index 2cd4aeff4a..dd1d43a643 100644
--- a/patches/server/0736-Add-API-for-item-entity-health.patch
+++ b/patches/server/0735-Add-API-for-item-entity-health.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add API for item entity health
 public net.minecraft.world.entity.item.ItemEntity health
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 43f6422fedae4304801c7be21990725eca11fc62..0a075ad3bbe13abc20c1f344cb706278b27bb202 100644
+index 953d3762292a4c15b063f9e237edf2f5c5362cb7..073643d7f83b974509cf2dd4ea41e3dd9cb90a0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -98,6 +98,21 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
index 213b301fc1..213b301fc1 100644
--- a/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
index 59eb60edd7..59eb60edd7 100644
--- a/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8c2c2fb117..913048fffc 100644
--- a/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
@@ -27,7 +27,7 @@ Co-authored-by: Zach Brown <[email protected]>
 Co-authored-by: Madeline Miller <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 195a08045d6705a47efa918fa0d3882ee9073ab4..5acf0e1fba2967e67bdb208ef73ae8fa84ffe35d 100644
+index b9896fd8e96a908637ce1edf9413166192903ce7..cdcf11fb9e4690d74b30fe0ade842d6574464624 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -146,15 +146,15 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..b0884e52bd 100644
--- a/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0742-Fix-bees-aging-inside-hives.patch b/patches/server/0741-Fix-bees-aging-inside-hives.patch
index 2be01a557c..646f563356 100644
--- a/patches/server/0742-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0741-Fix-bees-aging-inside-hives.patch
@@ -7,7 +7,7 @@ Fixes bees incorrectly being aged up due to upstream's
 resetting the ticks inside hive on a failed release
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 82ad97800cb115cc4830337a59cc4608c1d4a7a0..41c9f074203915c31c1ae7a160ce509c13383f84 100644
+index 9d4152f9fde93a832f263c793955d327f1e078f7..cf09525efd2d53bf884cd6ec3b0b9229715895eb 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -328,7 +328,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0743-Bucketable-API.patch b/patches/server/0742-Bucketable-API.patch
index 4345ec75a6..274ccde059 100644
--- a/patches/server/0743-Bucketable-API.patch
+++ b/patches/server/0742-Bucketable-API.patch
@@ -55,7 +55,7 @@ index e730292edca4624400bdb89d555922c5f61db7a5..cbfca242f820d238b112f8ce64e9de83
      public CraftAxolotl(CraftServer server, net.minecraft.world.entity.animal.axolotl.Axolotl entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index 69d103a8ec74b17ee3116bb4d448494bd66f50b6..3c64461119391ec2e987fc936104e21ef0a95ce4 100644
+index da5150f4ca0397bf10053aab0c3ff18af5bc3f3c..eb10f94d5ed8ca89d3786138647dd43357609a6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 @@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.AbstractFish;
diff --git a/patches/server/0744-Validate-usernames.patch b/patches/server/0743-Validate-usernames.patch
index 89ea54ab5e..fe0bca6d14 100644
--- a/patches/server/0744-Validate-usernames.patch
+++ b/patches/server/0743-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 58321faf05c9fbeaf4b417e2749b190ad2a33f60..52f1fcbe104e75e4413e90e77bfc0a93294dd1c6 100644
+index 2e73c94f74be95a7d6ba58d5151c3090253bb9c6..3a177569b9aa8d641252d0169bea8be739344318 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -61,6 +61,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -56,7 +56,7 @@ index 58321faf05c9fbeaf4b417e2749b190ad2a33f60..52f1fcbe104e75e4413e90e77bfc0a93
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c493f883940819913f0cecb5e374fe94123df24c..d5d83e605a33d2edd1c7c0ef7cfa8af35e22dcc9 100644
+index f505977aaa48ab25b0a8a630f51e36551cb0fa79..b380cbe84835bbe68f63f097dfb57d960bbe3271 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -660,7 +660,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0745-Make-water-animal-spawn-height-configurable.patch b/patches/server/0744-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0745-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0744-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 83b64455e5..4ed71d8ecc 100644
--- a/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6c02d5233c782b0e5049afdf84250687ae71dcde..2503e2b2436a6e07fa22c0e55ad1539bae06de1a 100644
+index f7c1d07c95f7b67e32bd6679af88612aec74f54f..9d4c9368fcc3a44e452c1b71b5bdb43d097132d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -550,7 +550,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 6c02d5233c782b0e5049afdf84250687ae71dcde..2503e2b2436a6e07fa22c0e55ad1539b
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c103ac154104a1e50ed687a2154a1e0e579b786a..73738d920a7a5776165eb3586ddf0676ffa64886 100644
+index 2aacf05d0f79a5418f31a5411b0d06e034f8a0da..c2ea7afae83b1cbecff86c519b9c6983c083d2a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1223,7 +1223,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index c103ac154104a1e50ed687a2154a1e0e579b786a..73738d920a7a5776165eb3586ddf0676
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e0a221639148c0b28c16ecd4cd45e2b3af16699f..d500962858fc9598481ff019bda1d1a7ad1813b7 100644
+index a0b9f22160a2b8277486f79205647125a412d8be..a0ec7bc7d89a165ad63c524433724caaec7c3c7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -203,6 +203,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
index 2050e579c5..ad9460d017 100644
--- a/patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add new overload to PersistentDataContainer#has
 Adds the new overload: PersistentDataContainer#has(NamespacedKey key)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-index 1c33e3456c410dac3ac2f0caef52ee24e00ffca5..564e97c6fefb4c8af4b4df70e68951a2157e72cb 100644
+index ae5091433fd605c46b9c57f07114923918fad506..390d5843233d26b76f90651f49a2a1d68c0aa67f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
 @@ -161,5 +161,12 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
diff --git a/patches/server/0749-Multiple-Entries-with-Scoreboards.patch b/patches/server/0748-Multiple-Entries-with-Scoreboards.patch
index 69772b2ea9..69772b2ea9 100644
--- a/patches/server/0749-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0748-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0750-Reset-placed-block-on-exception.patch b/patches/server/0749-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0750-Reset-placed-block-on-exception.patch
+++ b/patches/server/0749-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0751-Add-configurable-height-for-slime-spawn.patch b/patches/server/0750-Add-configurable-height-for-slime-spawn.patch
index a9aa51d551..a9aa51d551 100644
--- a/patches/server/0751-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0750-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index cd0f2e16aa..5d3797471d 100644
--- a/patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 52f1fcbe104e75e4413e90e77bfc0a93294dd1c6..f7ad9f51d4fb45d41c718a97c1fad72504d0c0ad 100644
+index 3a177569b9aa8d641252d0169bea8be739344318..5ff49a0f2f42b63d606c7d9205c0e63fe39e163f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -326,7 +326,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0753-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
index dec1fe13a1..a8293675b5 100644
--- a/patches/server/0753-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
@@ -9,7 +9,7 @@ so this resets it after each call to
 Zombie#getExperienceReward
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 87d909c2a34543ebdfc5d76aff7611d2d51144fb..3d44f8e9f8056d7d899e90e61240b2d1d109354b 100644
+index bcf31d0b784241b4f2b71bced4a431763d538a69..5fdad1600cc7a7c22d1d9a58b6b2dda605521b97 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -175,11 +175,16 @@ public class Zombie extends Monster {
diff --git a/patches/server/0754-Kick-on-main-for-illegal-chat.patch b/patches/server/0753-Kick-on-main-for-illegal-chat.patch
index 540f62d05d..90fe5ee6ad 100644
--- a/patches/server/0754-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0753-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23..ec1bec4f3ecdabad7ecf0a99f6edc1e2132a2c9e 100644
+index 1a44358117e5f72789dd270ce4311f6c6a17bf6d..5dad35d1b38ef4e82d1480ccc04d306dcd6aa9c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2021,7 +2021,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0755-Multi-Block-Change-API-Implementation.patch b/patches/server/0754-Multi-Block-Change-API-Implementation.patch
index 750f177fda..61a5c2f1ce 100644
--- a/patches/server/0755-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0754-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      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 0cc3a2949b72cfd3eaced42947c365539087e576..86f9950c6188f407b547cb19330444c5e29f5838 100644
+index 529792ac8f17ffd4960e67638e87974474cd776c..ed7d6c2303873b39ecabfe78d0950cf698f6f61c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -891,6 +891,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0756-Fix-NotePlayEvent.patch b/patches/server/0755-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0756-Fix-NotePlayEvent.patch
+++ b/patches/server/0755-Fix-NotePlayEvent.patch
diff --git a/patches/server/0757-Freeze-Tick-Lock-API.patch b/patches/server/0756-Freeze-Tick-Lock-API.patch
index 5a79589560..33dfa398ab 100644
--- a/patches/server/0757-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0756-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 7bbe11ed8f42af737063a803769e29a59e127d1e..5ab9a4d588f0f159c97972bfa113dc9b7485d1b5 100644
+index 27b07629aa36029e251ebbc3fb68466f02c0aab3..1bdc0c95d1f739ce7fc664cc9f7e561e7565e9d4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -46,7 +46,7 @@ index 7bbe11ed8f42af737063a803769e29a59e127d1e..5ab9a4d588f0f159c97972bfa113dc9b
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4e4cd3978499a363b16a2c2a0a81abef6bb6c815..7a530681bf043f4b335c16277cf07a7934afa8d9 100644
+index e0e9a1a0becd4754f4ee1a53e7a91206da22ac45..6aec9841fbb41ba448b7c77723f7081b6dfba884 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3450,7 +3450,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -59,7 +59,7 @@ index 4e4cd3978499a363b16a2c2a0a81abef6bb6c815..7a530681bf043f4b335c16277cf07a79
  
              if (this.isInPowderSnow && this.canFreeze()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 853561c0b3507808c70f4274812407d1ffb37504..c924ee182c150feca61deab9b8cc54806a23c49a 100644
+index cd2b8fa364ce49054007468ee607bd9a8c741971..b9c69703bb41f7d04f95bef27eb0614c5931c326 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -668,6 +668,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0758-Dolphin-API.patch b/patches/server/0757-Dolphin-API.patch
index e971f87322..e971f87322 100644
--- a/patches/server/0758-Dolphin-API.patch
+++ b/patches/server/0757-Dolphin-API.patch
diff --git a/patches/server/0759-More-PotionEffectType-API.patch b/patches/server/0758-More-PotionEffectType-API.patch
index 43acfd7f8e..5103da4ead 100644
--- a/patches/server/0759-More-PotionEffectType-API.patch
+++ b/patches/server/0758-More-PotionEffectType-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More PotionEffectType API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
-index 8f63c21186d8daa290286676bc2478d8629c533b..f05cbb27563fc5287875764b183c485c14589423 100644
+index 5beb6a971529149f17c6c5e0b0c50227a55e1884..59e2f63a031f37540ca7962209e4c2950b2b1eea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
 +++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
 @@ -128,4 +128,51 @@ public class CraftPotionEffectType extends PotionEffectType {
diff --git a/patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 84ed67d62f..84ed67d62f 100644
--- a/patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
index b92c1c2856..b92c1c2856 100644
--- a/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0762-Add-missing-structure-set-seed-configs.patch b/patches/server/0761-Add-missing-structure-set-seed-configs.patch
index f54b5cc96b..619c499781 100644
--- a/patches/server/0762-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0761-Add-missing-structure-set-seed-configs.patch
@@ -232,7 +232,7 @@ index 65dcb14241baadb2c9f8f16919d7b562198ad9c3..594a2dd3b1d4c29c969d1992b8e93795
  
          @Override
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 38da4cc3fe3be86e43432de942a1290fa8215474..5b5109e942b18418b3a3a0e2109fe4ef15045fe5 100644
+index 62c1434018be5b5fb70f7019b3c06d4d9200661d..f9b8e2bc039f1a37e47f84909c8785f3ef530284 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -368,6 +368,17 @@ public class SpigotWorldConfig
diff --git a/patches/server/0763-Implement-regenerateChunk.patch b/patches/server/0762-Implement-regenerateChunk.patch
index 205a09260d..dd01785a8f 100644
--- a/patches/server/0763-Implement-regenerateChunk.patch
+++ b/patches/server/0762-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d500962858fc9598481ff019bda1d1a7ad1813b7..6185477e9fc0ab2ed4e8e5835cc6e8e1adc79ef9 100644
+index a0ec7bc7d89a165ad63c524433724caaec7c3c7c..b60765a2176d7a290d2c9b09ba101d61ac572b21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -142,6 +142,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
index 6c443ed789..6c443ed789 100644
--- a/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 94c24dc109..56af4853a3 100644
--- a/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6254c962346c243a596ba3ace41a2d5218c86776..28c4be4c1876daa1919ac0c2e506747460918631 100644
+index 0bca5e89bc8df486b44c0921e217d0546a490d4e..93b101b8435fed77950e508901f380e20f943b74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2192,6 +2192,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0766-Add-GameEvent-tags.patch b/patches/server/0765-Add-GameEvent-tags.patch
index 7728d3b25d..02e72d2282 100644
--- a/patches/server/0766-Add-GameEvent-tags.patch
+++ b/patches/server/0765-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28c4be4c1876daa1919ac0c2e506747460918631..b29ae6ae2a869cba148f5e3be76962182934a577 100644
+index 93b101b8435fed77950e508901f380e20f943b74..2fd1d5c15a5231b0f889832ff1c57156ef46816d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2613,6 +2613,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index df4db48d20..1c13cca49e 100644
--- a/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2503e2b2436a6e07fa22c0e55ad1539bae06de1a..5e90384ae64af46acff9d1b58c7d401e5590859c 100644
+index 9d4c9368fcc3a44e452c1b71b5bdb43d097132d2..c4f90c6fc7bdf7339720936ad2c781396e7d91c4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1288,6 +1288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0768-Furnace-RecipesUsed-API.patch b/patches/server/0767-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0768-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0767-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0769-Configurable-sculk-sensor-listener-range.patch b/patches/server/0768-Configurable-sculk-sensor-listener-range.patch
index 6d55376b1e..ff5a549be0 100644
--- a/patches/server/0769-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0768-Configurable-sculk-sensor-listener-range.patch
@@ -84,7 +84,7 @@ index a6c226da995eecc323d69a3eff1f8d202410e069..5d3740875de337e24fdba28305f61e96
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
-index 7e4cef6ce439d3fdf148b456120f29dbc1efb432..40578b3f8374ee9c754c743ab263f80deeee5a36 100644
+index 0e5e316b6c76c3929cca037eddf52120767862ff..c796a1754385edabe115088ebb5aa2f44cfa657a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
 @@ -30,4 +30,17 @@ public class CraftSculkSensor<T extends SculkSensorBlockEntity> extends CraftBlo
diff --git a/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
index bf5dcd67c2..bf5dcd67c2 100644
--- a/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index e30c102eaa..9a36732d25 100644
--- a/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e90384ae64af46acff9d1b58c7d401e5590859c..7d944606f7e136aa60a0ea376ef325887bd4e6a8 100644
+index c4f90c6fc7bdf7339720936ad2c781396e7d91c4..ebf31af53f26d33a745badbfc6fa4e7f84aea87d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -577,7 +577,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
index 63add2e773..63add2e773 100644
--- a/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0773-Fix-Entity-Position-Desync.patch b/patches/server/0772-Fix-Entity-Position-Desync.patch
index 1a885e69f8..1a885e69f8 100644
--- a/patches/server/0773-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0772-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0774-Custom-Potion-Mixes.patch b/patches/server/0773-Custom-Potion-Mixes.patch
index b2b98e7214..bbfbea8133 100644
--- a/patches/server/0774-Custom-Potion-Mixes.patch
+++ b/patches/server/0773-Custom-Potion-Mixes.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e7bd891260ad4c95c6161542e6d1412c6e9daea0..a197fa2864382363860b4a3db8160ed64f928df7 100644
+index 9f56553b416df71ec60a3327a58d843be95dded8..18041f137157ca95639c0511f225bbb58356fe2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2058,6 +2058,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 91bdf2bc934d98513fd6b9b83f8e422763551e91..f8dbfec818059921e3bed2f79929385e5ee9dd7d 100644
+index 06f8b950bad67e890086db46d3cb9ec9ecbb0a2c..1ed5a16881cba8eb1c5c72177572b9ef6bb7b686 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0775-Force-close-world-loading-screen.patch b/patches/server/0774-Force-close-world-loading-screen.patch
index 6c99039e87..331c05b9a6 100644
--- a/patches/server/0775-Force-close-world-loading-screen.patch
+++ b/patches/server/0774-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d5d83e605a33d2edd1c7c0ef7cfa8af35e22dcc9..76e83980e96f52a8cea71d9c5e80c998021fe2ff 100644
+index b380cbe84835bbe68f63f097dfb57d960bbe3271..fe3811e3bb0f47fb201a9d47357adf0e3fd00b01 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -379,6 +379,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0776-Fix-falling-block-spawn-methods.patch b/patches/server/0775-Fix-falling-block-spawn-methods.patch
index 546e16b94b..546e16b94b 100644
--- a/patches/server/0776-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0775-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0777-Expose-furnace-minecart-push-values.patch b/patches/server/0776-Expose-furnace-minecart-push-values.patch
index 572d7c5f66..6245e14b4e 100644
--- a/patches/server/0777-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0776-Expose-furnace-minecart-push-values.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose furnace minecart push values
 Adds methods for getting and setting a furnace minecart's push values
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
-index 2469a8e393665c6b085b028816bd4dad4a1b5ba3..1027c915c0a2f981703908fdb2eb6beeb548f347 100644
+index 53042b75b45093535d6572239b34c3ff9a72f648..1b41026ab638bb2764b19429706eb0aded5aad12 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
 @@ -27,6 +27,28 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca
diff --git a/patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 9a608358db..9a608358db 100644
--- a/patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0779-More-Projectile-API.patch b/patches/server/0778-More-Projectile-API.patch
index d43871e79b..d43871e79b 100644
--- a/patches/server/0779-More-Projectile-API.patch
+++ b/patches/server/0778-More-Projectile-API.patch
diff --git a/patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
index b2499e69cc..b2499e69cc 100644
--- a/patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 277372d88a..62ec01585d 100644
--- a/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0780-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 ec1bec4f3ecdabad7ecf0a99f6edc1e2132a2c9e..db7d4a74021873a86a06f39c43d36804d97e4fdb 100644
+index 5dad35d1b38ef4e82d1480ccc04d306dcd6aa9c8..fce18ec126c3019249d2630dce1d8efa9d8f326b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0782-Implement-getComputedBiome-API.patch b/patches/server/0781-Implement-getComputedBiome-API.patch
index 9644f0562d..4421a72bbd 100644
--- a/patches/server/0782-Implement-getComputedBiome-API.patch
+++ b/patches/server/0781-Implement-getComputedBiome-API.patch
@@ -23,7 +23,7 @@ index 30a893f7f63961b752e043b81dda20d946cd63aa..57bb76050919d187adef4bfa8b21416a
      public void setBiome(Location location, Biome biome) {
          this.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), biome);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 5fa6a77ccd01deb929d86efc227439f4f280ba53..8fb44799c3273841ffc0996aa8984513e391c70d 100644
+index 6027b675ca032d7c8f6d43624dcfca69d26849ff..8f588ce8de7304dbb48bca01ed331f65ba25fef8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -339,6 +339,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0783-Make-some-itemstacks-nonnull.patch b/patches/server/0782-Make-some-itemstacks-nonnull.patch
index 153d145fd3..4679d4a859 100644
--- a/patches/server/0783-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0782-Make-some-itemstacks-nonnull.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make some itemstacks nonnull
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index f89a1b1c1902b16f6640c9a95f5b72351b60ceda..0c80dea986b0b63b2182c4ca0d23d6534f753cb0 100644
+index 972fe4237461f07f78b60845b2ebfefb06698ded..9d74577af071954e1e37201a96368c1360076209 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -155,13 +155,13 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
diff --git a/patches/server/0784-Implement-enchantWithLevels-API.patch b/patches/server/0783-Implement-enchantWithLevels-API.patch
index ab96d4c51c..ab96d4c51c 100644
--- a/patches/server/0784-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0783-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0785-Fix-saving-in-unloadWorld.patch b/patches/server/0784-Fix-saving-in-unloadWorld.patch
index 4b0c1c3d04..727e9e5c96 100644
--- a/patches/server/0785-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0784-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f8dbfec818059921e3bed2f79929385e5ee9dd7d..34934e9b1022facc9ca8a2770a4d8632c08f97a0 100644
+index 1ed5a16881cba8eb1c5c72177572b9ef6bb7b686..2a4b28e36858397b8be69c4375e205cffa91d35c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1301,7 +1301,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0786-Buffer-OOB-setBlock-calls.patch b/patches/server/0785-Buffer-OOB-setBlock-calls.patch
index d17173fb30..d17173fb30 100644
--- a/patches/server/0786-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0785-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0787-Add-TameableDeathMessageEvent.patch b/patches/server/0786-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0787-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0786-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 9f348863b2..c99d407f99 100644
--- a/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -196,7 +196,7 @@ index b13d89b1516130507402cd3b4bdb9f3c2a36e807..936644ec4a57e51a1c11a5bf4e8449ab
              }
              // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 42ebb3e499900aa7bdc694549a267e117ae82915..ee209d885527153c148b99618c9c26b63fb38aac 100644
+index 0d8a13fc70c139291fa26d6e8f9c38dbbc512e7d..8496bca5c104335ebdddd28193ff4d455313203f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1411,11 +1411,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
index f9bd8d3a22..7730bb996e 100644
--- a/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 19f94236df83d73686aded9658a6469b3840c0c3..fb7a40e6670a2f7522fe2b1b98d5489c54961d3f 100644
+index 97054a83f90cd1dc440b7c319c91014b237e36dc..edd8eb7e9b4c676bd823a5081f3f23f8eda13eba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -917,12 +917,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 2fc10bc3c8..cd6f5e26bb 100644
--- a/patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0789-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 5ab9a4d588f0f159c97972bfa113dc9b7485d1b5..23326931fef470fd96461ef21f8894f15b2dd234 100644
+index 1bdc0c95d1f739ce7fc664cc9f7e561e7565e9d4..c453351b3734320bef991880743245e8e69d3e86 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2841,7 +2841,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0791-Guard-against-invalid-entity-positions.patch b/patches/server/0790-Guard-against-invalid-entity-positions.patch
index 0145784265..959e17ca71 100644
--- a/patches/server/0791-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0790-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 23326931fef470fd96461ef21f8894f15b2dd234..be059aea19fbfd8d8bdde0ad39c7c0fbe7aaa30b 100644
+index c453351b3734320bef991880743245e8e69d3e86..540e357a191b3ebf27fd70f488f43839a1726225 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4522,11 +4522,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0792-cache-resource-keys.patch b/patches/server/0791-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0792-cache-resource-keys.patch
+++ b/patches/server/0791-cache-resource-keys.patch
diff --git a/patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 4871e529ae..26b7c6f5cf 100644
--- a/patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow to change the podium for the EnderDragon
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 1621a06eff438eccdbc04a2abebd718567c320b3..ccc68b1a1b1b087c52d91591ba4c63b075bfdc66 100644
+index 65e1aa3b2d3a8af997ccf8e259ca60e0fd73f34d..0edf0374c6890b2afdefc4b723f1f4501f4e7810 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -103,6 +103,10 @@ public class EnderDragon extends Mob implements Enemy {
@@ -123,7 +123,7 @@ index 1290090f855840bf64bf3a7ba93e3cb036630dcc..98fb6422df0ceadff5aaf4b2965eb1b0
                  this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
-index 1cfba7aaa807f70ce6d88bf67c7ddacecf55d295..492fdc855fe9735b614b6831aa5baaa6b252cfb6 100644
+index 25b3d889a1742c347e60725df8d6f6c1cee264c7..6eae6efa35a1ccc224e2f311e25ecf13e8647ec8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
 @@ -73,4 +73,22 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
diff --git a/patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index e9c2bc86cd..e9c2bc86cd 100644
--- a/patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index c7c36d1add..c7c36d1add 100644
--- a/patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
index 5619c86549..e1d3f11682 100644
--- a/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index db7d4a74021873a86a06f39c43d36804d97e4fdb..43ee0a36ace19a29f4e63133462ffc63a88b38e4 100644
+index fce18ec126c3019249d2630dce1d8efa9d8f326b..1a38e20ed90e2bb110a7ffbd9195b4b01650b17f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3187,7 +3187,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
index e78af9af5b..34c3763697 100644
--- a/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 76e83980e96f52a8cea71d9c5e80c998021fe2ff..255f7ab2560e493770bd99a8404f3c122cfca2ad 100644
+index fe3811e3bb0f47fb201a9d47357adf0e3fd00b01..ce04374971e679b4883d8a6ebba4c6832b606a65 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1424,7 +1424,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 7f78aa076d..7f78aa076d 100644
--- a/patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
index aaf785c107..a9456a58e4 100644
--- a/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c7894892afe97eb3cb453c37a2d9a23d811d70b8..2d06a8f85c5e29688aa0fd4726fd576721535384 100644
+index 5a0a34ea500607b1370df3e5ee4c1ad64f252449..321675996b83fbe34d7e0d690eafe170d7466e17 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,7 +18,7 @@ index c7894892afe97eb3cb453c37a2d9a23d811d70b8..2d06a8f85c5e29688aa0fd4726fd5767
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 43ee0a36ace19a29f4e63133462ffc63a88b38e4..bea158416ed6c13db633efb742153f7813df5540 100644
+index 1a38e20ed90e2bb110a7ffbd9195b4b01650b17f..b5a20f69f0df93e3786f9b27b17a2b0ab7c69a91 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2751,7 +2751,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -167,7 +167,7 @@ index 2e240ad721928a9a68370114ba61c21884ef1472..1a72fc5368731be617f9cab72e9e756d
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b964c5e81422a90f605191e2822ece425679396b..c5b6957aca67739a2d265ca985a0cc5b35c9c1e6 100644
+index b76d59ae107eec1ea52edfb2d08b1a1da7931593..6beefb48468779005cb3e93d1c6d8c0465e84d73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1950,7 +1950,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 676f145bb4..676f145bb4 100644
--- a/patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0801-WorldCreator-keepSpawnLoaded.patch b/patches/server/0800-WorldCreator-keepSpawnLoaded.patch
index d83f7422f1..d83f7422f1 100644
--- a/patches/server/0801-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0800-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index d7281d9015..0510692ca9 100644
--- a/patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CME in CraftPersistentDataTypeRegistry
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java
-index 579d7510f1a2a4de3d3b1aa921ef8462e8780d39..b851581103c72c9a9eb2b3cdd783fca1ee34bed3 100644
+index 36b69553eaf94df9230b8d57e014be0dcc56cdba..b074d9692a3194a0703a4aceb6800dd5624d1fbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java
 +++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java
 @@ -89,7 +89,7 @@ public final class CraftPersistentDataTypeRegistry {
diff --git a/patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 0a52efe49e..0a9bd54413 100644
--- a/patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0cb9803e30702de1cc530c1205fe9bbb4dcb2c08..96fde7b84ce4d195d0c54deff71df9fcf8447979 100644
+index 8a8b766d91d9e2328486e3156bd6a408808dc1e3..3fe747fdc4500bd65029446f63e314031d71ed4a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -428,12 +428,16 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 76380e425b..76380e425b 100644
--- a/patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0807-Add-PlayerStopUsingItemEvent.patch b/patches/server/0806-Add-PlayerStopUsingItemEvent.patch
index 8557c3e361..3134b2b297 100644
--- a/patches/server/0807-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0806-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7a530681bf043f4b335c16277cf07a7934afa8d9..67fdb5ea2b11588d17cd6f30766d1aa3d7796b1c 100644
+index 6aec9841fbb41ba448b7c77723f7081b6dfba884..351f6c554a3d50ebe2572671c433be5750ac6dd8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4023,6 +4023,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0808-Don-t-tick-markers.patch b/patches/server/0807-Don-t-tick-markers.patch
index 48b356285d..48b356285d 100644
--- a/patches/server/0808-Don-t-tick-markers.patch
+++ b/patches/server/0807-Don-t-tick-markers.patch
diff --git a/patches/server/0809-Expand-FallingBlock-API.patch b/patches/server/0808-Expand-FallingBlock-API.patch
index babfefa431..69b20741d3 100644
--- a/patches/server/0809-Expand-FallingBlock-API.patch
+++ b/patches/server/0808-Expand-FallingBlock-API.patch
@@ -54,7 +54,7 @@ index 5164c2bfb32275beff01b6e76dfbd9d031231bc6..e6f75a9cac46c8e3ddba664a9d5b27b6
  
      public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index e85a5dcae1a752c48dc457d05191355d72ca4443..a8bed9c1d129ac31486af8b65e26aa245920d6b5 100644
+index a7a3f74b846112d752fe04162b30805961457b11..73911b81f4e927026657953a0c68ddda9a8f93c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 @@ -33,6 +33,31 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
diff --git a/patches/server/0810-Do-not-accept-invalid-client-settings.patch b/patches/server/0809-Do-not-accept-invalid-client-settings.patch
index 443d50fb31..81f2f884ae 100644
--- a/patches/server/0810-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0809-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bea158416ed6c13db633efb742153f7813df5540..616ea3055c854872fbb5754bdf0b67deac1b4b58 100644
+index b5a20f69f0df93e3786f9b27b17a2b0ab7c69a91..3017a4509cf112578b96dce9bd517256313ebcb8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3311,6 +3311,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0811-Add-support-for-Proxy-Protocol.patch b/patches/server/0810-Add-support-for-Proxy-Protocol.patch
index 30de84af65..30de84af65 100644
--- a/patches/server/0811-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0810-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 0c622e6685..ed4f98caf0 100644
--- a/patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -8,7 +8,7 @@ instance of CraftOfflinePlayer the world was incorrect
 due to the logic for reading the NBT not being up-to-date.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 779b6bac307e252fe614cfce958d2eeed94c5f77..3762230eeee47114f683dfa428a8e55cf2f42b48 100644
+index ffc813934e719129d3805a2a181093c45db7cc71..9e01ef76bc6d18ab622fbec729f8bde3aa8d3e41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -36,6 +36,7 @@ import org.bukkit.profile.PlayerProfile;
diff --git a/patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
index b3404362f9..b3404362f9 100644
--- a/patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
index 866bb3539c..0c4b4bfa98 100644
--- a/patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0815-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 be059aea19fbfd8d8bdde0ad39c7c0fbe7aaa30b..f040d1757043a4ff5e095df3a0c72b2c4c234dee 100644
+index 540e357a191b3ebf27fd70f488f43839a1726225..0faf4c288cc9847fa72f2f2d98f55d552169524e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
index 84d0a27729..cdc81374d4 100644
--- a/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a197fa2864382363860b4a3db8160ed64f928df7..dd05048c5c9c37002708f0eee4e4fa0f6d86834c 100644
+index 18041f137157ca95639c0511f225bbb58356fe2b..47c984495a66fdbb10dea6bab33da78f4ab70a38 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,7 +45,7 @@ index a197fa2864382363860b4a3db8160ed64f928df7..dd05048c5c9c37002708f0eee4e4fa0f
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28be626682884f0a19692d3fbed1c71d051106e4..78970e3183877c329eb6fea4575289cfda120df4 100644
+index 1665d99aa45f708939dfc21d17a7b02182c7aefb..c1229e3ce355fb324a0fe0c37b4d39fbdc60c7a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -876,6 +876,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0818-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
index 2615719296..1fc17d2b19 100644
--- a/patches/server/0818-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b59ecc3571234a6168f9ba235e5acbfa733c0512..64a3b789a46438dcd01a5429dcab641467cf5f00 100644
+index 8f4d7e1878f34d56de7447ec39c794e1246008bc..eb81f8340d4e1dd87003db943516d1d1bdc1cdbf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2034,7 +2034,7 @@ index b59ecc3571234a6168f9ba235e5acbfa733c0512..64a3b789a46438dcd01a5429dcab6414
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 627758e4f55283c5dcf23d494efb92bfa9f6b005..ba5ad3372b3f3f2110841100729ea3b4c06ecc75 100644
+index 330ce28f128ff2e5ca80f0938ac3ea7b195e9d82..412f2283a85c39bfb730c73376ec663a79fb9187 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1856,4 +1856,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0819-Dont-resent-entity-on-art-update.patch b/patches/server/0818-Dont-resent-entity-on-art-update.patch
index 4ce24fc14e..38d1a4ca58 100644
--- a/patches/server/0819-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0818-Dont-resent-entity-on-art-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont resent entity on art update
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
-index e780118d894d5421be8c50c8be02e41603cd0f32..3d13a79f9add2e45db7f8538ee15e0d4e37a1314 100644
+index dd02cec9a82794a6b001c3b64f031f78d5fbb812..bcac1359c667ef1ee46384f9c7a5adf4010d2b08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
 @@ -36,7 +36,7 @@ public class CraftPainting extends CraftHanging implements Painting {
diff --git a/patches/server/0820-Add-WardenAngerChangeEvent.patch b/patches/server/0819-Add-WardenAngerChangeEvent.patch
index eb11b51339..eb11b51339 100644
--- a/patches/server/0820-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0819-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
index 1a0d9c5a70..919ba3b905 100644
--- a/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index d4a673a9fb604876c554f955ed13ad31a2adb217..e75b3df4db9cb618aef4837acb8cde92
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fb7a40e6670a2f7522fe2b1b98d5489c54961d3f..915126c0ee30180a81e5143086a958fb900929c6 100644
+index edd8eb7e9b4c676bd823a5081f3f23f8eda13eba..fdd8ae699ebffcce391321d0c0d48a2bf171de12 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1316,6 +1316,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
index d3763517ff..c18323e95f 100644
--- a/patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing important BlockStateListPopulator methods
 Without these methods it causes exceptions due to these being used by certain feature generators.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-index 6fbf1eab2ea818a0dd0adde0c9247a2d95aac2e0..311808903b42a03b28bad8c75223f95aeecbdfa6 100644
+index ffe6881d93153838cd23f125980b832e6fd1d0eb..f5cbe9ae5802fa48e57092b1e5ca8a5f5f69ee60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 @@ -129,7 +129,7 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
diff --git a/patches/server/0823-Nameable-Banner-API.patch b/patches/server/0822-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0823-Nameable-Banner-API.patch
+++ b/patches/server/0822-Nameable-Banner-API.patch
diff --git a/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
index c17c5f4a36..d009bb5b66 100644
--- a/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 78970e3183877c329eb6fea4575289cfda120df4..ab0e24d948f3192e6225966433c7f6e87b6718c9 100644
+index c1229e3ce355fb324a0fe0c37b4d39fbdc60c7a3..a148d03d746d4580777e1e193c07dad922a080e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1777,7 +1777,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
index a286185139..6ba582fff8 100644
--- a/patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0824-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 64a3b789a46438dcd01a5429dcab641467cf5f00..d79b354e6723450223e106d19f20aa096ec7a02a 100644
+index eb81f8340d4e1dd87003db943516d1d1bdc1cdbf..6b923585821a252943ea6a765c3b02217eb7a21e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1559,6 +1559,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 6397403478..5816232b91 100644
--- a/patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
@@ -7,7 +7,7 @@ Remove in 1.19 along with the SplashPotion and
 LingeringPotion interfaces
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index f1a3ed6670fcb4e40000ed5c4f7042a4ca99175c..04bcb1f26db12556d70e41541a5df0700d20d964 100644
+index d5f1681a476c8fe2ae128a84910f4bf04063b75a..d3aeb4b614b2b17d9613aa3ffa34ebfc81666f79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 @@ -13,7 +13,7 @@ import org.bukkit.entity.ThrownPotion;
diff --git a/patches/server/0827-Add-Player-getFishHook.patch b/patches/server/0826-Add-Player-getFishHook.patch
index aa6a534aac..8823cf2f88 100644
--- a/patches/server/0827-Add-Player-getFishHook.patch
+++ b/patches/server/0826-Add-Player-getFishHook.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 268d0abadb1c6de78f7b2de964808ca7029970a8..beefbb0d04bd995bc8750707487183c3ffc22239 100644
+index e8e61fb73792f8f7fb0266df93dbaf552114b492..9531094aa2b551e5576b0af494cc141fd8cac007 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -161,6 +161,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
index 5d8d9f3850..c41f44844d 100644
--- a/patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0828-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 f040d1757043a4ff5e095df3a0c72b2c4c234dee..ca0106627279c581550c5e86bfc9a1ee5a9d6173 100644
+index 0faf4c288cc9847fa72f2f2d98f55d552169524e..aa9fa4afe80fad145d94406f26dda2341da87dbe 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2693,6 +2693,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index f040d1757043a4ff5e095df3a0c72b2c4c234dee..ca0106627279c581550c5e86bfc9a1ee
              EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
              Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 1c4b8b29faac3dbcfc14a07b24c64650982ece00..8448c5d778998390cf2b683f36e4e18ca7ffdc34 100644
+index 2f62498432bc90cbbc3f206dca41bb276f46f247..c528cb7c18650863eaf8e2c6c0d9276c02712cc9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -597,7 +597,7 @@ public class Dolphin extends WaterAnimal {
@@ -37,7 +37,7 @@ index 1c4b8b29faac3dbcfc14a07b24c64650982ece00..8448c5d778998390cf2b683f36e4e18c
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index df06cad9447982ebe57d07c9967cb68c6dd20ca3..9f24fb3ea75b9dcb41f70f6e4b0d6cd5dca57ff6 100644
+index 74c5eec21fe447c525e204b504f40d0d363039bb..e21bf5b02a4d9e6e23ffd42a1da8a3a5f2ac05db 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -509,14 +509,14 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
diff --git a/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 7d232d5b1a..1305d58c28 100644
--- a/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 616ea3055c854872fbb5754bdf0b67deac1b4b58..e6efb852e2454294073968de546b5c61b6131766 100644
+index 3017a4509cf112578b96dce9bd517256313ebcb8..96882c99ad0f3dfb58d4e7a38a17929e252033c1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2148,7 +2148,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0831-Fix-Bee-flower-NPE.patch b/patches/server/0830-Fix-Bee-flower-NPE.patch
index bbc40a996b..bbc40a996b 100644
--- a/patches/server/0831-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0830-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 2eb8c8b516..eb5f74ca9a 100644
--- a/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0831-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 e6efb852e2454294073968de546b5c61b6131766..3663332ddc408b1f918b9f7b0a461a346073c9a4 100644
+index 96882c99ad0f3dfb58d4e7a38a17929e252033c1..7e388fc82cb4f7a71b36a204c5af827509ab60f3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2368,7 +2368,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0833-More-Teleport-API.patch b/patches/server/0832-More-Teleport-API.patch
index 519cdbe10e..519cdbe10e 100644
--- a/patches/server/0833-More-Teleport-API.patch
+++ b/patches/server/0832-More-Teleport-API.patch
diff --git a/patches/server/0834-Add-EntityPortalReadyEvent.patch b/patches/server/0833-Add-EntityPortalReadyEvent.patch
index b391863a8a..92b7d3617b 100644
--- a/patches/server/0834-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0833-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 ca0106627279c581550c5e86bfc9a1ee5a9d6173..a60bb065cedc9c70a4c9363d6994a9d00a5c15c9 100644
+index aa9fa4afe80fad145d94406f26dda2341da87dbe..bc303e7ab3c8db5cffec2c1c3640fbaf59601101 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3095,6 +3095,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
index 380c4d5c5d..380c4d5c5d 100644
--- a/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0836-Send-block-entities-after-destroy-prediction.patch b/patches/server/0835-Send-block-entities-after-destroy-prediction.patch
index d8a6e3fc1f..1ea3e81505 100644
--- a/patches/server/0836-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0835-Send-block-entities-after-destroy-prediction.patch
@@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua
 block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6f027c151 100644
+index 3fe747fdc4500bd65029446f63e314031d71ed4a..19573bfb05d7f9641964c76e6670e4a7658a1bbd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -62,6 +62,8 @@ public class ServerPlayerGameMode {
@@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ca4e4d5f272f2368a966a9eead1ba047c4cbc77a..1c98d65ed237d63faabcef64093957aef3157abf 100644
+index 331d8c69dc4464ff6b44b4b37ecf426ff3514fc3..bfa2e9919275a1eb5d83403c5ed88eee245e3194 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1751,8 +1751,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
index af872060f6..22237fb9e2 100644
--- a/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0836-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 ba5ad3372b3f3f2110841100729ea3b4c06ecc75..07a5bbdcada2d2cdb1c3d245379217fe19a48b75 100644
+index 412f2283a85c39bfb730c73376ec663a79fb9187..a28da797e3ea01eacb378f65da3cfc75cb6b1830 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -810,7 +810,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -18,7 +18,7 @@ index ba5ad3372b3f3f2110841100729ea3b4c06ecc75..07a5bbdcada2d2cdb1c3d245379217fe
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 32116487ea913080bc01a2e74b66d6034813b86e..2235b327afc8f1e4d54fcf3dc9e99c6fcd8cf901 100644
+index 6beefb48468779005cb3e93d1c6d8c0465e84d73..c9ab48d99992a39cc6977424c589489a35f36992 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -310,9 +310,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
index a4b0fa47b7..70a7bab286 100644
--- a/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0837-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 0fc4a90383a5b332cad58ec55e30dc363aed16ca..55d95fe1bb0fe5064bf5855a4e7aaee8a0b4abd7 100644
+index 8bdfbe71e2718e0e24b1de048c8e48927fae1e3a..7cea988c9ada598f00e79c834c644d6bf01b4c93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -652,6 +652,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
index dd7008cfb5..dd7008cfb5 100644
--- a/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0840-Collision-API.patch b/patches/server/0839-Collision-API.patch
index 4c9bd750bb..efa8916419 100644
--- a/patches/server/0840-Collision-API.patch
+++ b/patches/server/0839-Collision-API.patch
@@ -22,7 +22,7 @@ index 57bb76050919d187adef4bfa8b21416a70867d23..254cdf5efe85583c5ef126d46af7c524
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6fdde2f766b91833dc2318526f84e96cb26233b4..8733255559e63d8709d2502e58f16decdf1714ae 100644
+index 706eeebe3ebbecd431c42140e7f351d5f7faf032..53bda7a59a3abf6f99a044df5f2c44bedf1af501 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1435,4 +1435,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index bffcadeb49..bffcadeb49 100644
--- a/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0842-Block-Ticking-API.patch b/patches/server/0841-Block-Ticking-API.patch
index ea73ea61f0..4511a8454a 100644
--- a/patches/server/0842-Block-Ticking-API.patch
+++ b/patches/server/0841-Block-Ticking-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block Ticking API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 8fb44799c3273841ffc0996aa8984513e391c70d..e8dd0b9184e164b41cb4b361f23b6925e7670f8f 100644
+index 8f588ce8de7304dbb48bca01ed331f65ba25fef8..11cc7e640774c6098c247382da8520d62ba19c32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -708,5 +708,21 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
index 85a2ae83e6..85a2ae83e6 100644
--- a/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 02c71ad921..c067fd1eaf 100644
--- a/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 78810048fde7fd6299cdc99634ba646755e0c41c..ff2dd53e9e943aa929188fd9d4c35498b78c497a 100644
+index aac84898d2563bfb45c7d0884d65be2346d2911e..1c4f272219e68373eaae93fc5ea9af7d8f3fd6f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -50,6 +50,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0845-Add-NamespacedKey-biome-methods.patch b/patches/server/0844-Add-NamespacedKey-biome-methods.patch
index 6c282cba3f..6c282cba3f 100644
--- a/patches/server/0845-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0844-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
index 1255d4ddb9..a3c6981860 100644
--- a/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd05048c5c9c37002708f0eee4e4fa0f6d86834c..b5ffa564cf6389b6af281ecf12b8daa139861608 100644
+index 47c984495a66fdbb10dea6bab33da78f4ab70a38..ebc35224004375b77039342926876a408995b04d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -980,6 +980,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -49,7 +49,7 @@ index dd05048c5c9c37002708f0eee4e4fa0f6d86834c..b5ffa564cf6389b6af281ecf12b8daa1
          // Paper end - move final shutdown items here
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 84c9998a01000d5b7d70e5724dd03be1536ba297..cac89e4a445262b97c727640d1593a3d74e82b72 100644
+index 9d7905b7f93d33700045c18b8ccecb7426cb30a7..c8ae7b3eab18cc9e7be4e92200fb3ac345216357 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
index 9c3d5e3b5f..9c3d5e3b5f 100644
--- a/patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
index 4f0d9f51f2..4f0d9f51f2 100644
--- a/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0849-Missing-eating-regain-reason.patch b/patches/server/0848-Missing-eating-regain-reason.patch
index e04644ebf1..e04644ebf1 100644
--- a/patches/server/0849-Missing-eating-regain-reason.patch
+++ b/patches/server/0848-Missing-eating-regain-reason.patch
diff --git a/patches/server/0850-Missing-effect-cause.patch b/patches/server/0849-Missing-effect-cause.patch
index cdde105841..c5a77c1456 100644
--- a/patches/server/0850-Missing-effect-cause.patch
+++ b/patches/server/0849-Missing-effect-cause.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Missing effect cause
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index c1b95715a1ae8c89ce98848332b1e9e1c905a6f5..aa850cfaa0534d57e83f37360724da2428a48a18 100644
+index 21b414201539a1625001b8676d51b8afb67506bb..d5b97d4316390028f54aa9bb9fa52b0b003e32a0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -424,7 +424,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
diff --git a/patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
index b3ca268703..3e6734569e 100644
--- a/patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Added byte array serialization/deserialization for
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-index 564e97c6fefb4c8af4b4df70e68951a2157e72cb..8f3769145c3dacc976cc926d896ea9f82332119c 100644
+index 390d5843233d26b76f90651f49a2a1d68c0aa67f..3351962e85438ed05215ce0d159799ed4707afde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
 @@ -168,5 +168,26 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
diff --git a/patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 536e9fbff4..7e974ebb59 100644
--- a/patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0851-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 9d9b27f21c1d62dac7dd63e8af44601691e656be..f19ebe71b46d31772b486cae5d96535f28c86824 100644
+index 03b1b9d8bf7b12343564ff6eb4fb865e4626b1e4..b31356c042b5262ccb47fe1ec56bed0791e84262 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -509,8 +509,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0853-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
index ea04c3e249..ea04c3e249 100644
--- a/patches/server/0853-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0854-Configurable-chat-thread-limit.patch b/patches/server/0853-Configurable-chat-thread-limit.patch
index 5e312d3a14..5e312d3a14 100644
--- a/patches/server/0854-Configurable-chat-thread-limit.patch
+++ b/patches/server/0853-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index dcc6c03d54..764d46a061 100644
--- a/patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type
 TODO: Remove in 1.21?
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index d7495ea25713e959d106764054ce6642af497035..7131ae1fdfd7ac22f8178ff4d6265b4b6c14acb8 100644
+index 1f30da05f0dd1d0f67ff7ec544e8f8455e2ef516..6f752084919ec1329d46b61b9d5f84656c9d9921 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -460,6 +460,12 @@ public class Commodore
diff --git a/patches/server/0856-fix-Jigsaw-block-kicking-user.patch b/patches/server/0855-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0856-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0855-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 39be29edef..39be29edef 100644
--- a/patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0858-Add-getDrops-to-BlockState.patch b/patches/server/0857-Add-getDrops-to-BlockState.patch
index 75ef1dadb3..f1c9e20197 100644
--- a/patches/server/0858-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0857-Add-getDrops-to-BlockState.patch
@@ -7,7 +7,7 @@ Originally added isPreferredTool to BlockData but
 upstream added that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index 1308720c6f3072a5442b93d495e03735419d59eb..cfd1c68d7ad23ef20242306d7d8148921d697ca5 100644
+index 31bb92c026a4a2de0e8d3500f6ecf35b60d61fb9..390e1b7fd2721b99cb3ce268c6bc1bf0a38e08a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 @@ -337,5 +337,33 @@ public class CraftBlockState implements BlockState {
diff --git a/patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
index 37ace4ee67..5ef20d44ed 100644
--- a/patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
@@ -111,7 +111,7 @@ index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb1
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5c1b7795de57a2879230d2aef7563e4b8f1e30fd..d58c25b639df59212c61bab989a11679852eea26 100644
+index b71be5e7e18f884cf35cc3a940c87e744e00f811..81d3d664d4397e528a02e50469622c4ff3ffb804 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -899,7 +899,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -124,7 +124,7 @@ index 5c1b7795de57a2879230d2aef7563e4b8f1e30fd..d58c25b639df59212c61bab989a11679
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d79b354e6723450223e106d19f20aa096ec7a02a..67b4bba742cfd1eacc1ac3f230e78874efbb10cc 100644
+index 6b923585821a252943ea6a765c3b02217eb7a21e..008b0944dba1622e682ee21637273fb87f93dd37 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1005,7 +1005,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -137,7 +137,7 @@ index d79b354e6723450223e106d19f20aa096ec7a02a..67b4bba742cfd1eacc1ac3f230e78874
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 6cc9c28032cafd15d884223a01208ce6f027c151..14bbc86bbaad49b2af16f3b171eb667c28eda702 100644
+index 19573bfb05d7f9641964c76e6670e4a7658a1bbd..25cbbc714e86c11dcf05329430a83bba2cd05364 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -92,7 +92,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 2b050eec64..17bbabc57b 100644
--- a/patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0859-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 67b4bba742cfd1eacc1ac3f230e78874efbb10cc..5803f7b286cd262a8f79d0adb159d897361275a2 100644
+index 008b0944dba1622e682ee21637273fb87f93dd37..2ef076900edc35b6a0beac4e6f7ee4a7f255671c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2588,7 +2588,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0861-Fix-custom-piglin-loved-items.patch b/patches/server/0860-Fix-custom-piglin-loved-items.patch
index 41c934194f..41c934194f 100644
--- a/patches/server/0861-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0860-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0862-EntityPickupItemEvent-fixes.patch b/patches/server/0861-EntityPickupItemEvent-fixes.patch
index d052f8e0a1..d052f8e0a1 100644
--- a/patches/server/0862-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0861-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
index 21d5cb0b3c..e49f829afc 100644
--- a/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 14bbc86bbaad49b2af16f3b171eb667c28eda702..34ecfb89372f459117db99d57a7edd6f681bbe8a 100644
+index 25cbbc714e86c11dcf05329430a83bba2cd05364..4b1af7bba3ce10a1247bb61535456510e18da2d9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -521,6 +521,7 @@ public class ServerPlayerGameMode {
@@ -30,7 +30,7 @@ index 14bbc86bbaad49b2af16f3b171eb667c28eda702..34ecfb89372f459117db99d57a7edd6f
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a017858e05d6068a06feb4bea0e6ef7ea1f0966a..f29ae4e617b2ed37e2c0f14a81e019125b078aee 100644
+index 8496bca5c104335ebdddd28193ff4d455313203f..10169884ea37531a08d5a0ecb1fae95874332496 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -544,7 +544,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
index f004546ff1..a39e739eaa 100644
--- a/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 915126c0ee30180a81e5143086a958fb900929c6..bf17062ff3d7eb3085070f5186ab6477e9c1338e 100644
+index fdd8ae699ebffcce391321d0c0d48a2bf171de12..cd0f542a04ba23fc1bc3ac0a5a1910874f9d7c2c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -372,6 +372,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0865-Elder-Guardian-appearance-API.patch b/patches/server/0864-Elder-Guardian-appearance-API.patch
index 36e1626a80..467d5949ce 100644
--- a/patches/server/0865-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0864-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 7f46ada61d9f64e7fd6e462be234146cb329d152..eb2ef913705a8350493ef215c1ad123082b69c98 100644
+index 7cea988c9ada598f00e79c834c644d6bf01b4c93..d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3172,6 +3172,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0866-Allow-changing-bed-s-occupied-property.patch b/patches/server/0865-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0866-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0865-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0867-Add-entity-knockback-API.patch b/patches/server/0866-Add-entity-knockback-API.patch
index c08d2b3f95..2fab1f9c44 100644
--- a/patches/server/0867-Add-entity-knockback-API.patch
+++ b/patches/server/0866-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 8c8431f40e9415b32e43acea4cd91a20d82d8d08..bdaa21becdc17823628542d612daf2e055a273c8 100644
+index b31356c042b5262ccb47fe1ec56bed0791e84262..e76dfca102ef9b497fc28c9c221ac33fe3c31c10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1016,5 +1016,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0868-Detect-headless-JREs.patch b/patches/server/0867-Detect-headless-JREs.patch
index 21cb522e88..21cb522e88 100644
--- a/patches/server/0868-Detect-headless-JREs.patch
+++ b/patches/server/0867-Detect-headless-JREs.patch
diff --git a/patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
index ebd0cc3b2c..ebd0cc3b2c 100644
--- a/patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0870-optimized-dirt-and-snow-spreading.patch b/patches/server/0869-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0870-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0869-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0871-Added-EntityToggleSitEvent.patch b/patches/server/0870-Added-EntityToggleSitEvent.patch
index f1617cb3ca..31eaca5429 100644
--- a/patches/server/0871-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0870-Added-EntityToggleSitEvent.patch
@@ -31,7 +31,7 @@ index 9fb11df7131f400e6e631146c32efccea83adf56..1282911b97292cde30dff83de756bc91
          if (inSittingPose) {
              this.entityData.set(DATA_FLAGS_ID, (byte)(b | 1));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 9f24fb3ea75b9dcb41f70f6e4b0d6cd5dca57ff6..31d4683f5e158f076ce9a416b7003478af293688 100644
+index e21bf5b02a4d9e6e23ffd42a1da8a3a5f2ac05db..9e2af80c6a87f5849710266149cbca8cabfad4f8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -433,7 +433,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
diff --git a/patches/server/0872-Add-fire-tick-delay-option.patch b/patches/server/0871-Add-fire-tick-delay-option.patch
index 7649d101c9..7649d101c9 100644
--- a/patches/server/0872-Add-fire-tick-delay-option.patch
+++ b/patches/server/0871-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0873-Add-Moving-Piston-API.patch b/patches/server/0872-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0873-Add-Moving-Piston-API.patch
+++ b/patches/server/0872-Add-Moving-Piston-API.patch
diff --git a/patches/server/0874-Ignore-impossible-spawn-tick.patch b/patches/server/0873-Ignore-impossible-spawn-tick.patch
index 46cd469266..46cd469266 100644
--- a/patches/server/0874-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0873-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
index fe9f8e5826..fe9f8e5826 100644
--- a/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index d7fe125f17..0cdc0de2ff 100644
--- a/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0876-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 a60bb065cedc9c70a4c9363d6994a9d00a5c15c9..bff10831c154087077dd21b0d5b37c68b98e42dc 100644
+index bc303e7ab3c8db5cffec2c1c3640fbaf59601101..c71011cdc4ab02c4e39f8ef39a5030b1c16f3d8f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3374,6 +3374,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0878-Prevent-compass-from-loading-chunks.patch b/patches/server/0877-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0878-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0877-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
index d2c7b4c788..59e72b4db1 100644
--- a/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b40961ad53437a5aa603f658ed56fca827de5716..6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d 100644
+index 85799b95bab12b5a060246f20364e9440e56a3ed..f9a308490e1cd7745dc12369c6041f0ae9e0b1e1 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1245,8 +1245,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
index 6107fe92f8..6107fe92f8 100644
--- a/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 9780023a35..9780023a35 100644
--- a/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0882-Add-Player-Warden-Warning-API.patch b/patches/server/0881-Add-Player-Warden-Warning-API.patch
index 6b55e882b7..249094a304 100644
--- a/patches/server/0882-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0881-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 eb2ef913705a8350493ef215c1ad123082b69c98..8b94aefb8386b7569028fc999c77e64d1b5c9399 100644
+index d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8..7569b59b75adf4c7870cc95aad92ccc949a8a070 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3177,6 +3177,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
index 9c5c52b756..667a65e357 100644
--- a/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More vanilla friendly methods to update trades
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 84cee8fb09f90424438de336f60d9388da1b39de..f555e29c7f9ea4ddb243a018bdc93d2bf1950c3c 100644
+index f58be4e2529759cc64df2c70a69ef56eabbb762d..cbe2a37f74f4fb2abd0b3297699e54335aaed64f 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -944,6 +944,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -35,7 +35,7 @@ index 84cee8fb09f90424438de336f60d9388da1b39de..f555e29c7f9ea4ddb243a018bdc93d2b
  
      public void gossip(ServerLevel world, Villager villager, long time) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index 5e779b7f1ba40e418d24c9d37506420c83bfb3fe..a67b5d20b956e0bf801c9eeb9330567c21927010 100644
+index 00fb708bce2c79817cd9fccadec72f07f0d26317..6c15d40979fd3e3d246a447c432b321fbf29ada3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -95,6 +95,34 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
diff --git a/patches/server/0884-Add-paper-dumplisteners-command.patch b/patches/server/0883-Add-paper-dumplisteners-command.patch
index 9669276c0a..9669276c0a 100644
--- a/patches/server/0884-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0883-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0885-check-global-player-list-where-appropriate.patch b/patches/server/0884-check-global-player-list-where-appropriate.patch
index 0dcf88b979..1b18c29415 100644
--- a/patches/server/0885-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0884-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5803f7b286cd262a8f79d0adb159d897361275a2..42f0ea87dd0bb3be3fbe9e0f7d87582cd3cd7c97 100644
+index 2ef076900edc35b6a0beac4e6f7ee4a7f255671c..a1f25978c50b9b924fda0e399ec7eb5a58562c1b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2710,4 +2710,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -24,7 +24,7 @@ index 5803f7b286cd262a8f79d0adb159d897361275a2..42f0ea87dd0bb3be3fbe9e0f7d87582c
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3ac6e5c091077add9bb21675f4b082cd90e946a2..17cb02b76fd7e5944e0299a78230baf970bc2f25 100644
+index e2ccf8badc02b5a21e3fcd6fcac76155d29e472c..a73fdae75a8ef1b5c0aa7c05bd1ec9081634f565 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3676,7 +3676,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -37,7 +37,7 @@ index 3ac6e5c091077add9bb21675f4b082cd90e946a2..17cb02b76fd7e5944e0299a78230baf9
          if (entity instanceof ServerPlayer) {
              CriteriaTriggers.THROWN_ITEM_PICKED_UP_BY_ENTITY.trigger((ServerPlayer) entity, item.getItem(), this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 4b2cd6d34ea4081cad86041f57ccda41807d4279..807cff3fb51269b97d9aecbcc4706f0a139dfeaa 100644
+index d4ac3e566b47cfc8688bcc2ab08385b6de4693f8..94396ad1a3c280787d36c6c18256d10340ace488 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -272,7 +272,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -66,7 +66,7 @@ index 9f892de55ab03367daed4c30cc44c9dd8adc29ed..b3293a722fb5c5262a777402140c764c
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
-index faad948f089575e4988d989790cc1dd13f8a79cd..5935cf23ec11ae48b6c7cec9bd696d10d808e729 100644
+index ee11a52e82091911aa3a196bcc1f7ab829626cef..bcb9556314ccfcf54ec49860f46b309c72be0714 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
 @@ -100,6 +100,13 @@ public class SculkShriekerBlockEntity extends BlockEntity implements GameEventLi
diff --git a/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
index a2b4a2f003..a2b4a2f003 100644
--- a/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0887-ItemStack-damage-API.patch b/patches/server/0886-ItemStack-damage-API.patch
index 2de74483ab..83ab1c3ff4 100644
--- a/patches/server/0887-ItemStack-damage-API.patch
+++ b/patches/server/0886-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 bdaa21becdc17823628542d612daf2e055a273c8..725053ca75b0747d69ab3ec8e7035f9b58b82a8c 100644
+index e76dfca102ef9b497fc28c9c221ac33fe3c31c10..87a5260a94dc3388bad2803c64ecf15a8063ba9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0888-Friction-API.patch b/patches/server/0887-Friction-API.patch
index b18e996baf..7d174e0e49 100644
--- a/patches/server/0888-Friction-API.patch
+++ b/patches/server/0887-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4ed23c6143a96e75b0e2e060861dd7c702ce6a95..a9ee6deb5954e8bb9eaf93897f4eacdd481a61c5 100644
+index a73fdae75a8ef1b5c0aa7c05bd1ec9081634f565..e579d9cc70115a3fb3388adb309847faa1f9aaab 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -109,7 +109,7 @@ index 1a06d8c839e94fe2c1920035d606b62e0dc5cfba..eb0351aa12eebcefab1d1d14641fc3c6
  
          this.setItem(ItemStack.of(nbttagcompound1));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 0a075ad3bbe13abc20c1f344cb706278b27bb202..9c0f83ff8113696309265fb9e8f6006296de86a6 100644
+index 073643d7f83b974509cf2dd4ea41e3dd9cb90a0d..f444e843535ec68ede0f05e7e7ef182ce872342b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -99,6 +99,18 @@ public class CraftItem extends CraftEntity implements Item {
@@ -132,7 +132,7 @@ index 0a075ad3bbe13abc20c1f344cb706278b27bb202..9c0f83ff8113696309265fb9e8f60062
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 725053ca75b0747d69ab3ec8e7035f9b58b82a8c..6ec847b7928cf4217f4588cbb35224fe8db85fd4 100644
+index 87a5260a94dc3388bad2803c64ecf15a8063ba9d..962f4653757f870aff1bea8e98bcafabe639dc86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a019ee3c47..a019ee3c47 100644
--- a/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0890-Fix-player-kick-on-shutdown.patch b/patches/server/0889-Fix-player-kick-on-shutdown.patch
index f5de61909f..f5de61909f 100644
--- a/patches/server/0890-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0889-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0891-Sync-offhand-slot-in-menus.patch b/patches/server/0890-Sync-offhand-slot-in-menus.patch
index aef2af9e40..d54a5a6e67 100644
--- a/patches/server/0891-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0890-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bf17062ff3d7eb3085070f5186ab6477e9c1338e..76d513c61eec05edc8b037f2567562fb677f2d95 100644
+index cd0f542a04ba23fc1bc3ac0a5a1910874f9d7c2c..18518aaa8fad4130b7c89e8a36ed5434258d14f6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -341,6 +341,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0892-Player-Entity-Tracking-Events.patch b/patches/server/0891-Player-Entity-Tracking-Events.patch
index db19a6b1d1..7deeb6f655 100644
--- a/patches/server/0892-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0891-Player-Entity-Tracking-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d58c25b639df59212c61bab989a11679852eea26..d20112349868f4c76f43882ad0cab7be025a6303 100644
+index 81d3d664d4397e528a02e50469622c4ff3ffb804..c081842b4416d15342cbfc583ef367901dab2b7e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1410,9 +1410,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0893-Limit-pet-look-distance.patch b/patches/server/0892-Limit-pet-look-distance.patch
index 6b827724a3..6b827724a3 100644
--- a/patches/server/0893-Limit-pet-look-distance.patch
+++ b/patches/server/0892-Limit-pet-look-distance.patch
diff --git a/patches/server/0894-Properly-resend-entities.patch b/patches/server/0893-Properly-resend-entities.patch
index 7fb40cf3fd..7fb40cf3fd 100644
--- a/patches/server/0894-Properly-resend-entities.patch
+++ b/patches/server/0893-Properly-resend-entities.patch
diff --git a/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
index 2e8a508b26..2e8a508b26 100644
--- a/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0896-fix-Instruments.patch b/patches/server/0895-fix-Instruments.patch
index 81ec752460..8132408618 100644
--- a/patches/server/0896-fix-Instruments.patch
+++ b/patches/server/0895-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 4096145769065693c6d67f092ccedccb78ef4578..292054f546669fe607715e2d39e8ed558fc6fc0c 100644
+index 7569b59b75adf4c7870cc95aad92ccc949a8a070..f496824194613851ea3eb500b12fe7b9351fea88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -726,29 +726,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6c0d7471d6..6c0d7471d6 100644
--- a/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index f318df5bb3..f318df5bb3 100644
--- a/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0899-Add-BlockLockCheckEvent.patch b/patches/server/0898-Add-BlockLockCheckEvent.patch
index b57d228198..860cae73de 100644
--- a/patches/server/0899-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0898-Add-BlockLockCheckEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockLockCheckEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
-index f1acd19432877a833f0d4339f9de4830a0f7b890..8d38ebfdc976b9695ed367591e58de8ca18f00f3 100644
+index fce3a45d09a93ca68a3d49f2e666afa4c860d042..c134d089e55ea2ffb180f92aea020bd7647259c9 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
 @@ -69,17 +69,44 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
diff --git a/patches/server/0900-Add-Sneaking-API-for-Entities.patch b/patches/server/0899-Add-Sneaking-API-for-Entities.patch
index 05d02cc28f..9106439646 100644
--- a/patches/server/0900-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0899-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6759dad436d9e82f9c959e2c183e6e95c37abdcb..d97bc672a8e6fb7c2a0ed668cc15b54bf4254217 100644
+index dc1cc4db2195d4f346bdc5f39e2e14dba454f13d..841a007f24c3d9be2e8b6a9d03ba1694544996fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1218,6 +1218,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0901-Improve-logging-and-errors.patch b/patches/server/0900-Improve-logging-and-errors.patch
index 2c50ac6192..8689ac7c75 100644
--- a/patches/server/0901-Improve-logging-and-errors.patch
+++ b/patches/server/0900-Improve-logging-and-errors.patch
@@ -19,7 +19,7 @@ index 938fe76677139e7e99698b61691bfcadf70dbd87..8aa7439d9f3c071f88c84c6c75b7a65e
          if (advancement.parent() == null) {
              this.roots.remove(advancement);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ca01bd97068509e050485ffaddd7583563a29b8..56daa503f4471cbe2934ac554db1e0c56ecabff3 100644
+index c4425cd7357049e74e825b824e30b9691ad93196..0cd46c761253c197e94b16a78f15110b35b12c12 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3385,7 +3385,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0902-Improve-PortalEvents.patch b/patches/server/0901-Improve-PortalEvents.patch
index 0bbf4bfcbc..0ac3f798dc 100644
--- a/patches/server/0902-Improve-PortalEvents.patch
+++ b/patches/server/0901-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 bff10831c154087077dd21b0d5b37c68b98e42dc..7ccaf608d6afb96edbd0cdfdd85d8b9b13b3fa6a 100644
+index c71011cdc4ab02c4e39f8ef39a5030b1c16f3d8f..044106ea0907d24ab81c677d568e4433dca6ba1d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3757,7 +3757,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
index c37cb75cc6..1a5abc1781 100644
--- a/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7ccaf608d6afb96edbd0cdfdd85d8b9b13b3fa6a..d93ae4c8d2f6bfc8f2114c523ffad44e7ba735a7 100644
+index 044106ea0907d24ab81c677d568e4433dca6ba1d..a5b646d7167234d04232e244e32a977e89476802 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
index 6234450db8..6234450db8 100644
--- a/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 50b24fc2c0..581ad00ec1 100644
--- a/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix NPE on Allay#stopDancing while not dancing
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
-index cb8c2d0efa72c00a57dee5949943f6c7a2019c64..dc19a0ad99deed9cc71c243322e375b740db7a9b 100644
+index 1d04df8752af74ae73231922041d09df9d7492bb..c64918175ec08d20cde2bda9e0cac8b474385fe0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java
 @@ -78,7 +78,7 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay
diff --git a/patches/server/0906-Flying-Fall-Damage.patch b/patches/server/0905-Flying-Fall-Damage.patch
index 062be73949..3231fd2429 100644
--- a/patches/server/0906-Flying-Fall-Damage.patch
+++ b/patches/server/0905-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d..d58b4c0dbe651b5068212e5f14dce3164ee520f5 100644
+index f9a308490e1cd7745dc12369c6041f0ae9e0b1e1..481c3e321cfc0f20bb1c4c6942b8bdbd23c06339 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -186,6 +186,7 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index 6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d..d58b4c0dbe651b5068212e5f14dce316
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 292054f546669fe607715e2d39e8ed558fc6fc0c..b62ccc0aed92b825805e540c67fbf15399e1500d 100644
+index f496824194613851ea3eb500b12fe7b9351fea88..20b1de95c3afbf9cfd4f8943e06fdf07caa21219 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2392,6 +2392,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index b80b116381..39ca938316 100644
--- a/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -130,7 +130,7 @@ index e44cd3b8eef25a3e7eedbe8ae597d74585ecd627..e3b07d623cd64de9645f2372f1e08757
      // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity)
      private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f7f325bd2ff46bb02cc8aa31ea99cca5d0cb1ed8..059bde3786ba16e2a95314664d825492111c3787 100644
+index 10169884ea37531a08d5a0ecb1fae95874332496..73f12036dbbcecbd5848c8eda391fc34d04e9995 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1046,7 +1046,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 40033e7a91..1e77b38126 100644
--- a/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0907-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 d93ae4c8d2f6bfc8f2114c523ffad44e7ba735a7..5dc48c6cced218be3428b420f4823330ea84ba0a 100644
+index a5b646d7167234d04232e244e32a977e89476802..11a4d679c5b46f52eeb51b844f240a835027216a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0909-config-for-disabling-entity-tag-tags.patch b/patches/server/0908-config-for-disabling-entity-tag-tags.patch
index acdda06756..acdda06756 100644
--- a/patches/server/0909-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0908-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch b/patches/server/0909-Use-single-player-info-update-packet-on-join.patch
index a42843df0e..70aff90471 100644
--- a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0909-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 95a643bcd8d43b877e1496068c38ccc7f247924e..bbb42a372d314621221688d8d5d6f418e45f4e08 100644
+index a6630c0aefb31b4b07b62219e27ce724325d291c..f53bb528e9682c554751fefe549fe823958a79dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3415,7 +3415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -18,7 +18,7 @@ index 95a643bcd8d43b877e1496068c38ccc7f247924e..bbb42a372d314621221688d8d5d6f418
          });
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a56995333931685eecf6ea90ff1a89d38b4a2336..fb257dac3abcf899d3db1df47cd7c0ce395c585b 100644
+index 19a01b59ce3e75a0ed48e8fc7678063576d9a2b0..1354be9580ca74485fa0b7ba97fe94079292b8a0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -339,6 +339,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 7b2e2d63ae..7b2e2d63ae 100644
--- a/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0912-Win-Screen-API.patch b/patches/server/0911-Win-Screen-API.patch
index 5eb460ebe5..bd69622d7c 100644
--- a/patches/server/0912-Win-Screen-API.patch
+++ b/patches/server/0911-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 b62ccc0aed92b825805e540c67fbf15399e1500d..f7be775567a9aba1933bc3cf5d4e887ab589d778 100644
+index 20b1de95c3afbf9cfd4f8943e06fdf07caa21219..42c6288d26dc866dae19031aa3310d88274a6fbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1215,6 +1215,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
index b85d1dc31d..76965d3ef0 100644
--- a/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 28e6933e5b02d1d2f983968692bffa2b9e572051..ce82f313007762b6d1d9f006f21a8858e2976efb 100644
+index 5f8f601f5711f4e7aa3f3a6ca047fd75264d0d04..b758cf51923f9e227c287680287dc18525bed4a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0914-Fix-force-opening-enchantment-tables.patch b/patches/server/0913-Fix-force-opening-enchantment-tables.patch
index 3ebf5a30b4..7bdc01b518 100644
--- a/patches/server/0914-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0913-Fix-force-opening-enchantment-tables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index beefbb0d04bd995bc8750707487183c3ffc22239..196aa9dd610e7a10c35e0a532de012976829bb43 100644
+index 9531094aa2b551e5576b0af494cc141fd8cac007..e6326a7cefee568d7639cd3d0166910f8b965b80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0915-Add-Entity-Body-Yaw-API.patch b/patches/server/0914-Add-Entity-Body-Yaw-API.patch
index 1eed2eca74..e9df66e906 100644
--- a/patches/server/0915-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0914-Add-Entity-Body-Yaw-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d97bc672a8e6fb7c2a0ed668cc15b54bf4254217..314168d162f1242eca67706fd3fa225f1ed30cc4 100644
+index 841a007f24c3d9be2e8b6a9d03ba1694544996fd..9bd6d3be29b2f50bc91fa02382e34213f51337f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1450,6 +1450,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -41,7 +41,7 @@ index d97bc672a8e6fb7c2a0ed668cc15b54bf4254217..314168d162f1242eca67706fd3fa225f
      // Paper Start - Collision API
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6ec847b7928cf4217f4588cbb35224fe8db85fd4..bb5980b7e265860968bc86216f2f3ad47301830c 100644
+index 962f4653757f870aff1bea8e98bcafabe639dc86..6a4639a4584f3497661f8870d5722e300638e52a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 599ae035d5..9af995e790 100644
--- a/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0916-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 07a5bbdcada2d2cdb1c3d245379217fe19a48b75..487a25ca0f6719742a88648fbbebfc3e29e105f5 100644
+index a28da797e3ea01eacb378f65da3cfc75cb6b1830..6942c0e42814b995971bbe9bd3bd396e121989dd 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -920,6 +920,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0918-Add-EntityFertilizeEggEvent.patch b/patches/server/0917-Add-EntityFertilizeEggEvent.patch
index 14cc635210..ea181cda54 100644
--- a/patches/server/0918-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0917-Add-EntityFertilizeEggEvent.patch
@@ -69,7 +69,7 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 059bde3786ba16e2a95314664d825492111c3787..a2af7cdc6e538e844f354b2acb30ae3d6e103533 100644
+index 73f12036dbbcecbd5848c8eda391fc34d04e9995..4ad092c25a17cfb3eae26316260ddeeb66a59cfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2089,4 +2089,29 @@ public class CraftEventFactory {
diff --git a/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 75eeab264e..1a7f1ab11a 100644
--- a/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 196aa9dd610e7a10c35e0a532de012976829bb43..5b01ffcdbfff7dbd05143cb08479c90e9b29dfba 100644
+index e6326a7cefee568d7639cd3d0166910f8b965b80..8a6095850cece3203eeae474dbf32090f698a32e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 1291727de8..1291727de8 100644
--- a/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
index fec2b2ac08..ea22d29006 100644
--- a/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle ArmorStand invisibility
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 273f3c029f878c8a30e4f0911d79195c023d3442..dc26be80f2c1f058451c0d446165bc78a0ff8c47 100644
+index 2c16cedf8cb2e4047415e056c419ed9c33c80e93..ccda0d7a96c201905f0f62dcb0e5b278a51dee9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -152,6 +152,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
index c55eac7b90..c55eac7b90 100644
--- a/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0923-Fix-text-display-error-on-spawn.patch b/patches/server/0922-Fix-text-display-error-on-spawn.patch
index 43191b58fb..43191b58fb 100644
--- a/patches/server/0923-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0922-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
index c5b7ef9a42..c5b7ef9a42 100644
--- a/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0925-Add-Shearable-API.patch b/patches/server/0924-Add-Shearable-API.patch
index dbb764b5e7..53d2faf459 100644
--- a/patches/server/0925-Add-Shearable-API.patch
+++ b/patches/server/0924-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 7d9b8968334e536457b29be196545a1f4e312a83..efecddaa165decac6e0958b202ad838405220627 100644
+index ade11598bee28fea252e3500aaa1daefc506c175..7ee489da5963fd722fc2531fef14911447a16557 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 @@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -45,7 +45,7 @@ index 7d9b8968334e536457b29be196545a1f4e312a83..efecddaa165decac6e0958b202ad8384
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
-index c83f16868571ab4724201e9369ab8d90d0e280c5..19e8fc7fa6037b063bc1809c85c703996cd9b5ac 100644
+index 030bf7b6312799231d0b614ba5c84fec23c276e3..37291d7ad9fdf0fe78894f82a418f40bb581f58b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
 @@ -4,7 +4,7 @@ import org.bukkit.DyeColor;
@@ -58,7 +58,7 @@ index c83f16868571ab4724201e9369ab8d90d0e280c5..19e8fc7fa6037b063bc1809c85c70399
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 5d2e0fb911265f1184de5434464378ffba98d379..e4a14cdfeb91a3d32e622d27d612605b1bca08e2 100644
+index 1e9807b8f468742d208f817e22d7625106fc1b58..4ce2373ff71c3c1b8951646e057587a3ab09e145 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.SnowGolem;
diff --git a/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4c90082c28..6a85431dfa 100644
--- a/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnEggMeta#get/setSpawnedType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-index 2f65ce5d63ea4ad3a0b1b8fa47efa97b6641ef20..3ab43aab043ae59e541f708c8558ddf9bdd82f84 100644
+index f4ae4f7b927679c58322f0ec582bb9a5f6c236ec..18b9dcdc2b4bfacd4705085c947a5204a7a3cca3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
 @@ -216,6 +216,31 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
diff --git a/patches/server/0927-Optimize-Hoppers.patch b/patches/server/0926-Optimize-Hoppers.patch
index f74f8f0f52..1bb45392e9 100644
--- a/patches/server/0927-Optimize-Hoppers.patch
+++ b/patches/server/0926-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b5ffa564cf6389b6af281ecf12b8daa139861608..0dbfe7e9c57e0ff52d30ccce3ae3a6af413b7aa4 100644
+index ebc35224004375b77039342926876a408995b04d..9fff00b3706a97ba71a80f2ba39577b229325e02 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1509,6 +1509,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
index ebf4eed61e..ebf4eed61e 100644
--- a/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 6bd28ec0d8..6bd28ec0d8 100644
--- a/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch
index 8ab571c188..dda0696a1e 100644
--- a/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0929-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 bbb42a372d314621221688d8d5d6f418e45f4e08..f70ab11877ae04a4c9cc4ef61dc6e07c0f3fe9f2 100644
+index f53bb528e9682c554751fefe549fe823958a79dd..f06cbdef43e70cde315b0b4cb2d124efa1071618 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2011,6 +2011,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0931-remove-duplicate-animate-packet-for-records.patch b/patches/server/0930-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0931-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0930-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
index a13ddb0b4f..920fe148a5 100644
--- a/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 40ac5cf19934207f06755fbea02d4626d7aa0511..32e3f347e2e025e2675e9410116386e4
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f70ab11877ae04a4c9cc4ef61dc6e07c0f3fe9f2..93d84ca1d132222c8daed9d2683bf72f95dbb078 100644
+index f06cbdef43e70cde315b0b4cb2d124efa1071618..ba257447048b9322defaecfd7424579f287ff483 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -284,6 +284,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 960d48879a..b0bdc70fe9 100644
--- a/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0932-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 42f0ea87dd0bb3be3fbe9e0f7d87582cd3cd7c97..2858fe182e617429f7dcbd7b5d2d2f5df722d5bb 100644
+index a1f25978c50b9b924fda0e399ec7eb5a58562c1b..d38559bd6071e2e37dea46068ead80a24702ff3b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1696,6 +1696,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0934-Use-array-for-gamerule-storage.patch b/patches/server/0933-Use-array-for-gamerule-storage.patch
index 5c50da11c5..5c50da11c5 100644
--- a/patches/server/0934-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0933-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
index 1c9d5aefe4..1c9d5aefe4 100644
--- a/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0937-Add-Mob-Experience-reward-API.patch b/patches/server/0936-Add-Mob-Experience-reward-API.patch
index 47d2f879f2..941296a95c 100644
--- a/patches/server/0937-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0936-Add-Mob-Experience-reward-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob Experience reward API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index c526304d31fd9be1b3c895187f7d9fc45edf4866..153e4c88c168097eb4a78650e7c9c120bec202a3 100644
+index 40d277f2737f1a060c3047313289c73307948e73..b4e45d8e9851552f30c9c29d3d9671e1e9094c38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -158,4 +158,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
index 461e4c40ca..ff295ff960 100644
--- a/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
@@ -7,7 +7,7 @@ This logic hooks into the neighbour update which should be invoked
 as a result of redstone powering the trap door.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
-index aa3fdadd1cc2200adb6e0cf523c38833dc01b71b..b9e3c9cd709d42bced85436720ccc7b9c7e49552 100644
+index 761bbb448acf1c3bf03d728f1a285b89963e61e1..d2f3af70449b0b24734433533167cae444ec4bde 100644
 --- a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
 @@ -124,7 +124,26 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
diff --git a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
index 6490952e0e..7fe63b9f63 100644
--- a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a2af7cdc6e538e844f354b2acb30ae3d6e103533..7c0fec2df265bc72cb5e2f8f400c6ad4c128705e 100644
+index 4ad092c25a17cfb3eae26316260ddeeb66a59cfd..1d9efbde8ec52965bbed22d82a095aa73b8db3b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1086,6 +1086,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0941-More-accurate-isInOpenWater-impl.patch b/patches/server/0940-More-accurate-isInOpenWater-impl.patch
index c782627938..ca26fd9045 100644
--- a/patches/server/0941-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0940-More-accurate-isInOpenWater-impl.patch
@@ -13,7 +13,7 @@ public net.minecraft.world.entity.projectile.FishingHook calculateOpenWater(Lnet
 public net.minecraft.world.entity.projectile.FishingHook outOfWaterTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index 9de72665c947bb00547cdd7c41a890711f5b2afc..96b6e537ec4493a0cdd98ccfe7816f7ffb69c7dd 100644
+index ad1aeea80877f2cdb9e8ad9c5b46f95dd76b3335..116f23a3ee9fa409d7bc34c3769b94ed2bb07183 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 @@ -164,7 +164,7 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
diff --git a/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
index 0e23a9a123..0e23a9a123 100644
--- a/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0944-Expand-PlayerItemMendEvent.patch b/patches/server/0943-Expand-PlayerItemMendEvent.patch
index 88077775bf..0b4ee58ae8 100644
--- a/patches/server/0944-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0943-Expand-PlayerItemMendEvent.patch
@@ -51,7 +51,7 @@ index 42c6288d26dc866dae19031aa3310d88274a6fbf..2981475368094b7749cfec2e5a99ec09
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7c0fec2df265bc72cb5e2f8f400c6ad4c128705e..c562a0a970c83df3bfd4d600bb0ee97878b1649c 100644
+index 1d9efbde8ec52965bbed22d82a095aa73b8db3b8..c87849a4da75c5a0cbe56bb61a288252101a020f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1322,10 +1322,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
index d93fc48631..87276faa87 100644
--- a/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0944-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 5dc48c6cced218be3428b420f4823330ea84ba0a..c6fe58b0ce9d0847d139e72316ed271aa6be2d92 100644
+index 11a4d679c5b46f52eeb51b844f240a835027216a..f37790f7f461da9ecdbd1e83d7ac7832bc5c5eda 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0946-Add-transient-modifier-API.patch b/patches/server/0945-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0946-Add-transient-modifier-API.patch
+++ b/patches/server/0945-Add-transient-modifier-API.patch
diff --git a/patches/server/0947-Fix-block-place-logic.patch b/patches/server/0946-Fix-block-place-logic.patch
index d08e5291bc..a1c7cee366 100644
--- a/patches/server/0947-Fix-block-place-logic.patch
+++ b/patches/server/0946-Fix-block-place-logic.patch
@@ -41,7 +41,7 @@ index c73b57ffd622ccc2e6c570cf874ed118108b899b..efa73faab21c301a99cfe58c3d822d96
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 487a25ca0f6719742a88648fbbebfc3e29e105f5..2dbc5898338a2ee5e2ca7f05fd6de77033be4eb7 100644
+index 6942c0e42814b995971bbe9bd3bd396e121989dd..169fc7b1aaf2cefec3ddab53fcec912e0ec0117a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1035,17 +1035,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index da9489efd3..da9489efd3 100644
--- a/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
index 2b71534642..2b71534642 100644
--- a/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
index 69fc87cf3f..69fc87cf3f 100644
--- a/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index efa2da58fc..efa2da58fc 100644
--- a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0953-Fix-sniffer-removeExploredLocation.patch b/patches/server/0952-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0953-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0952-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch
index 570cabfbfd..7b09037690 100644
--- a/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0953-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 bb5980b7e265860968bc86216f2f3ad47301830c..daadfec2d86f7957072a639e1e36d4082448f35f 100644
+index 6a4639a4584f3497661f8870d5722e300638e52a..030fd330b13197d752a2d4c48628b9efd2c2c776 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index f4cceaa358..466d256466 100644
--- a/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index cac89e4a445262b97c727640d1593a3d74e82b72..e4cacb17f56c618bef19e1165c07aac86af61150 100644
+index c8ae7b3eab18cc9e7be4e92200fb3ac345216357..2af0068ef338634d1f44532af5db66c2d0b3dd10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -367,6 +367,7 @@ public class Main {
diff --git a/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0957-Properly-Cancel-Usable-Items.patch b/patches/server/0956-Properly-Cancel-Usable-Items.patch
index 655263e5a7..ac735f5582 100644
--- a/patches/server/0957-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0956-Properly-Cancel-Usable-Items.patch
@@ -10,7 +10,7 @@ The underlying issue of this is that the client modifies their synced data value
 them in order for the client to reset their using item state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae7ea86c89 100644
+index 4b1af7bba3ce10a1247bb61535456510e18da2d9..76cef8f2861af8fcb88b4dad294a8853dd3f3e01 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -562,6 +562,7 @@ public class ServerPlayerGameMode {
@@ -34,7 +34,7 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93d84ca1d132222c8daed9d2683bf72f95dbb078..2af12e7dddf872f3b80d6288c0b1bd47fcd2b2f7 100644
+index ba257447048b9322defaecfd7424579f287ff483..bb74c271acc02d4f750daeb05bc05b1d6f61ffeb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1923,6 +1923,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -46,7 +46,7 @@ index 93d84ca1d132222c8daed9d2683bf72f95dbb078..2af12e7dddf872f3b80d6288c0b1bd47
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0af0a1ee44375e17942f641df49c53c7804c50fc..9cc236acc47b54f84f0ad9137bfa4b7c38412a5c 100644
+index 371f6d2539eac7161a86bb64763b4ee228eccbdf..6d4d46163ffcffa98f400c2656703eb5c4818f40 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3811,6 +3811,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0958-Add-event-for-player-editing-sign.patch b/patches/server/0957-Add-event-for-player-editing-sign.patch
index 32a1b7ae72..d8b7be275f 100644
--- a/patches/server/0958-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0957-Add-event-for-player-editing-sign.patch
@@ -72,7 +72,7 @@ index 1a1f57cad2eeb5fa1d57e6a07e201ee77065ec90..0c1c6fbcf625da4a28514e0d040deb6c
          entityhuman.openTextEdit(tileentitysign, flag);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index c4fb012488202769ea221d66a8f05cb949b6c815..975c107ccb27e0e5bcd125bb59593a86d730fa43 100644
+index 94caa0915e1a9ec1c46c7a0380db840901cc8063..3b33aed51a84ee30b1e7bceecb0d3840866e0748 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -139,9 +139,15 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
diff --git a/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
index b3de8c9a7c..b3de8c9a7c 100644
--- a/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0960-Improve-command-function-perm-level-checks.patch b/patches/server/0959-Improve-command-function-perm-level-checks.patch
index 5d912059ff..5d912059ff 100644
--- a/patches/server/0960-Improve-command-function-perm-level-checks.patch
+++ b/patches/server/0959-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0961-Add-option-to-disable-block-updates.patch b/patches/server/0960-Add-option-to-disable-block-updates.patch
index ae431df4ef..29e45a4f7d 100644
--- a/patches/server/0961-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0960-Add-option-to-disable-block-updates.patch
@@ -108,7 +108,7 @@ index 910864cfeac085648e6c671b0f9480417324d36e..e46d84750bdd7c940f400efda226e12a
              this.playNote(player, state, world, pos);
              player.awardStat(Stats.TUNE_NOTEBLOCK);
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index 7f60175bf671d282c11e9084670d2bb900968255..cb2ff8d94308c637a498d2737f86f6af4c9c1b83 100644
+index a4ceb86f2c1bbd7d76d07532ed8a512722b01381..d78e5c5014f2af8c14ba5896d94b3100aaecedf9 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 @@ -53,6 +53,7 @@ public class TripWireBlock extends Block {
diff --git a/patches/server/0962-Call-missing-BlockDispenseEvent.patch b/patches/server/0961-Call-missing-BlockDispenseEvent.patch
index fa4ada4143..2496dada5e 100644
--- a/patches/server/0962-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0961-Call-missing-BlockDispenseEvent.patch
@@ -50,7 +50,7 @@ index c0baec6ae9bd90410f47aa04d7c7704233375d1a..e9b748a81ec223a701b56d2dc890c9eb
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c562a0a970c83df3bfd4d600bb0ee97878b1649c..3d93dae82d6fb6bc6abed4f32cf9da32f9159ba6 100644
+index c87849a4da75c5a0cbe56bb61a288252101a020f..8eaa16ef67cbbdc06ae74e1f3c9489d205092264 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2095,6 +2095,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
index faca8da061..21461515af 100644
--- a/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0962-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 c6fe58b0ce9d0847d139e72316ed271aa6be2d92..aa668d0451d96d2f59e3da19e3ae1bd340e17d81 100644
+index f37790f7f461da9ecdbd1e83d7ac7832bc5c5eda..1188fafa153992c9f2d23d22f1faaed3e2c4a1db 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0964-Optimize-player-lookups-for-beacons.patch b/patches/server/0963-Optimize-player-lookups-for-beacons.patch
index 5245e38833..5245e38833 100644
--- a/patches/server/0964-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0963-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0965-Add-Sign-getInteractableSideFor.patch b/patches/server/0964-Add-Sign-getInteractableSideFor.patch
index 2d3d9a47fb..0a4aadfb36 100644
--- a/patches/server/0965-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0964-Add-Sign-getInteractableSideFor.patch
@@ -30,7 +30,7 @@ index e34f7426df5d6c94fcc4101b28702e6c1d9fccff..9eea2982e92e9bc7a53962dc6b21de60
              float f1 = (float) (Mth.atan2(d1, d0) * 57.2957763671875D) - 90.0F;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 975c107ccb27e0e5bcd125bb59593a86d730fa43..736f76f31abedc051ec511524a55da98b77d111d 100644
+index 3b33aed51a84ee30b1e7bceecb0d3840866e0748..2a70c68af92967851f5caf8e67e433355ff48d44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -169,6 +169,14 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
diff --git a/patches/server/0966-Array-backed-synched-entity-data.patch b/patches/server/0965-Array-backed-synched-entity-data.patch
index 515a256250..84bf2095b4 100644
--- a/patches/server/0966-Array-backed-synched-entity-data.patch
+++ b/patches/server/0965-Array-backed-synched-entity-data.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Array backed synched entity data
 Original code by jellysquid3 in Lithium, licensed under the GNU Lesser General Public License v3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-index 15add3f4dfd718ec09bb1db4f22223466936879c..5dfb35117c285e0b202dc9c088ad5848beb8d054 100644
+index ccb7d92b6c36b6225a2e640f8cea6c0da37464c8..a043c382c37058032548a5192e17f5f816abe5a6 100644
 --- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
 +++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
 @@ -34,6 +34,11 @@ public class SynchedEntityData {
diff --git a/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
index 08907c84fd..c1d43316d3 100644
--- a/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
@@ -17,7 +17,7 @@ index 6e91c7ccc36e088be60739dd71b287f0b922a055..57f4cf40359fe9bb427eb0134660d008
          case GLOW_ITEM_FRAME:
          case PAINTING:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index ce82f313007762b6d1d9f006f21a8858e2976efb..0e5abd2a8694b24d4077a602a544e9c2b4c31822 100644
+index b758cf51923f9e227c287680287dc18525bed4a0..ff9e42299d46764cd53f72c730716102c6b8aa3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -600,6 +600,7 @@ public final class CraftItemStack extends ItemStack {
@@ -29,7 +29,7 @@ index ce82f313007762b6d1d9f006f21a8858e2976efb..0e5abd2a8694b24d4077a602a544e9c2
              case GLOW_ITEM_FRAME:
              case PAINTING:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
-index e65bdbbbedb91eca016d46de5cc7cbb70dd9f659..9024467a627a40a145a951510f2207e2a175a4ab 100644
+index 6aa64334943a22da8cfcac88d48ae8156ad7a9b4..630e16403cb1fc0f4ba798993bb0c3139196a97c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
 @@ -16,6 +16,7 @@ public class CraftMetaEntityTag extends CraftMetaItem {
diff --git a/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
index 4e1d19bbf6..660669617a 100644
--- a/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
@@ -67,7 +67,7 @@ index f6d2785b05b4c0a4393be706a90d7cc4388399bf..2510297df2f6ca80672c1dcbd35c0b1e
                  continue;
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 6398f31a29fdab0f6539139a09336b10d6d11d95..7e85f896dc243b2811ea87df759dffa9b6f495b3 100644
+index b6550a8c52122747668f9f0e93c2c2cbd2e86d94..77a789ada9c76c40aabfda358e0752db63a63da9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -71,11 +71,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
diff --git a/patches/server/0969-Fix-BanList-API.patch b/patches/server/0968-Fix-BanList-API.patch
index 4dbd085a1a..4dbd085a1a 100644
--- a/patches/server/0969-Fix-BanList-API.patch
+++ b/patches/server/0968-Fix-BanList-API.patch
diff --git a/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 05fb1ac2ac..05fb1ac2ac 100644
--- a/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
index 8485ab1255..8485ab1255 100644
--- a/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 1408560f1a..d72ec05289 100644
--- a/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only set despawnTimer for Wandering Traders spawned by
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 1cef116b692ebdf3ade01cde533d1e5182a05a91..3c2941d799c9acb3dd9e2b67b7092f4bba5ede17 100644
+index 96115fe8a8c32ce5992d779b5db540b9d81e3b82..833563e237462ccfc1b730b8f5fb35340d0db854 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -67,7 +67,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 24e77389a5..49b157ea07 100644
--- a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f08abdff3e190391d2b65e32e45eb391aeb4f346..def4d88b227b8764a84392843a2f0a026f9ee3fc 100644
+index 8eaa16ef67cbbdc06ae74e1f3c9489d205092264..3ac67ef07f574eacc09d8dc966800cb94caea3c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -720,7 +720,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0974-Don-t-tick-signs.patch b/patches/server/0973-Don-t-tick-signs.patch
index 759f4ef4d2..759f4ef4d2 100644
--- a/patches/server/0974-Don-t-tick-signs.patch
+++ b/patches/server/0973-Don-t-tick-signs.patch
diff --git a/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 45166cba2a..45166cba2a 100644
--- a/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0976-Add-whitelist-events.patch b/patches/server/0975-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0976-Add-whitelist-events.patch
+++ b/patches/server/0975-Add-whitelist-events.patch
diff --git a/patches/server/0977-Implement-PlayerFailMoveEvent.patch b/patches/server/0976-Implement-PlayerFailMoveEvent.patch
index 42ea363200..9feef646bd 100644
--- a/patches/server/0977-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0976-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2af12e7dddf872f3b80d6288c0b1bd47fcd2b2f7..6e23c295f77e95564bf132a03397c4640bf9f49e 100644
+index bb74c271acc02d4f750daeb05bc05b1d6f61ffeb..a51ba56ff7072a0fcaf7115486a61c2ea955e6c1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1291,8 +1291,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch b/patches/server/0977-Folia-scheduler-and-owned-region-API.patch
index 060b9e9c77..d407af42b5 100644
--- a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0977-Folia-scheduler-and-owned-region-API.patch
@@ -1121,7 +1121,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0dbfe7e9c57e0ff52d30ccce3ae3a6af413b7aa4..8f0769d248c7f3cce753130147223403c7923304 100644
+index 9fff00b3706a97ba71a80f2ba39577b229325e02..1bac9f7894321b5710f5475f6598ec9f3ccd94d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1466,6 +1466,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1146,7 +1146,7 @@ index 0dbfe7e9c57e0ff52d30ccce3ae3a6af413b7aa4..8f0769d248c7f3cce753130147223403
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fb257dac3abcf899d3db1df47cd7c0ce395c585b..2fcca41018e6432211606276ea33170ff4f86529 100644
+index 1354be9580ca74485fa0b7ba97fe94079292b8a0..46433978ab9fee1602b169aaf7982c849c4bd53f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -630,6 +630,7 @@ public abstract class PlayerList {
@@ -1158,7 +1158,7 @@ index fb257dac3abcf899d3db1df47cd7c0ce395c585b..2fcca41018e6432211606276ea33170f
          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 aa668d0451d96d2f59e3da19e3ae1bd340e17d81..b22f9de22359573ca64e0bf7e2a241f5ed31b698 100644
+index 1188fafa153992c9f2d23d22f1faaed3e2c4a1db..77d87dcd39147bd617b30a47140852dda750431f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1224,7 +1224,7 @@ index aa668d0451d96d2f59e3da19e3ae1bd340e17d81..b22f9de22359573ca64e0bf7e2a241f5
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b159ada5e593ee4e8e0059eb5cb554c723231e88..edbdfb66c629a5dc01db01d1164c22b4c6df6d00 100644
+index a2a2260f52032c50d57c2031b41d05f052394866..e3f776c909c2d4ea4311ea98dad8476b7da1f44e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -308,6 +308,76 @@ public final class CraftServer implements Server {
@@ -1305,7 +1305,7 @@ index b159ada5e593ee4e8e0059eb5cb554c723231e88..edbdfb66c629a5dc01db01d1164c22b4
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 314168d162f1242eca67706fd3fa225f1ed30cc4..d481534da33d98bf44f2b800bc8e6f6d26ab5fc9 100644
+index 9bd6d3be29b2f50bc91fa02382e34213f51337f5..8472b566bac933d2982683b01dac7eb5e3172192 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -207,6 +207,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0980-API-for-updating-recipes-on-clients.patch b/patches/server/0979-API-for-updating-recipes-on-clients.patch
index 2e98d04389..2e98d04389 100644
--- a/patches/server/0980-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0979-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
index d0ab343b2d..d0ab343b2d 100644
--- a/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0982-Only-capture-actual-tree-growth.patch b/patches/server/0981-Only-capture-actual-tree-growth.patch
index 8686b1f9de..7035d46e7a 100644
--- a/patches/server/0982-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0981-Only-capture-actual-tree-growth.patch
@@ -29,7 +29,7 @@ index 21b3be35da5636fa726f36f569142de5d16ac1f3..4697df75fdee2023c41260bed211e3e3
                      }
                      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 2dbc5898338a2ee5e2ca7f05fd6de77033be4eb7..87cae8ed22a2428a1dda8f2a4510e45fbc31eab5 100644
+index 169fc7b1aaf2cefec3ddab53fcec912e0ec0117a..f2f93761985a78b563dd1eda57f9a08b1cc8893a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1868,4 +1868,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -57,7 +57,7 @@ index f43e6fe77e943239c1f1d6fa3e31235949f79546..53ac4e618fec3fe384d8a106c521f3ea
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index e8dd0b9184e164b41cb4b361f23b6925e7670f8f..24ba4e1fd80d8effc8e70224103d3b93d69cb2ac 100644
+index 11cc7e640774c6098c247382da8520d62ba19c32..bec8e6b62dba2bd0e4e85a7d1fb51287384f1290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -565,6 +565,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
index 6eb9ff2e4c..6eb9ff2e4c 100644
--- a/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
index dd08dc14b0..dd08dc14b0 100644
--- a/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0985-Use-correct-seed-on-api-world-load.patch b/patches/server/0984-Use-correct-seed-on-api-world-load.patch
index 83354b23f6..63fc9c60eb 100644
--- a/patches/server/0985-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0984-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 243050b941b5e71796f6cf72ec831b4b6105c505..c40fbae05a174efc98ed721c7049e1d41d1bd3b8 100644
+index 7b8f4eac4b7361415695170beae50465d6605a22..60e67c271fa2e85271fbbadaa794eb41d608093f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1312,7 +1312,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 56ce0b4a41..56ce0b4a41 100644
--- a/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0987-Cache-map-ids-on-item-frames.patch b/patches/server/0986-Cache-map-ids-on-item-frames.patch
index 9b22a5bbd5..9b22a5bbd5 100644
--- a/patches/server/0987-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0986-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0988-Fix-custom-statistic-criteria-creation.patch b/patches/server/0987-Fix-custom-statistic-criteria-creation.patch
index d027126175..d027126175 100644
--- a/patches/server/0988-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0987-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0989-Bandaid-fix-for-Effect.patch b/patches/server/0988-Bandaid-fix-for-Effect.patch
index 30fbe85e64..5c981e5fca 100644
--- a/patches/server/0989-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0988-Bandaid-fix-for-Effect.patch
@@ -45,7 +45,7 @@ index 5a5a8945c786e16ff0df62494ddd1ac85c42b53f..63f9735d356dafd579cee4423d3037eb
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a54b8615b9652760eaa72b30dfa5460e77d4440a..4879b585df9a6488922511a8e6603964bd13abcf 100644
+index c9ab48d99992a39cc6977424c589489a35f36992..5e350fa39f47d54f6048ea89c1317759f122b8ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1374,7 +1374,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -58,7 +58,7 @@ index a54b8615b9652760eaa72b30dfa5460e77d4440a..4879b585df9a6488922511a8e6603964
              // 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 0ab1bbb44bb483a73dbb4763d785d74a5c6ced3a..0ce408720c8d689cd3ff75af1407a5fbc43bae12 100644
+index 1be276757f241d17f2d24f35df15c5d9cdaaa10c..3bdce11d4debf950ec5f1ce5d03e203f80b57214 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -862,7 +862,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0990-SculkCatalyst-bloom-API.patch b/patches/server/0989-SculkCatalyst-bloom-API.patch
index 8b4fa56999..77742addde 100644
--- a/patches/server/0990-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0989-SculkCatalyst-bloom-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] SculkCatalyst bloom API
 public net.minecraft.world.level.block.entity.SculkCatalystBlockEntity$CatalystListener bloom(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
-index 403abbc5061e4d2ca3e9a3917edf272614af470e..1299aadf8c132ec7e329d258bbd7d9c8e8bd33c4 100644
+index 139026c06589bb9c4201e20cd200887a8527fe55..a4ad8a90d0c2e4978370f9631dbd3a430e951b1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
 @@ -32,4 +32,20 @@ public class CraftSculkCatalyst extends CraftBlockEntityState<SculkCatalystBlock
diff --git a/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
index aa6761baa2..76ac7b4d9a 100644
--- a/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
@@ -7,7 +7,7 @@ Was obtainable through different methods, but you had to use different
 methods depending on the implementation of Entity you were working with.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d481534da33d98bf44f2b800bc8e6f6d26ab5fc9..9ae86d1eab7d831d6b7d637c40fb6408950f7e71 100644
+index 8472b566bac933d2982683b01dac7eb5e3172192..d57856bee23cd0fd22d0c2141c77c978dae7f8c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1506,4 +1506,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index b934dbf22c..2c00652021 100644
--- a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0991-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 d20112349868f4c76f43882ad0cab7be025a6303..984f5bf687f5d7364eea6cff4110a5a33c24d492 100644
+index c081842b4416d15342cbfc583ef367901dab2b7e..4d406ced4a1996b8883574ce0b785dc17370793b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -387,8 +387,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -38,7 +38,7 @@ index d20112349868f4c76f43882ad0cab7be025a6303..984f5bf687f5d7364eea6cff4110a5a3
      // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index dbedc73039f53ddf042999524eec62f032a20d5d..aaaf3a60696389b4e27a45de69743311c58e5829 100644
+index 8907396dc21dbfb31ff15286a7daa2110f6e34c0..8ef4b33c09c64c417e9b0d259550d7f78d1cec14 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -532,7 +532,17 @@ public class ServerChunkCache extends ChunkSource {
@@ -61,7 +61,7 @@ index dbedc73039f53ddf042999524eec62f032a20d5d..aaaf3a60696389b4e27a45de69743311
                  spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 76d513c61eec05edc8b037f2567562fb677f2d95..2919c0562b3cfa48912d81e8619883493da99a36 100644
+index 18518aaa8fad4130b7c89e8a36ed5434258d14f6..7838c7e051b1c4966e5a10289577d60a58ab16dd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -253,6 +253,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
index c4738be9d8..e45e0c150b 100644
--- a/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8aa576877ceb0e6917e02db99ddd4fa851dca811..bc761127b14dc5e91b51966f932c92a3c875f759 100644
+index 60e67c271fa2e85271fbbadaa794eb41d608093f..5f33d18234c055393255c9c3234c6688af7a455d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1855,6 +1855,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 2b8064b545..a7e006f843 100644
--- a/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0993-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 6e23c295f77e95564bf132a03397c4640bf9f49e..ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4 100644
+index a51ba56ff7072a0fcaf7115486a61c2ea955e6c1..7afe0df01d5df4ed8025237d0aed220c32a3b7b2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -805,6 +805,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
index be4fc3d3c2..ee56750095 100644
--- a/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -9,7 +9,7 @@ food consumption, turtle egg count decreases, ice to water
 conversions and beehive releases
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index baf3e79489e310f443788bc917c553ae7ea86c89..9a17193c9fe26c9c0390906b4c1f9d619ccba249 100644
+index 76cef8f2861af8fcb88b4dad294a8853dd3f3e01..ee12ca53c7919d6d424c4306b90d25660eb14af6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -438,8 +438,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
index be007b3577..3c23429d1c 100644
--- a/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fire entity death event for ender dragon
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index ccc68b1a1b1b087c52d91591ba4c63b075bfdc66..f8cdc76561852fd32d9c079ceb3567e6d49c892e 100644
+index 0edf0374c6890b2afdefc4b723f1f4501f4e7810..a288180da1996103eb7dc3bb87b4615f86630bb8 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -642,6 +642,15 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 70e8703885..74202812a3 100644
--- a/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0996-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 984f5bf687f5d7364eea6cff4110a5a33c24d492..aea643e24ed421419ae890759126f395a1ccd8db 100644
+index 4d406ced4a1996b8883574ce0b785dc17370793b..e3c1015a5538ad74b9f109837df5916e6ce7e711 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1420,6 +1420,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0998-Add-Listing-API-for-Player.patch b/patches/server/0997-Add-Listing-API-for-Player.patch
index e92aebc127..0a5a371aec 100644
--- a/patches/server/0998-Add-Listing-API-for-Player.patch
+++ b/patches/server/0997-Add-Listing-API-for-Player.patch
@@ -76,7 +76,7 @@ index 32e3f347e2e025e2675e9410116386e472bd6a79..929483116d05a803d317ece7a44861af
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c2d50d5b070e2e916cd9cb370d2d8ce074049e56..48d1444fbad1c57738807d0128b94160a5a17a4d 100644
+index 4e7141968d88ca3fbb9cceaadbef60fed0ce64eb..03d2dc7f68d6918065f852057321fbaaf22fb413 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -337,14 +337,22 @@ public abstract class PlayerList {
@@ -113,7 +113,7 @@ index c2d50d5b070e2e916cd9cb370d2d8ce074049e56..48d1444fbad1c57738807d0128b94160
          // Paper end
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0ce408720c8d689cd3ff75af1407a5fbc43bae12..c961d30098b614b2c90e460dc142d5e950b3d6d4 100644
+index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f917a2982c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -184,6 +184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0999-Configurable-Region-Compression-Format.patch b/patches/server/0998-Configurable-Region-Compression-Format.patch
index 08de696dde..08de696dde 100644
--- a/patches/server/0999-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0998-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index d57e36ca47..4ab00d4010 100644
--- a/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose clicked BlockFace during BlockDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9 100644
+index ee12ca53c7919d6d424c4306b90d25660eb14af6..cd57234a5f1131f48c9726f89262f253e61b9811 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -258,7 +258,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..618ab9a2903f6d4139acd4aaa2e6db0a
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index def4d88b227b8764a84392843a2f0a026f9ee3fc..3c8160bd5f235f386edd938603ff70d4b73c047e 100644
+index 3ac67ef07f574eacc09d8dc966800cb94caea3c6..975f4fe01ce0c3f98c4467927242558a66bc19f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -650,13 +650,13 @@ public class CraftEventFactory {
diff --git a/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
index 38c2bdfa09..f2b53faa13 100644
--- a/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
@@ -9,7 +9,7 @@ Boat status is null until the entity is added to the world and the tick() method
 public net.minecraft.world.entity.vehicle.Boat getStatus()Lnet/minecraft/world/entity/vehicle/Boat$Status;
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-index d7d54df20984352d84ffb9f7b7da583c34587b85..338e5ec5a518f9542e82ad43efeaa2a8cf04af42 100644
+index d161cbf9c83cd78593864850b98f688da2c85aa5..859f233197ebe738511011e36668c4eb5d4b7d8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
 @@ -88,6 +88,17 @@ public class CraftBoat extends CraftVehicle implements Boat {
diff --git a/patches/server/1002-Expand-Pose-API.patch b/patches/server/1001-Expand-Pose-API.patch
index 6916504cfd..8d8a36f14b 100644
--- a/patches/server/1002-Expand-Pose-API.patch
+++ b/patches/server/1001-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 b22f9de22359573ca64e0bf7e2a241f5ed31b698..684190fd12d910c5b2b47a409181330d3882bced 100644
+index 77d87dcd39147bd617b30a47140852dda750431f..d435d04ab50b2f64e6438c6c26639b6048322013 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -25,7 +25,7 @@ index b22f9de22359573ca64e0bf7e2a241f5ed31b698..684190fd12d910c5b2b47a409181330d
          if (pose == this.getPose()) {
              return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9ae86d1eab7d831d6b7d637c40fb6408950f7e71..f7ebddd35ff5a60a81034fd7de035ebba83e9517 100644
+index d57856bee23cd0fd22d0c2141c77c978dae7f8c6..90b04377088fcaf128cb35843702d2f5ead4b7f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1243,6 +1243,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/1003-More-DragonBattle-API.patch b/patches/server/1002-More-DragonBattle-API.patch
index 70af2d2d8b..d14bf53224 100644
--- a/patches/server/1003-More-DragonBattle-API.patch
+++ b/patches/server/1002-More-DragonBattle-API.patch
@@ -39,7 +39,7 @@ index 390542c42fe957e8e2d21c879c1c8908c8970b44..b2a57cb75916d2724f18779c922005ef
          if (!this.gateways.isEmpty()) {
              int i = (Integer) this.gateways.remove(this.gateways.size() - 1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
-index 9895225593a6b6d22c4c5d3966dd79de1dfa4582..ccc73410ba6938dfdb7c23c2124f9f657b3a7e5d 100644
+index 58f1562373bab8d082172e4a5db22493fb913ca8..716327137c3528a74871d2aad4849812d7113d22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
 @@ -132,4 +132,46 @@ public class CraftDragonBattle implements DragonBattle {
diff --git a/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch
index 20034089ec..a3b749dd22 100644
--- a/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/1003-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 3cea851c3f5389a5dd92601dfbef2975b2a5948b..714bcfffa40d0e876d0cc80acdd6018d41f7d543 100644
+index 2510297df2f6ca80672c1dcbd35c0b1e0ce18ccb..9105c420c0c8d2285f5f45c184d54e9a5c5fbc57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -304,7 +304,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -44,7 +44,7 @@ index 3cea851c3f5389a5dd92601dfbef2975b2a5948b..714bcfffa40d0e876d0cc80acdd6018d
              clone.unbreakable = this.unbreakable;
              clone.damage = this.damage;
 diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-index 8f3769145c3dacc976cc926d896ea9f82332119c..91cb4a28afa5d83e6de10dab834ed63e2eb3b76f 100644
+index 3351962e85438ed05215ce0d159799ed4707afde..8d5789cc6001fdf68c2d3f7ee3dd8fcafb9c831f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
 @@ -189,5 +189,11 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
diff --git a/patches/server/1005-Add-PlayerPickItemEvent.patch b/patches/server/1004-Add-PlayerPickItemEvent.patch
index 4c67972611..e27b097e29 100644
--- a/patches/server/1005-Add-PlayerPickItemEvent.patch
+++ b/patches/server/1004-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 ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4..34fcdeb0f4039f1fc6c4c8c593cc615560af1ba2 100644
+index 7afe0df01d5df4ed8025237d0aed220c32a3b7b2..8bca5ba75977c0a61197eb47c94f0456d66b29a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -942,7 +942,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1006-Improve-performance-of-mass-crafts.patch b/patches/server/1005-Improve-performance-of-mass-crafts.patch
index 183698b5c5..183698b5c5 100644
--- a/patches/server/1006-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1005-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1007-Allow-trident-custom-damage.patch b/patches/server/1006-Allow-trident-custom-damage.patch
index dcbcba2af5..dcbcba2af5 100644
--- a/patches/server/1007-Allow-trident-custom-damage.patch
+++ b/patches/server/1006-Allow-trident-custom-damage.patch
diff --git a/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
index d14e34ae64..d14e34ae64 100644
--- a/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1009-Optimize-nearest-structure-border-iteration.patch b/patches/server/1008-Optimize-nearest-structure-border-iteration.patch
index 07d0358cbb..07d0358cbb 100644
--- a/patches/server/1009-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/1008-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1010-Implement-OfflinePlayer-isConnected.patch b/patches/server/1009-Implement-OfflinePlayer-isConnected.patch
index 2cf0e8deb5..2cf0e8deb5 100644
--- a/patches/server/1010-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/1009-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1011-Fix-inventory-desync.patch b/patches/server/1010-Fix-inventory-desync.patch
index d85eb950fd..d85eb950fd 100644
--- a/patches/server/1011-Fix-inventory-desync.patch
+++ b/patches/server/1010-Fix-inventory-desync.patch
diff --git a/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
index f9b2542b7c..f9b2542b7c 100644
--- a/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1013-Configure-sniffer-egg-hatch-time.patch b/patches/server/1012-Configure-sniffer-egg-hatch-time.patch
index 6c035ed11f..6c035ed11f 100644
--- a/patches/server/1013-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/1012-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0244f274f5..0244f274f5 100644
--- a/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
index e45ced771d..e45ced771d 100644
--- a/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
index c9eb55f978..c9eb55f978 100644
--- a/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
index dcb22051b6..dcb22051b6 100644
--- a/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
index f8402dbd00..e6510b371c 100644
--- a/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 0e5abd2a8694b24d4077a602a544e9c2b4c31822..6556d7ab09826bb5a99f11385eddc26b67e44d68 100644
+index ff9e42299d46764cd53f72c730716102c6b8aa3c..654694515b4b9257a41c8623675fa3abc51a1cb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -33,12 +33,19 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
index 69b6c41e6e..69b6c41e6e 100644
--- a/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1020-Fix-spigot-s-Forced-Stats.patch b/patches/server/1019-Fix-spigot-s-Forced-Stats.patch
index 8e012f221e..8e012f221e 100644
--- a/patches/server/1020-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/1019-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
index 204c301017..b171f93a3c 100644
--- a/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
@@ -57,7 +57,7 @@ index 9d1ee40456a8d7001eee654a62e62cab2626305a..ecd6cb02ef326c8e1d7fba8138d806f3
      public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) {
          this.bukkitOwner = owner;
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 2047224f26bf6c6aa125c15a14fe91d81e5b76ba..ffd349c1b80df0f1e8c02bda23700184825170fd 100644
+index 5d298b11f74cd2da47e6613ced621ab62aa73a7b..f664da5a8413bb13cc95d2cf1604f11a5d285dae 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -1025,4 +1025,15 @@ public abstract class AbstractContainerMenu {
@@ -161,7 +161,7 @@ index c2d6265933dc4ceed80e2bd517970d02164a63df..c5c509fbb915c60dfa95aac8510684d0
              public void setChanged() {
                  super.setChanged();
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index b56766ff0e61691294b40ea8c2370940c0e8b640..a21eadcdfbdc4be803c5793bc97996db3e706071 100644
+index 24187a7ce812cb83a9a736bec8dce9e68ccc0798..076c2b2938c9b88b7e71dbc2aa9d8c7e90d4fe75 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -59,8 +59,8 @@ public class GrindstoneMenu extends AbstractContainerMenu {
diff --git a/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..738c4d4886 100644
--- a/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1023-Actually-optimise-explosions.patch b/patches/server/1022-Actually-optimise-explosions.patch
index a835a68c02..a835a68c02 100644
--- a/patches/server/1023-Actually-optimise-explosions.patch
+++ b/patches/server/1022-Actually-optimise-explosions.patch
diff --git a/patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch
index 604b80916e..604b80916e 100644
--- a/patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index d3ecc69301..d3ecc69301 100644
--- a/patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1026-Fix-SuspiciousStewMeta.patch b/patches/server/1025-Fix-SuspiciousStewMeta.patch
index 1bad5d7d04..834deff5db 100644
--- a/patches/server/1026-Fix-SuspiciousStewMeta.patch
+++ b/patches/server/1025-Fix-SuspiciousStewMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SuspiciousStewMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java
-index 2966fa3eec7770f66c2adc61f0f47db584d017a2..1e4224b9a22bc04c2efdcbf9b560efc4d0dee1b3 100644
+index df1df2ad759622b5b1355fae322cbc0333c932fb..bafc7215a3577c857fb7585f0d6dec54e1b95e90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java
 @@ -20,8 +20,8 @@ import org.bukkit.potion.PotionEffectType;
diff --git a/patches/server/1027-Optimise-chunk-tick-iteration.patch b/patches/server/1026-Optimise-chunk-tick-iteration.patch
index 7a6e81fc30..43a42f52d9 100644
--- a/patches/server/1027-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1026-Optimise-chunk-tick-iteration.patch
@@ -108,7 +108,7 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..5afeb59ff25fed2d565407acacffec83
              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 aea643e24ed421419ae890759126f395a1ccd8db..0c363f3f43e816fb5e047e81e6d748673164e81e 100644
+index e3c1015a5538ad74b9f109837df5916e6ce7e711..baa8497a18474ed142535749edfca200ef31f93e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -192,6 +192,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -187,7 +187,7 @@ index 68550d4497a5f10bf653482f79be77373df53f27..55f96545d6db95e3e657502a7910d96f
  
      public String getDebugStatus() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index aaaf3a60696389b4e27a45de69743311c58e5829..17b6925b46f8386dcfc561483693de516465ec12 100644
+index 8ef4b33c09c64c417e9b0d259550d7f78d1cec14..8c33a12ca879c46893150d6adfb8aa4d397c6b4c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -553,52 +553,114 @@ public class ServerChunkCache extends ChunkSource {
@@ -359,7 +359,7 @@ index aaaf3a60696389b4e27a45de69743311c58e5829..17b6925b46f8386dcfc561483693de51
              gameprofilerfiller.pop();
              this.chunkMap.tick();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ccc2ec523ea6b85ffefb2ae8e27d621499735997..ba972d1661426d7e30f6f61bad3b9608e66ea721 100644
+index 872bd74b581249a8132ec5c37dfdd9e699bfbafa..f71a4a8307fb092d33545e12d253e0b80c884168 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -318,6 +318,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1028-Lag-compensation-ticks.patch b/patches/server/1027-Lag-compensation-ticks.patch
index 17e883e30f..ae178899ed 100644
--- a/patches/server/1028-Lag-compensation-ticks.patch
+++ b/patches/server/1027-Lag-compensation-ticks.patch
@@ -8,7 +8,7 @@ Areas affected by lag comepnsation:
  - Eating food items
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f0769d248c7f3cce753130147223403c7923304..97745f0bab8d82d397c6c2a5775aed92bca0a034 100644
+index 1bac9f7894321b5710f5475f6598ec9f3ccd94d3..8f31413c939cc2b0454ad3d9a1b618dbae449d00 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -305,6 +305,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -30,7 +30,7 @@ index 8f0769d248c7f3cce753130147223403c7923304..97745f0bab8d82d397c6c2a5775aed92
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2858fe182e617429f7dcbd7b5d2d2f5df722d5bb..00b3d8cdf22ef6e1b6b93dc6ba228a9d8c918e6b 100644
+index d38559bd6071e2e37dea46068ead80a24702ff3b..ee6d9c19dbc01d46c60d0067664266c203087d8e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -564,6 +564,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -52,7 +52,7 @@ index 2858fe182e617429f7dcbd7b5d2d2f5df722d5bb..00b3d8cdf22ef6e1b6b93dc6ba228a9d
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..b2c2bd5ec0afd479973f7237a5c610f21231c505 100644
+index cd57234a5f1131f48c9726f89262f253e61b9811..106a312aba249d1e83e4b535fc6e741e04ccfd14 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -124,7 +124,7 @@ public class ServerPlayerGameMode {
@@ -65,7 +65,7 @@ index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..b2c2bd5ec0afd479973f7237a5c610f2
  
          if (this.hasDelayedDestroy) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9cc236acc47b54f84f0ad9137bfa4b7c38412a5c..24a9cdcd7edd2d9e9b002fd2449a7d80057c5ad7 100644
+index 6d4d46163ffcffa98f400c2656703eb5c4818f40..675d695989cef5d8fc2e85673efbb57ec1bb38bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3816,6 +3816,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index 34c0a06240..34c0a06240 100644
--- a/patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch
index f4bcaa50c7..6aa46a84f6 100644
--- a/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch
@@ -9,7 +9,7 @@ scoreboards. If a player's scoreboard has a displayed objective for the
 still had a 'gold' team, it would still be displayed
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index 628951be16da8f19f0e1a974a0b4efa86e873b99..7a2f46579352870cfbb32c343d7c68919758ffe3 100644
+index 24c5e6e3dd41e72d22819964bc8e77f0ebc2d089..891f850ea99dac1433f3e395e26be14c8abf2bfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -87,8 +87,8 @@ public final class CraftScoreboardManager implements ScoreboardManager {
diff --git a/patches/server/1032-Optimise-nearby-player-retrieval.patch b/patches/server/1031-Optimise-nearby-player-retrieval.patch
index 5486dc0f16..114dfb6f4d 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 00b3d8cdf22ef6e1b6b93dc6ba228a9d8c918e6b..2f2ca1c6d0b329521c4545015a878418870216f0 100644
+index ee6d9c19dbc01d46c60d0067664266c203087d8e..19ffb121934e9249d18fa53cae1ae892dfd7f8d4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -575,6 +575,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1033-Remove-streams-for-villager-AI.patch b/patches/server/1032-Remove-streams-for-villager-AI.patch
index a2538da4d0..a2538da4d0 100644
--- a/patches/server/1033-Remove-streams-for-villager-AI.patch
+++ b/patches/server/1032-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1034-Fix-missing-map-initialize-event-call.patch b/patches/server/1033-Fix-missing-map-initialize-event-call.patch
index e9765c3029..76a90f7aec 100644
--- a/patches/server/1034-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1033-Fix-missing-map-initialize-event-call.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing map initialize event call
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2f2ca1c6d0b329521c4545015a878418870216f0..17610196db7a1c6feb2cf74a02479a8691aa323f 100644
+index 19ffb121934e9249d18fa53cae1ae892dfd7f8d4..584a768f2ce1c98a1de7749060c47f21721f9055 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2100,7 +2100,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch
index de60d2ea6f..40c89bc2cc 100644
--- a/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Update entity data when attaching firework to entity
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed..1605ac0e726accdbd7953ffb95a302c2a21d64ce 100644
+index 13b09465952dca2e95647ddb9753a7fe2db51720..c13cdbaf7abdf120a3969f8e887b4c3b78989c9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -69,6 +69,10 @@ public class CraftFirework extends CraftProjectile implements Firework {
diff --git a/patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch
index bffc71910b..bffc71910b 100644
--- a/patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index b36b8cf1f6..b36b8cf1f6 100644
--- a/patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch
index 0aecd72d28..2b7c0f8110 100644
--- a/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4d66a9f24d718de4c6862b20ccb7240332523db4..6b31f88803041c75023a2c99bdc1efd902f0205c 100644
+index 4d66a9f24d718de4c6862b20ccb7240332523db4..548c77592a3520e8053483644eba805079a14f1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -319,7 +319,27 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/1039-Add-player-idle-duration-API.patch b/patches/server/1038-Add-player-idle-duration-API.patch
index bf7b454c60..bf7b454c60 100644
--- a/patches/server/1039-Add-player-idle-duration-API.patch
+++ b/patches/server/1038-Add-player-idle-duration-API.patch
diff --git a/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch
index 81712ec1a3..81712ec1a3 100644
--- a/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
index f4db24ce29..f4db24ce29 100644
--- a/patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index e70d4274ff..e70d4274ff 100644
--- a/patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/1043-Optimize-VarInts.patch b/patches/server/1042-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/1043-Optimize-VarInts.patch
+++ b/patches/server/1042-Optimize-VarInts.patch
diff --git a/patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch b/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
index 17028be297..17028be297 100644
--- a/patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
+++ b/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch