diff --git a/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 90510e0728..687e67e5e9 100644
--- a/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 97f045ee1af5479b2befe2e03f082933cfe91007..45cd4ac70bf322a3bb256579f795db46b9beb7a0 100644
+index 4da6c770ff4953b81c4694c665d453ca7d3e532b..8b586272b0f05a12607aa138596ecd5f1e86d0b7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1129,6 +1129,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
deleted file mode 100644
index 6c82126b25..0000000000
--- a/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach@zachbr.io>
-Date: Mon, 4 Mar 2019 02:23:28 -0500
-Subject: [PATCH] Set Zombie last tick at start of drowning process
-
-Fixes GH-1887
-
-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 1ff02c66fcc291b6ccc456673ad4c6c09d47d69e..bf5f4fe68a942dff8c2e2ad4735a529b5a6353e8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -223,6 +223,7 @@ public class Zombie extends Monster {
-                     ++this.inWaterTime;
-                     if (this.inWaterTime >= 600) {
-                         this.startUnderWaterConversion(300);
-+                        this.lastTick = MinecraftServer.currentTick; // Paper - Make sure this is set at start of process - GH-1887
-                     }
-                 } else {
-                     this.inWaterTime = -1;
diff --git a/patches/server/0305-Entity-getEntitySpawnReason.patch b/patches/server/0304-Entity-getEntitySpawnReason.patch
similarity index 95%
rename from patches/server/0305-Entity-getEntitySpawnReason.patch
rename to patches/server/0304-Entity-getEntitySpawnReason.patch
index 57bd938581..e4dd8652e6 100644
--- a/patches/server/0305-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0304-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index efc2db1b27e9ac4b1094b7e529c198a94d05b164..84eeb8787c389a3c66b23d567f6c2ebe9644a1ce 100644
+index 57dbe97d4d4f98811616d12570bf2fc2ba91a3a0..0ba8f25d7f54ec2ed9e15a3cf7016464741c0de0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1250,6 +1250,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -22,7 +22,7 @@ index efc2db1b27e9ac4b1094b7e529c198a94d05b164..84eeb8787c389a3c66b23d567f6c2ebe
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 45cd4ac70bf322a3bb256579f795db46b9beb7a0..80b6eb1e010559c02c9e7624a5c131d11c80c68e 100644
+index 8b586272b0f05a12607aa138596ecd5f1e86d0b7..fe359cfdc42a86e26a890252ba994ca1fe7726ea 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -348,7 +348,7 @@ public abstract class PlayerList {
@@ -93,7 +93,7 @@ index fb67f1d76d683694db13b29bab1d69606b414950..d83fc656e70612bbfa93f5ef2cc11611
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 0be0c7a323277093a6f8e476048eb9ee8712cbc9..c7e97263eee005fd673882e11c436542cb0ca62a 100644
+index 92e3bb8b59d79cbe79fa55a7db443bd7a1957914..c24c6fb1badf7d2764ef6cd76c0368297af84afc 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -181,6 +181,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0305-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0305-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0307-Fire-event-on-GS4-query.patch b/patches/server/0306-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0307-Fire-event-on-GS4-query.patch
rename to patches/server/0306-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0308-Implement-PlayerPostRespawnEvent.patch b/patches/server/0307-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0308-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0307-Implement-PlayerPostRespawnEvent.patch
index d4f88880bf..b769a9c729 100644
--- a/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0307-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 80b6eb1e010559c02c9e7624a5c131d11c80c68e..d8c936b6b242d6ad2ca63ab98a4a111fed402241 100644
+index fe359cfdc42a86e26a890252ba994ca1fe7726ea..f77bbe5ebd3fd93ec6cf92a049b585178c7583d8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -728,9 +728,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0308-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0308-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0310-Server-Tick-Events.patch b/patches/server/0309-Server-Tick-Events.patch
similarity index 93%
rename from patches/server/0310-Server-Tick-Events.patch
rename to patches/server/0309-Server-Tick-Events.patch
index 5feb5afd52..427db9a827 100644
--- a/patches/server/0310-Server-Tick-Events.patch
+++ b/patches/server/0309-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index acc9f22a1284cea2e29f3616598f8388f0a0e6f6..f9a96a11764b66709a0d74122f9ecc06d0365a93 100644
+index ddd7f78314275e054a1437b633458d8564ef28ca..412380f4bfe8a2d50090904124242e8b2c7bfa1b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1302,6 +1302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0310-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0310-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0311-Optimize-Captured-TileEntity-Lookup.patch
similarity index 94%
rename from patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0311-Optimize-Captured-TileEntity-Lookup.patch
index 2aea08c36b..c261c77a3b 100644
--- a/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0311-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1a474fb88dc1447fb754e8ad936ab6add470359c..cb7e92f2694cefeecebc840959a01e1e1945061a 100644
+index 699df824d2e9fe8b6f6a1ccc8ae7c818c84204cb..7ba3e9a2f974cd469d256dbfbdbfcb05b644c1ba 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -845,9 +845,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0313-Add-Heightmap-API.patch b/patches/server/0312-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0313-Add-Heightmap-API.patch
rename to patches/server/0312-Add-Heightmap-API.patch
index 2f3dd5b25e..f22ab03c27 100644
--- a/patches/server/0313-Add-Heightmap-API.patch
+++ b/patches/server/0312-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0ca653a0b0059116eaa943207bf04b5bfbe77e8f..8a8993ff7ec450416ef16941079ee0ac3078767b 100644
+index ec3ea01033e2c6f2904d4f0a4b0e08bd12b713f7..ce61a2b5b3dfb15e8aeb6816f6c6b1b9e3a9d725 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0314-Mob-Spawner-API-Enhancements.patch b/patches/server/0313-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from patches/server/0314-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0313-Mob-Spawner-API-Enhancements.patch
index 0947d35c6f..fe6110a98f 100644
--- a/patches/server/0314-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0313-Mob-Spawner-API-Enhancements.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index c7e97263eee005fd673882e11c436542cb0ca62a..e3d8814cbad30da795632afddf8ebc87eff72106 100644
+index c24c6fb1badf7d2764ef6cd76c0368297af84afc..763b4049060b294345ef8a796c0f5b52575d644c 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -235,7 +235,13 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0314-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0314-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0315-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0315-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0317-Implement-CraftBlockSoundGroup.patch b/patches/server/0316-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0317-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0316-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0318-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from patches/server/0318-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index b1bbb41122..6dc25bd2e7 100644
--- a/patches/server/0318-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0317-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -64,7 +64,7 @@ index 412380f4bfe8a2d50090904124242e8b2c7bfa1b..1a21f7e590aaeca131256dd7079b9546
          // CraftBukkit start
          // this.updateMobSpawningFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 798ddd562f7dcf97f24cc356742d31befb9eef3e..f7e965d1764f7431eaf2673c7bb0a26a1406207a 100644
+index 0ba8f25d7f54ec2ed9e15a3cf7016464741c0de0..0c5065ac62d8a708f70282e765277866834169bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
@@ -200,7 +200,7 @@ index 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844f
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e16798c836d46d08d42a27c549dbdc119803966..919ea3ee6be9877938f9f7743b74b737793bae1d 100644
+index ce61a2b5b3dfb15e8aeb6816f6c6b1b9e3a9d725..f3235c80c6eecdeade88ddafaf39c52beadda684 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1346,15 +1346,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0319-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0318-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0319-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0318-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0320-Expose-the-internal-current-tick.patch b/patches/server/0319-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0320-Expose-the-internal-current-tick.patch
rename to patches/server/0319-Expose-the-internal-current-tick.patch
index d4a0f4b4f8..d6b0866c02 100644
--- a/patches/server/0320-Expose-the-internal-current-tick.patch
+++ b/patches/server/0319-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dd7eebe8397764206e07809293f1b8ca4e8f205c..a7ee6b54e763d5ff2eb4afdbccdf5becb4e1f305 100644
+index 6a893d44ee85d53ce131ba6c35bbb8c8bfe87b0a..c8979c8f51cf07824fc2780c5daccc30922bbd80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2663,5 +2663,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0321-Fix-World-isChunkGenerated-calls.patch b/patches/server/0320-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0321-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0320-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0322-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0321-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0322-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0321-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0323-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 94%
rename from patches/server/0323-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 564ab73bbf..38648d8e26 100644
--- a/patches/server/0323-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0322-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index ac5fa1d9e4e8f9057e3c3780fda3660bb7795295..eb4d06cb115f9b923b0441c341523d0df0392049 100644
+index 96a3e97b509839e265dc83a7961ed0bd2c9d74f8..3b8ea490e7b8bd1a6df624e4eb5c7edccaeb800f 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -87,6 +87,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0324-Configurable-projectile-relative-velocity.patch b/patches/server/0323-Configurable-projectile-relative-velocity.patch
similarity index 96%
rename from patches/server/0324-Configurable-projectile-relative-velocity.patch
rename to patches/server/0323-Configurable-projectile-relative-velocity.patch
index 024876f999..c2d8580ed1 100644
--- a/patches/server/0324-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0323-Configurable-projectile-relative-velocity.patch
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 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 2dfe2e655026e6da1f548779ab3b455a6e42fb0c..66c3f374a779cd3a4548393ba23e9219f1caf6d3 100644
+index 9379e887af9c15119bbb158dec88a016e649fb7c..68f3131eb5d3c725279796effff083345edbaec9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -161,7 +161,7 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0325-offset-item-frame-ticking.patch b/patches/server/0324-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0325-offset-item-frame-ticking.patch
rename to patches/server/0324-offset-item-frame-ticking.patch
diff --git a/patches/server/0326-Fix-MC-158900.patch b/patches/server/0325-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0326-Fix-MC-158900.patch
rename to patches/server/0325-Fix-MC-158900.patch
diff --git a/patches/server/0327-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0326-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0327-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0326-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0328-Dont-send-unnecessary-sign-update.patch b/patches/server/0327-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0328-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0327-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0329-Add-option-to-disable-pillager-patrols.patch b/patches/server/0328-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0329-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0328-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0330-Flat-bedrock-generator-settings.patch b/patches/server/0329-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0330-Flat-bedrock-generator-settings.patch
rename to patches/server/0329-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0331-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0330-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0331-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0330-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0332-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0331-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0332-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0331-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0333-Duplicate-UUID-Resolve-Option.patch b/patches/server/0332-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0333-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0332-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0334-Optimize-Hoppers.patch b/patches/server/0333-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0334-Optimize-Hoppers.patch
rename to patches/server/0333-Optimize-Hoppers.patch
index e390a98062..616c99c65a 100644
--- a/patches/server/0334-Optimize-Hoppers.patch
+++ b/patches/server/0333-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 d6ca6ef7262e25620aceda589d21363193c70310..aa52b644b7af9261fdec06b29b7daa7ad8f89b3a 100644
+index 1a21f7e590aaeca131256dd7079b9546710ca9ad..eeb794d96ac8cbe36b788d390e638192182a21c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1405,6 +1405,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0335-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0335-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0336-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 91%
rename from patches/server/0336-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch
index 3e8d451777..0724ac87d3 100644
--- a/patches/server/0336-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position
 
 
 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 255ebdcddb46653d70b810b8ca94b86ccde80343..bdc9911f5a72d2f23a3a01d0420ac9ba6cb78570 100644
+index 599cf33fe766539deba246feb724943dbefa2aab..c5069740e922dc6028ba98f2fe9edac216780a19 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -496,6 +496,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0337-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0337-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0338-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0338-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0339-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0338-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0339-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0338-Optimise-IEntityAccess-getPlayerByUUID.patch
index d35f424d78..03b737be9f 100644
--- a/patches/server/0339-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0338-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a9acb6bd32609489e7442188209f3b7c771eb52f..faee1edda215fa72f5b7e1bdbbeb01004d019b0d 100644
+index 0c5065ac62d8a708f70282e765277866834169bc..878123befd7580082cf85222fa3a331baf41156c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -423,6 +423,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0340-Fix-items-not-falling-correctly.patch b/patches/server/0339-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0340-Fix-items-not-falling-correctly.patch
rename to patches/server/0339-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0341-Lag-compensate-eating.patch b/patches/server/0340-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0341-Lag-compensate-eating.patch
rename to patches/server/0340-Lag-compensate-eating.patch
diff --git a/patches/server/0342-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0341-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0342-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0341-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0343-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0343-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0344-Add-effect-to-block-break-naturally.patch b/patches/server/0343-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0344-Add-effect-to-block-break-naturally.patch
rename to patches/server/0343-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0345-Entity-Activation-Range-2.0.patch b/patches/server/0344-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0345-Entity-Activation-Range-2.0.patch
rename to patches/server/0344-Entity-Activation-Range-2.0.patch
index d6938aae98..3ac08fb573 100644
--- a/patches/server/0345-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0344-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index faee1edda215fa72f5b7e1bdbbeb01004d019b0d..4a06da72c8b769c683e9eb03817bd9381a0cf099 100644
+index 878123befd7580082cf85222fa3a331baf41156c..1433ece7d85de61271ec619b68e09ecfd46b3f24 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -341,7 +341,7 @@ index 3f8990d15bd6815db0ccb924e621dfcc3220e0e0..70f1916185b79bbb9f033f4ef8119d7b
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cb7e92f2694cefeecebc840959a01e1e1945061a..10a5315c6a2f872d88c080910eeca140ac6fbbc4 100644
+index 7ba3e9a2f974cd469d256dbfbdbfcb05b644c1ba..46f8bf8a0f97c83824248c0d39681430807bd0ca 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -158,6 +158,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0346-Increase-Light-Queue-Size.patch b/patches/server/0345-Increase-Light-Queue-Size.patch
similarity index 93%
rename from patches/server/0346-Increase-Light-Queue-Size.patch
rename to patches/server/0345-Increase-Light-Queue-Size.patch
index 280ab17dc9..7a7ea902da 100644
--- a/patches/server/0346-Increase-Light-Queue-Size.patch
+++ b/patches/server/0345-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aa52b644b7af9261fdec06b29b7daa7ad8f89b3a..668d7479bb9a56f710ead272166abd615b9463cc 100644
+index eeb794d96ac8cbe36b788d390e638192182a21c8..ba99b3ffef6d5c46c3bb0b0de99a042ae000c196 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -780,7 +780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0347-Anti-Xray.patch b/patches/server/0346-Anti-Xray.patch
similarity index 99%
rename from patches/server/0347-Anti-Xray.patch
rename to patches/server/0346-Anti-Xray.patch
index ce3b4f2b21..35154a8d26 100644
--- a/patches/server/0347-Anti-Xray.patch
+++ b/patches/server/0346-Anti-Xray.patch
@@ -1044,7 +1044,7 @@ index 7825d6f0fdcfda6212cff8033ec55fb7db236154..000853110c7a89f2d0403a7a2737025a
  
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9223b2c90bca5ed82ba424d936fc85b4fc1dba18..19432d3408bfa806bc415dc3f148e154eeb802fc 100644
+index d97e017289783cd8795e055616dd5931bb6147cd..7c4eded1135e50f2ffea069de7bcd77bd80d0ac1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -618,7 +618,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1079,7 +1079,7 @@ index 9223b2c90bca5ed82ba424d936fc85b4fc1dba18..19432d3408bfa806bc415dc3f148e154
          List<Entity> list = Lists.newArrayList();
          List<Entity> list1 = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4a06da72c8b769c683e9eb03817bd9381a0cf099..b8ac1df1f2e2114a16d417b31fbbbc734074b2b6 100644
+index 1433ece7d85de61271ec619b68e09ecfd46b3f24..7aaa8e7bfc2a949346dc760a5ff1231f80d410d5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -434,7 +434,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1114,7 +1114,7 @@ index 3fadf6b46cc722ad81cf810c0761cf717e9f9b78..af00442931f9f6cf878bd61137c2f29f
  
      public void destroyAndAck(BlockPos pos, int sequence, String reason) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 10a5315c6a2f872d88c080910eeca140ac6fbbc4..0dd6ccc5b281ea46d2d12eb99c28335bdbe66d7e 100644
+index 46f8bf8a0f97c83824248c0d39681430807bd0ca..7e03e88dc7196d757ffcc6cdc2ca15c96abcc2a0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1178,7 +1178,7 @@ index 41e61e6c128f22224665af3f07cd11d69a43062b..54e57791f6220325d05939decae46dc4
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 5cd8755dc8db2f1fdb32d2db3a5a137ca7cad3c7..bc573695ace324c7cd536bc24fbfc66a53ef9fa0 100644
+index 0493be4a898962ef80aa6ae6fb61f0a755540ab8..fb42b212805c8ea9ae5be8b2a515a37ecda28535 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -93,7 +93,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1524,7 +1524,7 @@ index 1827fdc551095ab411d6b43b94106273f53386c8..7f23c69e7d6232190a2c75cbc79e1ea5
  
      public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7ee6b54e763d5ff2eb4afdbccdf5becb4e1f305..826bd8ae116a94ddc59815d4dbb37ffee71780e7 100644
+index c8979c8f51cf07824fc2780c5daccc30922bbd80..bb930f03af4c649eba0dbde356ad098023070832 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2235,7 +2235,7 @@ public final class CraftServer implements Server {
@@ -1537,7 +1537,7 @@ index a7ee6b54e763d5ff2eb4afdbccdf5becb4e1f305..826bd8ae116a94ddc59815d4dbb37ffe
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 37efb3305b4f740d9092c2a253b93f1925ee75d5..414522b641cd866822c13a753cc623c463004fd6 100644
+index 7ff5943949aea15d7b8a48f01ce8e8cb98c78532..c3703933598ee96d856a18dcc0932061959c9791 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -410,11 +410,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0348-Implement-alternative-item-despawn-rate.patch b/patches/server/0347-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0348-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0347-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0349-Tracking-Range-Improvements.patch b/patches/server/0348-Tracking-Range-Improvements.patch
similarity index 97%
rename from patches/server/0349-Tracking-Range-Improvements.patch
rename to patches/server/0348-Tracking-Range-Improvements.patch
index 873ea928bc..5c7541eb0c 100644
--- a/patches/server/0349-Tracking-Range-Improvements.patch
+++ b/patches/server/0348-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 19432d3408bfa806bc415dc3f148e154eeb802fc..442d720783b43254d95b7fa62776f70605644ec1 100644
+index 7c4eded1135e50f2ffea069de7bcd77bd80d0ac1..ec352a1916bea3893173375cfeaf84fc1c3cc52a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1285,6 +1285,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0350-Fix-items-vanishing-through-end-portal.patch b/patches/server/0349-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0350-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0349-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0351-implement-optional-per-player-mob-spawns.patch b/patches/server/0350-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0351-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0350-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0352-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 94%
rename from patches/server/0352-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 2b398af935..a662ea4a03 100644
--- a/patches/server/0352-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
 
 
 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 bdc9911f5a72d2f23a3a01d0420ac9ba6cb78570..d94f045d7fe928c256c5d3e1af02ac73d7897f5a 100644
+index c5069740e922dc6028ba98f2fe9edac216780a19..6efa135bb149e1dbe05d1b8c4af82bd38b4aa37c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -143,7 +143,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0353-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from patches/server/0353-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 04dd0e4e33..cad8b3acb6 100644
--- a/patches/server/0353-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 2d0a8668d1828fe085631079798a36374a0d4844..f3375712ae25ef1503a030b3059477f350d922da 100644
+index 8b8c8970e1d478edc3a0231556bf92f8263392c1..800dc1f2f5ef6026704e17583421f7b54d2ac631 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -420,6 +420,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0354-Add-debug-for-sync-chunk-loads.patch b/patches/server/0353-Add-debug-for-sync-chunk-loads.patch
similarity index 98%
rename from patches/server/0354-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0353-Add-debug-for-sync-chunk-loads.patch
index 9e6db8a2a9..bde0be01fd 100644
--- a/patches/server/0354-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0353-Add-debug-for-sync-chunk-loads.patch
@@ -298,7 +298,7 @@ index 0000000000000000000000000000000000000000..1120aef5b0dd983c467167f77245884e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index f3375712ae25ef1503a030b3059477f350d922da..60264feb656861d5a9474fe4285ac69d8d12269e 100644
+index 800dc1f2f5ef6026704e17583421f7b54d2ac631..8a20fa6d1c357f6d9787032c31dd0d0f80bd74be 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -444,6 +444,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -310,7 +310,7 @@ index f3375712ae25ef1503a030b3059477f350d922da..60264feb656861d5a9474fe4285ac69d
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b8ac1df1f2e2114a16d417b31fbbbc734074b2b6..d23c04ce96d12c0ec11c97433c9fa4dca53d3e6e 100644
+index 7aaa8e7bfc2a949346dc760a5ff1231f80d410d5..9abe233a02b6e5fdeda7a602223188897df5a2e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -421,6 +421,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0355-Remove-garbage-Java-version-check.patch b/patches/server/0354-Remove-garbage-Java-version-check.patch
similarity index 100%
rename from patches/server/0355-Remove-garbage-Java-version-check.patch
rename to patches/server/0354-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0356-Add-ThrownEggHatchEvent.patch b/patches/server/0355-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0356-Add-ThrownEggHatchEvent.patch
rename to patches/server/0355-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0357-Entity-Jump-API.patch b/patches/server/0356-Entity-Jump-API.patch
similarity index 95%
rename from patches/server/0357-Entity-Jump-API.patch
rename to patches/server/0356-Entity-Jump-API.patch
index b7387454a3..8864fa36b1 100644
--- a/patches/server/0357-Entity-Jump-API.patch
+++ b/patches/server/0356-Entity-Jump-API.patch
@@ -34,7 +34,7 @@ index dbcf70dacf99b61c0147b43edd6a374b31809733..9c07e3f5554b3b9cf2a2c4d9239a7234
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index f747aa85beab98fbecdbe15b188be6614478bac6..a0eee7dc73bd4a96d9a1aa9555093820c5f7c49c 100644
+index 8517fd004727b083545082a5de26b11cb2a93623..23cd2e1faf0d7b59885e194fc0f0adc558e4921b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -177,7 +177,9 @@ public class Ravager extends Raider {
@@ -48,7 +48,7 @@ index f747aa85beab98fbecdbe15b188be6614478bac6..a0eee7dc73bd4a96d9a1aa9555093820
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index fb92f55ae3c8c54edce7565b27fb84f50ee85702..ee6783220de6c3142810744a68fda51367589bd1 100644
+index bfa6b088f87117015791dc4ab25d8e8cf4c4cf28..efaf058e6d56f6aed29541e77da46fef058c496a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -870,5 +870,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0358-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0358-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0359-Make-the-GUI-graph-fancier.patch b/patches/server/0358-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0359-Make-the-GUI-graph-fancier.patch
rename to patches/server/0358-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0360-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0359-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0360-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0359-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0361-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0360-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0361-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0360-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0362-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0362-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch
similarity index 92%
rename from patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch
index ce51b7964c..1b328d76e2 100644
--- a/patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,10 +8,10 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 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 bf5f4fe68a942dff8c2e2ad4735a529b5a6353e8..3c3095e7e684079bcba0ea5a6b44c8fe2a3f47c4 100644
+index 1ff02c66fcc291b6ccc456673ad4c6c09d47d69e..b2b396dd7c5face635595d527f132e0787ef7e26 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -451,10 +451,14 @@ public class Zombie extends Monster {
+@@ -450,10 +450,14 @@ public class Zombie extends Monster {
      public boolean wasKilled(ServerLevel world, LivingEntity other) {
          boolean flag = super.wasKilled(world, other);
  
diff --git a/patches/server/0364-Optimise-Chunk-getFluid.patch b/patches/server/0363-Optimise-Chunk-getFluid.patch
similarity index 96%
rename from patches/server/0364-Optimise-Chunk-getFluid.patch
rename to patches/server/0363-Optimise-Chunk-getFluid.patch
index 1d78a740b0..8ddb1788ee 100644
--- a/patches/server/0364-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0363-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index bc573695ace324c7cd536bc24fbfc66a53ef9fa0..bd1c957a9405ccf18f110c7976cf8e0af922cf78 100644
+index fb42b212805c8ea9ae5be8b2a515a37ecda28535..6b24417b73d42bbb92425e61d166ebf619277d3b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -427,18 +427,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 89%
rename from patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 45ea278818..08bc7193a2 100644
--- a/patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 9c9723e13b5440d4803a7268057d63cbdc973b77..40984144a062230fd45cc6c707b03e5cd7d89efc 100644
+index a345befaee2e4703294c3941f4060c496838c496..102b038e2566cba4f259a61e502ff0808c47234c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0366-Add-tick-times-API-and-mspt-command.patch b/patches/server/0365-Add-tick-times-API-and-mspt-command.patch
similarity index 97%
rename from patches/server/0366-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0365-Add-tick-times-API-and-mspt-command.patch
index 4fe85cbca3..c5d896f42e 100644
--- a/patches/server/0366-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0365-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index 6a00f3d38da8107825ab1d405f337fd077b09f72..d31b5ed47cffc61c90c926a0cd2005b7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 668d7479bb9a56f710ead272166abd615b9463cc..a8cbbe13f7da0fe89191196acfa8617e683a66e7 100644
+index ba99b3ffef6d5c46c3bb0b0de99a042ae000c196..564acfd222aaf111025d7e2c6b79438159d31686 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -237,6 +237,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -185,7 +185,7 @@ index 668d7479bb9a56f710ead272166abd615b9463cc..a8cbbe13f7da0fe89191196acfa8617e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 826bd8ae116a94ddc59815d4dbb37ffee71780e7..d0858a98a26745747ac50943a7ec1bb4c7491fb6 100644
+index bb930f03af4c649eba0dbde356ad098023070832..c9df003cc9b5cc1a9826086911be33f310fa7eaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2485,6 +2485,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0367-Expose-MinecraftServer-isRunning.patch b/patches/server/0366-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0367-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0366-Expose-MinecraftServer-isRunning.patch
index 263db14d03..93c72072f6 100644
--- a/patches/server/0367-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0366-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d0858a98a26745747ac50943a7ec1bb4c7491fb6..b92dff790cfe699c3e6a036f1377c3052373fe05 100644
+index c9df003cc9b5cc1a9826086911be33f310fa7eaf..a2750cba8540caa9f12f5d5179b51f7753d38bba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2678,5 +2678,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0368-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0368-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0369-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0369-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 92%
rename from patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index be6afe3eed..39cd7d2d6a 100644
--- a/patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b23905e5d2d1e8300c710df2aeb370fd4af8ac76..2a84d4b07b89672b76d31fa60bb4a0c1ba394831 100644
+index 8dc6aef7f8b9950d889770bf62bd672be9f12f74..ec305bff74ca1075d8c91397076e6924b88a0f52 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -397,11 +397,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 95%
rename from patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index aa61dfee66..f1689b175c 100644
--- a/patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives
 
 
 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 d94f045d7fe928c256c5d3e1af02ac73d7897f5a..d13f3460644f635ded96bf92ddf9ecf8984c8e47 100644
+index 6efa135bb149e1dbe05d1b8c4af82bd38b4aa37c..66293e620dcf2c7ee3e2fc91f8a7cf52f2950de1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -409,6 +409,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 93%
rename from patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 6fc04d2ef4..ac1a0cd435 100644
--- a/patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 428d3a9c9c55d482bd7db8fd2784d1e55dea0528..68d072d3b84fb19aae9c20151c342c81131038ca 100644
+index 7b6a35026978485b676ea92324d3290ad9da3705..160147561c03f18d955467ba48e4e368d26c2ca5 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1018,6 +1018,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -25,7 +25,7 @@ index 428d3a9c9c55d482bd7db8fd2784d1e55dea0528..68d072d3b84fb19aae9c20151c342c81
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d23c04ce96d12c0ec11c97433c9fa4dca53d3e6e..5a2797104d43d5981fe0d4599c0abbbf8658f153 100644
+index 9abe233a02b6e5fdeda7a602223188897df5a2e4..7cc21dab89dcb50ee4034e1e39b6a27478fd983b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2344,7 +2344,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0373-Don-t-tick-dead-players.patch b/patches/server/0372-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0373-Don-t-tick-dead-players.patch
rename to patches/server/0372-Don-t-tick-dead-players.patch
diff --git a/patches/server/0374-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0374-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0375-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0374-Optimize-Collision-to-not-load-chunks.patch
similarity index 98%
rename from patches/server/0375-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0374-Optimize-Collision-to-not-load-chunks.patch
index d6a997eaf1..1e82b8229e 100644
--- a/patches/server/0375-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0374-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c7ec290b712cf509ce53d5ef3a6785bb15cabbb6..3f2abd13dfcb45601fd3e333626e24ee036706fd 100644
+index d1da13e361c4898420e9d6ab8a9c48cb29ae65bf..e5ee52c702ab4d50309c7f1ff1639755db1c4846 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -797,6 +797,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch
similarity index 96%
rename from patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch
index bc2a400726..6a21b5ead6 100644
--- a/patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch
@@ -32,7 +32,7 @@ index 8e4dff97dba9f8e1395113bed8f91b0cbb70b354..eb0e5c43b995e778d28ecfad813ca388
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 78c2872ed6f696053a03e8c37995f4c2f67a9aa6..f738012c97024e81488ea6683160ee8236458cb1 100644
+index e5ee52c702ab4d50309c7f1ff1639755db1c4846..55985d21fd89a753e0e10004bb01295655ac43d3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -216,6 +216,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0377-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0377-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0378-Improved-Watchdog-Support.patch b/patches/server/0377-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0378-Improved-Watchdog-Support.patch
rename to patches/server/0377-Improved-Watchdog-Support.patch
index 30efd68a45..b019cbe10e 100644
--- a/patches/server/0378-Improved-Watchdog-Support.patch
+++ b/patches/server/0377-Improved-Watchdog-Support.patch
@@ -269,7 +269,7 @@ index ec305bff74ca1075d8c91397076e6924b88a0f52..6fba140877e7369cdb7933ec225572c6
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e7d4e046a7fc9570a19e3ac0b1ab61c5fef42f56..95ed2d4dac9d1c188ed5f555be4b2dd4c9bb563f 100644
+index 55985d21fd89a753e0e10004bb01295655ac43d3..89d45ae9b2856aaed265d7333ba2e69a3836bb2e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -518,7 +518,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0379-Optimize-Pathfinding.patch b/patches/server/0378-Optimize-Pathfinding.patch
similarity index 94%
rename from patches/server/0379-Optimize-Pathfinding.patch
rename to patches/server/0378-Optimize-Pathfinding.patch
index d39cf83257..92e26303d9 100644
--- a/patches/server/0379-Optimize-Pathfinding.patch
+++ b/patches/server/0378-Optimize-Pathfinding.patch
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index 64cbff139ee8ccf5cdfe7c3d97fa69d8244becb2..c1781c92ff59f0c9eb47cbbef01e3252c5e1a1bf 100644
+index 185f0bce91f03dfe9a37412710aa7319a15f57ff..1d9d502e071324f50c8b7655790091c0c55263ba 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 @@ -190,9 +190,29 @@ public abstract class PathNavigation {
diff --git a/patches/server/0380-Reduce-Either-Optional-allocation.patch b/patches/server/0379-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0380-Reduce-Either-Optional-allocation.patch
rename to patches/server/0379-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0381-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0381-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0382-Prevent-opening-inventories-when-frozen.patch b/patches/server/0381-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0382-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0381-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0384-Implement-Player-Client-Options-API.patch b/patches/server/0383-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0384-Implement-Player-Client-Options-API.patch
rename to patches/server/0383-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 95%
rename from patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 88b3e2dd6a..894be0b652 100644
--- a/patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 68d072d3b84fb19aae9c20151c342c81131038ca..6d539b0fe7a0d72a24896a0000ba813bbf0dcfd2 100644
+index 160147561c03f18d955467ba48e4e368d26c2ca5..4488d8719be0d685ef99e7903adc0889552d8185 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1024,6 +1024,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -40,7 +40,7 @@ index 68d072d3b84fb19aae9c20151c342c81131038ca..6d539b0fe7a0d72a24896a0000ba813b
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 867deadfc38e069931211a2b0db4350acd96247f..3008e1cce4df86150dec87cca0433676033d4f73 100644
+index a25be75e636fa1bac4890da3fa9db9267382c46d..b886e52e7b316df6415cdaee75242a829e491dd4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
@@ -52,7 +52,7 @@ index 867deadfc38e069931211a2b0db4350acd96247f..3008e1cce4df86150dec87cca0433676
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 401b1f440b7b1e4f12ba5e8080ca004971c56ae6..1096e24835194f20425f75228cafe62adebc2282 100644
+index 89d45ae9b2856aaed265d7333ba2e69a3836bb2e..6cc70d6eb84fb819fb7f1b8b1ef1bbb4715315e5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -282,6 +282,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0386-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0386-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0388-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0388-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 94%
rename from patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch
index b9aecc5313..032b44ebcd 100644
--- a/patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads
 Caused a deadlock
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 2188cfc34ab4bd67fac9aedd861a597c137a5c40..5ce5902b13ebb9438433d189f2c03677e4cb54b3 100644
+index 69903bad7b3e143b73b20624c06909458564396c..8d79612cdba48756bb0352c41b98f8a9ea489ff6 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -100,6 +100,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch
similarity index 94%
rename from patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch
index 3b9eaafdbf..66b47ed30d 100644
--- a/patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch
@@ -17,7 +17,7 @@ index b91a61be7c4829fce0ff8da290eab580e20bb78d..22f36cd3df49160f1b6668befdd05c22
      private EntitySelector() {}
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 84400bb44d5deb7c79295a83c4c3c6aac88f3175..180bcdeb262d61c56193dbf99f1c11f3a6889145 100644
+index 0e96e9d7e4d636f4222f60cec556663f506c3906..5432b3eff8ac09e45c7e118ddc1bc5303005412b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -558,6 +558,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -29,7 +29,7 @@ index 84400bb44d5deb7c79295a83c4c3c6aac88f3175..180bcdeb262d61c56193dbf99f1c11f3
                              return true;
                          }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index e9d25aef08103ccdbc6a35c3ab67c1d921e9f45d..6b5c31470499e25d01936106839c2fff21b113c8 100644
+index 0dbb0c4d038379c6ffdae8528d98431e98faeb93..2093d08bccbfbe096ea24cc4f70cbfdfa07d6a56 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -51,7 +51,7 @@ public class PhantomSpawner implements CustomSpawner {
diff --git a/patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0393-Villager-Restocks-API.patch b/patches/server/0392-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0393-Villager-Restocks-API.patch
rename to patches/server/0392-Villager-Restocks-API.patch
diff --git a/patches/server/0394-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0394-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0395-Expose-game-version.patch b/patches/server/0394-Expose-game-version.patch
similarity index 89%
rename from patches/server/0395-Expose-game-version.patch
rename to patches/server/0394-Expose-game-version.patch
index 87d1ff120a..0d2ba75f07 100644
--- a/patches/server/0395-Expose-game-version.patch
+++ b/patches/server/0394-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 237127907c3c8ddcd16bdc9645e84a2d0b922440..30199124d6c1a394fa074a221d6015c09acdd43a 100644
+index e5c5a514e6b7bdf663d33074557e34372f18ea77..86402126b13e5e6542f880cbdc978eb581d33a8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -579,6 +579,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0396-Optimize-Voxel-Shape-Merging.patch b/patches/server/0395-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0396-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0395-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0397-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0397-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0398-misc-debugging-dumps.patch b/patches/server/0397-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0398-misc-debugging-dumps.patch
rename to patches/server/0397-misc-debugging-dumps.patch
diff --git a/patches/server/0399-Prevent-teleporting-dead-entities.patch b/patches/server/0398-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0399-Prevent-teleporting-dead-entities.patch
rename to patches/server/0398-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0400-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0400-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0401-Implement-Mob-Goal-API.patch b/patches/server/0400-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0401-Implement-Mob-Goal-API.patch
rename to patches/server/0400-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0402-Add-villager-reputation-API.patch b/patches/server/0401-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0402-Add-villager-reputation-API.patch
rename to patches/server/0401-Add-villager-reputation-API.patch
diff --git a/patches/server/0403-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0403-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0404-ExperienceOrbMergeEvent.patch b/patches/server/0403-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0404-ExperienceOrbMergeEvent.patch
rename to patches/server/0403-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 92%
rename from patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch
index 1091a96abf..7dcb2191c0 100644
--- a/patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ee6783220de6c3142810744a68fda51367589bd1..55881c189e96bccd6538dfb6b4ea897b72d3936d 100644
+index efaf058e6d56f6aed29541e77da46fef058c496a..b9c3683fca1ac85d8f18ab7629a51836248169ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -414,7 +414,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0406-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0405-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0406-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0405-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0407-Potential-bed-API.patch b/patches/server/0406-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0407-Potential-bed-API.patch
rename to patches/server/0406-Potential-bed-API.patch
diff --git a/patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 93%
rename from patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch
index 918e5417b2..f8854a8a4e 100644
--- a/patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b3231076683e5a63602ff1293765c5d76c36bfef..057c335b15123061ed239f9559aad137e2c97982 100644
+index 7c7114193fadc6c14d6d8a87cc2d734eaa68b864..fb2d02ad6f6a4a1c69dde06e7e193aaef8655028 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -921,6 +921,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -22,7 +22,7 @@ index b3231076683e5a63602ff1293765c5d76c36bfef..057c335b15123061ed239f9559aad137
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 547bb2aab1c31cbd2d571a995c1014726993b39f..ef6ca51679c818989f3ddd83f0bc7f37db6d6196 100644
+index f1134bce181e8ea5eebb241e3af9691390cd2533..e8e31ddaa7fa87b9854961dd44abff9ddb6a6142 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1011,6 +1011,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0410-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0410-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index a69e0635a3..aa4924fef9 100644
--- a/patches/server/0410-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -34,7 +34,7 @@ index 38bb502e9f1272020a23a3ef8ebb0cb1a5a251ef..b18b0e1b5e059f08fd3117eaa0fb28a1
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 426fe552d2444a4977a3e261d7e60fbda0893756..ea3b4c52769ff8112d865b226c8d3dcf48982787 100644
+index cff803e60a7592fc55fc4a76e39f2254196c07f6..e58f576c1bd7a3b1f3d57ed384bbdbc13248147b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -429,6 +429,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0411-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0411-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0412-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0412-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index efe2a5cda1..d099ae8f18 100644
--- a/patches/server/0412-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,7 +18,7 @@ index 3167f5c6be39757e3cc42cbb17ab0cf13a2fe470..3768a71491ef7836b9739bdaec7a077c
      private static long encode(double value) {
          return Mth.lfloor(value * 4096.0D);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6d539b0fe7a0d72a24896a0000ba813bbf0dcfd2..b56bba0614545cf2dc51bc0670250e464a7b52d5 100644
+index 4488d8719be0d685ef99e7903adc0889552d8185..999a675dd42c37b27e40d1a32b77641188b8d432 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1302,9 +1302,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0413-Ensure-safe-gateway-teleport.patch b/patches/server/0412-Ensure-safe-gateway-teleport.patch
similarity index 93%
rename from patches/server/0413-Ensure-safe-gateway-teleport.patch
rename to patches/server/0412-Ensure-safe-gateway-teleport.patch
index 6d352f74a8..b466eeb164 100644
--- a/patches/server/0413-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0412-Ensure-safe-gateway-teleport.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure safe gateway teleport
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index befd35b0edf4a76b119f711f8536369a02abc1ba..56d68b87287f0bb2c79ce0bed02fa333b85c4287 100644
+index 9bb730b489006c7baaaf55194ef796ff20771dd3..89bf5fc4fab2cf39378600aa8925ac4bb7707428 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -105,7 +105,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
diff --git a/patches/server/0414-Add-option-for-console-having-all-permissions.patch b/patches/server/0413-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0414-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0413-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0415-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 99%
rename from patches/server/0415-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index a4f92249c6..77ad74e89b 100644
--- a/patches/server/0415-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -333,7 +333,7 @@ index 8a20fa6d1c357f6d9787032c31dd0d0f80bd74be..67bcda3e1d343b59dd1842f5eb982a71
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fdc1d1d5840ee7f12e4a72656698924c51fea05c..0faa0d73907e6ef1285eba4cf7d692a5f8c3a0e3 100644
+index 84edbb30158b8ea7771b6fb33a660d9229e6b4a5..83d05b2546fe54485daede323a0f6343b62d278a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0416-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0416-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0417-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0416-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0417-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0416-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0418-Maps-shouldn-t-load-chunks.patch b/patches/server/0417-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0418-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0417-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0419-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0419-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0420-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0420-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0421-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0421-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0422-Fix-sand-duping.patch b/patches/server/0421-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0422-Fix-sand-duping.patch
rename to patches/server/0421-Fix-sand-duping.patch
diff --git a/patches/server/0423-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0423-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0424-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0424-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0425-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0424-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0425-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0424-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0426-Improve-Arrow-API.patch b/patches/server/0425-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0426-Improve-Arrow-API.patch
rename to patches/server/0425-Improve-Arrow-API.patch
diff --git a/patches/server/0427-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0427-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0428-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0427-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0428-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0427-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0429-Add-permission-for-command-blocks.patch b/patches/server/0428-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0429-Add-permission-for-command-blocks.patch
rename to patches/server/0428-Add-permission-for-command-blocks.patch
index a0bcd3db18..211e5736a2 100644
--- a/patches/server/0429-Add-permission-for-command-blocks.patch
+++ b/patches/server/0428-Add-permission-for-command-blocks.patch
@@ -40,7 +40,7 @@ index b7865696d9b939791b0315ab2a231e2dc5872de8..02b6cf65f6abedfd4933e4e64d254f19
          } else {
              BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level);
 diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index da504702bc9423774b35dff792d2dbe7fc270fe3..c0195f73cd2c8721e882c681eaead65471710081 100644
+index 7dac559fd35e7ba646b84bb28315001375723643..7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5 100644
 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 @@ -198,7 +198,7 @@ public abstract class BaseCommandBlock implements CommandSource {
diff --git a/patches/server/0430-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 95%
rename from patches/server/0430-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch
index 6d62904a94..6f30642b95 100644
--- a/patches/server/0430-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6a86125c6f6daa0a443601db4fea19531225ad33..9fcd1808ea0dbfd6b5f0d09700d4aa4b1a21eed3 100644
+index 26c8b19d484032f5d0935ba8672a3121a3197d67..1582da75f92aed598c1c076af7b94af7ab48d10a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -713,8 +713,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0431-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0431-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0432-Paper-dumpitem-command.patch b/patches/server/0431-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0432-Paper-dumpitem-command.patch
rename to patches/server/0431-Paper-dumpitem-command.patch
diff --git a/patches/server/0433-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0432-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0433-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0432-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0434-Improve-Legacy-Component-serialization-size.patch b/patches/server/0433-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0434-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0433-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0435-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0434-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0435-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0434-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0436-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0436-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0437-incremental-chunk-and-player-saving.patch b/patches/server/0436-incremental-chunk-and-player-saving.patch
similarity index 95%
rename from patches/server/0437-incremental-chunk-and-player-saving.patch
rename to patches/server/0436-incremental-chunk-and-player-saving.patch
index f7bce0f362..167bbf588d 100644
--- a/patches/server/0437-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0436-incremental-chunk-and-player-saving.patch
@@ -53,7 +53,7 @@ index dda33bd52d9c527c37f67b829010c27dba4b667a..e42b12839faab0c040495b00368b107b
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 018ccef6f9157e95f957915736db61cde920f788..ac1c500fce8c4abbb8ed82908607fe5ded4ee727 100644
+index 67bcda3e1d343b59dd1842f5eb982a71859d4d7b..a05e8d136dfeb41fb6008cba4d3b4abcddbd9557 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -601,6 +601,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -73,7 +73,7 @@ index 018ccef6f9157e95f957915736db61cde920f788..ac1c500fce8c4abbb8ed82908607fe5d
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cfe370d1cf1b9ce11896a6aa2071eafd4bf64d27..43f668f96aef2c537f4d3fc7913967cebafb3a43 100644
+index 35439d857801d56494cc457d116fbcbb12561bcd..8c233252583ffbc05c20fe3e6704dc5404b209f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1122,6 +1122,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -115,7 +115,7 @@ index cfe370d1cf1b9ce11896a6aa2071eafd4bf64d27..43f668f96aef2c537f4d3fc7913967ce
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 582b9595aa06dd6787fd84c0ea0058c890f84c33..02bb4ecdc6797d1c5bccc64cc235fe63bdc7ccd4 100644
+index d8c77533a44e316693535ea66fe6ae7f4994de5f..b39bb4b5a1612dac7d495f22e5ab3ec5fb00a058 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -179,6 +179,7 @@ import org.bukkit.inventory.MainHand;
@@ -127,7 +127,7 @@ index 582b9595aa06dd6787fd84c0ea0058c890f84c33..02bb4ecdc6797d1c5bccc64cc235fe63
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9aebe7dca9f5085a821f52653fe349aa6c8d2ca1..d75a3e54599c52f510d9dc31c3e44fd9b6fe5b80 100644
+index 1ec5facab133f265b280738afe9917592384984e..80c98d35293cd5a25982d04c980c9fd7e7b4670c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -569,6 +569,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0438-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0438-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0439-Support-old-UUID-format-for-NBT.patch b/patches/server/0438-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0439-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0438-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0440-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0439-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0440-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0439-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0441-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0440-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0441-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0440-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0442-Remove-some-streams-from-structures.patch b/patches/server/0441-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0442-Remove-some-streams-from-structures.patch
rename to patches/server/0441-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0443-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0442-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0443-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0442-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0444-Support-components-in-ItemMeta.patch b/patches/server/0443-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0444-Support-components-in-ItemMeta.patch
rename to patches/server/0443-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0445-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0445-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0446-Add-entity-liquid-API.patch b/patches/server/0445-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0446-Add-entity-liquid-API.patch
rename to patches/server/0445-Add-entity-liquid-API.patch
diff --git a/patches/server/0447-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0446-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0447-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0446-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0448-Spawn-player-in-correct-world-on-login.patch b/patches/server/0447-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0448-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0447-Spawn-player-in-correct-world-on-login.patch
index a5a6a1cf19..4bab29fec6 100644
--- a/patches/server/0448-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0447-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b0120df807a61db21da04324644fbd71a285f461..354719476074acc75b35f8e4a06f0363bd13a3f3 100644
+index 80c98d35293cd5a25982d04c980c9fd7e7b4670c..55c5576bd76718a0cc5d8fbcb80eeeac8b6c9277 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -203,7 +203,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0449-Add-PrepareResultEvent.patch b/patches/server/0448-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0449-Add-PrepareResultEvent.patch
rename to patches/server/0448-Add-PrepareResultEvent.patch
diff --git a/patches/server/0450-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0450-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0451-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0450-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0451-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0450-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0452-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0452-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0453-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch
similarity index 91%
rename from patches/server/0453-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch
index 8bdc8589fd..5597e70116 100644
--- a/patches/server/0453-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 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 7f1f4813ac007fbf79e8ba254075c015fe15e3a1..f02fb03c63975e5c1ccdd848f5727559929cce00 100644
+index da92f324322f4fb18f9aa72c4298ffc8ab040953..3b1e17a8733de823b36315c81e8ca5884e83368e 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -199,6 +199,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0454-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0454-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0455-Fix-SPIGOT-5989.patch b/patches/server/0454-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0455-Fix-SPIGOT-5989.patch
rename to patches/server/0454-Fix-SPIGOT-5989.patch
index 5136ee4fc5..075f2a20e1 100644
--- a/patches/server/0455-Fix-SPIGOT-5989.patch
+++ b/patches/server/0454-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 354719476074acc75b35f8e4a06f0363bd13a3f3..db03f510195981e9f860ce2fdc59d0a70283dc14 100644
+index 55c5576bd76718a0cc5d8fbcb80eeeac8b6c9277..7528491e129b250da5cb505d7befceee8cfe74e6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -842,6 +842,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0456-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0456-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0457-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0457-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0458-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0458-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0459-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 90%
rename from patches/server/0459-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 15a24cf922..2ba58a89b9 100644
--- a/patches/server/0459-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d83ea6113d3f2f7aaeac6e09473282434ec2fc67..8a5967b5e4196d1df1aacb28ccefadb7863b75a5 100644
+index 20a08c79d4577d0eb36ab413b36811c828f4f084..fabd0ef0bef97bc7f14d6fae18028cca0709d3a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2134,6 +2134,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0460-Fix-some-rails-connecting-improperly.patch b/patches/server/0459-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0460-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0459-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0461-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0461-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0462-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0462-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0463-Brand-support.patch b/patches/server/0462-Brand-support.patch
similarity index 100%
rename from patches/server/0463-Brand-support.patch
rename to patches/server/0462-Brand-support.patch
diff --git a/patches/server/0464-Add-setMaxPlayers-API.patch b/patches/server/0463-Add-setMaxPlayers-API.patch
similarity index 89%
rename from patches/server/0464-Add-setMaxPlayers-API.patch
rename to patches/server/0463-Add-setMaxPlayers-API.patch
index 70a4396a97..8f770a4f2f 100644
--- a/patches/server/0464-Add-setMaxPlayers-API.patch
+++ b/patches/server/0463-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index db03f510195981e9f860ce2fdc59d0a70283dc14..4d05d23f5b6967da29d5c9c91931cd79745f5dcb 100644
+index 7528491e129b250da5cb505d7befceee8cfe74e6..fcd2f8514e60e1faafec787f162baf98663fb734 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -147,7 +147,7 @@ public abstract class PlayerList {
@@ -18,7 +18,7 @@ index db03f510195981e9f860ce2fdc59d0a70283dc14..4d05d23f5b6967da29d5c9c91931cd79
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 007b85cfda82d245ae336efc26aa38ad2f6d2c28..e0050956b90ce35082017b3f1f697e455ecb9d34 100644
+index 2aab13270af76bcc1b62787e9910d23d5ab56add..50a540f796f4d418ae5f5377b39a08bc3e02543e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -674,6 +674,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0465-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 90%
rename from patches/server/0465-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch
index 93c4be55ff..148284b3a9 100644
--- a/patches/server/0465-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 55881c189e96bccd6538dfb6b4ea897b72d3936d..679e08544fc1e6973605dd2f3953c12a0d338ddd 100644
+index b9c3683fca1ac85d8f18ab7629a51836248169ca..128db5db4b15b933520f2e864be4d8f7a5c845af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -884,5 +884,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0466-Don-t-require-FACING-data.patch b/patches/server/0465-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0466-Don-t-require-FACING-data.patch
rename to patches/server/0465-Don-t-require-FACING-data.patch
diff --git a/patches/server/0467-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 92%
rename from patches/server/0467-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 9e2ec47632..86b3e30a97 100644
--- a/patches/server/0467-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7ef0eaa6fffae02c3c27313f05eab5ae1558e948..6e9e9ec7a8f8f1213681c25f4fb44c7a1cf3d715 100644
+index 8c233252583ffbc05c20fe3e6704dc5404b209f3..31a624cd60afa29741576ae35209acab5f48e912 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1892,6 +1892,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -17,7 +17,7 @@ index 7ef0eaa6fffae02c3c27313f05eab5ae1558e948..6e9e9ec7a8f8f1213681c25f4fb44c7a
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8a5967b5e4196d1df1aacb28ccefadb7863b75a5..55438fc0c789d4ea00653c6b521080460176e4be 100644
+index fabd0ef0bef97bc7f14d6fae18028cca0709d3a6..37c7eb9357d897e1d5aefd355460d6fe76762d9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -263,11 +263,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0468-Add-moon-phase-API.patch b/patches/server/0467-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0468-Add-moon-phase-API.patch
rename to patches/server/0467-Add-moon-phase-API.patch
diff --git a/patches/server/0469-Prevent-headless-pistons-from-being-created.patch b/patches/server/0468-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0469-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0468-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0470-Add-BellRingEvent.patch b/patches/server/0469-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0470-Add-BellRingEvent.patch
rename to patches/server/0469-Add-BellRingEvent.patch
diff --git a/patches/server/0471-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0470-Add-zombie-targets-turtle-egg-config.patch
similarity index 91%
rename from patches/server/0471-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0470-Add-zombie-targets-turtle-egg-config.patch
index a92287451d..da7839967c 100644
--- a/patches/server/0471-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0470-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 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 3c3095e7e684079bcba0ea5a6b44c8fe2a3f47c4..67fe3b79b6fe4064b26f87734174a394b9e2b3e3 100644
+index b2b396dd7c5face635595d527f132e0787ef7e26..15783f8c8a65820aa5a643bbd4866b1eb6bf980a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -107,7 +107,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0472-Buffer-joins-to-world.patch b/patches/server/0471-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0472-Buffer-joins-to-world.patch
rename to patches/server/0471-Buffer-joins-to-world.patch
diff --git a/patches/server/0473-Eigencraft-redstone-implementation.patch b/patches/server/0472-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0473-Eigencraft-redstone-implementation.patch
rename to patches/server/0472-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0474-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0474-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0475-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 98%
rename from patches/server/0475-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch
index 9630b4e364..29df4d3231 100644
--- a/patches/server/0475-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -52,7 +52,7 @@ index 378d4316a51d48cb84e2d8a553f7b28bae55630e..922b5b22a4ccfeead9d6d2b9a2a2b3cc
  
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 5ce5902b13ebb9438433d189f2c03677e4cb54b3..e34b8cff424ad58eee65a65fa510fa9908dbdf39 100644
+index 8d79612cdba48756bb0352c41b98f8a9ea489ff6..f17233ea94d61af41b4db1696b114e9c721466f8 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -12,6 +12,7 @@ import net.minecraft.core.Direction;
diff --git a/patches/server/0476-Fix-CraftTeam-null-check.patch b/patches/server/0475-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0476-Fix-CraftTeam-null-check.patch
rename to patches/server/0475-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0477-Add-more-Evoker-API.patch b/patches/server/0476-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0477-Add-more-Evoker-API.patch
rename to patches/server/0476-Add-more-Evoker-API.patch
diff --git a/patches/server/0478-Add-methods-to-get-translation-keys.patch b/patches/server/0477-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0478-Add-methods-to-get-translation-keys.patch
rename to patches/server/0477-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0479-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0479-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0480-Cache-block-data-strings.patch b/patches/server/0479-Cache-block-data-strings.patch
similarity index 97%
rename from patches/server/0480-Cache-block-data-strings.patch
rename to patches/server/0479-Cache-block-data-strings.patch
index 06987a2b52..9602336b1d 100644
--- a/patches/server/0480-Cache-block-data-strings.patch
+++ b/patches/server/0479-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 922475997902dcc85ae42f351ace15e82b5aa638..a06c3c73744385eaa990b111af301f36737fce4b 100644
+index e42b12839faab0c040495b00368b107b35b93283..83a9c7f8a92055da43854d16fffe6892beff8c6b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2026,6 +2026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0481-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 94%
rename from patches/server/0481-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index abbf3000ec..9fd7a379f2 100644
--- a/patches/server/0481-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index da6a0171bd63ac68635de1c23fc9eafa732503bd..214771e661ca3303af167fda3b623d83
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9fcd1808ea0dbfd6b5f0d09700d4aa4b1a21eed3..4639f888850128771d726c1f7755093211af50db 100644
+index 1582da75f92aed598c1c076af7b94af7ab48d10a..5a43e57d2e2146d324685808cfe980178bde03a2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -57,7 +57,7 @@ index 9fcd1808ea0dbfd6b5f0d09700d4aa4b1a21eed3..4639f888850128771d726c1f77550932
          this.setYRot(yaw);
          this.setXRot(pitch);
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index e3d8814cbad30da795632afddf8ebc87eff72106..ee619590aa49323059947fbaee9e88d61df99789 100644
+index 763b4049060b294345ef8a796c0f5b52575d644c..8d403b4a6db98cc5c3851d5f2c485560cf8b412f 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -163,6 +163,7 @@ public abstract class BaseSpawner {
@@ -69,7 +69,7 @@ index e3d8814cbad30da795632afddf8ebc87eff72106..ee619590aa49323059947fbaee9e88d6
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c2282592a3e5c8e08acb30a8fe6f3a83dfe6d93d..40e6cd06f6b0cab2718c165cb38e772e90795917 100644
+index ceb7123362ba85df825a50c035a399174b6634dc..52ccc5cb9c5512b30ce863062de85219adb801ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -561,7 +561,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0482-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0481-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0482-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0481-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0483-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0483-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0484-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0484-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch
index acb9fca4c8..c207acedef 100644
--- a/patches/server/0484-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6e9e9ec7a8f8f1213681c25f4fb44c7a1cf3d715..7fb15c373f5d212aee1d1607768c814b06092097 100644
+index 31a624cd60afa29741576ae35209acab5f48e912..03232cda01646a6bc8493f9b3abdd70c9ce3ec67 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1329,6 +1329,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0485-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from patches/server/0485-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 7f73346383..e43a9f67f3 100644
--- a/patches/server/0485-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4639f888850128771d726c1f7755093211af50db..23ec6c64579b1e682ec30ea6d4ec196ddb9ed403 100644
+index 5a43e57d2e2146d324685808cfe980178bde03a2..c99798ea88f7f6dd6db6c80666171e759bf47cc0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4162,4 +4162,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0486-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0485-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0486-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0485-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0487-Entity-isTicking.patch b/patches/server/0486-Entity-isTicking.patch
similarity index 93%
rename from patches/server/0487-Entity-isTicking.patch
rename to patches/server/0486-Entity-isTicking.patch
index 29619b1414..a6c62cfaaf 100644
--- a/patches/server/0487-Entity-isTicking.patch
+++ b/patches/server/0486-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 23ec6c64579b1e682ec30ea6d4ec196ddb9ed403..37eb939935dc5fbaa22f89f1784bd69c0c37cfcf 100644
+index c99798ea88f7f6dd6db6c80666171e759bf47cc0..9b1ee67e9963f31c107f5bc310f6840d58906477 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4167,5 +4167,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0488-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 94%
rename from patches/server/0488-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 6788d38d97..194bd602ce 100644
--- a/patches/server/0488-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a06c3c73744385eaa990b111af301f36737fce4b..37df16b8f1dd1f75ed4c922347e648386fa54e6a 100644
+index 83a9c7f8a92055da43854d16fffe6892beff8c6b..8a984036862c259b9b5b03665df3d78f8c965c19 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2092,13 +2092,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0489-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0489-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0490-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0490-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0491-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0491-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0492-Optimise-getType-calls.patch b/patches/server/0491-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0492-Optimise-getType-calls.patch
rename to patches/server/0491-Optimise-getType-calls.patch
diff --git a/patches/server/0493-Villager-resetOffers.patch b/patches/server/0492-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0493-Villager-resetOffers.patch
rename to patches/server/0492-Villager-resetOffers.patch
diff --git a/patches/server/0494-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0494-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0495-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0495-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch
index a316317a3e..1f80e72f9b 100644
--- a/patches/server/0495-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ea3b4c52769ff8112d865b226c8d3dcf48982787..1fcbf1fe2ed5d46766ae71e556f124e7822829e3 100644
+index e58f576c1bd7a3b1f3d57ed384bbdbc13248147b..c00a7913274ff246c33a9894b680955427948f45 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -155,7 +155,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0496-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0496-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0497-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0496-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0497-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0496-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0498-Player-elytra-boost-API.patch b/patches/server/0497-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0498-Player-elytra-boost-API.patch
rename to patches/server/0497-Player-elytra-boost-API.patch
diff --git a/patches/server/0499-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0498-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0499-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0498-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0500-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0500-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0501-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0500-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0501-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0500-Add-getOfflinePlayerIfCached-String.patch
index 2139494956..9095c21d9b 100644
--- a/patches/server/0501-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0500-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e0050956b90ce35082017b3f1f697e455ecb9d34..9f989f49d6b26386fd2f634769d16390f84629c9 100644
+index 50a540f796f4d418ae5f5377b39a08bc3e02543e..462ffe647b11185001a08b09e74773b8831a3b46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1803,6 +1803,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0502-Add-ignore-discounts-API.patch b/patches/server/0501-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0502-Add-ignore-discounts-API.patch
rename to patches/server/0501-Add-ignore-discounts-API.patch
diff --git a/patches/server/0503-Toggle-for-removing-existing-dragon.patch b/patches/server/0502-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0503-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0502-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0504-Fix-client-lag-on-advancement-loading.patch b/patches/server/0503-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0504-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0503-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0505-Item-no-age-no-player-pickup.patch b/patches/server/0504-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0505-Item-no-age-no-player-pickup.patch
rename to patches/server/0504-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0506-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0506-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0507-Beacon-API-custom-effect-ranges.patch b/patches/server/0506-Beacon-API-custom-effect-ranges.patch
similarity index 98%
rename from patches/server/0507-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0506-Beacon-API-custom-effect-ranges.patch
index 42125ab17d..f462f881de 100644
--- a/patches/server/0507-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0506-Beacon-API-custom-effect-ranges.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Beacon API - custom effect ranges
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 349b89dd4d34b92d1077ddadb30c36642fd85622..812d21393ed2ed0623b7445585f1b0b3dcefb55d 100644
+index 12bb07ba7bcb37a26c0492e045b42289bfec70db..d60cd642f905776cab9412b72f0fde0ed6a071fe 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -76,6 +76,26 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
diff --git a/patches/server/0508-Add-API-for-quit-reason.patch b/patches/server/0507-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0508-Add-API-for-quit-reason.patch
rename to patches/server/0507-Add-API-for-quit-reason.patch
diff --git a/patches/server/0509-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0509-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0510-Expose-world-spawn-angle.patch b/patches/server/0509-Expose-world-spawn-angle.patch
similarity index 93%
rename from patches/server/0510-Expose-world-spawn-angle.patch
rename to patches/server/0509-Expose-world-spawn-angle.patch
index c14ae7ba25..ba5db7a0c6 100644
--- a/patches/server/0510-Expose-world-spawn-angle.patch
+++ b/patches/server/0509-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8c7c0e9c972f81d458124d5b067b3c547ef87f6d..74d5c45ac10bffc82868a7c34c3378ab9f83916f 100644
+index 90559afc3533778d5cf43b04a83a0b6cd20796ac..a26388bd15f26ea7712b9a84855b9aaf4d7aac06 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -885,7 +885,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0511-Add-Destroy-Speed-API.patch b/patches/server/0510-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0511-Add-Destroy-Speed-API.patch
rename to patches/server/0510-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0512-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0512-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0513-Add-LivingEntity-clearActiveItem.patch b/patches/server/0512-Add-LivingEntity-clearActiveItem.patch
similarity index 90%
rename from patches/server/0513-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0512-Add-LivingEntity-clearActiveItem.patch
index 2eb3c37c50..79ee2b2a08 100644
--- a/patches/server/0513-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0512-Add-LivingEntity-clearActiveItem.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 679e08544fc1e6973605dd2f3953c12a0d338ddd..4e7cb29909fd82d26029e4c78580ead500db5c2a 100644
+index 128db5db4b15b933520f2e864be4d8f7a5c845af..491ff045779a25ec105e5fc9440bb9d395f92f10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -851,6 +851,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0514-Add-PlayerItemCooldownEvent.patch b/patches/server/0513-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0514-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0513-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0515-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0514-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0515-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0514-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0516-More-lightning-API.patch b/patches/server/0515-More-lightning-API.patch
similarity index 100%
rename from patches/server/0516-More-lightning-API.patch
rename to patches/server/0515-More-lightning-API.patch
diff --git a/patches/server/0517-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0517-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch
index 4911e64afa..374b9d2cb0 100644
--- a/patches/server/0517-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 37eb939935dc5fbaa22f89f1784bd69c0c37cfcf..508eb07ac137ca81e4f9015fe2665d992bd1cb72 100644
+index 9b1ee67e9963f31c107f5bc310f6840d58906477..648d08635e2ec9c4847ada7709b7452f651b528d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1896,6 +1896,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -76,7 +76,7 @@ index 8910fed602d6055911d87eb3d12e1d707b5e8ea9..0896cbe04be6a5471088c32129650641
  
      // CraftBukkit start - collidable API
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index e9f6e31cd557410a4ad4ced7086c4a846f13a4f6..50d4595b81f24949011c7565c5e3fc8c26c86019 100644
+index fd2a73c5bd940df2af3f7b5777e2a0b3ac6376c3..def01d221f36d71640bf4ef982a984909aacc6da 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -82,7 +82,7 @@ public class Bat extends AmbientCreature {
diff --git a/patches/server/0518-Added-missing-default-perms-for-commands.patch b/patches/server/0517-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0518-Added-missing-default-perms-for-commands.patch
rename to patches/server/0517-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0519-Add-PlayerShearBlockEvent.patch b/patches/server/0518-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0519-Add-PlayerShearBlockEvent.patch
rename to patches/server/0518-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0520-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0519-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0520-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0519-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0521-Limit-recipe-packets.patch b/patches/server/0520-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0521-Limit-recipe-packets.patch
rename to patches/server/0520-Limit-recipe-packets.patch
diff --git a/patches/server/0522-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0521-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0522-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0521-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0523-Player-Chunk-Load-Unload-Events.patch b/patches/server/0522-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0523-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0522-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0524-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0523-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0524-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0523-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0525-Expose-LivingEntity-hurt-direction.patch b/patches/server/0524-Expose-LivingEntity-hurt-direction.patch
similarity index 91%
rename from patches/server/0525-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0524-Expose-LivingEntity-hurt-direction.patch
index ff8defb04b..d321dde1d3 100644
--- a/patches/server/0525-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0524-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4e7cb29909fd82d26029e4c78580ead500db5c2a..d16ea002ca558502be2f04528f0346d9aacff30f 100644
+index 491ff045779a25ec105e5fc9440bb9d395f92f10..6d2acbe95f5ebe41c82d1e99c28f15a46b65a9db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -896,5 +896,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0526-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0526-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0527-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0527-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0528-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0528-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0529-Implement-TargetHitEvent.patch b/patches/server/0528-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0529-Implement-TargetHitEvent.patch
rename to patches/server/0528-Implement-TargetHitEvent.patch
diff --git a/patches/server/0530-MC-4-Fix-item-position-desync.patch b/patches/server/0529-MC-4-Fix-item-position-desync.patch
similarity index 96%
rename from patches/server/0530-MC-4-Fix-item-position-desync.patch
rename to patches/server/0529-MC-4-Fix-item-position-desync.patch
index 903a68fd62..0e16eea060 100644
--- a/patches/server/0530-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0529-MC-4-Fix-item-position-desync.patch
@@ -27,7 +27,7 @@ index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c38
  
      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 508eb07ac137ca81e4f9015fe2665d992bd1cb72..83701f22e7903d0c4b9bea111dbed5d096a2ddf9 100644
+index 648d08635e2ec9c4847ada7709b7452f651b528d..c22778e5155abf5dcfbf574ef633f253208f7e6c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3970,6 +3970,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0531-Additional-Block-Material-API-s.patch b/patches/server/0530-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0531-Additional-Block-Material-API-s.patch
rename to patches/server/0530-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0532-Fix-harming-potion-dupe.patch b/patches/server/0531-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0532-Fix-harming-potion-dupe.patch
rename to patches/server/0531-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0534-Cache-burn-durations.patch b/patches/server/0533-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0534-Cache-burn-durations.patch
rename to patches/server/0533-Cache-burn-durations.patch
diff --git a/patches/server/0535-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0535-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0536-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0536-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0537-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0537-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0538-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0538-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0539-Zombie-API-breaking-doors.patch b/patches/server/0538-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0539-Zombie-API-breaking-doors.patch
rename to patches/server/0538-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0540-Fix-nerfed-slime-when-splitting.patch b/patches/server/0539-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0540-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0539-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0541-Add-EntityLoadCrossbowEvent.patch b/patches/server/0540-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0541-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0540-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0542-Guardian-beam-workaround.patch b/patches/server/0541-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0542-Guardian-beam-workaround.patch
rename to patches/server/0541-Guardian-beam-workaround.patch
diff --git a/patches/server/0543-Added-WorldGameRuleChangeEvent.patch b/patches/server/0542-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0543-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0542-Added-WorldGameRuleChangeEvent.patch
index 98de18415c..e31546e7aa 100644
--- a/patches/server/0543-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0542-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 55438fc0c789d4ea00653c6b521080460176e4be..73a475b7d268e84cc9eb608664c5d753da212bee 100644
+index 37c7eb9357d897e1d5aefd355460d6fe76762d9d..55f07a9675f4a1fde183f2009b46a4a09a8fb1c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1793,8 +1793,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0544-Added-ServerResourcesReloadedEvent.patch b/patches/server/0543-Added-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0544-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0543-Added-ServerResourcesReloadedEvent.patch
index 08c7e91119..da8dfb50f4 100644
--- a/patches/server/0544-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0543-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 37df16b8f1dd1f75ed4c922347e648386fa54e6a..a3f5585db8579350c1390d7ee141e1a8af9225ff 100644
+index 8a984036862c259b9b5b03665df3d78f8c965c19..17e0425a520bd95074bf34c262c36c5603266ea7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1988,7 +1988,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0545-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 93%
rename from patches/server/0545-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch
index 4c1e7b2549..8227b41958 100644
--- a/patches/server/0545-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -18,10 +18,10 @@ index 60064770f08cbee19eeb43bf7c144b6eefbc4888..c2a26b91d9065fdb52a1ded6c3295093
              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 67fe3b79b6fe4064b26f87734174a394b9e2b3e3..c84bae4aac13698893420e669ca323194e28ca48 100644
+index 15783f8c8a65820aa5a643bbd4866b1eb6bf980a..e4bd194998b14fa4f6212ec978afc8dc7921bb9f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -509,7 +509,7 @@ public class Zombie extends Monster {
+@@ -508,7 +508,7 @@ public class Zombie extends Monster {
          Object object = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
          float f = difficulty.getSpecialMultiplier();
  
diff --git a/patches/server/0546-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0545-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0546-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0545-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0547-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0546-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0547-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0546-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0548-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0547-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0548-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0547-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0549-Configurable-door-breaking-difficulty.patch b/patches/server/0548-Configurable-door-breaking-difficulty.patch
similarity index 95%
rename from patches/server/0549-Configurable-door-breaking-difficulty.patch
rename to patches/server/0548-Configurable-door-breaking-difficulty.patch
index 45e5e3e168..e2eb5d3c3e 100644
--- a/patches/server/0549-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0548-Configurable-door-breaking-difficulty.patch
@@ -19,7 +19,7 @@ index ffc8e20d916940fb5e28bac610e3c6bd3d493f78..a9e75a16a7dc0ff5d4f0faa92ebc4445
          }
  
 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 c84bae4aac13698893420e669ca323194e28ca48..3e1fa4336cc18eaeb048d0a1d592cf74820ff3b2 100644
+index e4bd194998b14fa4f6212ec978afc8dc7921bb9f..c5b6236c58485351fb2866197b55d2c8809105c7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -98,7 +98,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0550-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0549-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0550-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0549-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0551-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0550-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0551-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0550-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0552-Remove-stale-POIs.patch b/patches/server/0551-Remove-stale-POIs.patch
similarity index 91%
rename from patches/server/0552-Remove-stale-POIs.patch
rename to patches/server/0551-Remove-stale-POIs.patch
index 3fb9c90f2c..4d5310ecf9 100644
--- a/patches/server/0552-Remove-stale-POIs.patch
+++ b/patches/server/0551-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 7fb15c373f5d212aee1d1607768c814b06092097..dc308e26913ffc8ae6be022eeaa411a205b10149 100644
+index 03232cda01646a6bc8493f9b3abdd70c9ce3ec67..0a0727b5c6900bd7299a0caf1e1125d809880423 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1957,6 +1957,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0553-Fix-villager-boat-exploit.patch b/patches/server/0552-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0553-Fix-villager-boat-exploit.patch
rename to patches/server/0552-Fix-villager-boat-exploit.patch
index 59a1fd1acc..c63ef19c4b 100644
--- a/patches/server/0553-Fix-villager-boat-exploit.patch
+++ b/patches/server/0552-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 74d5c45ac10bffc82868a7c34c3378ab9f83916f..2732af0971dcac3fab8043b1e1ae2a57925699a2 100644
+index a26388bd15f26ea7712b9a84855b9aaf4d7aac06..631df93868512d2fba997f8e23b99762b56384ef 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -632,6 +632,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0554-Add-sendOpLevel-API.patch b/patches/server/0553-Add-sendOpLevel-API.patch
similarity index 95%
rename from patches/server/0554-Add-sendOpLevel-API.patch
rename to patches/server/0553-Add-sendOpLevel-API.patch
index ded813ce5d..3229761ac8 100644
--- a/patches/server/0554-Add-sendOpLevel-API.patch
+++ b/patches/server/0553-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 2048964e21cc8db6fccc233506cdf84eab84f0ce..1bdde339c0a021fef850944556d7a353e5a9d7bd 100644
+index 631df93868512d2fba997f8e23b99762b56384ef..6868fc701d032295858bdd15d55f290e0bc9d537 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1130,6 +1130,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0555-Add-PaperRegistry.patch b/patches/server/0554-Add-PaperRegistry.patch
similarity index 99%
rename from patches/server/0555-Add-PaperRegistry.patch
rename to patches/server/0554-Add-PaperRegistry.patch
index 172e03c5a5..04b8933447 100644
--- a/patches/server/0555-Add-PaperRegistry.patch
+++ b/patches/server/0554-Add-PaperRegistry.patch
@@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..6f39e343147803e15e7681c993b8797a
 +public record RegistryKey<API extends Keyed, MINECRAFT>(Class<API> apiClass, ResourceKey<? extends Registry<MINECRAFT>> resourceKey) {
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a3f5585db8579350c1390d7ee141e1a8af9225ff..be7cfe5ce05b51786790a7eaf3cdac9acf9ff566 100644
+index 17e0425a520bd95074bf34c262c36c5603266ea7..f05f5d13f23599dbb95a7062ebbb41334ec21f14 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2020,6 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0556-Add-StructuresLocateEvent.patch b/patches/server/0555-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0556-Add-StructuresLocateEvent.patch
rename to patches/server/0555-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0557-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0556-Collision-option-for-requiring-a-player-participant.patch
similarity index 96%
rename from patches/server/0557-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0556-Collision-option-for-requiring-a-player-participant.patch
index 153ee3e325..def70b66b5 100644
--- a/patches/server/0557-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0556-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 83701f22e7903d0c4b9bea111dbed5d096a2ddf9..12a14012a53000470702ce89b883a204dc1189c8 100644
+index c22778e5155abf5dcfbf574ef633f253208f7e6c..0624f832f301ec2a36085e66f67b6a529583a496 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1779,6 +1779,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0558-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0558-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0559-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0559-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0560-Make-schedule-command-per-world.patch b/patches/server/0559-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0560-Make-schedule-command-per-world.patch
rename to patches/server/0559-Make-schedule-command-per-world.patch
diff --git a/patches/server/0561-Configurable-max-leash-distance.patch b/patches/server/0560-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0561-Configurable-max-leash-distance.patch
rename to patches/server/0560-Configurable-max-leash-distance.patch
diff --git a/patches/server/0562-Implement-BlockPreDispenseEvent.patch b/patches/server/0561-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0562-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0561-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0563-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0563-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0564-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0564-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0565-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0565-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0566-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0566-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0567-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0566-Reset-shield-blocking-on-dimension-change.patch
similarity index 89%
rename from patches/server/0567-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0566-Reset-shield-blocking-on-dimension-change.patch
index d43e9466ff..f15ef83553 100644
--- a/patches/server/0567-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0566-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 e79d93940ca728a6a9867148510d969082ddbfd6..325796bfb75ec4605c7bb13d69873be2a50ac899 100644
+index 826dcafaf65cef8bbff4f231f71305e851de0902..becbe9c488577e1acea8ae1dac9792f4a25c2c66 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1166,6 +1166,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0568-add-DragonEggFormEvent.patch b/patches/server/0567-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0568-add-DragonEggFormEvent.patch
rename to patches/server/0567-add-DragonEggFormEvent.patch
diff --git a/patches/server/0569-EntityMoveEvent.patch b/patches/server/0568-EntityMoveEvent.patch
similarity index 95%
rename from patches/server/0569-EntityMoveEvent.patch
rename to patches/server/0568-EntityMoveEvent.patch
index ce15689ddb..17db772399 100644
--- a/patches/server/0569-EntityMoveEvent.patch
+++ b/patches/server/0568-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 be7cfe5ce05b51786790a7eaf3cdac9acf9ff566..2bd90398b85c34efcad4e1779a4fbbf043ca478e 100644
+index f05f5d13f23599dbb95a7062ebbb41334ec21f14..2f8026fffde9976e28d3263cbc4296a51fce8221 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1489,6 +1489,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index be7cfe5ce05b51786790a7eaf3cdac9acf9ff566..2bd90398b85c34efcad4e1779a4fbbf0
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dc308e26913ffc8ae6be022eeaa411a205b10149..6a218e39001259a737c1e823b95f87faae532464 100644
+index 0a0727b5c6900bd7299a0caf1e1125d809880423..44dc48d663e384161cd2a2b3de5464ee4b068dbf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 91%
rename from patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch
index a63c04be90..e3d688b7cc 100644
--- a/patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0569-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 6a218e39001259a737c1e823b95f87faae532464..017bf2c25e777194ed2229ac275f8f11e7804fb6 100644
+index 44dc48d663e384161cd2a2b3de5464ee4b068dbf..88b2e618f4e140a099b9711498b699e54ed83dc9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1531,6 +1531,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0571-Inline-shift-direction-fields.patch b/patches/server/0570-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0571-Inline-shift-direction-fields.patch
rename to patches/server/0570-Inline-shift-direction-fields.patch
diff --git a/patches/server/0572-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0572-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0573-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0573-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0574-living-entity-allow-attribute-registration.patch b/patches/server/0573-living-entity-allow-attribute-registration.patch
similarity index 96%
rename from patches/server/0574-living-entity-allow-attribute-registration.patch
rename to patches/server/0573-living-entity-allow-attribute-registration.patch
index 8b29222bec..8db0430432 100644
--- a/patches/server/0574-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0573-living-entity-allow-attribute-registration.patch
@@ -41,7 +41,7 @@ index 46c313d581b9af6aa0a48f97ae3cc800a88535f2..07d700382fc356837045c46d320b7b69
          return net.minecraft.core.Registry.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d16ea002ca558502be2f04528f0346d9aacff30f..1322f5a059743e7e2245ef2e25e9bffda138aa7c 100644
+index 6d2acbe95f5ebe41c82d1e99c28f15a46b65a9db..c3d701f58feb503aa073b30df3999e0c7a081a6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -688,6 +688,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0575-fix-dead-slime-setSize-invincibility.patch b/patches/server/0574-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0575-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0574-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0576-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0576-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0577-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0576-Add-support-for-hex-color-codes-in-console.patch
similarity index 99%
rename from patches/server/0577-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0576-Add-support-for-hex-color-codes-in-console.patch
index e17cdae98b..ce2879a852 100644
--- a/patches/server/0577-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0576-Add-support-for-hex-color-codes-in-console.patch
@@ -282,7 +282,7 @@ index 0000000000000000000000000000000000000000..b4d0b7ecd56ab952319946854168c129
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2bd90398b85c34efcad4e1779a4fbbf043ca478e..66870e0bf19124da595dff87bee99926e98d6043 100644
+index 2f8026fffde9976e28d3263cbc4296a51fce8221..64dd0211ac2ceed34dba900b5af3a56ac5a4a65a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1682,7 +1682,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0578-Expose-Tracked-Players.patch b/patches/server/0577-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0578-Expose-Tracked-Players.patch
rename to patches/server/0577-Expose-Tracked-Players.patch
diff --git a/patches/server/0579-Remove-streams-from-SensorNearest.patch b/patches/server/0578-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0579-Remove-streams-from-SensorNearest.patch
rename to patches/server/0578-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0580-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0580-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0581-Improve-ServerGUI.patch b/patches/server/0580-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0581-Improve-ServerGUI.patch
rename to patches/server/0580-Improve-ServerGUI.patch
diff --git a/patches/server/0582-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0582-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0583-fix-converting-txt-to-json-file.patch b/patches/server/0582-fix-converting-txt-to-json-file.patch
similarity index 94%
rename from patches/server/0583-fix-converting-txt-to-json-file.patch
rename to patches/server/0582-fix-converting-txt-to-json-file.patch
index f43088ff63..02db61ed0b 100644
--- a/patches/server/0583-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0582-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index d83bed436d2ad51cef83ecbf0c7df227a67ff404..dc96b30c70cd79d7b2a0322f32b9399a
          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 8984a30f0fa790e7854534076912e619f9487160..f4378558557c36cdbbaf43481b679f86583bdf16 100644
+index a8e18a168e8288ebea95bacd61a38039b3427d5e..b32820ead6d5f9c78f3b6dee3c598060e371dbd6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -203,6 +203,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -48,7 +48,7 @@ index 8984a30f0fa790e7854534076912e619f9487160..f4378558557c36cdbbaf43481b679f86
          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 a199dee07c67e4e66bbdccd2c5f77223cbc6fecf..78d0ece91358766aa03b833234b8cb9466371565 100644
+index 6868fc701d032295858bdd15d55f290e0bc9d537..4b8dc6c6c24774df4dbc1b38611152ac7a3b2fa6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -177,6 +177,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0584-Add-worldborder-events.patch b/patches/server/0583-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0584-Add-worldborder-events.patch
rename to patches/server/0583-Add-worldborder-events.patch
diff --git a/patches/server/0585-added-PlayerNameEntityEvent.patch b/patches/server/0584-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0585-added-PlayerNameEntityEvent.patch
rename to patches/server/0584-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0586-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0585-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0586-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0585-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0587-Add-recipe-to-cook-events.patch b/patches/server/0586-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0587-Add-recipe-to-cook-events.patch
rename to patches/server/0586-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0588-Add-Block-isValidTool.patch b/patches/server/0587-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0588-Add-Block-isValidTool.patch
rename to patches/server/0587-Add-Block-isValidTool.patch
diff --git a/patches/server/0589-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0588-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0589-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0588-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0590-Expand-world-key-API.patch b/patches/server/0589-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0590-Expand-world-key-API.patch
rename to patches/server/0589-Expand-world-key-API.patch
index 8ba278c90f..b8b8a11e0d 100644
--- a/patches/server/0590-Expand-world-key-API.patch
+++ b/patches/server/0589-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index ee5e59c37301d9a806e2f696d52d9d217b232833..bb5d22125b6cd4e60d2b7e2e00af158c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f989f49d6b26386fd2f634769d16390f84629c9..11f9add86f43923ceab9eebc5371c2bfc3990f98 100644
+index 462ffe647b11185001a08b09e74773b8831a3b46..e90ef57567928fdfd08fd16ce84503b07bdfe499 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1143,9 +1143,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0591-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0590-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0591-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0590-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0592-Item-Rarity-API.patch b/patches/server/0591-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0592-Item-Rarity-API.patch
rename to patches/server/0591-Item-Rarity-API.patch
diff --git a/patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 95%
rename from patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index a8810d8bca..7ad8f56595 100644
--- a/patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0592-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/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 4b8024f8f62caaa417de6798522c2beb98e00fc4..e7bfd61be4974dbe6abc2ebb870664ff1fce19cb 100644
+index fdefccfa07227f315259f636076e36a120c72917..7e9f2a128639c1b80c008f1203a4a41b783b1f73 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -347,6 +347,12 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -31,7 +31,7 @@ index 4b8024f8f62caaa417de6798522c2beb98e00fc4..e7bfd61be4974dbe6abc2ebb870664ff
          if (t0 != null) {
              worldserver.addFreshEntityWithPassengers(t0, spawnReason);
 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 d7cb3d8b37f225ee4796246aa907da1092fa9a0d..abb2c5c4ac481c7529aa29322babb1929235e15a 100644
+index dc1762ad344bf49fda4c891f38ef20639f353a45..9162f3e5752a7bee825e7ae21e9fb950cf4eb644 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -59,7 +59,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0594-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0593-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0594-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0593-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0594-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0594-Drop-carried-item-when-player-has-disconnected.patch
index 04925bb087..82e12eaa72 100644
--- a/patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0594-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 78d0ece91358766aa03b833234b8cb9466371565..e535f8c2f81e62ca29f3ae944b9c35ee8ed45be0 100644
+index 4b8dc6c6c24774df4dbc1b38611152ac7a3b2fa6..10c23d1f89661b88dc8383c6846ba5ad972c43d2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -625,6 +625,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0596-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0595-forced-whitelist-use-configurable-kick-message.patch
similarity index 92%
rename from patches/server/0596-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0595-forced-whitelist-use-configurable-kick-message.patch
index cf1f9f3caf..788882418e 100644
--- a/patches/server/0596-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0595-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 66870e0bf19124da595dff87bee99926e98d6043..ac5119577debc7262fc5d1bdb746a2e31a0d901b 100644
+index 64dd0211ac2ceed34dba900b5af3a56ac5a4a65a..4c405e699fc77766d6731e51a2fc03997232c9be 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2109,7 +2109,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0597-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0597-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0598-Entity-load-save-limit-per-chunk.patch b/patches/server/0597-Entity-load-save-limit-per-chunk.patch
similarity index 97%
rename from patches/server/0598-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0597-Entity-load-save-limit-per-chunk.patch
index 3aaa2613fc..a9ae2842db 100644
--- a/patches/server/0598-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0597-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index e7bfd61be4974dbe6abc2ebb870664ff1fce19cb..ac0f0a4da4282c13f6e1f37710cb615d66b8ef2c 100644
+index 7e9f2a128639c1b80c008f1203a4a41b783b1f73..215050f514fdc64b21018924376df9830aaaa6c4 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -563,9 +563,20 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
diff --git a/patches/server/0599-Expose-protocol-version.patch b/patches/server/0598-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0599-Expose-protocol-version.patch
rename to patches/server/0598-Expose-protocol-version.patch
diff --git a/patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch
index f20da4badc..591a6921f3 100644
--- a/patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0599-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 f4378558557c36cdbbaf43481b679f86583bdf16..2b79f5cd92a442f47324e13b5bf1b803e730197c 100644
+index b32820ead6d5f9c78f3b6dee3c598060e371dbd6..df17422d17053e400ff14ef92b2d4aa61bf6d06d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -178,7 +178,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0602-Add-bypass-host-check.patch b/patches/server/0601-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0602-Add-bypass-host-check.patch
rename to patches/server/0601-Add-bypass-host-check.patch
diff --git a/patches/server/0603-Set-area-affect-cloud-rotation.patch b/patches/server/0602-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0603-Set-area-affect-cloud-rotation.patch
rename to patches/server/0602-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0604-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0603-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0604-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0603-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0605-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0605-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0606-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0606-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0607-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0606-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0607-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0606-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0608-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0608-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0609-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0609-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0610-Added-PlayerDeepSleepEvent.patch b/patches/server/0609-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0610-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0609-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0611-More-World-API.patch b/patches/server/0610-More-World-API.patch
similarity index 97%
rename from patches/server/0611-More-World-API.patch
rename to patches/server/0610-More-World-API.patch
index 23edd9b83c..fbd013415f 100644
--- a/patches/server/0611-More-World-API.patch
+++ b/patches/server/0610-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 73a475b7d268e84cc9eb608664c5d753da212bee..3e4b077f2c890b28c88c62b0491f9f2a355446c9 100644
+index 55f07a9675f4a1fde183f2009b46a4a09a8fb1c7..888090b2548fb23089dcd05e9de2b1f09dc5876a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2035,6 +2035,65 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0612-Added-PlayerBedFailEnterEvent.patch b/patches/server/0611-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0612-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0611-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0612-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 96%
rename from patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0612-Implement-methods-to-convert-between-Component-and-B.patch
index 361b5a010c..41ed1d375d 100644
--- a/patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0612-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 2b79f5cd92a442f47324e13b5bf1b803e730197c..3e600ee2d5370c2ad9c445af15f350dee21248c1 100644
+index df17422d17053e400ff14ef92b2d4aa61bf6d06d..e11d90ca94e9ec34f4593cf0dde2f5853bef7ae5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index cace3debb8..ad7a356e26 100644
--- a/patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0613-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 e535f8c2f81e62ca29f3ae944b9c35ee8ed45be0..c5aeaf5f9753933874d2d52a13cf24ff2eb2a98b 100644
+index 10c23d1f89661b88dc8383c6846ba5ad972c43d2..2f085e1dea44760a13b059051dd32e1b83ce64a8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -858,6 +858,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0615-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0614-Introduce-beacon-activation-deactivation-events.patch
similarity index 95%
rename from patches/server/0615-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0614-Introduce-beacon-activation-deactivation-events.patch
index b3f265d709..53321c5633 100644
--- a/patches/server/0615-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0614-Introduce-beacon-activation-deactivation-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Introduce beacon activation/deactivation events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 812d21393ed2ed0623b7445585f1b0b3dcefb55d..5f6eeb36f57bd342b18590c8f0ffb668d2bf273c 100644
+index d60cd642f905776cab9412b72f0fde0ed6a071fe..bb4ab75ec0e7a5d71dafeeb55e26d2204455e7a1 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -210,6 +210,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
diff --git a/patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch
index b58233b00a..9a0ef4da45 100644
--- a/patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,7 +18,7 @@ index 917aa2bd63db9a63c75267564d0c3602b0f01392..161b5d6f0d420ac7b6ed112d1b03d42c
                  } 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 c5aeaf5f9753933874d2d52a13cf24ff2eb2a98b..4c2c495d936cb84d85fb3e9f91e101a0fd796026 100644
+index 2f085e1dea44760a13b059051dd32e1b83ce64a8..ee78edd11164f106b5ecf5645072bef7f9f28459 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -817,6 +817,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0617-Add-Channel-initialization-listeners.patch b/patches/server/0616-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0617-Add-Channel-initialization-listeners.patch
rename to patches/server/0616-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0618-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0618-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0619-Add-more-WanderingTrader-API.patch b/patches/server/0618-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0619-Add-more-WanderingTrader-API.patch
rename to patches/server/0618-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0620-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0619-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0620-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0619-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0621-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0621-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0623-Inventory-close.patch b/patches/server/0622-Inventory-close.patch
similarity index 100%
rename from patches/server/0623-Inventory-close.patch
rename to patches/server/0622-Inventory-close.patch
diff --git a/patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 94%
rename from patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch
index 69d7b501e2..bd13550fcd 100644
--- a/patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] call PortalCreateEvent players and end platform
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 325796bfb75ec4605c7bb13d69873be2a50ac899..ee6581758784c5aeab40fb35775b18031fb191ea 100644
+index becbe9c488577e1acea8ae1dac9792f4a25c2c66..498194b77e0efd97e59ef2adbcbc08526e925ace 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1193,15 +1193,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0624-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 98%
rename from patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0624-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 15c8339c99..764fc2b16c 100644
--- a/patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0624-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -48,7 +48,7 @@ index c2a26b91d9065fdb52a1ded6c3295093c244d7eb..b8abee145fc92faddef98da913eca771
      @Override
      public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 180bcdeb262d61c56193dbf99f1c11f3a6889145..cb81c5d37c72845133c4e59acaf8de56dcc9e62a 100644
+index 5432b3eff8ac09e45c7e118ddc1bc5303005412b..aa8734856ec7b90036afad13bfda46c02e548812 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -144,7 +144,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0626-Fix-CraftPotionBrewer-cache.patch b/patches/server/0625-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0626-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0625-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0627-Add-basic-Datapack-API.patch b/patches/server/0626-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0627-Add-basic-Datapack-API.patch
rename to patches/server/0626-Add-basic-Datapack-API.patch
index 5bcb6e081e..f241afe9c5 100644
--- a/patches/server/0627-Add-basic-Datapack-API.patch
+++ b/patches/server/0626-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 11f9add86f43923ceab9eebc5371c2bfc3990f98..ab8ab0180508948c7b21bafcbf914483673047d3 100644
+index e90ef57567928fdfd08fd16ce84503b07bdfe499..c330d63cc8d40092fdf70e5aea6f6ee9e8521e88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -282,6 +282,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0628-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0627-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0628-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0627-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0628-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0628-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0630-ItemStack-repair-check-API.patch b/patches/server/0629-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0630-ItemStack-repair-check-API.patch
rename to patches/server/0629-ItemStack-repair-check-API.patch
diff --git a/patches/server/0631-More-Enchantment-API.patch b/patches/server/0630-More-Enchantment-API.patch
similarity index 98%
rename from patches/server/0631-More-Enchantment-API.patch
rename to patches/server/0630-More-Enchantment-API.patch
index 538c746f7e..4b947b4e53 100644
--- a/patches/server/0631-More-Enchantment-API.patch
+++ b/patches/server/0630-More-Enchantment-API.patch
@@ -64,7 +64,7 @@ index 31a22f26070059e5379730c1940ff1c5fb109be1..873185fd4d4c994130f2e7c271b3e03c
  
      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 1322f5a059743e7e2245ef2e25e9bffda138aa7c..3ba00e72d9760ec0dcde93d54cd7868eea23ec8a 100644
+index c3d701f58feb503aa073b30df3999e0c7a081a6a..77dd873eb5d28e83c3a9d8053ae4eaed848df1c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -913,5 +913,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0632-Move-range-check-for-block-placing-up.patch b/patches/server/0631-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0632-Move-range-check-for-block-placing-up.patch
rename to patches/server/0631-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0633-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0632-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0633-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0632-Fix-and-optimise-world-force-upgrading.patch
index 98096691c6..81642cd605 100644
--- a/patches/server/0633-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0632-Fix-and-optimise-world-force-upgrading.patch
@@ -272,7 +272,7 @@ index 2f82002c52af7304ff6b2d6fe8f094314daf0bba..5962f7a2b185d7d54a0f9e341a4fdf6e
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac5119577debc7262fc5d1bdb746a2e31a0d901b..b108b4ce54570a841086adffac542d8f7f2f2c6d 100644
+index 4c405e699fc77766d6731e51a2fc03997232c9be..adacd9a7234b98124cbd8cf9af2efd4b9db6b5b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -545,11 +545,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -303,7 +303,7 @@ index ac5119577debc7262fc5d1bdb746a2e31a0d901b..b108b4ce54570a841086adffac542d8f
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1fcbf1fe2ed5d46766ae71e556f124e7822829e3..15050e9bfbb5c5639a8b225a9beb3834aab4eafb 100644
+index c00a7913274ff246c33a9894b680955427948f45..74d9ed2606c2fd10e9b633cdb584654cfa8f0ab8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -182,6 +182,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -356,7 +356,7 @@ index 7bfb0716964af5ee300150d500c97e8f90c849d4..c881d15efa94fc379ed2817a534fef3a
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ab8ab0180508948c7b21bafcbf914483673047d3..60224fce02148ac7e8a28524b8769372eff98817 100644
+index c330d63cc8d40092fdf70e5aea6f6ee9e8521e88..acc385d4b6852a55e93a5c19755a3d7f59a16eea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1204,12 +1204,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0634-Add-Mob-lookAt-API.patch b/patches/server/0633-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0634-Add-Mob-lookAt-API.patch
rename to patches/server/0633-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0635-Add-Unix-domain-socket-support.patch b/patches/server/0634-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0635-Add-Unix-domain-socket-support.patch
rename to patches/server/0634-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0636-Add-EntityInsideBlockEvent.patch b/patches/server/0635-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0636-Add-EntityInsideBlockEvent.patch
rename to patches/server/0635-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0637-Attributes-API-for-item-defaults.patch b/patches/server/0636-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0637-Attributes-API-for-item-defaults.patch
rename to patches/server/0636-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0638-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0637-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 97%
rename from patches/server/0638-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0637-Add-cause-to-Weather-ThunderChangeEvents.patch
index 33e592d4f4..8edf6efd0e 100644
--- a/patches/server/0638-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0637-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 017bf2c25e777194ed2229ac275f8f11e7804fb6..d58af846320f18db9f30a18ceaded050c0986049 100644
+index 88b2e618f4e140a099b9711498b699e54ed83dc9..c44139052e080b39be81a3b2a4e0ebc086fe30a6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -530,8 +530,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,7 +95,7 @@ index 401787a5b55384b9ab7755e822b3b881dc45ac45..e537a8df45c31efa80cb898cbef9c3a0
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3e4b077f2c890b28c88c62b0491f9f2a355446c9..be311f228b6146cb115f5df24290579792592a50 100644
+index 888090b2548fb23089dcd05e9de2b1f09dc5876a..b39a9924f6dd8facc8f22b3e98f5a48cdd555f4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1184,7 +1184,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0639-More-Lidded-Block-API.patch b/patches/server/0638-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0639-More-Lidded-Block-API.patch
rename to patches/server/0638-More-Lidded-Block-API.patch
diff --git a/patches/server/0640-Limit-item-frame-cursors-on-maps.patch b/patches/server/0639-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0640-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0639-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0641-Add-PlayerKickEvent-causes.patch b/patches/server/0640-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0641-Add-PlayerKickEvent-causes.patch
rename to patches/server/0640-Add-PlayerKickEvent-causes.patch
index cc586d402f..be8213e6ea 100644
--- a/patches/server/0641-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0640-Add-PlayerKickEvent-causes.patch
@@ -367,7 +367,7 @@ index 3ef39ebeb76f43d521266402e170bd1af6af2348..55c5348e793fa560d7042cf90076a8f7
          }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 74a5363ee64ddc31746dc7e12b6bab14882e2649..0bc9383e02088569fc1b789ed3f58dcb872518df 100644
+index ee78edd11164f106b5ecf5645072bef7f9f28459..d2ecd5143e931579b96f434c0d3ced4a87e739ac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -726,7 +726,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0642-Add-PufferFishStateChangeEvent.patch b/patches/server/0641-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0642-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0641-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0643-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0642-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0643-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0642-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0644-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0643-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0644-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0643-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0645-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0644-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0645-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0644-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0646-Add-BellRevealRaiderEvent.patch b/patches/server/0645-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0646-Add-BellRevealRaiderEvent.patch
rename to patches/server/0645-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0647-Fix-invulnerable-end-crystals.patch b/patches/server/0646-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0647-Fix-invulnerable-end-crystals.patch
rename to patches/server/0646-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0648-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0647-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0648-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0647-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0649-Fix-dangerous-end-portal-logic.patch b/patches/server/0648-Fix-dangerous-end-portal-logic.patch
similarity index 97%
rename from patches/server/0649-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0648-Fix-dangerous-end-portal-logic.patch
index 476debd1fd..380c43c234 100644
--- a/patches/server/0649-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0648-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 12a14012a53000470702ce89b883a204dc1189c8..232e9fe555b58632ee2a522b656d0927d4df0f26 100644
+index 0624f832f301ec2a36085e66f67b6a529583a496..6b6de6812740357d4c2c8bca0c064aa52e61fa60 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -509,6 +509,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0650-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0649-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0650-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0649-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0651-Make-item-validations-configurable.patch b/patches/server/0650-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0651-Make-item-validations-configurable.patch
rename to patches/server/0650-Make-item-validations-configurable.patch
diff --git a/patches/server/0652-Line-Of-Sight-Changes.patch b/patches/server/0651-Line-Of-Sight-Changes.patch
similarity index 98%
rename from patches/server/0652-Line-Of-Sight-Changes.patch
rename to patches/server/0651-Line-Of-Sight-Changes.patch
index 604f928ae1..cb1bf324d2 100644
--- a/patches/server/0652-Line-Of-Sight-Changes.patch
+++ b/patches/server/0651-Line-Of-Sight-Changes.patch
@@ -40,7 +40,7 @@ index 84d84ceda1855bd1d11b2917c16fdb845a7600fe..d1fca0e3227b5f37c11367548be362f5
      // 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 3ba00e72d9760ec0dcde93d54cd7868eea23ec8a..310dcf72f24fcbb86bc5b118536a8ebfc084eb7e 100644
+index 77dd873eb5d28e83c3a9d8053ae4eaed848df1c5..cac821ce75f80c9fc51935415ccb840ff5887664 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -29,6 +29,9 @@ import net.minecraft.world.entity.projectile.ThrownEgg;
diff --git a/patches/server/0653-add-per-world-spawn-limits.patch b/patches/server/0652-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0653-add-per-world-spawn-limits.patch
rename to patches/server/0652-add-per-world-spawn-limits.patch
index 252b1ab32b..e087d85129 100644
--- a/patches/server/0653-add-per-world-spawn-limits.patch
+++ b/patches/server/0652-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 be311f228b6146cb115f5df24290579792592a50..b6aefca1ef13ddbe4f79b91cfed4fbc109b89475 100644
+index b39a9924f6dd8facc8f22b3e98f5a48cdd555f4c..5f780daddfc90c44bd621cee7a2a72a20b292e29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -210,6 +210,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0654-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0653-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0654-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0653-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0655-Add-more-LimitedRegion-API.patch b/patches/server/0654-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0655-Add-more-LimitedRegion-API.patch
rename to patches/server/0654-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0656-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0655-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0656-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0655-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0657-Missing-Entity-Behavior-API.patch b/patches/server/0656-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0657-Missing-Entity-Behavior-API.patch
rename to patches/server/0656-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0658-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0657-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0658-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0657-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0659-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0658-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0659-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0658-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0660-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0659-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 93%
rename from patches/server/0660-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0659-Use-getChunkIfLoadedImmediately-in-places.patch
index 8eff3c351b..6df5afef65 100644
--- a/patches/server/0660-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0659-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 d58af846320f18db9f30a18ceaded050c0986049..6b1124ee45b40b49fdbf7e5d3b0349986112afc4 100644
+index c44139052e080b39be81a3b2a4e0ebc086fe30a6..304002cab34cdbb000f22d18ee94ffe233ac2b8e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -225,7 +225,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,7 +30,7 @@ index d58af846320f18db9f30a18ceaded050c0986049..6b1124ee45b40b49fdbf7e5d3b034998
                  if (chunk != null) {
                      for (int j2 = k; j2 <= j1; ++j2) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 15050e9bfbb5c5639a8b225a9beb3834aab4eafb..e30414e1a5e7907c59917c5cd182bca65bc65825 100644
+index 74d9ed2606c2fd10e9b633cdb584654cfa8f0ab8..e2e705d9d48adf61bb10f0ef60e2717ea660e24a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -199,6 +199,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0661-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0660-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0661-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0660-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0662-Adds-PlayerArmSwingEvent.patch b/patches/server/0661-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0662-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0661-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0663-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0662-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 96%
rename from patches/server/0663-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0662-Fixes-kick-event-leave-message-not-being-sent.patch
index 4bf0b330d1..c011989656 100644
--- a/patches/server/0663-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0662-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 f5905fd32f1fbbc62e4578a735aae3c45a65a3f9..31d976d0a4fdf3bb155e08627ce4a85bd5d051db 100644
+index 3ad77356734253f98cc92dd734d1171060dca62d..ca07a861d9005de51134152ef72dcbd3505f1baa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -259,7 +259,6 @@ public class ServerPlayer extends Player {
@@ -59,7 +59,7 @@ index 7d594e23dc7c393f258b16ec5f04e60fc31f91c8..ebaf6ddcdccf4e2a5836782e58770e2c
              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 e316acab310fcf689f7a31f73bb3bc2b5e7eff0e..627cf258312e5dc7a129286de6dcb4c028f846ac 100644
+index d2ecd5143e931579b96f434c0d3ced4a87e739ac..c72f6e73a80f7e738362c02f03deb6f245c0c7c5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -598,6 +598,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0664-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0663-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0664-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0663-Add-config-for-mobs-immune-to-default-effects.patch
index fe187880f1..5f83ae240c 100644
--- a/patches/server/0664-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0663-Add-config-for-mobs-immune-to-default-effects.patch
@@ -18,7 +18,7 @@ index 914fa03592e006c86c35c4ef1f3879130ad6ee00..cba73b4bf817a164726863aecada7c05
              }
          }
 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 02d7cd9cd27ff9254c3e99e3e94309a8cb8b243d..a6d30f3213d30ba925926437ed4535319061213d 100644
+index d4d7830ab5b9944c38a301a0e2a2150063adf229..b9d42e59a9f9e9ee4e6a06e2245a00dcc34f9002 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
 @@ -611,7 +611,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0665-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0664-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0665-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0664-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0666-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0665-Don-t-apply-cramming-damage-to-players.patch
similarity index 93%
rename from patches/server/0666-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0665-Don-t-apply-cramming-damage-to-players.patch
index 6487e17c55..f7fff943d8 100644
--- a/patches/server/0666-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0665-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 31d976d0a4fdf3bb155e08627ce4a85bd5d051db..a02b02c71ac6dddcccb10a6aa7993337ed04b829 100644
+index ca07a861d9005de51134152ef72dcbd3505f1baa..95e2cbe6f80e64c00e8e261a3e1731c73845fc83 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1431,7 +1431,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0667-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0666-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0667-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0666-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0668-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0667-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0668-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0667-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0669-Stinger-API.patch b/patches/server/0668-Stinger-API.patch
similarity index 94%
rename from patches/server/0669-Stinger-API.patch
rename to patches/server/0668-Stinger-API.patch
index bfa434970f..6de82a2e8a 100644
--- a/patches/server/0669-Stinger-API.patch
+++ b/patches/server/0668-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 310dcf72f24fcbb86bc5b118536a8ebfc084eb7e..1994dd3c272395a27474ec1b37a924a24fc50fd6 100644
+index cac821ce75f80c9fc51935415ccb840ff5887664..b31cad6e5de47531736c0195d9160afb328595e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -323,7 +323,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0670-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0669-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0670-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0669-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0671-Add-System.out-err-catcher.patch b/patches/server/0670-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0671-Add-System.out-err-catcher.patch
rename to patches/server/0670-Add-System.out-err-catcher.patch
index 2a683a5cf1..9c4386581a 100644
--- a/patches/server/0671-Add-System.out-err-catcher.patch
+++ b/patches/server/0670-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 60224fce02148ac7e8a28524b8769372eff98817..7c5dd4a3bf98599356022539f203ef276c29cbab 100644
+index acc385d4b6852a55e93a5c19755a3d7f59a16eea..3ebf81b45cf1897471a3262d23cc59dd45652b6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -284,6 +284,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0672-Fix-test-not-bootstrapping.patch b/patches/server/0671-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0672-Fix-test-not-bootstrapping.patch
rename to patches/server/0671-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0673-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0672-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0673-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0672-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0674-Improve-boat-collision-performance.patch b/patches/server/0673-Improve-boat-collision-performance.patch
similarity index 97%
rename from patches/server/0674-Improve-boat-collision-performance.patch
rename to patches/server/0673-Improve-boat-collision-performance.patch
index e4cc2289a0..d2d89fa7a9 100644
--- a/patches/server/0674-Improve-boat-collision-performance.patch
+++ b/patches/server/0673-Improve-boat-collision-performance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve boat collision performance
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 4fce18c52c8144460ebf0c1e336dce712d796cc6..384ddb03af26ae360fd22e2e231d9d14d6ad0865 100644
+index 0773447354542925826369625f21e26aa30ebff4..adb1c48f42157fb127be4fd9f0a6f3784d8c4b39 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -112,6 +112,7 @@ public class Util {
diff --git a/patches/server/0675-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0674-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0675-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0674-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0676-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0675-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0676-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0675-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0677-Add-PlayerSetSpawnEvent.patch b/patches/server/0676-Add-PlayerSetSpawnEvent.patch
similarity index 99%
rename from patches/server/0677-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0676-Add-PlayerSetSpawnEvent.patch
index 8fb2d10aa5..8884e73610 100644
--- a/patches/server/0677-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0676-Add-PlayerSetSpawnEvent.patch
@@ -89,7 +89,7 @@ index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 157c263649d56ee47a4ccf91d76ba6cfa783f87f..e756066c9ed33cfd5ff3c5911421ff8433b0d2d7 100644
+index c72f6e73a80f7e738362c02f03deb6f245c0c7c5..eedcccde859d39fada71122488ea019cc7405e27 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -902,13 +902,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0678-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0677-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0678-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0677-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0679-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0678-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0679-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0678-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0680-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0679-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0680-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0679-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0681-Added-EntityDamageItemEvent.patch b/patches/server/0680-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0681-Added-EntityDamageItemEvent.patch
rename to patches/server/0680-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0682-Optimize-indirect-passenger-iteration.patch b/patches/server/0681-Optimize-indirect-passenger-iteration.patch
similarity index 96%
rename from patches/server/0682-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0681-Optimize-indirect-passenger-iteration.patch
index bde26d1af8..6688b1a3b1 100644
--- a/patches/server/0682-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0681-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 232e9fe555b58632ee2a522b656d0927d4df0f26..311267d5afd70ad48ac195ebfd659d0a718cdfd7 100644
+index 6b6de6812740357d4c2c8bca0c064aa52e61fa60..325e6518c279a9915ea4b9a25df0e05669b33fe8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3660,20 +3660,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0683-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0682-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0683-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0682-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0684-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0683-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0684-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0683-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0685-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0684-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0685-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0684-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0686-Clear-bucket-NBT-after-dispense.patch b/patches/server/0685-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0686-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0685-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0687-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0686-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0687-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0686-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0688-Add-BlockBreakBlockEvent.patch b/patches/server/0687-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0688-Add-BlockBreakBlockEvent.patch
rename to patches/server/0687-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0689-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0688-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0689-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0688-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0690-More-CommandBlock-API.patch b/patches/server/0689-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0690-More-CommandBlock-API.patch
rename to patches/server/0689-More-CommandBlock-API.patch
diff --git a/patches/server/0691-Add-missing-team-sidebar-display-slots.patch b/patches/server/0690-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0691-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0690-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0692-Add-back-EntityPortalExitEvent.patch b/patches/server/0691-Add-back-EntityPortalExitEvent.patch
similarity index 97%
rename from patches/server/0692-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0691-Add-back-EntityPortalExitEvent.patch
index aabeea1353..8f5abe7571 100644
--- a/patches/server/0692-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0691-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 311267d5afd70ad48ac195ebfd659d0a718cdfd7..bb535ca99a14a016c00bf7825384a831afb9ebaa 100644
+index 325e6518c279a9915ea4b9a25df0e05669b33fe8..3abc8894f575e246201845b757dbef2699663859 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3162,6 +3162,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0693-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0692-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 93%
rename from patches/server/0693-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0692-Add-methods-to-find-targets-for-lightning-strikes.patch
index c586250bee..a2b7b70aae 100644
--- a/patches/server/0693-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0692-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 56afb3c6a0c575e793e6c30cfb42596fcb83dd4f..c0dd56bc2eb8cdcf8a7dc20904f5a33f4a90f8a2 100644
+index 304002cab34cdbb000f22d18ee94ffe233ac2b8e..7d35d948e395258c77301c3dfee572545d3e52ff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -815,6 +815,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 56afb3c6a0c575e793e6c30cfb42596fcb83dd4f..c0dd56bc2eb8cdcf8a7dc20904f5a33f
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cad1d4be462a53567dc56472f90d9aacdf82be99..31659cf6decac7cb83b83b09a17eaf91be656b53 100644
+index 5f780daddfc90c44bd621cee7a2a72a20b292e29..0d5ae9b6db5cba4154c1e3ac042ae27fcd84d209 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -686,6 +686,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0694-Get-entity-default-attributes.patch b/patches/server/0693-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0694-Get-entity-default-attributes.patch
rename to patches/server/0693-Get-entity-default-attributes.patch
diff --git a/patches/server/0695-Left-handed-API.patch b/patches/server/0694-Left-handed-API.patch
similarity index 100%
rename from patches/server/0695-Left-handed-API.patch
rename to patches/server/0694-Left-handed-API.patch
diff --git a/patches/server/0696-Add-advancement-display-API.patch b/patches/server/0695-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0696-Add-advancement-display-API.patch
rename to patches/server/0695-Add-advancement-display-API.patch
diff --git a/patches/server/0697-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0696-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0697-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0696-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0698-Add-critical-damage-API.patch b/patches/server/0697-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0698-Add-critical-damage-API.patch
rename to patches/server/0697-Add-critical-damage-API.patch
index adeb195cba..dcd4bfe384 100644
--- a/patches/server/0698-Add-critical-damage-API.patch
+++ b/patches/server/0697-Add-critical-damage-API.patch
@@ -60,7 +60,7 @@ index 92a5aadef076cb905962dab86f32d4ff253fef93..5451b1d61ae2ee4fa461c2a334bfe8f7
                                      }
                                      // CraftBukkit end
 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 f02fb03c63975e5c1ccdd848f5727559929cce00..8564ecd20578d907bcfa1b9c149da22e424e254a 100644
+index 3b1e17a8733de823b36315c81e8ca5884e83368e..39136b9707221e4e4934ee0ef18fc2cb92723aa2 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -382,6 +382,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0699-Fix-issues-with-mob-conversion.patch b/patches/server/0698-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0699-Fix-issues-with-mob-conversion.patch
rename to patches/server/0698-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0700-Add-isCollidable-methods-to-various-places.patch b/patches/server/0699-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0700-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0699-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0701-Goat-ram-API.patch b/patches/server/0700-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0701-Goat-ram-API.patch
rename to patches/server/0700-Goat-ram-API.patch
diff --git a/patches/server/0702-Add-API-for-resetting-a-single-score.patch b/patches/server/0701-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0702-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0701-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0703-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0702-Add-Raw-Byte-Entity-Serialization.patch
similarity index 97%
rename from patches/server/0703-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0702-Add-Raw-Byte-Entity-Serialization.patch
index cd44a778d5..9b313da6b5 100644
--- a/patches/server/0703-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0702-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bb535ca99a14a016c00bf7825384a831afb9ebaa..27b42e8305a4aa3a3d99b73be441af9687da70a5 100644
+index 3abc8894f575e246201845b757dbef2699663859..dcbbf53b23a9347470986f052ecba0149d7503aa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1985,6 +1985,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0704-Vanilla-command-permission-fixes.patch b/patches/server/0703-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0704-Vanilla-command-permission-fixes.patch
rename to patches/server/0703-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0705-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0704-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 95%
rename from patches/server/0705-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0704-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index d609e5be7b..33166594be 100644
--- a/patches/server/0705-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0704-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 0070f82f7725f584a177464cc8dc543b7a5c78e1..ff2f7b933929e4b8ac4710e5eaa2bd3667f19bbe 100644
+index 7d35d948e395258c77301c3dfee572545d3e52ff..34c587232c6bb9876de68f4bf07d11b3d794f0b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1375,9 +1375,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -28,7 +28,7 @@ index 0070f82f7725f584a177464cc8dc543b7a5c78e1..ff2f7b933929e4b8ac4710e5eaa2bd36
          }
          // 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 18f67094f0ce0902963a118744f9fd48f53273c8..9075b0476e775af0e5bc173dc736781dfde6938a 100644
+index 218a71cbd62795fdf3b9b3ad224e201b1e97a5b6..ffee74216d6ba1742e97400a7177725766bb557e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1573,6 +1573,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0706-Fix-GameProfileCache-concurrency.patch b/patches/server/0705-Fix-GameProfileCache-concurrency.patch
similarity index 98%
rename from patches/server/0706-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0705-Fix-GameProfileCache-concurrency.patch
index 694dd0fbaa..8c22da1dde 100644
--- a/patches/server/0706-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0705-Fix-GameProfileCache-concurrency.patch
@@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups
 from stalling simple state access/write calls
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 5e3bc0590e59770490b1c6c818d99be054214a8a..84bdf4a849b09a90da6c22f4080386e85a53f6b3 100644
+index 2456edc11b29a92b1648937cd3dd6a9a05706803..b48650c38751a925b83fb4c19ac02f87cb1bef6e 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -62,6 +62,11 @@ public class GameProfileCache {
diff --git a/patches/server/0707-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0706-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0707-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0706-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0708-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0707-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0708-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0707-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 5423af0db6..c1a6a6f32d 100644
--- a/patches/server/0708-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0707-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -265,7 +265,7 @@ index 0000000000000000000000000000000000000000..2e02d94e2903c48f6d08e743c1cf8bad
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 9fdaf0aecb3c850be63ae9aae0879cb5584c5472..e0b6f7da138776be2892821b32a099c2d0e45038 100644
+index 25256c422a3274ed75c9a9cd20fbbb709c8b298e..edd32b6d5a96a6fffe641a23c27921e6dcf37a54 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -191,6 +191,16 @@ public final class NaturalSpawner {
@@ -286,7 +286,7 @@ index 9fdaf0aecb3c850be63ae9aae0879cb5584c5472..e0b6f7da138776be2892821b32a099c2
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7c5dd4a3bf98599356022539f203ef276c29cbab..2f793169ee3b8265059f75c5a3cc13a86acedc83 100644
+index 3ebf81b45cf1897471a3262d23cc59dd45652b6d..c648acdd0066f6c480d08927a3c72524cde32ec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2156,6 +2156,11 @@ public final class CraftServer implements Server {
@@ -302,7 +302,7 @@ index 7c5dd4a3bf98599356022539f203ef276c29cbab..2f793169ee3b8265059f75c5a3cc13a8
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5a3e498776a35770a19535751f9dfcc1573035d7..65c82c3ec11b29245f7d92e402f2cf2ab5b8dae4 100644
+index 0d5ae9b6db5cba4154c1e3ac042ae27fcd84d209..4fcd36e6c0ad99575917962fbd1353f509383482 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1701,9 +1701,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0709-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0708-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0709-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0708-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0710-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0709-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0710-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0709-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0711-Optimise-general-POI-access.patch b/patches/server/0710-Optimise-general-POI-access.patch
similarity index 99%
rename from patches/server/0711-Optimise-general-POI-access.patch
rename to patches/server/0710-Optimise-general-POI-access.patch
index a3eb3b3a10..b826375789 100644
--- a/patches/server/0711-Optimise-general-POI-access.patch
+++ b/patches/server/0710-Optimise-general-POI-access.patch
@@ -876,7 +876,7 @@ index 33fbf72b440e0d164ecd4fb0fdec72e2394d0a1e..8db20db72cd51046213625fac46c3585
                  BlockPos blockPos = path.getTarget();
                  Optional<Holder<PoiType>> optional = poiManager.getType(blockPos);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-index 8938e04ffab2d31e64b80879d21d9f1eb90c20bb..fea4dd3fe06e66f72969331fdf9491dbbe44f3c2 100644
+index a98f4315b82919e4d90d74f5cd0e6f21e49353dc..8849ae489ebdafef6836425729d7714d7e136986 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 @@ -127,43 +127,62 @@ public class PoiManager extends SectionStorage<PoiSection> {
diff --git a/patches/server/0712-Optimise-chunk-tick-iteration.patch b/patches/server/0711-Optimise-chunk-tick-iteration.patch
similarity index 97%
rename from patches/server/0712-Optimise-chunk-tick-iteration.patch
rename to patches/server/0711-Optimise-chunk-tick-iteration.patch
index 2d346cd0dc..30dc147417 100644
--- a/patches/server/0712-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0711-Optimise-chunk-tick-iteration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise chunk tick iteration
 Use a dedicated list of entity ticking chunks to reduce the cost
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 2add24517d38708a84e7f8ec25fbe9c62309375e..1fb298ff60b59a7074fb9d7a79709f05887ce32c 100644
+index a61f55ed1fbe5aac5289014cb95cb6950b4c77fa..e11ec87e8007979a1c6932b414bcd70c10db746c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -88,6 +88,11 @@ public class ChunkHolder {
@@ -72,7 +72,7 @@ index 2add24517d38708a84e7f8ec25fbe9c62309375e..1fb298ff60b59a7074fb9d7a79709f05
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2a25d552612bf94c5f54249ae3cba549ea242488..3540ac6f99d724d91ff4e897f7e84ef03037f1bf 100644
+index ed6e0a186dba26bee5ebcc02120c24ecb38d6892..bfc1965482fe6556caa09306767583e3635b06c8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
@@ -93,7 +93,7 @@ index 2a25d552612bf94c5f54249ae3cba549ea242488..3540ac6f99d724d91ff4e897f7e84ef0
      // Paper - rewrite chunk system
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index fa7801158b68eaa12d6322c9c0def9de37f03814..cfcb3ba96569f3eb24d1035d770c50085f60b772 100644
+index a05e8d136dfeb41fb6008cba4d3b4abcddbd9557..4e73960a77165a959e989249fd25a7c5376e50bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -47,6 +47,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp
diff --git a/patches/server/0713-Execute-chunk-tasks-mid-tick.patch b/patches/server/0712-Execute-chunk-tasks-mid-tick.patch
similarity index 95%
rename from patches/server/0713-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0712-Execute-chunk-tasks-mid-tick.patch
index 7867ac2db3..5d74da9c88 100644
--- a/patches/server/0713-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0712-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index 23e564b05ba438924180c91f9b19a60731eedd1b..5ec241d49ff5e3a161a39006f05823a5
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 79c4ee2dd842fcf29eb91a69e536960c814c1a0d..207c1fb92493757de90f1a583a66ae4ad18b0e3f 100644
+index 1203076f688a16af17b7e55d913c9248e3f0fec7..ee6dc7d149f96c9a63e627e765b8d3a0107af864 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1298,6 +1298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -106,7 +106,7 @@ index 79c4ee2dd842fcf29eb91a69e536960c814c1a0d..207c1fb92493757de90f1a583a66ae4a
 +    // 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 cfcb3ba96569f3eb24d1035d770c50085f60b772..89ecb5c6c25246d0c71b14cc089386d4c4b83093 100644
+index 4e73960a77165a959e989249fd25a7c5376e50bb..44ea29c42d660cc92481a78990b5cdb7a23ef2a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -748,6 +748,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -126,7 +126,7 @@ index cfcb3ba96569f3eb24d1035d770c50085f60b772..89ecb5c6c25246d0c71b14cc089386d4
                  }
                  // Paper start - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ff2f7b933929e4b8ac4710e5eaa2bd3667f19bbe..ced278aef7c5e883a04255974a8428743a6f5168 100644
+index 34c587232c6bb9876de68f4bf07d11b3d794f0b7..0577b370e0b3696d45836e6765edfdbccefd9e8b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -212,6 +212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -154,7 +154,7 @@ index ff2f7b933929e4b8ac4710e5eaa2bd3667f19bbe..ced278aef7c5e883a04255974a842874
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e30414e1a5e7907c59917c5cd182bca65bc65825..4a3cfc66fdbff749f098a384c16a2c7cfc72e294 100644
+index e2e705d9d48adf61bb10f0ef60e2717ea660e24a..70b6479ef8aeb51135b31add61e4fdab0c495233 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -804,6 +804,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0714-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0713-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0714-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0713-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0715-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0714-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0715-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0714-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0716-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0715-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0716-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0715-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0717-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0716-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0717-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0716-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0718-Distance-manager-tick-timings.patch b/patches/server/0717-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0718-Distance-manager-tick-timings.patch
rename to patches/server/0717-Distance-manager-tick-timings.patch
diff --git a/patches/server/0719-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0718-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0719-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0718-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0719-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0719-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 07e018b6ef..9f57ee0138 100644
--- a/patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0719-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 4a3cfc66fdbff749f098a384c16a2c7cfc72e294..b94af31814c251a9b4b575c206de9807df696c62 100644
+index 70b6479ef8aeb51135b31add61e4fdab0c495233..97623e46160bf038bbcc4584bb921d524b3830c0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -367,6 +367,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0721-Add-packet-limiter-config.patch b/patches/server/0720-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0721-Add-packet-limiter-config.patch
rename to patches/server/0720-Add-packet-limiter-config.patch
diff --git a/patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0721-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 96%
rename from patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0721-Use-correct-LevelStem-registry-when-loading-default-.patch
index 7d89a66288..3b4219d344 100644
--- a/patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0721-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -24,7 +24,7 @@ index 8da1226a6c293abb038d10c7921a77ed71ad06cc..f958f0ae738a6fb26400e17e54c8d69e
          } else {
              Holder<E> holder = registry.getOrCreateHolderOrThrow(entryKey);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 207c1fb92493757de90f1a583a66ae4ad18b0e3f..ce99c2f4f172baa96831b194b4289da02a244519 100644
+index ee6dc7d149f96c9a63e627e765b8d3a0107af864..75651db840072806bb4ef15c4de370fdf6b46c05 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -553,7 +553,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0723-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0722-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0723-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0722-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0724-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0723-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 96%
rename from patches/server/0724-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0723-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 486fcc284b..8565ca71fe 100644
--- a/patches/server/0724-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0723-Consolidate-flush-calls-for-entity-tracker-packets.patch
@@ -22,7 +22,7 @@ With this change I could get all 200 on at 0ms ping.
 So in general this patch should reduce Netty I/O thread load.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 89ecb5c6c25246d0c71b14cc089386d4c4b83093..6d1f929eb717f62f0d7ebb9e9b52c3788061e240 100644
+index 44ea29c42d660cc92481a78990b5cdb7a23ef2a9..be97d38f45046a7f6d2337d879651f04cf9ff825 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -804,7 +804,24 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0725-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0724-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0725-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0724-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0726-Time-scoreboard-search.patch b/patches/server/0725-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0726-Time-scoreboard-search.patch
rename to patches/server/0725-Time-scoreboard-search.patch
diff --git a/patches/server/0727-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0726-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0727-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0726-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0728-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0727-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0728-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0727-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0729-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0728-Oprimise-map-impl-for-tracked-players.patch
similarity index 92%
rename from patches/server/0729-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0728-Oprimise-map-impl-for-tracked-players.patch
index 905a88d95e..2f0167797b 100644
--- a/patches/server/0729-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0728-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 6ff62d07b5db18d920786d62255ead9f74cc7d80..3c8d435ede28ded94db2a745dbd145cb4c3fe29a 100644
+index bfc1965482fe6556caa09306767583e3635b06c8..0abcc48cea5f0ca99d9ad5b753cc0c5bc91e97d9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1360,7 +1360,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0730-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0729-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0730-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0729-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0731-Optimise-random-block-ticking.patch b/patches/server/0730-Optimise-random-block-ticking.patch
similarity index 98%
rename from patches/server/0731-Optimise-random-block-ticking.patch
rename to patches/server/0730-Optimise-random-block-ticking.patch
index 0d30abe902..5e8a7201ec 100644
--- a/patches/server/0731-Optimise-random-block-ticking.patch
+++ b/patches/server/0730-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 b8ede677ae35a30c19e7a5e2afa72319ef02c9ac..60d354bce53b5101dc986d0c35d82ac9dbbbd016 100644
+index b3c482f221dcaec62b0961e05da77d7e46e0420c..195c50c7ba10b784c372046d956b54fccf684812 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -705,6 +705,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -299,7 +299,7 @@ index 9686ce7536c9924b1b2aced4f013f46759cbc72e..5d8e9bdf5538b19681f21949368d862f
      public void getAll(IntConsumer action) {
          for(int i = 0; i < this.size; ++i) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 69c98c2cb2fd8f149a39bbddcbfe0c5c5adc3904..5575730aa6f77a91467c394fa8465c335d73db8e 100644
+index 0cea2eacfe3264a9b3500dc3a6a19d21d74d54e9..4764b975386f1c5629a59f762f7ba1c1ae2598c5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -83,7 +83,7 @@ public class Turtle extends Animal {
@@ -312,7 +312,7 @@ index 69c98c2cb2fd8f149a39bbddcbfe0c5c5adc3904..5575730aa6f77a91467c394fa8465c33
  
      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 b94af31814c251a9b4b575c206de9807df696c62..aa90454e70e5c25eb331ceb212df3128d64b1567 100644
+index 97623e46160bf038bbcc4584bb921d524b3830c0..b5fd3a9b58fb56db92d579d307edc99bbe344c79 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1306,10 +1306,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0732-Optimise-non-flush-packet-sending.patch b/patches/server/0731-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0732-Optimise-non-flush-packet-sending.patch
rename to patches/server/0731-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0733-Optimise-nearby-player-lookups.patch b/patches/server/0732-Optimise-nearby-player-lookups.patch
similarity index 99%
rename from patches/server/0733-Optimise-nearby-player-lookups.patch
rename to patches/server/0732-Optimise-nearby-player-lookups.patch
index 7a0d38249a..c100775c9c 100644
--- a/patches/server/0733-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0732-Optimise-nearby-player-lookups.patch
@@ -322,7 +322,7 @@ index edd32b6d5a96a6fffe641a23c27921e6dcf37a54..272bdc088f440cf94850dff6e626331b
  
      private static Boolean isValidSpawnPostitionForType(ServerLevel world, MobCategory group, StructureManager structureAccessor, ChunkGenerator chunkGenerator, MobSpawnSettings.SpawnerData spawnEntry, BlockPos.MutableBlockPos pos, double squaredDistance) { // Paper
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 97a1972b8e4359b4327fa0b0ac1fb82966122a27..6c31e246b49dfa2447f3179b744b0b3842d1509e 100644
+index 623046a5a0ba36619d43d8e55cfee3c06d09b62b..7350b73f4af4ae347532dc579ab151447c298e09 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -269,6 +269,98 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0734-Remove-streams-for-villager-AI.patch b/patches/server/0733-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0734-Remove-streams-for-villager-AI.patch
rename to patches/server/0733-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0734-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0734-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0735-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 93%
rename from patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0735-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index c8dd06ca73..c69b1c2d8f 100644
--- a/patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0735-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce worldgen thread worker count for low core count CPUs
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 384ddb03af26ae360fd22e2e231d9d14d6ad0865..23a999c19809a4fb62b37400e3767dc44692adb3 100644
+index adb1c48f42157fb127be4fd9f0a6f3784d8c4b39..998f63fba0d45a44eaf9cbe48a034bac4e02e965 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -146,7 +146,19 @@ public class Util {
diff --git a/patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0736-Async-catch-modifications-to-critical-entity-state.patch
similarity index 98%
rename from patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0736-Async-catch-modifications-to-critical-entity-state.patch
index 8f9a21c9d1..94d6bcf59c 100644
--- a/patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0736-Async-catch-modifications-to-critical-entity-state.patch
@@ -8,7 +8,7 @@ Now in 1.17, this state is _even more_ critical than it was before,
 so these must exist to catch stupid plugins.
 
 diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
-index ab7eadf2fc4c4598fa89068332eaaf9a8e0a100f..e738f058af577150445ac4ef7a0bcbf98e3ba52e 100644
+index 21e1d86bd287c5e90db43c9c0247d6b7ee1425ae..8d2143dc2a4a20c585e84cfd3c218d8b5a95e165 100644
 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 @@ -77,6 +77,7 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
diff --git a/patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0737-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 96%
rename from patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0737-Fix-Bukkit-NamespacedKey-shenanigans.patch
index fabf5a82e9..efa00b82a4 100644
--- a/patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0737-Fix-Bukkit-NamespacedKey-shenanigans.patch
@@ -18,7 +18,7 @@ index 88e32ed64f90bfd277dac84ba4bd84f0d943f5f8..d4a8c1bbb8fef27ac42bdf27dde495b4
  
      @Override
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index 3377b86c337d0234bbb9b0349e4034a7cd450a97..94dc68182ec5f6dc1294ad15523427836228086a 100644
+index 9cfa5d36a6991067a3866e0d437749fafcc0158e..2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99 100644
 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
diff --git a/patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0738-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 94%
rename from patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0738-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 286218bc7b..9fccf0c28e 100644
--- a/patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0738-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 2112b7aef36054c9854c13cc5e9fb4c05bf18c6e..8085c73a405166fd2a70db60f53c37b4b2798ef7 100644
+index 48c5a62ea9c0441fa14300aff4dab44cc26090c5..cf24d93a7c84938ead0390f0a7876bc3fd5b1855 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2608,6 +2608,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0740-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0739-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0740-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0739-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0741-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0740-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0741-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0740-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0742-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0741-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0742-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0741-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0743-Ensure-valid-vehicle-status.patch b/patches/server/0742-Ensure-valid-vehicle-status.patch
similarity index 90%
rename from patches/server/0743-Ensure-valid-vehicle-status.patch
rename to patches/server/0742-Ensure-valid-vehicle-status.patch
index f3e2c1b98b..d063079759 100644
--- a/patches/server/0743-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0742-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 9075b0476e775af0e5bc173dc736781dfde6938a..c6be77e9fae04f2a6dd332dbde9daf0109111e60 100644
+index ffee74216d6ba1742e97400a7177725766bb557e..e761e01a02e2bc1f13bf88163f9cc55849031155 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -498,7 +498,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0744-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0743-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0744-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0743-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0745-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0744-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0745-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0744-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0746-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0745-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0746-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0745-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0747-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0746-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0747-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0746-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0748-Preserve-overstacked-loot.patch b/patches/server/0747-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0748-Preserve-overstacked-loot.patch
rename to patches/server/0747-Preserve-overstacked-loot.patch
diff --git a/patches/server/0749-Update-head-rotation-in-missing-places.patch b/patches/server/0748-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0749-Update-head-rotation-in-missing-places.patch
rename to patches/server/0748-Update-head-rotation-in-missing-places.patch
index fe28ba4797..416e9b0fff 100644
--- a/patches/server/0749-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0748-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 b1e1b8f9717d2a5a61485b843d3fde05012272ec..1b24aa8dfa0c76b2738bbb710d2d3c1f85f23666 100644
+index 8d342290a9ed81b20260e2e4f7262e03332464b1..3194c4461a5a86e28e73414a94dbfa7e611ee3a8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0750-prevent-unintended-light-block-manipulation.patch b/patches/server/0749-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0750-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0749-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0751-Fix-CraftCriteria-defaults-map.patch b/patches/server/0750-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0751-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0750-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0752-Fix-upstreams-block-state-factories.patch b/patches/server/0751-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0752-Fix-upstreams-block-state-factories.patch
rename to patches/server/0751-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0752-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0752-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0754-Configurable-feature-seeds.patch b/patches/server/0753-Configurable-feature-seeds.patch
similarity index 96%
rename from patches/server/0754-Configurable-feature-seeds.patch
rename to patches/server/0753-Configurable-feature-seeds.patch
index 6e138bc312..76bc5d0b98 100644
--- a/patches/server/0754-Configurable-feature-seeds.patch
+++ b/patches/server/0753-Configurable-feature-seeds.patch
@@ -19,7 +19,7 @@ index 98171f6c8e23f6ef89b897e4b80e3afb2a1950a0..06bff37e4c1fddd3be6343049a66787c
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 50b9c2fbe3a5c12a43b4711d678ed2398dbdee58..cc79ca7ee770408ec59b1f6a3f4ec58e23bd2619 100644
+index c35bf0709e83e05c2135d7a5c98bf44c48d0c31f..4ce5d41b23d6204f280e6d4d21713ec5d9a724d1 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -606,7 +606,14 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0755-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0754-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0755-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0754-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0756-Add-root-admin-user-detection.patch b/patches/server/0755-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0756-Add-root-admin-user-detection.patch
rename to patches/server/0755-Add-root-admin-user-detection.patch
index a3bdc6b127..a15ee81921 100644
--- a/patches/server/0756-Add-root-admin-user-detection.patch
+++ b/patches/server/0755-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 6b40e5659923d74438efaeb846732cb4efbf3f1b..11efaeb12340946c7447617500cbc69bc9bdaf01 100644
+index 7dba8ef3291987cc428cd337693c3446d01e435b..c399aaeee89e12a7da4e054acd877fe033676dfd 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -184,6 +184,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0757-Always-allow-item-changing-in-Fireball.patch b/patches/server/0756-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0757-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0756-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0757-don-t-attempt-to-teleport-dead-entities.patch
similarity index 91%
rename from patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0757-don-t-attempt-to-teleport-dead-entities.patch
index a9889cb728..2ba22b78e7 100644
--- a/patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0757-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 1b24aa8dfa0c76b2738bbb710d2d3c1f85f23666..97ae347604922916308c6d3e1e2e97911ddc9e35 100644
+index 3194c4461a5a86e28e73414a94dbfa7e611ee3a8..3f71b0f328842b3659bc01af8502cdc9561c7e5d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -779,7 +779,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0758-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0758-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0759-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 92%
rename from patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0759-Remove-client-side-code-using-deprecated-for-removal.patch
index d96ebe539e..49bc5d68f8 100644
--- a/patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0759-Remove-client-side-code-using-deprecated-for-removal.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Remove client-side code using deprecated for removal
 Fixes warnings on build
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 23a999c19809a4fb62b37400e3767dc44692adb3..cdb7aea969b56f59d88f60bc3744e4932228c50a 100644
+index 998f63fba0d45a44eaf9cbe48a034bac4e02e965..6b7943e8348b0a41ca69fb56ccfd5f1c1484eb07 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -889,17 +889,7 @@ public class Util {
diff --git a/patches/server/0761-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0760-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0761-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0760-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0762-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0761-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0762-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0761-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0762-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0762-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0763-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0763-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0765-Fix-Spigot-growth-modifiers.patch b/patches/server/0764-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0765-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0764-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0766-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0765-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0766-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0765-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0767-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0766-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0767-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0766-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0768-Add-player-health-update-API.patch b/patches/server/0767-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0768-Add-player-health-update-API.patch
rename to patches/server/0767-Add-player-health-update-API.patch
diff --git a/patches/server/0769-Optimize-HashMapPalette.patch b/patches/server/0768-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0769-Optimize-HashMapPalette.patch
rename to patches/server/0768-Optimize-HashMapPalette.patch
diff --git a/patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0769-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0769-Allow-delegation-to-vanilla-chunk-gen.patch
index fc9c73e933..ee5856163c 100644
--- a/patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0769-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 2f793169ee3b8265059f75c5a3cc13a86acedc83..bf747c7584733014aac771ba4ca039c588582f25 100644
+index c648acdd0066f6c480d08927a3c72524cde32ec7..ed3f27e605a6d9454953a6fd8b0e784b1b89acf3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2329,6 +2329,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index be9dee1811..f9b2b0bdea 100644
--- a/patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c6be77e9fae04f2a6dd332dbde9daf0109111e60..370bd3adb0003115ec5774eedd4dac01a41ae4af 100644
+index e761e01a02e2bc1f13bf88163f9cc55849031155..fd785c88b4e269fde577eb7abab3dc1c46365f1f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -408,7 +408,7 @@ public class ServerPlayer extends Player {
@@ -1202,7 +1202,7 @@ index c6be77e9fae04f2a6dd332dbde9daf0109111e60..370bd3adb0003115ec5774eedd4dac01
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3e870218321a701b814a4dac97ff1af12142600e..4277f7fdd8f27e57708a8dee59bf1b9052a1ebe4 100644
+index 279b7953638d1400072bd153dc3d0c63efdf9035..870a48360dd35c190171f1302393f325f0db6692 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -943,7 +943,7 @@ public abstract class PlayerList {
@@ -1215,7 +1215,7 @@ index 3e870218321a701b814a4dac97ff1af12142600e..4277f7fdd8f27e57708a8dee59bf1b90
          }
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 97ae347604922916308c6d3e1e2e97911ddc9e35..ecdb1a905b12d1d37698f7a51acbb36bffeda698 100644
+index 3f71b0f328842b3659bc01af8502cdc9561c7e5d..97e308353f6e634887a9d5bc9559f84e46f4a507 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1160,9 +1160,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1402,7 +1402,7 @@ index 97ae347604922916308c6d3e1e2e97911ddc9e35..ecdb1a905b12d1d37698f7a51acbb36b
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/BlockCollisions.java b/src/main/java/net/minecraft/world/level/BlockCollisions.java
-index 95e22c91bc701785f4804e5d4e0a6b420b9830fd..2528291e00532c95690c4d7fb4cc0691cfb8c857 100644
+index be578f14146b0184d5419d5b961c5d681f9ba7a3..018cbf866bbe39b69a4afa039166e8d34ec3ab5f 100644
 --- a/src/main/java/net/minecraft/world/level/BlockCollisions.java
 +++ b/src/main/java/net/minecraft/world/level/BlockCollisions.java
 @@ -106,7 +106,7 @@ public class BlockCollisions extends AbstractIterator<VoxelShape> {
diff --git a/patches/server/0772-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0771-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0772-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0771-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0773-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0772-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0773-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0772-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0774-Update-Log4j.patch b/patches/server/0773-Update-Log4j.patch
similarity index 100%
rename from patches/server/0774-Update-Log4j.patch
rename to patches/server/0773-Update-Log4j.patch
diff --git a/patches/server/0775-Add-more-Campfire-API.patch b/patches/server/0774-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0775-Add-more-Campfire-API.patch
rename to patches/server/0774-Add-more-Campfire-API.patch
diff --git a/patches/server/0776-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0775-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0776-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0775-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0777-Fix-tripwire-state-inconsistency.patch b/patches/server/0776-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0777-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0776-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0778-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0777-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0778-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0777-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0779-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0778-Forward-CraftEntity-in-teleport-command.patch
similarity index 95%
rename from patches/server/0779-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0778-Forward-CraftEntity-in-teleport-command.patch
index eb1d99e7f9..4c29f6a838 100644
--- a/patches/server/0779-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0778-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 ecdb1a905b12d1d37698f7a51acbb36bffeda698..88df5e35020edc805f9e0371e20d6849d2dfff88 100644
+index 97e308353f6e634887a9d5bc9559f84e46f4a507..305a70f4b4646fa6cb8f36af367222a2b7fa39d4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3276,6 +3276,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0780-Improve-scoreboard-entries.patch b/patches/server/0779-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0780-Improve-scoreboard-entries.patch
rename to patches/server/0779-Improve-scoreboard-entries.patch
diff --git a/patches/server/0781-Entity-powdered-snow-API.patch b/patches/server/0780-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0781-Entity-powdered-snow-API.patch
rename to patches/server/0780-Entity-powdered-snow-API.patch
diff --git a/patches/server/0782-Add-API-for-item-entity-health.patch b/patches/server/0781-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0782-Add-API-for-item-entity-health.patch
rename to patches/server/0781-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0782-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0782-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0784-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0783-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0784-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0783-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0785-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0784-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0785-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0784-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0786-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0785-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0786-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0785-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0787-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0786-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0787-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0786-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0788-Fix-bees-aging-inside-hives.patch b/patches/server/0787-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0788-Fix-bees-aging-inside-hives.patch
rename to patches/server/0787-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0789-Bucketable-API.patch b/patches/server/0788-Bucketable-API.patch
similarity index 100%
rename from patches/server/0789-Bucketable-API.patch
rename to patches/server/0788-Bucketable-API.patch
diff --git a/patches/server/0790-Validate-usernames.patch b/patches/server/0789-Validate-usernames.patch
similarity index 100%
rename from patches/server/0790-Validate-usernames.patch
rename to patches/server/0789-Validate-usernames.patch
diff --git a/patches/server/0791-Make-water-animal-spawn-height-configurable.patch b/patches/server/0790-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0791-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0790-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0791-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0791-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index a9805b24fc..ec28493f6e 100644
--- a/patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0791-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 ce99c2f4f172baa96831b194b4289da02a244519..efe7a3afaf5ef548bded4dc2957375fdbc605d63 100644
+index 75651db840072806bb4ef15c4de370fdf6b46c05..2699381f72ff00bb0a9711e3b286e820f1b8dc32 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -562,7 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index ce99c2f4f172baa96831b194b4289da02a244519..efe7a3afaf5ef548bded4dc2957375fd
                  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 bf747c7584733014aac771ba4ca039c588582f25..e69480421f4fbebcf2a2000e8fa91fc9a9d34201 100644
+index ed3f27e605a6d9454953a6fd8b0e784b1b89acf3..94961c271b4fc1b8b2b6c4d35e9c2ac685ac3268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1212,7 +1212,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index bf747c7584733014aac771ba4ca039c588582f25..e69480421f4fbebcf2a2000e8fa91fc9
              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 65c82c3ec11b29245f7d92e402f2cf2ab5b8dae4..36a8552f046f8f6bf8138bef4ff0c526425e57a4 100644
+index 4fcd36e6c0ad99575917962fbd1353f509383482..0e5a375b25a647e26e47aacc87d2db899da5d520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -200,6 +200,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0793-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0792-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0793-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0792-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0794-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0793-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0794-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0793-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0795-Multiple-Entries-with-Scoreboards.patch b/patches/server/0794-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0795-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0794-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0796-Reset-placed-block-on-exception.patch b/patches/server/0795-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0796-Reset-placed-block-on-exception.patch
rename to patches/server/0795-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0797-Add-configurable-height-for-slime-spawn.patch b/patches/server/0796-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0797-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0796-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0797-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0797-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0799-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0798-Fix-xp-reward-for-baby-zombies.patch
similarity index 92%
rename from patches/server/0799-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0798-Fix-xp-reward-for-baby-zombies.patch
index 42920471c5..a9cae82e96 100644
--- a/patches/server/0799-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0798-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 3e1fa4336cc18eaeb048d0a1d592cf74820ff3b2..97b3082dc020043fa38d9e5e4591102f97519ed3 100644
+index c5b6236c58485351fb2866197b55d2c8809105c7..dc9402e343d3bc0b0d38e3a7834521a976f89c39 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -173,11 +173,16 @@ public class Zombie extends Monster {
diff --git a/patches/server/0800-Kick-on-main-for-illegal-chat.patch b/patches/server/0799-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0800-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0799-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0801-Multi-Block-Change-API-Implementation.patch b/patches/server/0800-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0801-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0800-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0802-Fix-NotePlayEvent.patch b/patches/server/0801-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0802-Fix-NotePlayEvent.patch
rename to patches/server/0801-Fix-NotePlayEvent.patch
diff --git a/patches/server/0803-Freeze-Tick-Lock-API.patch b/patches/server/0802-Freeze-Tick-Lock-API.patch
similarity index 97%
rename from patches/server/0803-Freeze-Tick-Lock-API.patch
rename to patches/server/0802-Freeze-Tick-Lock-API.patch
index 4fa7369491..fa1d5fca7f 100644
--- a/patches/server/0803-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0802-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 88df5e35020edc805f9e0371e20d6849d2dfff88..95388d7d9097316df87c0ca8bba1d5730f33b378 100644
+index 305a70f4b4646fa6cb8f36af367222a2b7fa39d4..476668fe955841f61cf12d032b0d3bd1e400cd93 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -396,6 +396,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0804-Dolphin-API.patch b/patches/server/0803-Dolphin-API.patch
similarity index 100%
rename from patches/server/0804-Dolphin-API.patch
rename to patches/server/0803-Dolphin-API.patch
diff --git a/patches/server/0805-More-PotionEffectType-API.patch b/patches/server/0804-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0805-More-PotionEffectType-API.patch
rename to patches/server/0804-More-PotionEffectType-API.patch
diff --git a/patches/server/0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0805-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0805-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0806-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0806-API-for-creating-command-sender-which-forwards-feedb.patch
index c06c0406b5..ea80c8f423 100644
--- a/patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0806-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e69480421f4fbebcf2a2000e8fa91fc9a9d34201..126da8691f515998626492667b6a145ffe1bbd2d 100644
+index 94961c271b4fc1b8b2b6c4d35e9c2ac685ac3268..cabcddbf3f3db301a0827767b1f8917d011b8ae7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1990,6 +1990,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0808-Add-missing-structure-set-seed-configs.patch b/patches/server/0807-Add-missing-structure-set-seed-configs.patch
similarity index 99%
rename from patches/server/0808-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0807-Add-missing-structure-set-seed-configs.patch
index 3e8dff27d6..e5ee2d2e6e 100644
--- a/patches/server/0808-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0807-Add-missing-structure-set-seed-configs.patch
@@ -20,7 +20,7 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index cc79ca7ee770408ec59b1f6a3f4ec58e23bd2619..52264a583e79cc6adb9967aebac7f6b3ac129017 100644
+index 4ce5d41b23d6204f280e6d4d21713ec5d9a724d1..9579889e4c7dedefc4f901ccac6157c425740481 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -133,7 +133,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0809-Implement-regenerateChunk.patch b/patches/server/0808-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0809-Implement-regenerateChunk.patch
rename to patches/server/0808-Implement-regenerateChunk.patch
index 52ed98a62f..3c341b5492 100644
--- a/patches/server/0809-Implement-regenerateChunk.patch
+++ b/patches/server/0808-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 36a8552f046f8f6bf8138bef4ff0c526425e57a4..7757e5b1aec0b1f0cba79aa4618a7fe1d210b72c 100644
+index 0e5a375b25a647e26e47aacc87d2db899da5d520..7251506312f96873de4d70231eb0c211dcc16fd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -139,6 +139,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0810-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0809-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0810-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0809-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0810-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0810-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 4e491d2b35..68fab906bc 100644
--- a/patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0810-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 126da8691f515998626492667b6a145ffe1bbd2d..a9a084edf27908b42ee4c2673df877469e65ca27 100644
+index cabcddbf3f3db301a0827767b1f8917d011b8ae7..08b171f08313da411a6ab036851b4435963477f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2164,6 +2164,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0812-Add-GameEvent-tags.patch b/patches/server/0811-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0812-Add-GameEvent-tags.patch
rename to patches/server/0811-Add-GameEvent-tags.patch
index bcde64da83..ee6eeb562d 100644
--- a/patches/server/0812-Add-GameEvent-tags.patch
+++ b/patches/server/0811-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a9a084edf27908b42ee4c2673df877469e65ca27..d457e7ece66b2f901dc12d459533129396ac134d 100644
+index 08b171f08313da411a6ab036851b4435963477f4..07fab4c97e0a873b2a81ad9fd3a3f97cbb6a92f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2575,6 +2575,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0812-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0812-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b39e446490..b4cc8be55d 100644
--- a/patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0812-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 efe7a3afaf5ef548bded4dc2957375fdbc605d63..8a51a5da86e3e9b277109b0acf2982197292682e 100644
+index 2699381f72ff00bb0a9711e3b286e820f1b8dc32..3cd3beb7625a9cf18951f4311d80dbdf00e1334f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1308,6 +1308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0814-Furnace-RecipesUsed-API.patch b/patches/server/0813-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0814-Furnace-RecipesUsed-API.patch
rename to patches/server/0813-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0815-Configurable-sculk-sensor-listener-range.patch b/patches/server/0814-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0815-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0814-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0816-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0815-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0816-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0815-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0816-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0816-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index b4b2dbda38..1b7232e838 100644
--- a/patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0816-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 8a51a5da86e3e9b277109b0acf2982197292682e..f45f82b5d08b9ce9517866d9f2575552cb3df95f 100644
+index 3cd3beb7625a9cf18951f4311d80dbdf00e1334f..8ac653bbf61015a38343d54f1009c1d935833546 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -589,7 +589,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0817-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 91%
rename from patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0817-Put-world-into-worldlist-before-initing-the-world.patch
index 678a666fc4..cb8234093b 100644
--- a/patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0817-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f45f82b5d08b9ce9517866d9f2575552cb3df95f..56c49187c63fd124738ed1efe634ddfcd0f846f9 100644
+index 8ac653bbf61015a38343d54f1009c1d935833546..b3e272bf7329a17094850e2fac9ee0c69d5e045d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -601,9 +601,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index f45f82b5d08b9ce9517866d9f2575552cb3df95f..56c49187c63fd124738ed1efe634ddfc
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d457e7ece66b2f901dc12d459533129396ac134d..418ec6b1fb062ad5b4642c2a5ccc32775f8c8b48 100644
+index 07fab4c97e0a873b2a81ad9fd3a3f97cbb6a92f3..d577623aef69a0b93946301a6500e9009b9b4ab6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1241,10 +1241,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0819-Fix-Entity-Position-Desync.patch b/patches/server/0818-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0819-Fix-Entity-Position-Desync.patch
rename to patches/server/0818-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0820-Custom-Potion-Mixes.patch b/patches/server/0819-Custom-Potion-Mixes.patch
similarity index 98%
rename from patches/server/0820-Custom-Potion-Mixes.patch
rename to patches/server/0819-Custom-Potion-Mixes.patch
index 83f97585c5..ecd6b788a4 100644
--- a/patches/server/0820-Custom-Potion-Mixes.patch
+++ b/patches/server/0819-Custom-Potion-Mixes.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..6b0bed550763f34e18c9e92f9a47ec0c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56c49187c63fd124738ed1efe634ddfcd0f846f9..41543b69934c5e5c050636482c7d2b93a6bab796 100644
+index b3e272bf7329a17094850e2fac9ee0c69d5e045d..300f6af9e01ce966ca03110c444139f1ae7e691c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2043,6 +2043,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 418ec6b1fb062ad5b4642c2a5ccc32775f8c8b48..b819ec350d230ea9425b4c1512dba2438408f066 100644
+index d577623aef69a0b93946301a6500e9009b9b4ab6..5522f9ef3416c666447b466c6aecc2b6e37dd5a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -285,6 +285,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0821-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0820-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0821-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0820-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0822-Force-close-world-loading-screen.patch b/patches/server/0821-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0822-Force-close-world-loading-screen.patch
rename to patches/server/0821-Force-close-world-loading-screen.patch
index 9294146475..39175a5fa9 100644
--- a/patches/server/0822-Force-close-world-loading-screen.patch
+++ b/patches/server/0821-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 133bf27e301aa5815cc7d7e275b2b08cdc6e4392..f29700d1a7cfebbe4a54b06470ab73d1522c5dd0 100644
+index 10a4b9b2a954fc5d86ebf3f643cdc940911e7693..4fe2184223568a6d8b800e83faa9ade1bba7d31f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -429,6 +429,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0823-Fix-falling-block-spawn-methods.patch b/patches/server/0822-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0823-Fix-falling-block-spawn-methods.patch
rename to patches/server/0822-Fix-falling-block-spawn-methods.patch
index 7aaafc2cf1..e217bea0ab 100644
--- a/patches/server/0823-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0822-Fix-falling-block-spawn-methods.patch
@@ -21,7 +21,7 @@ index d1fca0e3227b5f37c11367548be362f5a49b6a71..5628940cd3c3566c5db2beda506d4f20
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7757e5b1aec0b1f0cba79aa4618a7fe1d210b72c..8ab92e7a9ed2008b90f3a816d972512f5dc58876 100644
+index 7251506312f96873de4d70231eb0c211dcc16fd0..10c57995a65980a37ab9bd601332686a9ba97482 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1395,7 +1395,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0824-Expose-furnace-minecart-push-values.patch b/patches/server/0823-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0824-Expose-furnace-minecart-push-values.patch
rename to patches/server/0823-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0824-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0824-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0826-More-Projectile-API.patch b/patches/server/0825-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0826-More-Projectile-API.patch
rename to patches/server/0825-More-Projectile-API.patch
diff --git a/patches/server/0827-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0826-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0827-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0826-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0827-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0827-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0829-Implement-getComputedBiome-API.patch b/patches/server/0828-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0829-Implement-getComputedBiome-API.patch
rename to patches/server/0828-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0830-Make-some-itemstacks-nonnull.patch b/patches/server/0829-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0830-Make-some-itemstacks-nonnull.patch
rename to patches/server/0829-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0830-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0830-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0832-Implement-enchantWithLevels-API.patch b/patches/server/0831-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0832-Implement-enchantWithLevels-API.patch
rename to patches/server/0831-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0833-Fix-saving-in-unloadWorld.patch b/patches/server/0832-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0833-Fix-saving-in-unloadWorld.patch
rename to patches/server/0832-Fix-saving-in-unloadWorld.patch
index 0011be143d..295a67bcb6 100644
--- a/patches/server/0833-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0832-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 b819ec350d230ea9425b4c1512dba2438408f066..9ec45da690ab2bcc36b7353cc689c6050936ab5d 100644
+index 5522f9ef3416c666447b466c6aecc2b6e37dd5a5..962d3fb3479047f798f6392d7f4e1983ee6d001e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1289,7 +1289,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0834-Buffer-OOB-setBlock-calls.patch b/patches/server/0833-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0834-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0833-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0835-Add-TameableDeathMessageEvent.patch b/patches/server/0834-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0835-Add-TameableDeathMessageEvent.patch
rename to patches/server/0834-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0836-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0835-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0836-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0835-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0836-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 92%
rename from patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0836-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 8dd4659462..80926e82e7 100644
--- a/patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0836-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 370bd3adb0003115ec5774eedd4dac01a41ae4af..7c1c193123c9ecda1bcedd2d89002a24e5b3fbba 100644
+index fd785c88b4e269fde577eb7abab3dc1c46365f1f..566da3ef03bd866762d02a7240b92b4f36d793c9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -846,12 +846,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0837-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 92%
rename from patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0837-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 58c393fb73..ed69a224f1 100644
--- a/patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0837-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 95388d7d9097316df87c0ca8bba1d5730f33b378..13a601ba8c26bac8ec943b848b9130081fd78a3f 100644
+index 476668fe955841f61cf12d032b0d3bd1e400cd93..dd53f6a00ba4a5714fe6314b527195c3c84fdb90 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2684,6 +2684,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0839-Guard-against-invalid-entity-positions.patch b/patches/server/0838-Guard-against-invalid-entity-positions.patch
similarity index 95%
rename from patches/server/0839-Guard-against-invalid-entity-positions.patch
rename to patches/server/0838-Guard-against-invalid-entity-positions.patch
index c46dce184c..79d45fd9ba 100644
--- a/patches/server/0839-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0838-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 13a601ba8c26bac8ec943b848b9130081fd78a3f..d92f594684c32a15c378f41a9e587c67784be005 100644
+index dd53f6a00ba4a5714fe6314b527195c3c84fdb90..d81ee5367205ba96eb23f885ec648a27f2cf62f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4197,11 +4197,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0840-cache-resource-keys.patch b/patches/server/0839-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0840-cache-resource-keys.patch
rename to patches/server/0839-cache-resource-keys.patch
diff --git a/patches/server/0841-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0840-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0841-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0840-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0841-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0841-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0842-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0842-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0844-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0843-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0844-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0843-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0844-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0844-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 0d9a571f4d..73130dbdc1 100644
--- a/patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0844-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 f29700d1a7cfebbe4a54b06470ab73d1522c5dd0..06eda955f96b5fe2d08ed0d39229c7a6ebb88931 100644
+index 4fe2184223568a6d8b800e83faa9ade1bba7d31f..3be9352ae9b0b84acf07064b45562ceffd30391b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1483,7 +1483,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0845-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0845-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0846-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0846-Pass-ServerLevel-for-gamerule-callbacks.patch
index e309f68ed2..095d44c0bb 100644
--- a/patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0846-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 11efaeb12340946c7447617500cbc69bc9bdaf01..2932d2bb797a49e904cebec4285d24d69b429cd9 100644
+index c399aaeee89e12a7da4e054acd877fe033676dfd..ff3eced0e20c39b825586897ee2fed01dd471d88 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -309,7 +309,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -158,7 +158,7 @@ index 3c93bfeb94168f832904a8462ae23b06e81e080d..468c635d31cfa8051666bbefce8df4b4
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8ab92e7a9ed2008b90f3a816d972512f5dc58876..53f780bb47979e728e0212f8159bf9d440ea32b0 100644
+index 10c57995a65980a37ab9bd601332686a9ba97482..532727b69f8af7351e78c428a06b7c8d13990ab5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1899,7 +1899,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0847-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0847-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0849-WorldCreator-keepSpawnLoaded.patch b/patches/server/0848-WorldCreator-keepSpawnLoaded.patch
similarity index 91%
rename from patches/server/0849-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0848-WorldCreator-keepSpawnLoaded.patch
index 83b3e1ff72..7e5a1f094b 100644
--- a/patches/server/0849-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0848-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9ec45da690ab2bcc36b7353cc689c6050936ab5d..8df7c0c29d8bf37e52994751464cc91e44050792 100644
+index 962d3fb3479047f798f6392d7f4e1983ee6d001e..252139711a2bf63449e03c5593a81f2f7ed3e7c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1248,6 +1248,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0849-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0849-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0850-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 97%
rename from patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0850-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 79c74b0a57..86b9af2f3b 100644
--- a/patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0850-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -40,7 +40,7 @@ index 1ad1f958a9b6e1bc21f1c505aa7ea54950de6cad..9378e83a67a70dbb1fb4f05b33f1e553
                  return true;
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
-index 1aaab26c59bb9255955aff34ea1d057b88152768..0e61c47307b9e06eddc43a3aa5f8ae9da24acd08 100644
+index dd51ea83935028a083c9cf368e6826fa32c00462..c2715a576d2b36188da2e2e472b22a3ea2f9d7d3 100644
 --- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
 @@ -88,7 +88,7 @@ public class BeehiveBlock extends BaseEntityBlock {
diff --git a/patches/server/0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0851-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0851-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0853-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0852-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0853-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0852-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0854-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0853-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0854-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0853-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0855-Add-PlayerStopUsingItemEvent.patch b/patches/server/0854-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0855-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0854-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0856-FallingBlock-auto-expire-setting.patch b/patches/server/0855-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0856-FallingBlock-auto-expire-setting.patch
rename to patches/server/0855-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0857-Don-t-tick-markers.patch b/patches/server/0856-Don-t-tick-markers.patch
similarity index 96%
rename from patches/server/0857-Don-t-tick-markers.patch
rename to patches/server/0856-Don-t-tick-markers.patch
index 6f1a2dd7e8..a95227e0a4 100644
--- a/patches/server/0857-Don-t-tick-markers.patch
+++ b/patches/server/0856-Don-t-tick-markers.patch
@@ -22,7 +22,7 @@ index 68f99e93ed3e843b4001a7a27620f88a48b85e67..0dc96c39151ec4dbeec3947cb17606f5
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8085c73a405166fd2a70db60f53c37b4b2798ef7..b8f766d181ada1e7c13c4cf5c3f3ebcaad37e865 100644
+index cf24d93a7c84938ead0390f0a7876bc3fd5b1855..352b74e2705af3b6d31bb2caf83b4553929e070c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2518,6 +2518,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0858-Do-not-accept-invalid-client-settings.patch b/patches/server/0857-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0858-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0857-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0859-Add-support-for-Proxy-Protocol.patch b/patches/server/0858-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0859-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0858-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0860-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0859-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0860-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0859-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0860-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0860-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0862-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0861-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0862-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0861-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0862-Prevent-entity-loading-causing-async-lookups.patch
similarity index 96%
rename from patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0862-Prevent-entity-loading-causing-async-lookups.patch
index af64e15a4b..10ec349b28 100644
--- a/patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0862-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 d92f594684c32a15c378f41a9e587c67784be005..3dc081f73670553e764fde8dbf27ac96cfed15b7 100644
+index d81ee5367205ba96eb23f885ec648a27f2cf62f8..7bb45ae3ed51975972e013aaf66acc352277c375 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -788,6 +788,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0864-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0863-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0864-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0863-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0864-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 95%
rename from patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0864-Throw-exception-on-world-create-while-being-ticked.patch
index 92792493ee..01dcadbd3d 100644
--- a/patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0864-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 41543b69934c5e5c050636482c7d2b93a6bab796..60a84de276885009310904afc90516d6106458d1 100644
+index 300f6af9e01ce966ca03110c444139f1ae7e691c..5113e04bae5b1a1944b3e80889d9985937de936f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -297,6 +297,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,7 +45,7 @@ index 41543b69934c5e5c050636482c7d2b93a6bab796..60a84de276885009310904afc90516d6
          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 8df7c0c29d8bf37e52994751464cc91e44050792..75aa5bc28fde5d8b542778caeb46b31c57b86e5e 100644
+index 252139711a2bf63449e03c5593a81f2f7ed3e7c9..f511e3824d59a8de3ab00737ffc98147742964e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -855,6 +855,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0866-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0865-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0866-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0865-Add-Alternate-Current-redstone-implementation.patch
index 08a0345e44..c410b3a2f2 100644
--- a/patches/server/0866-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0865-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 b8f766d181ada1e7c13c4cf5c3f3ebcaad37e865..359c70e99f40ed8ae67000d18d54966ff6804562 100644
+index 352b74e2705af3b6d31bb2caf83b4553929e070c..9f9e9ffb7c33540f5cb3c58a255227b7e524b5af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -219,6 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2034,7 +2034,7 @@ index b8f766d181ada1e7c13c4cf5c3f3ebcaad37e865..359c70e99f40ed8ae67000d18d54966f
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c1a3bcc8d9df2bf25a9c73faeac84652756d430a..01cbff44c8b53458362cf849910cdff0a6da27e2 100644
+index 09c2d318330e03d0230a82b30985bba3a4231615..cd6edd02da99ef0e53d5cf451e037a591b4f585a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1452,4 +1452,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0867-Dont-resent-entity-on-art-update.patch b/patches/server/0866-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0867-Dont-resent-entity-on-art-update.patch
rename to patches/server/0866-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0868-Add-missing-spawn-eggs.patch b/patches/server/0867-Add-missing-spawn-eggs.patch
similarity index 100%
rename from patches/server/0868-Add-missing-spawn-eggs.patch
rename to patches/server/0867-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0869-Add-WardenAngerChangeEvent.patch b/patches/server/0868-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0869-Add-WardenAngerChangeEvent.patch
rename to patches/server/0868-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0869-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 94%
rename from patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0869-Add-option-for-strict-advancement-dimension-checks.patch
index 400526a4d4..618757ad59 100644
--- a/patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0869-Add-option-for-strict-advancement-dimension-checks.patch
@@ -11,7 +11,7 @@ distance trigger. This adds a config option to ignore that
 and use the exact dimension key of the worlds involved.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7c1c193123c9ecda1bcedd2d89002a24e5b3fbba..5fca2fc3733880721ae6ff2db020c9809bfffc16 100644
+index 566da3ef03bd866762d02a7240b92b4f36d793c9..b40200993fa1aea187c7d5c0d7e5f28477288f62 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1236,6 +1236,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0871-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0870-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0871-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0870-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0872-Nameable-Banner-API.patch b/patches/server/0871-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0872-Nameable-Banner-API.patch
rename to patches/server/0871-Nameable-Banner-API.patch
diff --git a/patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0872-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 91%
rename from patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0872-Don-t-broadcast-messages-to-command-blocks.patch
index fd94342154..bbacc0aef4 100644
--- a/patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0872-Don-t-broadcast-messages-to-command-blocks.patch
@@ -8,7 +8,7 @@ in command blocks, and if called asynchronously, would throw
 an error
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index c0195f73cd2c8721e882c681eaead65471710081..861b348f73867af3199f1cc0dab1ddd4241d1567 100644
+index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4a5466428 100644
 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 @@ -172,6 +172,7 @@ public abstract class BaseCommandBlock implements CommandSource {
@@ -20,7 +20,7 @@ index c0195f73cd2c8721e882c681eaead65471710081..861b348f73867af3199f1cc0dab1ddd4
              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 75aa5bc28fde5d8b542778caeb46b31c57b86e5e..10f4e8067c21d4a0aa5f121bffe56c45c00e5d62 100644
+index f511e3824d59a8de3ab00737ffc98147742964e5..1cec39362b6f9f23c8e6c8b45f5fd254c8e08efe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1763,7 +1763,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0873-Prevent-empty-items-from-being-added-to-world.patch
similarity index 96%
rename from patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0873-Prevent-empty-items-from-being-added-to-world.patch
index f5ec296ded..ce14431634 100644
--- a/patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0873-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 359c70e99f40ed8ae67000d18d54966ff6804562..a57e5319e41231aa65d0d05c91a2ed97d97b535c 100644
+index 9f9e9ffb7c33540f5cb3c58a255227b7e524b5af..1e79eaf5ac647840ef97f728d5d29aaf3b401a86 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1466,6 +1466,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0874-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0874-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0876-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0875-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0876-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0875-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0877-Add-Player-getFishHook.patch b/patches/server/0876-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0877-Add-Player-getFishHook.patch
rename to patches/server/0876-Add-Player-getFishHook.patch
diff --git a/patches/server/0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0877-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0877-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0878-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 97%
rename from patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0878-Add-various-missing-EntityDropItemEvent-calls.patch
index cef83e5b43..3ba384acaf 100644
--- a/patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0878-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 3dc081f73670553e764fde8dbf27ac96cfed15b7..8b87b7d78b5be77d4ad36d24b6a1ab8fc7dd1db4 100644
+index 7bb45ae3ed51975972e013aaf66acc352277c375..5a540e0ba51a0edb1f6310f93f6f3c84b5963d0e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2520,6 +2520,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0880-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0879-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0880-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0879-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0881-Fix-Bee-flower-NPE.patch b/patches/server/0880-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0881-Fix-Bee-flower-NPE.patch
rename to patches/server/0880-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0881-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0881-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0882-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 97%
rename from patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0882-Fixes-and-additions-to-the-SpawnReason-API.patch
index 596e867634..d26a4989f4 100644
--- a/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0882-Fixes-and-additions-to-the-SpawnReason-API.patch
@@ -8,7 +8,7 @@ Fixes some wrong reasons, and adds missing spawn reasons for entities.
 Co-authored-by: Doc <nachito94@msn.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index ac0f0a4da4282c13f6e1f37710cb615d66b8ef2c..12cf4d3dfbd2c4f4a1815f5e26e59ae8667f7b47 100644
+index 215050f514fdc64b21018924376df9830aaaa6c4..72516335570d7137a62ec8667a6e8f06f024692f 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -342,7 +342,7 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
diff --git a/patches/server/0884-More-Teleport-API.patch b/patches/server/0883-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0884-More-Teleport-API.patch
rename to patches/server/0883-More-Teleport-API.patch
diff --git a/patches/server/0885-Add-EntityPortalReadyEvent.patch b/patches/server/0884-Add-EntityPortalReadyEvent.patch
similarity index 94%
rename from patches/server/0885-Add-EntityPortalReadyEvent.patch
rename to patches/server/0884-Add-EntityPortalReadyEvent.patch
index 1789bbd1ec..a16122aad2 100644
--- a/patches/server/0885-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0884-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 8b87b7d78b5be77d4ad36d24b6a1ab8fc7dd1db4..a1421689445b9df3f25889845c21cf37a439afe2 100644
+index 5a540e0ba51a0edb1f6310f93f6f3c84b5963d0e..f2908cf61ff28bef44fcf46b15cf585e942fd7ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2867,6 +2867,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0885-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0885-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0887-Send-block-entities-after-destroy-prediction.patch b/patches/server/0886-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0887-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0886-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0887-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 96%
rename from patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0887-Warn-on-plugins-accessing-faraway-chunks.patch
index fd9a449523..bd796458da 100644
--- a/patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0887-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 01cbff44c8b53458362cf849910cdff0a6da27e2..d89471935b2b5888cb5d1f6829ae479003451fda 100644
+index cd6edd02da99ef0e53d5cf451e037a591b4f585a..596fb8ee21ba8450db13a11890d241ef3974d81d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -417,7 +417,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -18,7 +18,7 @@ index 01cbff44c8b53458362cf849910cdff0a6da27e2..d89471935b2b5888cb5d1f6829ae4790
  
      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 53f780bb47979e728e0212f8159bf9d440ea32b0..72ed25022d5ea1074304be3c72b23882b8f0f88a 100644
+index 532727b69f8af7351e78c428a06b7c8d13990ab5..81ab184cb5235913ef43ae4d7f1ac82bce927519 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -313,9 +313,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0889-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0888-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0889-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0888-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0890-Add-missing-BlockFadeEvents.patch b/patches/server/0889-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0890-Add-missing-BlockFadeEvents.patch
rename to patches/server/0889-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0891-Collision-API.patch b/patches/server/0890-Collision-API.patch
similarity index 100%
rename from patches/server/0891-Collision-API.patch
rename to patches/server/0890-Collision-API.patch
diff --git a/patches/server/0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0891-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0891-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0893-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0892-Fix-command-preprocess-cancelling-and-command-changi.patch
similarity index 100%
rename from patches/server/0893-Fix-command-preprocess-cancelling-and-command-changi.patch
rename to patches/server/0892-Fix-command-preprocess-cancelling-and-command-changi.patch
diff --git a/patches/server/0894-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0893-Remove-invalid-signature-login-stacktrace.patch
similarity index 93%
rename from patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0893-Remove-invalid-signature-login-stacktrace.patch
index 482f6273e6..5f564a6286 100644
--- a/patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0893-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 d3051a26f37a9022e9429b0cf949969bdc031b56..67e04be8d37af83e7a4bccfb780082e237983a60 100644
+index 96e33103773ae2b8807a6c0a6daac95c35c18bda..df1a1681cdd5f055ff4394aa6990b252a3e25ea8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -166,7 +166,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0894-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 100%
rename from patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0894-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
diff --git a/patches/server/0896-Block-Ticking-API.patch b/patches/server/0895-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0896-Block-Ticking-API.patch
rename to patches/server/0895-Block-Ticking-API.patch
diff --git a/patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0896-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0896-Add-Velocity-IP-Forwarding-Support.patch
index be1ffca1cf..8eb45338da 100644
--- a/patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0896-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 67e04be8d37af83e7a4bccfb780082e237983a60..6f7d807f75ac3c069c47a5e698239180de1f4ea7 100644
+index df1a1681cdd5f055ff4394aa6990b252a3e25ea8..4be871c79cebfa62b6d2a22674ad2cde8bc9799c 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/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0897-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 92%
rename from patches/server/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0897-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 9e8a29aee8..5466a7d29f 100644
--- a/patches/server/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0897-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 18a8bf9a26c7aa2b73bc696ebb54846643262e25..ea9b56fd6ae1d5577da5bd3e0c38abfeec8f3646 100644
+index 4be871c79cebfa62b6d2a22674ad2cde8bc9799c..fbd9807e3a9ad555999fa99e06211ecaf455a091 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/0899-Add-NamespacedKey-biome-methods.patch b/patches/server/0898-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0899-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0898-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0899-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0899-Fix-plugin-loggers-on-server-shutdown.patch
index 1ebabbd92c..2ddeeb6b45 100644
--- a/patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0899-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 60a84de276885009310904afc90516d6106458d1..ce81ba5345c8d2fde8a2534b9673275c7e86af8b 100644
+index 5113e04bae5b1a1944b3e80889d9985937de936f..6dc6c3bccb4ba34268a87b0754c87eb1e0df4135 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -997,6 +997,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0900-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 98%
rename from patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0900-Workaround-for-client-lag-spikes-MC-162253.patch
index fd5bf78e20..0c84412be6 100644
--- a/patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/server/0900-Workaround-for-client-lag-spikes-MC-162253.patch
@@ -16,7 +16,7 @@ Co-authored-by: =?UTF-8?q?Dani=C3=ABl=20Goossens?= <daniel@goossens.ch>
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 57b8a657cd8a1b525ec95bca1cad89591d81ff46..971405224418fee037030a4c465b5f4bb9cd2c3b 100644
+index 43466ce2b9ce583a5af067937ce9c47f7635f56d..9ad7c417616e68b1d14a702aca38b2582feb896c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1328,6 +1328,46 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0901-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0901-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0902-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0902-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0903-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0903-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0905-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0904-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0905-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0904-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0906-Missing-eating-regain-reason.patch b/patches/server/0905-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0906-Missing-eating-regain-reason.patch
rename to patches/server/0905-Missing-eating-regain-reason.patch
diff --git a/patches/server/0907-Missing-effect-cause.patch b/patches/server/0906-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0907-Missing-effect-cause.patch
rename to patches/server/0906-Missing-effect-cause.patch
diff --git a/patches/server/0908-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0907-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0908-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0907-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0908-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 97%
rename from patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0908-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 8e7053e1f5..bb23a6dab7 100644
--- a/patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0908-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 1994dd3c272395a27474ec1b37a924a24fc50fd6..e807ef287136e7b3931197e45434a3f618cf3054 100644
+index b31cad6e5de47531736c0195d9160afb328595e7..b3f963499290a0c4fe8991709df2ef414dfff359 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -482,8 +482,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0910-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0909-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0910-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0909-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0911-Configurable-chat-thread-limit.patch b/patches/server/0910-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0911-Configurable-chat-thread-limit.patch
rename to patches/server/0910-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0911-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0911-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0912-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 92%
rename from patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0912-Set-position-before-player-sending-on-dimension-chan.patch
index ecc49e7279..4965b9904c 100644
--- a/patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/server/0912-Set-position-before-player-sending-on-dimension-chan.patch
@@ -7,7 +7,7 @@ This causes a moment where the player entity is sent with the previous location,
 teleport packet which is sent shortly after is meant to correct that.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5fca2fc3733880721ae6ff2db020c9809bfffc16..af7acb628b84539b1ee5ef1934f75f091c4cd91e 100644
+index b40200993fa1aea187c7d5c0d7e5f28477288f62..59629d81f9a767fabf9f641bc9b1200be722ddb6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1141,6 +1141,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0914-fix-Jigsaw-block-kicking-user.patch b/patches/server/0913-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0914-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0913-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0915-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0914-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0915-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0914-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0915-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0915-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0917-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0916-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0917-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0916-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0918-Fix-nothing-mlg.patch b/patches/server/0917-Fix-nothing-mlg.patch
similarity index 100%
rename from patches/server/0918-Fix-nothing-mlg.patch
rename to patches/server/0917-Fix-nothing-mlg.patch
diff --git a/patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0918-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 94%
rename from patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0918-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 71b2d48ea7..c39b18ecb9 100644
--- a/patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0918-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 a57e5319e41231aa65d0d05c91a2ed97d97b535c..f1a1c58fd70610c7fe29d5890cdf161346f34cb9 100644
+index 1e79eaf5ac647840ef97f728d5d29aaf3b401a86..8b3e703ebb497b9166bd211b4247a78891b61aeb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2554,7 +2554,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0920-Fix-custom-piglin-loved-items.patch b/patches/server/0919-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0920-Fix-custom-piglin-loved-items.patch
rename to patches/server/0919-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0921-EntityPickupItemEvent-fixes.patch b/patches/server/0920-EntityPickupItemEvent-fixes.patch
similarity index 94%
rename from patches/server/0921-EntityPickupItemEvent-fixes.patch
rename to patches/server/0920-EntityPickupItemEvent-fixes.patch
index 55ee52922d..09bd195b0c 100644
--- a/patches/server/0921-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0920-EntityPickupItemEvent-fixes.patch
@@ -25,7 +25,7 @@ index 793576928dad6752dddd86e62d4c0800d8515fc4..abeb7285dc0d1e6687feaae8be2dbde1
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index bf133cd7f6187253616fec331762e55dce73487c..64aa83616507288d46a8caa85dd65fbcf44b5d76 100644
+index 0ee023afcf5673df4b069f70ce90a2c3417d71b6..eedb4445c3aa47f09f5964fafff5e6f7f8b02c02 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 @@ -231,7 +231,10 @@ public class PiglinAi {
@@ -49,7 +49,7 @@ index bf133cd7f6187253616fec331762e55dce73487c..64aa83616507288d46a8caa85dd65fbc
  
          if (PiglinAi.isLovedItem(itemstack, piglin)) { // CraftBukkit - Changes to allow for custom payment in bartering
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 4bb9730b6a42702e91467f980b9f045585039db3..8877423a99e387c18d1d994518bf15d8d9ba64af 100644
+index 5f68945264d138ae04d6bcbd5bde310b42e30713..e5ccbaf72f29731f1d1aa939b9297b644a408cd4 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -245,6 +245,11 @@ public abstract class Raider extends PatrollingMonster {
diff --git a/patches/server/0922-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0921-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0922-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0921-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0922-Add-PlayerInventorySlotChangeEvent.patch
similarity index 97%
rename from patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0922-Add-PlayerInventorySlotChangeEvent.patch
index 4c38d4e329..65dbba2023 100644
--- a/patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0922-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 af7acb628b84539b1ee5ef1934f75f091c4cd91e..961d25bbf868438bf5e5257bad745c8208a01171 100644
+index 59629d81f9a767fabf9f641bc9b1200be722ddb6..5819e8e5e3c6f87eb123cf16091ea74357d53b3b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -318,6 +318,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0924-Elder-Guardian-appearance-API.patch b/patches/server/0923-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0924-Elder-Guardian-appearance-API.patch
rename to patches/server/0923-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0925-Allow-changing-bed-s-occupied-property.patch b/patches/server/0924-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0925-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0924-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0926-Add-entity-knockback-API.patch b/patches/server/0925-Add-entity-knockback-API.patch
similarity index 91%
rename from patches/server/0926-Add-entity-knockback-API.patch
rename to patches/server/0925-Add-entity-knockback-API.patch
index 27409e5603..45833587c9 100644
--- a/patches/server/0926-Add-entity-knockback-API.patch
+++ b/patches/server/0925-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 e807ef287136e7b3931197e45434a3f618cf3054..06559a620b36f744c3d9fa2754e3c3eabead4752 100644
+index b3f963499290a0c4fe8991709df2ef414dfff359..76ee8adfb6cccc15dde748b0796d1de7fc5507f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -977,5 +977,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0927-Detect-headless-JREs.patch b/patches/server/0926-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0927-Detect-headless-JREs.patch
rename to patches/server/0926-Detect-headless-JREs.patch
diff --git a/patches/server/0928-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0927-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0928-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0927-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0929-optimized-dirt-and-snow-spreading.patch b/patches/server/0928-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0929-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0928-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0930-Added-EntityToggleSitEvent.patch b/patches/server/0929-Added-EntityToggleSitEvent.patch
similarity index 97%
rename from patches/server/0930-Added-EntityToggleSitEvent.patch
rename to patches/server/0929-Added-EntityToggleSitEvent.patch
index 72110ccbfb..8c73e84a97 100644
--- a/patches/server/0930-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0929-Added-EntityToggleSitEvent.patch
@@ -57,7 +57,7 @@ index 6a66b5d1a3d8615dcc15057f03476e9ccbf4b4f2..06b11bdbccd76f166561bcaff444066c
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 39c26f486d6392eb0a9b623cdb2161846357174b..1494a3d5256f663b17617356d57d2e09aeec6189 100644
+index a5633cb6824e801732f5ca2dbc01691794a6975b..87c9f1cba8eac70d54576d6ffb6f85fc5dcb8e8a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -131,6 +131,7 @@ public class Panda extends Animal {
diff --git a/patches/server/0931-Add-fire-tick-delay-option.patch b/patches/server/0930-Add-fire-tick-delay-option.patch
similarity index 95%
rename from patches/server/0931-Add-fire-tick-delay-option.patch
rename to patches/server/0930-Add-fire-tick-delay-option.patch
index f30b4f8be8..8fc456cff3 100644
--- a/patches/server/0931-Add-fire-tick-delay-option.patch
+++ b/patches/server/0930-Add-fire-tick-delay-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add fire-tick-delay option
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index e34b8cff424ad58eee65a65fa510fa9908dbdf39..f245416a3292586b6ca4ce39d4f984c68f9af041 100644
+index f17233ea94d61af41b4db1696b114e9c721466f8..2a0ab0568e93d610d75bf32d19eee56688bbaf97 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -164,7 +164,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0932-Add-Moving-Piston-API.patch b/patches/server/0931-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0932-Add-Moving-Piston-API.patch
rename to patches/server/0931-Add-Moving-Piston-API.patch
diff --git a/patches/server/0933-Ignore-impossible-spawn-tick.patch b/patches/server/0932-Ignore-impossible-spawn-tick.patch
similarity index 90%
rename from patches/server/0933-Ignore-impossible-spawn-tick.patch
rename to patches/server/0932-Ignore-impossible-spawn-tick.patch
index 9db2fe1bb4..47caf4baae 100644
--- a/patches/server/0933-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0932-Ignore-impossible-spawn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index ee619590aa49323059947fbaee9e88d61df99789..1fac6e884f6916d3207fb82053135bd8e1b14412 100644
+index 8d403b4a6db98cc5c3851d5f2c485560cf8b412f..6dea3a2a72e41e125f715dc9e364d48896056e3b 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -77,6 +77,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0934-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0933-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0934-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0933-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0935-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0934-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0935-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0934-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0936-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0935-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0936-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0935-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch