Only limit global sounds to same world if limiting radius (#8499)

146 files changed, 37 insertions, 43 deletions

diff --git a/patches/server/0101-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
index 9bd57f4d90..bc7d89b3b1 100644
--- a/patches/server/0101-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
@@ -1,12 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 31 May 2016 22:53:50 -0400
-Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
+Subject: [PATCH] Only send global sounds to same world if limiting radius
 
-Also fix view distance lookup
+Co-authored-by: Evan McCarthy <[email protected]>
+Co-authored-by: lexikiq <[email protected]>
 
 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 dd1d606543da93e6068b8fa4239d369a4b648523..e6a6b0a298e69ce975eac413723f068aaef72ec0 100644
+index dd1d606543da93e6068b8fa4239d369a4b648523..127aab56eef67d7f02f5c3de80d8f445ba70e7db 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
 @@ -654,7 +654,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -14,12 +15,12 @@ index dd1d606543da93e6068b8fa4239d369a4b648523..e6a6b0a298e69ce975eac413723f068a
                  // this.world.b(1028, this.getChunkCoordinates(), 0);
                  int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
 -                for (net.minecraft.server.level.ServerPlayer player : this.level.getServer().getPlayerList().players) {
-+                for (net.minecraft.server.level.ServerPlayer player : (List<net.minecraft.server.level.ServerPlayer>) ((ServerLevel)level).players()) {
++                for (net.minecraft.server.level.ServerPlayer player : level.spigotConfig.dragonDeathSoundRadius > 0 ? ((ServerLevel) level).players() : level.getServer().getPlayerList().players) { // Paper
                      double deltaX = this.getX() - player.getX();
                      double deltaZ = this.getZ() - player.getZ();
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 78bffaddbc9e478fb53639396e9c4970e9961b21..1fc862a3b5d40a45cf91703051bcfb06ec1b177a 100644
+index 78bffaddbc9e478fb53639396e9c4970e9961b21..0d36a903b7aa8d26232e6edcb0fdbba1defde660 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -272,7 +272,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -27,7 +28,20 @@ index 78bffaddbc9e478fb53639396e9c4970e9961b21..1fc862a3b5d40a45cf91703051bcfb06
                      // this.world.globalLevelEvent(1023, new BlockPosition(this), 0);
                      int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
 -                    for (ServerPlayer player : (List<ServerPlayer>) MinecraftServer.getServer().getPlayerList().players) {
-+                    for (ServerPlayer player : (List<ServerPlayer>)this.level.players()) { // Paper
++                    for (ServerPlayer player : level.spigotConfig.witherSpawnSoundRadius > 0 ? ((ServerLevel) level).players() : level.getServer().getPlayerList().players) { // Paper
                          double deltaX = this.getX() - player.getX();
                          double deltaZ = this.getZ() - player.getZ();
                          double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
+diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
+index a88ffff41481d346a99762352094cdb4e8dd6cc2..e0c3aa1285709a40ff0ea8c1d74d43d2b341aecc 100644
+--- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
++++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
+@@ -64,7 +64,7 @@ public class EnderEyeItem extends Item {
+                     // world.b(1038, blockposition1.c(1, 0, 1), 0);
+                     int viewDistance = world.getCraftServer().getViewDistance() * 16;
+                     BlockPos soundPos = blockposition1.offset(1, 0, 1);
+-                    for (ServerPlayer player : world.getServer().getPlayerList().players) {
++                    for (ServerPlayer player : world.spigotConfig.endPortalSoundRadius > 0 ? ((ServerLevel) world).players() : world.getServer().getPlayerList().players) { // Paper
+                         double deltaX = soundPos.getX() - player.getX();
+                         double deltaZ = soundPos.getZ() - player.getZ();
+                         double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
diff --git a/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
deleted file mode 100644
index a5edd3fe44..0000000000
--- a/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: lexikiq <[email protected]>
-Date: Sat, 17 Jul 2021 20:37:02 -0400
-Subject: [PATCH] Check player world in endPortalSoundRadius
-
-Fixes Spigot's endPortalSoundRadius not checking player worlds
-
-diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-index a88ffff41481d346a99762352094cdb4e8dd6cc2..0b3e9e4ed162a6d9e1f3f55b9522b75c94d13254 100644
---- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-@@ -68,7 +68,7 @@ public class EnderEyeItem extends Item {
-                         double deltaX = soundPos.getX() - player.getX();
-                         double deltaZ = soundPos.getZ() - player.getZ();
-                         double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
--                        if (world.spigotConfig.endPortalSoundRadius > 0 && distanceSquared > world.spigotConfig.endPortalSoundRadius * world.spigotConfig.endPortalSoundRadius) continue; // Spigot
-+                        if (world.spigotConfig.endPortalSoundRadius > 0 && (distanceSquared > world.spigotConfig.endPortalSoundRadius * world.spigotConfig.endPortalSoundRadius || player.getLevel() != world)) continue; // Spigot // Paper - ensure recipient is in same world as portal
-                         if (distanceSquared > viewDistance * viewDistance) {
-                             double deltaLength = Math.sqrt(distanceSquared);
-                             double relativeX = player.getX() + (deltaX / deltaLength) * viewDistance;
diff --git a/patches/server/0791-Validate-usernames.patch b/patches/server/0790-Validate-usernames.patch
index af37250ab9..6abb6a6f00 100644
--- a/patches/server/0791-Validate-usernames.patch
+++ b/patches/server/0790-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 b87bd1c2d3a371e2fca1d0bff6d0985188b22584..64e2004e023f79d28c400f7182b0ffa93789620d 100644
+index dd599443c7197868eaa0708b4be26f1a341ce4e4..82b55548d4652ec0c25d3dc6da628573a9c9000a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0792-Make-water-animal-spawn-height-configurable.patch b/patches/server/0791-Make-water-animal-spawn-height-configurable.patch
index dea45f0b70..dea45f0b70 100644
--- a/patches/server/0792-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0791-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0793-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index a9805b24fc..a9805b24fc 100644
--- a/patches/server/0793-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0794-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0793-Add-config-option-for-worlds-affected-by-time-cmd.patch
index de155852d0..de155852d0 100644
--- a/patches/server/0794-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0793-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0795-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0794-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0795-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0794-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0796-Multiple-Entries-with-Scoreboards.patch b/patches/server/0795-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0796-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0795-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0797-Reset-placed-block-on-exception.patch b/patches/server/0796-Reset-placed-block-on-exception.patch
index 3881c0d6de..3881c0d6de 100644
--- a/patches/server/0797-Reset-placed-block-on-exception.patch
+++ b/patches/server/0796-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0798-Add-configurable-height-for-slime-spawn.patch b/patches/server/0797-Add-configurable-height-for-slime-spawn.patch
index a05bae35ee..a05bae35ee 100644
--- a/patches/server/0798-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0797-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0799-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 1f0e3525bd..d9b38bfa03 100644
--- a/patches/server/0799-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0798-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 64e2004e023f79d28c400f7182b0ffa93789620d..dff440dc51724e85d9fea88a9602efcbb5450776 100644
+index 82b55548d4652ec0c25d3dc6da628573a9c9000a..62a404871650ff5caffcd9c6c83046abeefff49d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -411,7 +411,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0800-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0799-Fix-xp-reward-for-baby-zombies.patch
index 42920471c5..42920471c5 100644
--- a/patches/server/0800-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0799-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0801-Kick-on-main-for-illegal-chat.patch b/patches/server/0800-Kick-on-main-for-illegal-chat.patch
index 054da69477..054da69477 100644
--- a/patches/server/0801-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0800-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0802-Multi-Block-Change-API-Implementation.patch b/patches/server/0801-Multi-Block-Change-API-Implementation.patch
index ffb3e44334..ffb3e44334 100644
--- a/patches/server/0802-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0801-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0803-Fix-NotePlayEvent.patch b/patches/server/0802-Fix-NotePlayEvent.patch
index 83040e523a..83040e523a 100644
--- a/patches/server/0803-Fix-NotePlayEvent.patch
+++ b/patches/server/0802-Fix-NotePlayEvent.patch
diff --git a/patches/server/0804-Freeze-Tick-Lock-API.patch b/patches/server/0803-Freeze-Tick-Lock-API.patch
index 4fa7369491..4fa7369491 100644
--- a/patches/server/0804-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0803-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0805-Dolphin-API.patch b/patches/server/0804-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0805-Dolphin-API.patch
+++ b/patches/server/0804-Dolphin-API.patch
diff --git a/patches/server/0806-More-PotionEffectType-API.patch b/patches/server/0805-More-PotionEffectType-API.patch
index 5d8c4415d3..5d8c4415d3 100644
--- a/patches/server/0806-More-PotionEffectType-API.patch
+++ b/patches/server/0805-More-PotionEffectType-API.patch
diff --git a/patches/server/0807-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 02ee15a8e1..02ee15a8e1 100644
--- a/patches/server/0807-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0808-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch
index c06c0406b5..c06c0406b5 100644
--- a/patches/server/0808-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0809-Add-missing-structure-set-seed-configs.patch b/patches/server/0808-Add-missing-structure-set-seed-configs.patch
index 3e8dff27d6..3e8dff27d6 100644
--- a/patches/server/0809-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0808-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0810-Implement-regenerateChunk.patch b/patches/server/0809-Implement-regenerateChunk.patch
index 52ed98a62f..52ed98a62f 100644
--- a/patches/server/0810-Implement-regenerateChunk.patch
+++ b/patches/server/0809-Implement-regenerateChunk.patch
diff --git a/patches/server/0811-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0810-Fix-cancelled-powdered-snow-bucket-placement.patch
index c6754ee3e6..c6754ee3e6 100644
--- a/patches/server/0811-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0810-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0812-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 4e491d2b35..4e491d2b35 100644
--- a/patches/server/0812-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0813-Add-GameEvent-tags.patch b/patches/server/0812-Add-GameEvent-tags.patch
index bcde64da83..bcde64da83 100644
--- a/patches/server/0813-Add-GameEvent-tags.patch
+++ b/patches/server/0812-Add-GameEvent-tags.patch
diff --git a/patches/server/0814-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b39e446490..b39e446490 100644
--- a/patches/server/0814-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0815-Furnace-RecipesUsed-API.patch b/patches/server/0814-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0815-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0814-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0816-Configurable-sculk-sensor-listener-range.patch b/patches/server/0815-Configurable-sculk-sensor-listener-range.patch
index f19796285a..f19796285a 100644
--- a/patches/server/0816-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0815-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0817-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0816-Add-missing-block-data-mins-and-maxes.patch
index 83ba5f6bc1..83ba5f6bc1 100644
--- a/patches/server/0817-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0816-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0818-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index b4b2dbda38..b4b2dbda38 100644
--- a/patches/server/0818-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0819-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch
index 678a666fc4..678a666fc4 100644
--- a/patches/server/0819-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0820-Fix-Entity-Position-Desync.patch b/patches/server/0819-Fix-Entity-Position-Desync.patch
index f4b0a0dc54..f4b0a0dc54 100644
--- a/patches/server/0820-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0819-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0821-Custom-Potion-Mixes.patch b/patches/server/0820-Custom-Potion-Mixes.patch
index 83f97585c5..83f97585c5 100644
--- a/patches/server/0821-Custom-Potion-Mixes.patch
+++ b/patches/server/0820-Custom-Potion-Mixes.patch
diff --git a/patches/server/0822-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0821-Fix-Fluid-tags-isTagged-method.patch
index 0ce876073c..0ce876073c 100644
--- a/patches/server/0822-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0821-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0823-Force-close-world-loading-screen.patch b/patches/server/0822-Force-close-world-loading-screen.patch
index 9294146475..9294146475 100644
--- a/patches/server/0823-Force-close-world-loading-screen.patch
+++ b/patches/server/0822-Force-close-world-loading-screen.patch
diff --git a/patches/server/0824-Fix-falling-block-spawn-methods.patch b/patches/server/0823-Fix-falling-block-spawn-methods.patch
index 7aaafc2cf1..7aaafc2cf1 100644
--- a/patches/server/0824-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0823-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0825-Expose-furnace-minecart-push-values.patch b/patches/server/0824-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0825-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0824-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0826-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index a9cdda7a75..6d3b59c1d7 100644
--- a/patches/server/0826-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -12,7 +12,7 @@ already-existing field on AbstractArrow for tracking entities hit by
 piercing arrows to avoid duplicate damage being applied.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 8564ecd20578d907bcfa1b9c149da22e424e254a..bc01e5014e1355a225bdf5c47f2965290b45e2d2 100644
+index 39136b9707221e4e4934ee0ef18fc2cb92723aa2..def3b3f8dac4b28eaaafdd9bc2e7f4b9ec9d6855 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -300,6 +300,19 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0827-More-Projectile-API.patch b/patches/server/0826-More-Projectile-API.patch
index cc09814a54..cc09814a54 100644
--- a/patches/server/0827-More-Projectile-API.patch
+++ b/patches/server/0826-More-Projectile-API.patch
diff --git a/patches/server/0828-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0827-Fix-swamp-hut-cat-generation-deadlock.patch
index ae8f7dbdb2..ae8f7dbdb2 100644
--- a/patches/server/0828-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0827-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0829-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 77c8b0c110..77c8b0c110 100644
--- a/patches/server/0829-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0830-Implement-getComputedBiome-API.patch b/patches/server/0829-Implement-getComputedBiome-API.patch
index b6a274bb77..b6a274bb77 100644
--- a/patches/server/0830-Implement-getComputedBiome-API.patch
+++ b/patches/server/0829-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0831-Make-some-itemstacks-nonnull.patch b/patches/server/0830-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0831-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0830-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0832-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index fe6855e900..fe6855e900 100644
--- a/patches/server/0832-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/server/0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0833-Implement-enchantWithLevels-API.patch b/patches/server/0832-Implement-enchantWithLevels-API.patch
index 204d4534fb..204d4534fb 100644
--- a/patches/server/0833-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0832-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0834-Fix-saving-in-unloadWorld.patch b/patches/server/0833-Fix-saving-in-unloadWorld.patch
index 0011be143d..0011be143d 100644
--- a/patches/server/0834-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0833-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0835-Buffer-OOB-setBlock-calls.patch b/patches/server/0834-Buffer-OOB-setBlock-calls.patch
index 62e5606e17..62e5606e17 100644
--- a/patches/server/0835-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0834-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0836-Add-TameableDeathMessageEvent.patch b/patches/server/0835-Add-TameableDeathMessageEvent.patch
index 8bbbaffa2c..8bbbaffa2c 100644
--- a/patches/server/0836-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0835-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0837-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0836-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
index 8ecf55d257..8ecf55d257 100644
--- a/patches/server/0837-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
+++ b/patches/server/0836-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0838-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 8dd4659462..8dd4659462 100644
--- a/patches/server/0838-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0839-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 58c393fb73..58c393fb73 100644
--- a/patches/server/0839-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0840-Guard-against-invalid-entity-positions.patch b/patches/server/0839-Guard-against-invalid-entity-positions.patch
index c46dce184c..c46dce184c 100644
--- a/patches/server/0840-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0839-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0841-cache-resource-keys.patch b/patches/server/0840-cache-resource-keys.patch
index 4234b8673f..4234b8673f 100644
--- a/patches/server/0841-cache-resource-keys.patch
+++ b/patches/server/0840-cache-resource-keys.patch
diff --git a/patches/server/0842-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0841-Allow-to-change-the-podium-for-the-EnderDragon.patch
index ca79a2f05b..8dde383d5e 100644
--- a/patches/server/0842-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0841-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 6495b0421cab1b067b9483cc448222705c15578c..ac3d4d90407288526a8c787e365ff41234a58543 100644
+index 3f854bea2e6be82c7ad12b4d13064de8baec55c7..b786bd5178a605a5dfb7682b7cb809646895aea3 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
 @@ -99,6 +99,10 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0843-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 9ef13e101f..9ef13e101f 100644
--- a/patches/server/0843-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0844-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index 4b39ce4dc3..55e32b5b6d 100644
--- a/patches/server/0844-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix StructureGrowEvent species for RED_MUSHROOM
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
-index 5333188e45e47c12c8c56939b87603750a45af57..881d899ff551bc2c2c6fc7d58107a2aee7d86f2a 100644
+index 30dac710f355de75e620b807f88c6a209615b05f..88a7b38f33500a618f42aed427e7e15db9e837b3 100644
 --- a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
 @@ -85,7 +85,7 @@ public class MushroomBlock extends BushBlock implements BonemealableBlock {
diff --git a/patches/server/0845-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0844-Prevent-tile-entity-copies-loading-chunks.patch
index 3c5eabbf49..3c5eabbf49 100644
--- a/patches/server/0845-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0844-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0846-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 0d9a571f4d..0d9a571f4d 100644
--- a/patches/server/0846-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0847-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 951baf9062..951baf9062 100644
--- a/patches/server/0847-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0848-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch
index e309f68ed2..e309f68ed2 100644
--- a/patches/server/0848-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0849-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index fff84c5a62..fff84c5a62 100644
--- a/patches/server/0849-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0850-WorldCreator-keepSpawnLoaded.patch b/patches/server/0849-WorldCreator-keepSpawnLoaded.patch
index 83b3e1ff72..83b3e1ff72 100644
--- a/patches/server/0850-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0849-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0851-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index d33dabf6c9..d33dabf6c9 100644
--- a/patches/server/0851-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/server/0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0852-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 79c74b0a57..79c74b0a57 100644
--- a/patches/server/0852-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0853-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 8eacb2217e..8eacb2217e 100644
--- a/patches/server/0853-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0854-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0853-Fire-CauldronLevelChange-on-initial-fill.patch
index c0fcd53f55..c0fcd53f55 100644
--- a/patches/server/0854-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0853-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0855-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0854-fix-powder-snow-cauldrons-not-turning-to-water.patch
index aef5bd0551..aef5bd0551 100644
--- a/patches/server/0855-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0854-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0856-Add-PlayerStopUsingItemEvent.patch b/patches/server/0855-Add-PlayerStopUsingItemEvent.patch
index 0257c5ae82..0257c5ae82 100644
--- a/patches/server/0856-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0855-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0857-FallingBlock-auto-expire-setting.patch b/patches/server/0856-FallingBlock-auto-expire-setting.patch
index a7b0c20dd6..59902948f9 100644
--- a/patches/server/0857-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0856-FallingBlock-auto-expire-setting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] FallingBlock auto expire setting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index f6405e862b15b71dbb96215e604610fe5ff59bfc..ef07967b64180c54338b8fb2ba1780adec87f333 100644
+index da00fab453f3fb580acc9de65a0853656f9b6fc4..b2d1a17867cdbaad0c6e5c2376c716f9461af124 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -61,6 +61,7 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0858-Don-t-tick-markers.patch b/patches/server/0857-Don-t-tick-markers.patch
index 6f1a2dd7e8..6f1a2dd7e8 100644
--- a/patches/server/0858-Don-t-tick-markers.patch
+++ b/patches/server/0857-Don-t-tick-markers.patch
diff --git a/patches/server/0859-Do-not-accept-invalid-client-settings.patch b/patches/server/0858-Do-not-accept-invalid-client-settings.patch
index 88c7e8c514..88c7e8c514 100644
--- a/patches/server/0859-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0858-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0860-Add-support-for-Proxy-Protocol.patch b/patches/server/0859-Add-support-for-Proxy-Protocol.patch
index 51687b36e9..51687b36e9 100644
--- a/patches/server/0860-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0859-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0861-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0860-Fix-OfflinePlayer-getBedSpawnLocation.patch
index b11ce011a5..b11ce011a5 100644
--- a/patches/server/0861-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0860-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0862-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0862-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0863-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0862-Sanitize-Sent-BlockEntity-NBT.patch
index fb3c8b1818..fb3c8b1818 100644
--- a/patches/server/0863-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0862-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0864-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch
index af64e15a4b..af64e15a4b 100644
--- a/patches/server/0864-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0865-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0864-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0865-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0864-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0866-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch
index 92792493ee..92792493ee 100644
--- a/patches/server/0866-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0867-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0866-Add-Alternate-Current-redstone-implementation.patch
index 08a0345e44..08a0345e44 100644
--- a/patches/server/0867-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0866-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0868-Dont-resent-entity-on-art-update.patch b/patches/server/0867-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0868-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0867-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0869-Add-missing-spawn-eggs.patch b/patches/server/0868-Add-missing-spawn-eggs.patch
index ba88344787..ba88344787 100644
--- a/patches/server/0869-Add-missing-spawn-eggs.patch
+++ b/patches/server/0868-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0870-Add-WardenAngerChangeEvent.patch b/patches/server/0869-Add-WardenAngerChangeEvent.patch
index cfe1a98c72..cfe1a98c72 100644
--- a/patches/server/0870-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0869-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0871-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch
index 400526a4d4..400526a4d4 100644
--- a/patches/server/0871-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0872-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0871-Add-missing-important-BlockStateListPopulator-method.patch
index 2296cce864..2296cce864 100644
--- a/patches/server/0872-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0871-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0873-Nameable-Banner-API.patch b/patches/server/0872-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0873-Nameable-Banner-API.patch
+++ b/patches/server/0872-Nameable-Banner-API.patch
diff --git a/patches/server/0874-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch
index fd94342154..fd94342154 100644
--- a/patches/server/0874-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0875-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch
index f5ec296ded..f5ec296ded 100644
--- a/patches/server/0875-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0876-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index ad894dbcce..ad894dbcce 100644
--- a/patches/server/0876-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0877-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0876-Don-t-print-component-in-resource-pack-rejection-mes.patch
index e39a508723..e39a508723 100644
--- a/patches/server/0877-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0876-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0878-Add-Player-getFishHook.patch b/patches/server/0877-Add-Player-getFishHook.patch
index bf5ccb5986..bf5ccb5986 100644
--- a/patches/server/0878-Add-Player-getFishHook.patch
+++ b/patches/server/0877-Add-Player-getFishHook.patch
diff --git a/patches/server/0879-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index f9cbdd0899..f9cbdd0899 100644
--- a/patches/server/0879-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0880-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch
index cef83e5b43..cef83e5b43 100644
--- a/patches/server/0880-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0881-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0880-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 2cbecbfbe0..2cbecbfbe0 100644
--- a/patches/server/0881-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0880-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0882-Fix-Bee-flower-NPE.patch b/patches/server/0881-Fix-Bee-flower-NPE.patch
index d1fca0922f..6072e1dcc5 100644
--- a/patches/server/0882-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0881-Fix-Bee-flower-NPE.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Bee flower NPE
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index bd048cc30046f19f9eee89c6ba45d0816a160e67..e5de2c1d11e5de88420caba35bf75c8bbd799db5 100644
+index f2243f65cdf0e4b327e8597dfefe5b2de8912cef..87f8d46cb2032474008811ca11dc7ff1f7859f7e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -802,7 +802,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0883-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 90422ebe0b..90422ebe0b 100644
--- a/patches/server/0883-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
index 596e867634..596e867634 100644
--- a/patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0885-More-Teleport-API.patch b/patches/server/0884-More-Teleport-API.patch
index e2e71abd9a..43474de5a7 100644
--- a/patches/server/0885-More-Teleport-API.patch
+++ b/patches/server/0884-More-Teleport-API.patch
@@ -29,7 +29,7 @@ index 421d7e28370085dffa415d71d4e28d3c4d38ac87..92617a19fb328320e17b58956cf0276d
              d0 = to.getX();
              d1 = to.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c4ffccddce33cf461d9b04ccbb90026544f16b7d..99b99fae67e53a688b3519d8a8d0cc5f3468e7e8 100644
+index 2015147126f463f11202d04ca475cc86e5ac12c2..a1e2664c9a6cc41edf0dfb92cd2b9d77170d8fde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -542,15 +542,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0886-Add-EntityPortalReadyEvent.patch b/patches/server/0885-Add-EntityPortalReadyEvent.patch
index 1789bbd1ec..1789bbd1ec 100644
--- a/patches/server/0886-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0885-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0887-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch
index aea2ef2591..32c6071e98 100644
--- a/patches/server/0887-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch
@@ -9,7 +9,7 @@ should be supported. Some entities (for whatever
 reason) use the level's random in some places.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index e5de2c1d11e5de88420caba35bf75c8bbd799db5..a9cdf9034ad269f7a71358443acc053288cfbe6d 100644
+index 87f8d46cb2032474008811ca11dc7ff1f7859f7e..2e05c953182c27e3571b2c33eceeb379e60b54be 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -1028,7 +1028,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -49,7 +49,7 @@ index 4c78c04ed031ec2e04642ebe5d79527e848d95f6..fcc5444a1268931a0fd2df1e6bbbc17c
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 8101f358975b35b5a2dafbade3d14a910e408fa2..e09271450cae84f6206a20d6622918fe37380d59 100644
+index 65f0aa076dbfc4cd72d14ec485d1edf5533d825e..438de71a17d7bfaed8fbb1b4f7aa7f53538603a2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -35,7 +35,7 @@ public class PrimedTnt extends Entity {
diff --git a/patches/server/0888-Send-block-entities-after-destroy-prediction.patch b/patches/server/0887-Send-block-entities-after-destroy-prediction.patch
index 0d7cf43457..0d7cf43457 100644
--- a/patches/server/0888-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0887-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0889-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch
index fd9a449523..fd9a449523 100644
--- a/patches/server/0889-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0890-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0889-Custom-Chat-Completion-Suggestions-API.patch
index 0a4575bacf..0a4575bacf 100644
--- a/patches/server/0890-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0889-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0891-Add-missing-BlockFadeEvents.patch b/patches/server/0890-Add-missing-BlockFadeEvents.patch
index 6b887deccf..6b887deccf 100644
--- a/patches/server/0891-Add-missing-BlockFadeEvents.patch
+++ b/patches/server/0890-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0892-Collision-API.patch b/patches/server/0891-Collision-API.patch
index 620c1e6cec..620c1e6cec 100644
--- a/patches/server/0892-Collision-API.patch
+++ b/patches/server/0891-Collision-API.patch
diff --git a/patches/server/0893-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 3a5bf3be59..3a5bf3be59 100644
--- a/patches/server/0893-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0894-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0893-Fix-command-preprocess-cancelling-and-command-changi.patch
index 6a4d1cbe43..6a4d1cbe43 100644
--- a/patches/server/0894-Fix-command-preprocess-cancelling-and-command-changi.patch
+++ b/patches/server/0893-Fix-command-preprocess-cancelling-and-command-changi.patch
diff --git a/patches/server/0895-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
index af4b5e1aec..b725449353 100644
--- a/patches/server/0895-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index dff440dc51724e85d9fea88a9602efcbb5450776..dfebe4ae6f19a36f2802195f2989a562c5570526 100644
+index 62a404871650ff5caffcd9c6c83046abeefff49d..cb761c4d87eded85a80996e6894b731381b7516c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -167,7 +167,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0896-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 05e9d349b8..6ebf299ac6 100644
--- a/patches/server/0896-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ff25ce408aba3620455f74e1535b5862b3bbdf9..9eb921fec32afa360f3a402e978411fcf3ec618c 100644
+index 8ae8055c185237a76159285c8fce3aacc295fb3b..8a35db69e986c393bf56ae556ea28adff91da08d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1757,6 +1757,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0897-Block-Ticking-API.patch b/patches/server/0896-Block-Ticking-API.patch
index 43db29d605..43db29d605 100644
--- a/patches/server/0897-Block-Ticking-API.patch
+++ b/patches/server/0896-Block-Ticking-API.patch
diff --git a/patches/server/0898-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
index d651ad3104..31827a8f92 100644
--- a/patches/server/0898-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..5de2dabbc076a9482b1d6c299f1cff74
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index dfebe4ae6f19a36f2802195f2989a562c5570526..36802586717613abfce9f23e0d2a405f0590ae6e 100644
+index cb761c4d87eded85a80996e6894b731381b7516c..18a8bf9a26c7aa2b73bc696ebb54846643262e25 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -67,6 +67,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0899-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 5d5ebb5ffd..9e8a29aee8 100644
--- a/patches/server/0899-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0898-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 36802586717613abfce9f23e0d2a405f0590ae6e..b607f5ccbce10570f827dd21eb38504f42781d2f 100644
+index 18a8bf9a26c7aa2b73bc696ebb54846643262e25..ea9b56fd6ae1d5577da5bd3e0c38abfeec8f3646 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -52,7 +52,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0900-Add-NamespacedKey-biome-methods.patch b/patches/server/0899-Add-NamespacedKey-biome-methods.patch
index 3266ac0fb2..3266ac0fb2 100644
--- a/patches/server/0900-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0899-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0901-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch
index 1ebabbd92c..1ebabbd92c 100644
--- a/patches/server/0901-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0902-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch
index fd5bf78e20..fd5bf78e20 100644
--- a/patches/server/0902-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0903-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch
index 430fec0edb..1566b53ccc 100644
--- a/patches/server/0903-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch
@@ -54,7 +54,7 @@ index 780cff9638fe717e98a97f1241cf65337b55382c..0318c9483a4d96eb39ff4df9054a9e63
          this.level.getProfiler().pop();
          this.animStep += f2;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 66c3f374a779cd3a4548393ba23e9219f1caf6d3..c61ed38d0a824fee9b45acfc862baf03c85fe54b 100644
+index 68f3131eb5d3c725279796effff083345edbaec9..713c11d6547cb02ac4b6a02aec07a8ba68019f3f 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -245,13 +245,7 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0904-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index f5809b775f..f5809b775f 100644
--- a/patches/server/0904-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/server/0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0905-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
index 0bdc6667a6..0bdc6667a6 100644
--- a/patches/server/0905-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
+++ b/patches/server/0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0906-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0905-Fire-EntityChangeBlockEvent-in-more-places.patch
index 35c92f85b3..35c92f85b3 100644
--- a/patches/server/0906-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0905-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0907-Missing-eating-regain-reason.patch b/patches/server/0906-Missing-eating-regain-reason.patch
index 1f8bd2bc7b..43860b492f 100644
--- a/patches/server/0907-Missing-eating-regain-reason.patch
+++ b/patches/server/0906-Missing-eating-regain-reason.patch
@@ -18,7 +18,7 @@ index ab86bfdaebe9b8791f0cfa6e0c61f80c8f891a93..745883a7b9c2590ae8e28db79e1bd034
                          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 5ffae9d3be22b5e78645da57a6bd0e7350749ef1..ed8dfabdad28e27054aa0679e06fcf87dc049f77 100644
+index 9aec9f80c564fa3ae03e445423d9e50afc45f837..149be8bf166282e651a375a27ca209010f25d688 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -211,7 +211,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
diff --git a/patches/server/0908-Missing-effect-cause.patch b/patches/server/0907-Missing-effect-cause.patch
index 70a763eeb3..70a763eeb3 100644
--- a/patches/server/0908-Missing-effect-cause.patch
+++ b/patches/server/0907-Missing-effect-cause.patch
diff --git a/patches/server/0909-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0908-Added-byte-array-serialization-deserialization-for-P.patch
index 3553cbd00c..3553cbd00c 100644
--- a/patches/server/0909-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0908-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0910-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 8e7053e1f5..8e7053e1f5 100644
--- a/patches/server/0910-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0911-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0910-Call-BlockPhysicsEvent-more-often.patch
index 532418a20f..532418a20f 100644
--- a/patches/server/0911-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0910-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0912-Configurable-chat-thread-limit.patch b/patches/server/0911-Configurable-chat-thread-limit.patch
index 1bb08ba4e5..1bb08ba4e5 100644
--- a/patches/server/0912-Configurable-chat-thread-limit.patch
+++ b/patches/server/0911-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0913-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index b571f18f1d..b571f18f1d 100644
--- a/patches/server/0913-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0914-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch
index ecc49e7279..ecc49e7279 100644
--- a/patches/server/0914-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0915-fix-Jigsaw-block-kicking-user.patch b/patches/server/0914-fix-Jigsaw-block-kicking-user.patch
index 846e244a93..846e244a93 100644
--- a/patches/server/0915-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0914-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0916-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0915-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 9e935dca74..9e935dca74 100644
--- a/patches/server/0916-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0915-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0917-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
index 517828b9b3..517828b9b3 100644
--- a/patches/server/0917-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
+++ b/patches/server/0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0918-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0917-Fix-a-bunch-of-vanilla-bugs.patch
index ff0ed12381..ff0ed12381 100644
--- a/patches/server/0918-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0917-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0919-Fix-nothing-mlg.patch b/patches/server/0918-Fix-nothing-mlg.patch
index 5daa6a890c..b3405c25b7 100644
--- a/patches/server/0919-Fix-nothing-mlg.patch
+++ b/patches/server/0918-Fix-nothing-mlg.patch
@@ -19,7 +19,7 @@ doCheckFallDamage method is meant to be called repeatedly anyway.
 Mojira-ID: MC-255653
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9eb921fec32afa360f3a402e978411fcf3ec618c..63c9040ed2349eec500ba6e9090440347c514a3b 100644
+index 8a35db69e986c393bf56ae556ea28adff91da08d..9ad36447e82a3504576f6c10cb297514a2f69289 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1564,6 +1564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0920-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 71b2d48ea7..71b2d48ea7 100644
--- a/patches/server/0920-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0921-Fix-custom-piglin-loved-items.patch b/patches/server/0920-Fix-custom-piglin-loved-items.patch
index 316765e536..316765e536 100644
--- a/patches/server/0921-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0920-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0922-EntityPickupItemEvent-fixes.patch b/patches/server/0921-EntityPickupItemEvent-fixes.patch
index 55ee52922d..55ee52922d 100644
--- a/patches/server/0922-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0921-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0923-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0922-Correctly-handle-interactions-with-items-on-cooldown.patch
index 3c2b0a812f..3c2b0a812f 100644
--- a/patches/server/0923-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0922-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0924-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch
index 4c38d4e329..4c38d4e329 100644
--- a/patches/server/0924-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0925-Elder-Guardian-appearance-API.patch b/patches/server/0924-Elder-Guardian-appearance-API.patch
index 415f2653b4..415f2653b4 100644
--- a/patches/server/0925-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0924-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0926-Allow-changing-bed-s-occupied-property.patch b/patches/server/0925-Allow-changing-bed-s-occupied-property.patch
index 4d0128b6d3..4d0128b6d3 100644
--- a/patches/server/0926-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0925-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0927-Add-entity-knockback-API.patch b/patches/server/0926-Add-entity-knockback-API.patch
index 27409e5603..27409e5603 100644
--- a/patches/server/0927-Add-entity-knockback-API.patch
+++ b/patches/server/0926-Add-entity-knockback-API.patch
diff --git a/patches/server/0928-Detect-headless-JREs.patch b/patches/server/0927-Detect-headless-JREs.patch
index 85669a4c56..85669a4c56 100644
--- a/patches/server/0928-Detect-headless-JREs.patch
+++ b/patches/server/0927-Detect-headless-JREs.patch
diff --git a/patches/server/0929-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0928-fixed-entity-vehicle-collision-event-not-called.patch
index 38afe823d5..38afe823d5 100644
--- a/patches/server/0929-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0928-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0930-optimized-dirt-and-snow-spreading.patch b/patches/server/0929-optimized-dirt-and-snow-spreading.patch
index a146caa330..a146caa330 100644
--- a/patches/server/0930-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0929-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0931-Added-EntityToggleSitEvent.patch b/patches/server/0930-Added-EntityToggleSitEvent.patch
index 72110ccbfb..72110ccbfb 100644
--- a/patches/server/0931-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0930-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0932-Add-fire-tick-delay-option.patch b/patches/server/0931-Add-fire-tick-delay-option.patch
index f30b4f8be8..f30b4f8be8 100644
--- a/patches/server/0932-Add-fire-tick-delay-option.patch
+++ b/patches/server/0931-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0933-Add-Moving-Piston-API.patch b/patches/server/0932-Add-Moving-Piston-API.patch
index 53df041ba1..53df041ba1 100644
--- a/patches/server/0933-Add-Moving-Piston-API.patch
+++ b/patches/server/0932-Add-Moving-Piston-API.patch
diff --git a/patches/server/0934-Ignore-impossible-spawn-tick.patch b/patches/server/0933-Ignore-impossible-spawn-tick.patch
index 9db2fe1bb4..9db2fe1bb4 100644
--- a/patches/server/0934-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0933-Ignore-impossible-spawn-tick.patch