diff --git a/patches/server/0539-Added-WorldGameRuleChangeEvent.patch b/patches/server/0538-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0539-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0538-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0538-Guardian-beam-workaround.patch b/patches/server/0538-Guardian-beam-workaround.patch
deleted file mode 100644
index fa66573d2b..0000000000
--- a/patches/server/0538-Guardian-beam-workaround.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gabscap <git@gabscap.de>
-Date: Sat, 19 Mar 2016 22:25:11 +0100
-Subject: [PATCH] Guardian beam workaround
-
-This patch is a workaround for MC-165595
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..689ad22925b2561f7c8db961743eb1f821dbb25f 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-@@ -8,7 +8,7 @@ public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener
-     private final long dayTime;
- 
-     public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
--        this.gameTime = time;
-+        this.gameTime = time % 192000; // Paper - fix guardian beam
-         long l = timeOfDay;
-         if (!doDaylightCycle) {
-             l = -timeOfDay;
diff --git a/patches/server/0540-Added-ServerResourcesReloadedEvent.patch b/patches/server/0539-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0540-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0539-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0541-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0540-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0541-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0540-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0542-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0541-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0542-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0541-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0543-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0542-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0543-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0542-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0544-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0543-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0544-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0543-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0545-Configurable-door-breaking-difficulty.patch b/patches/server/0544-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0545-Configurable-door-breaking-difficulty.patch
rename to patches/server/0544-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0546-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0545-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0546-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0545-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0547-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0546-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0547-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0546-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0548-Remove-stale-POIs.patch b/patches/server/0547-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0548-Remove-stale-POIs.patch
rename to patches/server/0547-Remove-stale-POIs.patch
diff --git a/patches/server/0549-Fix-villager-boat-exploit.patch b/patches/server/0548-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0549-Fix-villager-boat-exploit.patch
rename to patches/server/0548-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0550-Add-sendOpLevel-API.patch b/patches/server/0549-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0550-Add-sendOpLevel-API.patch
rename to patches/server/0549-Add-sendOpLevel-API.patch
diff --git a/patches/server/0551-Add-PaperRegistry.patch b/patches/server/0550-Add-PaperRegistry.patch
similarity index 100%
rename from patches/server/0551-Add-PaperRegistry.patch
rename to patches/server/0550-Add-PaperRegistry.patch
diff --git a/patches/server/0552-Add-StructuresLocateEvent.patch b/patches/server/0551-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0552-Add-StructuresLocateEvent.patch
rename to patches/server/0551-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0553-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0552-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0553-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0552-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0554-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0554-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0555-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0554-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0555-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0554-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0556-Make-schedule-command-per-world.patch b/patches/server/0555-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0556-Make-schedule-command-per-world.patch
rename to patches/server/0555-Make-schedule-command-per-world.patch
diff --git a/patches/server/0557-Configurable-max-leash-distance.patch b/patches/server/0556-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0557-Configurable-max-leash-distance.patch
rename to patches/server/0556-Configurable-max-leash-distance.patch
diff --git a/patches/server/0558-Implement-BlockPreDispenseEvent.patch b/patches/server/0557-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0558-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0557-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0559-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0559-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0560-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0559-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0560-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0559-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0561-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0560-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0561-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0560-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0562-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0562-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0563-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0562-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0563-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0562-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0564-add-DragonEggFormEvent.patch b/patches/server/0563-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0564-add-DragonEggFormEvent.patch
rename to patches/server/0563-add-DragonEggFormEvent.patch
diff --git a/patches/server/0565-EntityMoveEvent.patch b/patches/server/0564-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0565-EntityMoveEvent.patch
rename to patches/server/0564-EntityMoveEvent.patch
diff --git a/patches/server/0566-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0566-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0567-Inline-shift-direction-fields.patch b/patches/server/0566-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0567-Inline-shift-direction-fields.patch
rename to patches/server/0566-Inline-shift-direction-fields.patch
diff --git a/patches/server/0568-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0567-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0568-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0567-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0569-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0569-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0570-living-entity-allow-attribute-registration.patch b/patches/server/0569-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0570-living-entity-allow-attribute-registration.patch
rename to patches/server/0569-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0571-fix-dead-slime-setSize-invincibility.patch b/patches/server/0570-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0571-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0570-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0572-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0571-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0572-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0571-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0573-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0572-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0573-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0572-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0574-Expose-Tracked-Players.patch b/patches/server/0573-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0574-Expose-Tracked-Players.patch
rename to patches/server/0573-Expose-Tracked-Players.patch
diff --git a/patches/server/0575-Remove-streams-from-SensorNearest.patch b/patches/server/0574-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0575-Remove-streams-from-SensorNearest.patch
rename to patches/server/0574-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0576-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0575-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0576-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0575-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0577-Improve-ServerGUI.patch b/patches/server/0576-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0577-Improve-ServerGUI.patch
rename to patches/server/0576-Improve-ServerGUI.patch
diff --git a/patches/server/0578-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0578-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0579-fix-converting-txt-to-json-file.patch b/patches/server/0578-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0579-fix-converting-txt-to-json-file.patch
rename to patches/server/0578-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0580-Add-worldborder-events.patch b/patches/server/0579-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0580-Add-worldborder-events.patch
rename to patches/server/0579-Add-worldborder-events.patch
diff --git a/patches/server/0581-added-PlayerNameEntityEvent.patch b/patches/server/0580-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0581-added-PlayerNameEntityEvent.patch
rename to patches/server/0580-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0582-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0581-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0582-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0581-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0583-Add-recipe-to-cook-events.patch b/patches/server/0582-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0583-Add-recipe-to-cook-events.patch
rename to patches/server/0582-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0584-Add-Block-isValidTool.patch b/patches/server/0583-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0584-Add-Block-isValidTool.patch
rename to patches/server/0583-Add-Block-isValidTool.patch
diff --git a/patches/server/0585-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0584-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0585-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0584-Allow-using-signs-inside-spawn-protection.patch
index f0d20da672..72811dc8ea 100644
--- a/patches/server/0585-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0584-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a21117908a8e1ccbb23fa79cfcc7a6d956ba6a51..aacb7835387e8cb1f0c02ba6718d17f0896cd96d 100644
+index ee3966cd5df09fda88a269105de8fe11736b55b3..ae50b297bc43a4092395640ec53bbfbba5fee0d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1839,7 +1839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0586-Expand-world-key-API.patch b/patches/server/0585-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0586-Expand-world-key-API.patch
rename to patches/server/0585-Expand-world-key-API.patch
diff --git a/patches/server/0587-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0586-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0587-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0586-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0588-Item-Rarity-API.patch b/patches/server/0587-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0588-Item-Rarity-API.patch
rename to patches/server/0587-Item-Rarity-API.patch
diff --git a/patches/server/0589-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0588-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0589-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0588-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0590-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0590-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0591-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0590-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0591-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0590-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0592-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0592-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 0e470e1625..5119b8e1b5 100644
--- a/patches/server/0592-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aacb7835387e8cb1f0c02ba6718d17f0896cd96d..ac07efd081e6e5810872dc7a9eaf0acff373f4d2 100644
+index ae50b297bc43a4092395640ec53bbfbba5fee0d7..c9e3bc224427d91269624622cf646de752adf74b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1286,7 +1286,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0593-Entity-load-save-limit-per-chunk.patch b/patches/server/0592-Entity-load-save-limit-per-chunk.patch
similarity index 97%
rename from patches/server/0593-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0592-Entity-load-save-limit-per-chunk.patch
index e5781378f0..8e80b61dcc 100644
--- a/patches/server/0593-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0592-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 cb1fe497477d6850260b09dcfbf290119ff6ab49..ac681ad0d8a55dc216c737bff22a9db8114e7b2d 100644
+index 57bcdc06823efdb50b656e05fae6a50e92eb2217..a697c3a68e9f00f7d66dead1ec516961d9ae6e1c 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -618,9 +618,20 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0594-Expose-protocol-version.patch b/patches/server/0593-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0594-Expose-protocol-version.patch
rename to patches/server/0593-Expose-protocol-version.patch
diff --git a/patches/server/0595-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0594-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0595-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0594-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0596-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0596-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0597-Add-bypass-host-check.patch b/patches/server/0596-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0597-Add-bypass-host-check.patch
rename to patches/server/0596-Add-bypass-host-check.patch
diff --git a/patches/server/0598-Set-area-affect-cloud-rotation.patch b/patches/server/0597-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0598-Set-area-affect-cloud-rotation.patch
rename to patches/server/0597-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0599-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0598-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0599-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0598-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0600-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0599-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0600-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0599-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0601-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0600-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0601-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0600-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0602-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0601-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0602-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0601-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0603-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0602-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0603-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0602-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0604-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0604-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch
index 22cc05465b..ce78db7dff 100644
--- a/patches/server/0604-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ac07efd081e6e5810872dc7a9eaf0acff373f4d2..27653640844eb475398ddba16ad228ee127bf324 100644
+index c9e3bc224427d91269624622cf646de752adf74b..4c041d94a408698cc54f5036a2bf245334edbe7e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2051,6 +2051,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0605-Added-PlayerDeepSleepEvent.patch b/patches/server/0604-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0605-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0604-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0606-More-World-API.patch b/patches/server/0605-More-World-API.patch
similarity index 100%
rename from patches/server/0606-More-World-API.patch
rename to patches/server/0605-More-World-API.patch
diff --git a/patches/server/0607-Added-PlayerBedFailEnterEvent.patch b/patches/server/0606-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0607-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0606-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0608-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0607-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0608-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0607-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0609-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0609-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0610-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0609-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0610-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0609-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0611-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0611-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 0768aef362..9936fda961 100644
--- a/patches/server/0611-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 27653640844eb475398ddba16ad228ee127bf324..1a2a227b802830d7ef1120b6507353ca50f92b0a 100644
+index 4c041d94a408698cc54f5036a2bf245334edbe7e..4e71a80a6cc163d72001804de6ed3ba8167101b4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2762,7 +2762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0612-Add-Channel-initialization-listeners.patch b/patches/server/0611-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0612-Add-Channel-initialization-listeners.patch
rename to patches/server/0611-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0613-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0612-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0613-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0612-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0614-Add-more-WanderingTrader-API.patch b/patches/server/0613-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0614-Add-more-WanderingTrader-API.patch
rename to patches/server/0613-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0615-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0614-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0615-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0614-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0616-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0616-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0617-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0617-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0618-Inventory-close.patch b/patches/server/0617-Inventory-close.patch
similarity index 100%
rename from patches/server/0618-Inventory-close.patch
rename to patches/server/0617-Inventory-close.patch
diff --git a/patches/server/0619-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0619-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0620-Fix-CraftPotionBrewer-cache.patch b/patches/server/0619-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0620-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0619-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0621-Add-basic-Datapack-API.patch b/patches/server/0620-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0621-Add-basic-Datapack-API.patch
rename to patches/server/0620-Add-basic-Datapack-API.patch
diff --git a/patches/server/0622-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0621-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0622-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0621-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0623-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch
similarity index 99%
rename from patches/server/0623-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch
index 4ee8641c89..537f833864 100644
--- a/patches/server/0623-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch
@@ -129,7 +129,7 @@ index 645a226c2e3f6dcf1c25187d006d425038b4545d..17c313b9cb45c8158cab751ffc4e0dc3
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1a2a227b802830d7ef1120b6507353ca50f92b0a..380f8de32119f5888676119176cda7e3def243db 100644
+index 4e71a80a6cc163d72001804de6ed3ba8167101b4..d056dbdf89284b120e28002bcca463c60fb22f4b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2771,7 +2771,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0624-ItemStack-repair-check-API.patch b/patches/server/0623-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0624-ItemStack-repair-check-API.patch
rename to patches/server/0623-ItemStack-repair-check-API.patch
diff --git a/patches/server/0625-More-Enchantment-API.patch b/patches/server/0624-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0625-More-Enchantment-API.patch
rename to patches/server/0624-More-Enchantment-API.patch
diff --git a/patches/server/0626-Move-range-check-for-block-placing-up.patch b/patches/server/0625-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0626-Move-range-check-for-block-placing-up.patch
rename to patches/server/0625-Move-range-check-for-block-placing-up.patch
index 06308c5da4..b6fa7601ad 100644
--- a/patches/server/0626-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0625-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 380f8de32119f5888676119176cda7e3def243db..6680ef4b625e539de951a7ad59d68229fe49303a 100644
+index d056dbdf89284b120e28002bcca463c60fb22f4b..f8b170b2842cc388463858d2c2815aedd14ceec7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1825,6 +1825,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0627-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0627-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0626-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0628-Add-Mob-lookAt-API.patch b/patches/server/0627-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0628-Add-Mob-lookAt-API.patch
rename to patches/server/0627-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0629-Add-Unix-domain-socket-support.patch b/patches/server/0628-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0629-Add-Unix-domain-socket-support.patch
rename to patches/server/0628-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0630-Add-EntityInsideBlockEvent.patch b/patches/server/0629-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0630-Add-EntityInsideBlockEvent.patch
rename to patches/server/0629-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0631-Attributes-API-for-item-defaults.patch b/patches/server/0630-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0631-Attributes-API-for-item-defaults.patch
rename to patches/server/0630-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0632-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0632-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch
index 125f1268be..3ef95cf22a 100644
--- a/patches/server/0632-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,7 +95,7 @@ index 68d495d5554d5c5758537be11188745e1458a00c..6eafa7969f463a6ee33b84b7e6a79f80
              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 7beaea21edf0b832bc1115d90f5893c75a8da912..0b1b0f5eaf8ac1e01d991fbf90f3656b649b878f 100644
+index efc2fa39175d6981ebbc5b204baeef4298eb0e5c..88e04599e4f4718f4e7dc8b0e49c52e6714fad1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1183,7 +1183,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0633-More-Lidded-Block-API.patch b/patches/server/0632-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0633-More-Lidded-Block-API.patch
rename to patches/server/0632-More-Lidded-Block-API.patch
diff --git a/patches/server/0634-Limit-item-frame-cursors-on-maps.patch b/patches/server/0633-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0634-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0633-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0635-Add-PlayerKickEvent-causes.patch b/patches/server/0634-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0635-Add-PlayerKickEvent-causes.patch
rename to patches/server/0634-Add-PlayerKickEvent-causes.patch
index a7382d5da3..90a4b3da11 100644
--- a/patches/server/0635-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0634-Add-PlayerKickEvent-causes.patch
@@ -88,7 +88,7 @@ index 65637a33ba171a4b598f70cd943d24b0ee44a69f..57a9146bf2dee7a60aab16716e25348f
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6680ef4b625e539de951a7ad59d68229fe49303a..297cc815a15096c1f723ed451d76fd55d9d5e629 100644
+index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b05bb61fbc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0636-Add-PufferFishStateChangeEvent.patch b/patches/server/0635-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0636-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0635-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0637-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0637-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0638-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0638-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0639-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0638-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0639-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0638-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0640-Add-BellRevealRaiderEvent.patch b/patches/server/0639-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0640-Add-BellRevealRaiderEvent.patch
rename to patches/server/0639-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0641-Fix-invulnerable-end-crystals.patch b/patches/server/0640-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0641-Fix-invulnerable-end-crystals.patch
rename to patches/server/0640-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0642-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0641-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0642-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0641-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0643-Fix-dangerous-end-portal-logic.patch b/patches/server/0642-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0643-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0642-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0644-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0644-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0645-Make-item-validations-configurable.patch b/patches/server/0644-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0645-Make-item-validations-configurable.patch
rename to patches/server/0644-Make-item-validations-configurable.patch
diff --git a/patches/server/0646-Line-Of-Sight-Changes.patch b/patches/server/0645-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0646-Line-Of-Sight-Changes.patch
rename to patches/server/0645-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0647-add-per-world-spawn-limits.patch b/patches/server/0646-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0647-add-per-world-spawn-limits.patch
rename to patches/server/0646-add-per-world-spawn-limits.patch
index 425ecd823b..049fb4c4b1 100644
--- a/patches/server/0647-add-per-world-spawn-limits.patch
+++ b/patches/server/0646-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 0b1b0f5eaf8ac1e01d991fbf90f3656b649b878f..78427e0b3f02f01bb7c688049091469b1fd50e05 100644
+index 88e04599e4f4718f4e7dc8b0e49c52e6714fad1d..f48c2be5fcc134c2e440507e31f61c4430ec06b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -209,6 +209,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0648-Fix-potions-splash-events.patch b/patches/server/0647-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0648-Fix-potions-splash-events.patch
rename to patches/server/0647-Fix-potions-splash-events.patch
diff --git a/patches/server/0649-Add-more-LimitedRegion-API.patch b/patches/server/0648-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0649-Add-more-LimitedRegion-API.patch
rename to patches/server/0648-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0650-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0650-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0651-Missing-Entity-Behavior-API.patch b/patches/server/0650-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0651-Missing-Entity-Behavior-API.patch
rename to patches/server/0650-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0652-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0652-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index e9ae30cefd..8d80d71692 100644
--- a/patches/server/0652-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 297cc815a15096c1f723ed451d76fd55d9d5e629..9955f63c36a7fa4adf9176497a6767ece81c3a4f 100644
+index 8e8c1117246cbe574f8c096629d0b8b05bb61fbc..693b23c4c4fe35197685709cbb3600e4de2ca9c1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1205,7 +1205,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0654-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0654-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0655-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0654-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0655-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0654-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0656-Adds-PlayerArmSwingEvent.patch b/patches/server/0655-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0656-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0655-Adds-PlayerArmSwingEvent.patch
index 088d385bb9..05fe6c3be6 100644
--- a/patches/server/0656-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0655-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9955f63c36a7fa4adf9176497a6767ece81c3a4f..402df2938711b592bd8bcd114d6ec17749107748 100644
+index 693b23c4c4fe35197685709cbb3600e4de2ca9c1..d7b46b05be29b5671ee03d9308c784c11beea549 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2494,7 +2494,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0657-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0657-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch
index 3b80c77501..53eca4b91a 100644
--- a/patches/server/0657-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index 31aab0affbedf89108d5809ba25e64adde071bc7..dda5b7f7ead6821b4212f79fcbf55636
      public boolean isRealPlayer; // Paper
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 402df2938711b592bd8bcd114d6ec17749107748..96e0b661489d6a66996645e58729396077b7cf4b 100644
+index d7b46b05be29b5671ee03d9308c784c11beea549..b1e5b912fc428942850e279a8cdec00763ef6cac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0658-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0658-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0659-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0658-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0659-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0658-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0660-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0659-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0660-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0659-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0661-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0660-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0661-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0660-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0662-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0661-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0662-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0661-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0663-Stinger-API.patch b/patches/server/0662-Stinger-API.patch
similarity index 100%
rename from patches/server/0663-Stinger-API.patch
rename to patches/server/0662-Stinger-API.patch
diff --git a/patches/server/0664-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0664-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0665-Add-System.out-err-catcher.patch b/patches/server/0664-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0665-Add-System.out-err-catcher.patch
rename to patches/server/0664-Add-System.out-err-catcher.patch
diff --git a/patches/server/0666-Fix-test-not-bootstrapping.patch b/patches/server/0665-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0666-Fix-test-not-bootstrapping.patch
rename to patches/server/0665-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0667-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0667-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0668-Improve-boat-collision-performance.patch b/patches/server/0667-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0668-Improve-boat-collision-performance.patch
rename to patches/server/0667-Improve-boat-collision-performance.patch
diff --git a/patches/server/0669-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0669-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch
index d2a297dd43..231b3670c7 100644
--- a/patches/server/0669-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 96e0b661489d6a66996645e58729396077b7cf4b..b43ee21186d3cf48e02b6ae71bbb2185f11f3a02 100644
+index b1e5b912fc428942850e279a8cdec00763ef6cac..4974dc18ee0dd401268b2daaadf53bf1f70e8daf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0670-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0669-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0670-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0669-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0671-Add-PlayerSetSpawnEvent.patch b/patches/server/0670-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0671-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0670-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0672-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0671-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0672-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0671-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0673-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0672-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0673-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0672-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0674-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0673-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0674-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0673-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0675-Added-EntityDamageItemEvent.patch b/patches/server/0674-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0675-Added-EntityDamageItemEvent.patch
rename to patches/server/0674-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0676-Optimize-indirect-passenger-iteration.patch b/patches/server/0675-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0676-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0675-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0677-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0676-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0677-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0676-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0678-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0677-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0678-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0677-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0679-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0678-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0679-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0678-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0680-Clear-bucket-NBT-after-dispense.patch b/patches/server/0679-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0680-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0679-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0681-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0680-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0681-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0680-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0682-Add-BlockBreakBlockEvent.patch b/patches/server/0681-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0682-Add-BlockBreakBlockEvent.patch
rename to patches/server/0681-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0683-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0683-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0684-More-CommandBlock-API.patch b/patches/server/0683-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0684-More-CommandBlock-API.patch
rename to patches/server/0683-More-CommandBlock-API.patch
diff --git a/patches/server/0685-Add-missing-team-sidebar-display-slots.patch b/patches/server/0684-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0685-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0684-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0686-Add-back-EntityPortalExitEvent.patch b/patches/server/0685-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0686-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0685-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0687-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0687-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch
index 6ced63ffcd..63dba48d87 100644
--- a/patches/server/0687-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -31,7 +31,7 @@ index e14c8dfb8238b4afed2085e68beaf746463f7846..e875ae882652b7c2c8cc85fade6ecfa2
                      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 78427e0b3f02f01bb7c688049091469b1fd50e05..0f7c6711dc36a31da53a2389fd3c9bba4008d7d1 100644
+index f48c2be5fcc134c2e440507e31f61c4430ec06b3..1a2b706d26aa355de95fb9d0599e7c59435e50b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -685,6 +685,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0688-Get-entity-default-attributes.patch b/patches/server/0687-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0688-Get-entity-default-attributes.patch
rename to patches/server/0687-Get-entity-default-attributes.patch
diff --git a/patches/server/0689-Left-handed-API.patch b/patches/server/0688-Left-handed-API.patch
similarity index 100%
rename from patches/server/0689-Left-handed-API.patch
rename to patches/server/0688-Left-handed-API.patch
diff --git a/patches/server/0690-Add-more-advancement-API.patch b/patches/server/0689-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0690-Add-more-advancement-API.patch
rename to patches/server/0689-Add-more-advancement-API.patch
diff --git a/patches/server/0691-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0691-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0692-Add-critical-damage-API.patch b/patches/server/0691-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0692-Add-critical-damage-API.patch
rename to patches/server/0691-Add-critical-damage-API.patch
diff --git a/patches/server/0693-Fix-issues-with-mob-conversion.patch b/patches/server/0692-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0693-Fix-issues-with-mob-conversion.patch
rename to patches/server/0692-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0694-Add-isCollidable-methods-to-various-places.patch b/patches/server/0693-Add-isCollidable-methods-to-various-places.patch
similarity index 96%
rename from patches/server/0694-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0693-Add-isCollidable-methods-to-various-places.patch
index f745a1e7c5..9b07d99f36 100644
--- a/patches/server/0694-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0693-Add-isCollidable-methods-to-various-places.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add isCollidable methods to various places
 public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 6ec8ebdd702424d94821180f65f6344be1a0527a..016f58f452e19a00d72a277d41bcbbb107e4232b 100644
+index 60aa47a78b9d5921dffd1e205c0b69f453a94851..b7496922faee8bc5d82f3f5922f6fb2fe44a8d2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -482,6 +482,11 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0695-Goat-ram-API.patch b/patches/server/0694-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0695-Goat-ram-API.patch
rename to patches/server/0694-Goat-ram-API.patch
diff --git a/patches/server/0696-Add-API-for-resetting-a-single-score.patch b/patches/server/0695-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0696-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0695-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0697-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0697-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0698-Vanilla-command-permission-fixes.patch b/patches/server/0697-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0698-Vanilla-command-permission-fixes.patch
rename to patches/server/0697-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0699-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0699-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0700-Fix-GameProfileCache-concurrency.patch b/patches/server/0699-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0700-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0699-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0701-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0700-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0701-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0700-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0702-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0702-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 78112c0228..de33d5f917 100644
--- a/patches/server/0702-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -302,7 +302,7 @@ index 6aec9535f73a79439c6325095c8adf140891035a..7601342f6228df2c72c5c6fabff21a9f
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0f7c6711dc36a31da53a2389fd3c9bba4008d7d1..aaba757b605405e08da7b359bc1fc87252114252 100644
+index 1a2b706d26aa355de95fb9d0599e7c59435e50b8..cb7c070c190e63644160ddd9855628547fd37ee1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1700,9 +1700,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0703-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0702-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0703-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0702-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0704-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0703-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0704-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0703-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0705-Optimise-general-POI-access.patch b/patches/server/0704-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0705-Optimise-general-POI-access.patch
rename to patches/server/0704-Optimise-general-POI-access.patch
diff --git a/patches/server/0706-Optimise-chunk-tick-iteration.patch b/patches/server/0705-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0706-Optimise-chunk-tick-iteration.patch
rename to patches/server/0705-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0707-Execute-chunk-tasks-mid-tick.patch b/patches/server/0706-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0707-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0706-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0708-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0708-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0709-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0708-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0709-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0708-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0710-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0710-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0709-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0711-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0710-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0711-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0710-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0712-Distance-manager-tick-timings.patch b/patches/server/0711-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0712-Distance-manager-tick-timings.patch
rename to patches/server/0711-Distance-manager-tick-timings.patch
diff --git a/patches/server/0713-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0712-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0713-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0712-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0714-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0714-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0715-Add-packet-limiter-config.patch b/patches/server/0714-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0715-Add-packet-limiter-config.patch
rename to patches/server/0714-Add-packet-limiter-config.patch
diff --git a/patches/server/0716-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0716-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0717-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0716-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0717-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0716-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0718-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0717-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0718-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0717-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0719-Time-scoreboard-search.patch b/patches/server/0718-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0719-Time-scoreboard-search.patch
rename to patches/server/0718-Time-scoreboard-search.patch
diff --git a/patches/server/0720-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0719-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0720-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0719-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0721-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0720-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0721-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0720-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0722-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0721-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0722-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0721-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0723-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0722-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0723-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0722-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0724-Optimise-random-block-ticking.patch b/patches/server/0723-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0724-Optimise-random-block-ticking.patch
rename to patches/server/0723-Optimise-random-block-ticking.patch
diff --git a/patches/server/0725-Optimise-non-flush-packet-sending.patch b/patches/server/0724-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0725-Optimise-non-flush-packet-sending.patch
rename to patches/server/0724-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0726-Optimise-nearby-player-lookups.patch b/patches/server/0725-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0726-Optimise-nearby-player-lookups.patch
rename to patches/server/0725-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0727-Remove-streams-for-villager-AI.patch b/patches/server/0726-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0727-Remove-streams-for-villager-AI.patch
rename to patches/server/0726-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0728-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0728-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0729-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0729-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0730-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0729-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0730-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0729-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0731-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0730-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0731-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0730-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0732-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0732-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0733-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0732-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0733-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0732-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0734-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0734-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 6d94fb5cc6..f47dff8a7b 100644
--- a/patches/server/0734-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b43ee21186d3cf48e02b6ae71bbb2185f11f3a02..2877ff6f7c27ebb039dfb427911c3f4b38f0a494 100644
+index 4974dc18ee0dd401268b2daaadf53bf1f70e8daf..5136e33f3c7360dfef7c992dcbde804f4f3eb184 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -839,6 +839,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0735-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0735-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0736-Ensure-valid-vehicle-status.patch b/patches/server/0735-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0736-Ensure-valid-vehicle-status.patch
rename to patches/server/0735-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0737-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0736-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0737-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0736-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0738-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0738-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0739-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0738-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0739-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0738-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0740-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0739-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0740-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0739-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0741-Preserve-overstacked-loot.patch b/patches/server/0740-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0741-Preserve-overstacked-loot.patch
rename to patches/server/0740-Preserve-overstacked-loot.patch
diff --git a/patches/server/0742-Update-head-rotation-in-missing-places.patch b/patches/server/0741-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0742-Update-head-rotation-in-missing-places.patch
rename to patches/server/0741-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0743-prevent-unintended-light-block-manipulation.patch b/patches/server/0742-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0743-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0742-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0744-Fix-CraftCriteria-defaults-map.patch b/patches/server/0743-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0744-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0743-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0745-Fix-upstreams-block-state-factories.patch b/patches/server/0744-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0745-Fix-upstreams-block-state-factories.patch
rename to patches/server/0744-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0746-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0746-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0747-Configurable-feature-seeds.patch b/patches/server/0746-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0747-Configurable-feature-seeds.patch
rename to patches/server/0746-Configurable-feature-seeds.patch
diff --git a/patches/server/0748-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0748-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0749-Add-root-admin-user-detection.patch b/patches/server/0748-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0749-Add-root-admin-user-detection.patch
rename to patches/server/0748-Add-root-admin-user-detection.patch
diff --git a/patches/server/0750-Always-allow-item-changing-in-Fireball.patch b/patches/server/0749-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0750-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0749-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0751-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0750-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0751-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0750-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0752-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0752-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0753-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0752-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0753-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0752-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0754-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0754-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0755-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0754-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0755-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0754-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0756-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0756-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0757-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0757-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch
index f07de6ce2b..7e0e4e22bb 100644
--- a/patches/server/0757-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index d2fed123ed56eaf550ac2c7a3fcc1678a127bba3..77443525e68fab0211ff48af12020ff0
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2877ff6f7c27ebb039dfb427911c3f4b38f0a494..c20b72d7ff5a2d7e2d13d804947310b65fb9e49c 100644
+index 5136e33f3c7360dfef7c992dcbde804f4f3eb184..fea98677f907ccc8a9c400669331698efafc84eb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2681,8 +2681,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0758-Fix-Spigot-growth-modifiers.patch b/patches/server/0757-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0758-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0757-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0759-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0759-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0760-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0759-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0760-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0759-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0761-Add-player-health-update-API.patch b/patches/server/0760-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0761-Add-player-health-update-API.patch
rename to patches/server/0760-Add-player-health-update-API.patch
diff --git a/patches/server/0762-Optimize-HashMapPalette.patch b/patches/server/0761-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0762-Optimize-HashMapPalette.patch
rename to patches/server/0761-Optimize-HashMapPalette.patch
diff --git a/patches/server/0763-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0763-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0765-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0765-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch
index 6f04ddaec5..8ff40181fb 100644
--- a/patches/server/0765-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c20b72d7ff5a2d7e2d13d804947310b65fb9e49c..7dff3cff9ec9c87fea7be838a6a34c02f2eeb3b1 100644
+index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20aa900e83b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0766-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0766-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0767-Add-more-Campfire-API.patch b/patches/server/0766-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0767-Add-more-Campfire-API.patch
rename to patches/server/0766-Add-more-Campfire-API.patch
diff --git a/patches/server/0768-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0768-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0769-Fix-tripwire-state-inconsistency.patch b/patches/server/0768-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0769-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0768-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0770-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0769-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0770-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0769-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0771-Improve-scoreboard-entries.patch b/patches/server/0770-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0771-Improve-scoreboard-entries.patch
rename to patches/server/0770-Improve-scoreboard-entries.patch
diff --git a/patches/server/0772-Entity-powdered-snow-API.patch b/patches/server/0771-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0772-Entity-powdered-snow-API.patch
rename to patches/server/0771-Entity-powdered-snow-API.patch
diff --git a/patches/server/0773-Add-API-for-item-entity-health.patch b/patches/server/0772-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0773-Add-API-for-item-entity-health.patch
rename to patches/server/0772-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0774-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0773-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0774-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0773-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0775-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0774-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0775-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0774-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0775-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0775-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0777-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0776-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0777-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0776-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0777-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0777-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0779-Fix-bees-aging-inside-hives.patch b/patches/server/0778-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0779-Fix-bees-aging-inside-hives.patch
rename to patches/server/0778-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0780-Bucketable-API.patch b/patches/server/0779-Bucketable-API.patch
similarity index 100%
rename from patches/server/0780-Bucketable-API.patch
rename to patches/server/0779-Bucketable-API.patch
diff --git a/patches/server/0781-Validate-usernames.patch b/patches/server/0780-Validate-usernames.patch
similarity index 100%
rename from patches/server/0781-Validate-usernames.patch
rename to patches/server/0780-Validate-usernames.patch
diff --git a/patches/server/0782-Make-water-animal-spawn-height-configurable.patch b/patches/server/0781-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0782-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0781-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0784-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0783-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0784-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0783-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0785-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0784-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0785-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0784-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0786-Multiple-Entries-with-Scoreboards.patch b/patches/server/0785-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0786-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0785-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0787-Reset-placed-block-on-exception.patch b/patches/server/0786-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0787-Reset-placed-block-on-exception.patch
rename to patches/server/0786-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0788-Add-configurable-height-for-slime-spawn.patch b/patches/server/0787-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0788-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0787-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0788-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0788-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0790-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0789-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0790-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0789-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0791-Kick-on-main-for-illegal-chat.patch b/patches/server/0790-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0791-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0790-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0792-Multi-Block-Change-API-Implementation.patch b/patches/server/0791-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0792-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0791-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0793-Fix-NotePlayEvent.patch b/patches/server/0792-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0793-Fix-NotePlayEvent.patch
rename to patches/server/0792-Fix-NotePlayEvent.patch
diff --git a/patches/server/0794-Freeze-Tick-Lock-API.patch b/patches/server/0793-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0794-Freeze-Tick-Lock-API.patch
rename to patches/server/0793-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0795-Dolphin-API.patch b/patches/server/0794-Dolphin-API.patch
similarity index 100%
rename from patches/server/0795-Dolphin-API.patch
rename to patches/server/0794-Dolphin-API.patch
diff --git a/patches/server/0796-More-PotionEffectType-API.patch b/patches/server/0795-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0796-More-PotionEffectType-API.patch
rename to patches/server/0795-More-PotionEffectType-API.patch
diff --git a/patches/server/0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0796-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0796-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0799-Add-missing-structure-set-seed-configs.patch b/patches/server/0798-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0799-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0798-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0800-Implement-regenerateChunk.patch b/patches/server/0799-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0800-Implement-regenerateChunk.patch
rename to patches/server/0799-Implement-regenerateChunk.patch
diff --git a/patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0800-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0800-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0803-Add-GameEvent-tags.patch b/patches/server/0802-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0803-Add-GameEvent-tags.patch
rename to patches/server/0802-Add-GameEvent-tags.patch
diff --git a/patches/server/0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0805-Furnace-RecipesUsed-API.patch b/patches/server/0804-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0805-Furnace-RecipesUsed-API.patch
rename to patches/server/0804-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0806-Configurable-sculk-sensor-listener-range.patch b/patches/server/0805-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0806-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0805-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0807-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0806-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0807-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0806-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0810-Fix-Entity-Position-Desync.patch b/patches/server/0809-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0810-Fix-Entity-Position-Desync.patch
rename to patches/server/0809-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0811-Custom-Potion-Mixes.patch b/patches/server/0810-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0811-Custom-Potion-Mixes.patch
rename to patches/server/0810-Custom-Potion-Mixes.patch
diff --git a/patches/server/0812-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0811-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0812-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0811-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0813-Force-close-world-loading-screen.patch b/patches/server/0812-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0813-Force-close-world-loading-screen.patch
rename to patches/server/0812-Force-close-world-loading-screen.patch
diff --git a/patches/server/0814-Fix-falling-block-spawn-methods.patch b/patches/server/0813-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0814-Fix-falling-block-spawn-methods.patch
rename to patches/server/0813-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0815-Expose-furnace-minecart-push-values.patch b/patches/server/0814-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0815-Expose-furnace-minecart-push-values.patch
rename to patches/server/0814-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0817-More-Projectile-API.patch b/patches/server/0816-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0817-More-Projectile-API.patch
rename to patches/server/0816-More-Projectile-API.patch
diff --git a/patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0817-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0817-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0820-Implement-getComputedBiome-API.patch b/patches/server/0819-Implement-getComputedBiome-API.patch
similarity index 97%
rename from patches/server/0820-Implement-getComputedBiome-API.patch
rename to patches/server/0819-Implement-getComputedBiome-API.patch
index 917fd0fc05..4c57720593 100644
--- a/patches/server/0820-Implement-getComputedBiome-API.patch
+++ b/patches/server/0819-Implement-getComputedBiome-API.patch
@@ -23,7 +23,7 @@ index e365081bf532488f2b41b22deb2fb2346d4f2322..446657577aa843e6ebc5143b6c511f33
      public void setBiome(Location location, Biome biome) {
          this.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), biome);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index d6d8929c5332ddd315e67ebceb14f10c447f0f53..cd8ffcbcda3497e79d5e4a5d699ed6e28995571a 100644
+index b7496922faee8bc5d82f3f5922f6fb2fe44a8d2f..0976a1295be35dd7c053fb4ee4050011fc3d95fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -343,6 +343,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0821-Make-some-itemstacks-nonnull.patch b/patches/server/0820-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0821-Make-some-itemstacks-nonnull.patch
rename to patches/server/0820-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0822-Implement-enchantWithLevels-API.patch b/patches/server/0821-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0822-Implement-enchantWithLevels-API.patch
rename to patches/server/0821-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0823-Fix-saving-in-unloadWorld.patch b/patches/server/0822-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0823-Fix-saving-in-unloadWorld.patch
rename to patches/server/0822-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0824-Buffer-OOB-setBlock-calls.patch b/patches/server/0823-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0824-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0823-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0825-Add-TameableDeathMessageEvent.patch b/patches/server/0824-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0825-Add-TameableDeathMessageEvent.patch
rename to patches/server/0824-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0825-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0825-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0826-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0826-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0828-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0827-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0828-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0827-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0829-Guard-against-invalid-entity-positions.patch b/patches/server/0828-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0829-Guard-against-invalid-entity-positions.patch
rename to patches/server/0828-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0830-cache-resource-keys.patch b/patches/server/0829-cache-resource-keys.patch
similarity index 97%
rename from patches/server/0830-cache-resource-keys.patch
rename to patches/server/0829-cache-resource-keys.patch
index 83011e9594..ebefeaede3 100644
--- a/patches/server/0830-cache-resource-keys.patch
+++ b/patches/server/0829-cache-resource-keys.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] cache resource keys
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index cd8ffcbcda3497e79d5e4a5d699ed6e28995571a..b6bf79b571c3a82df92e41810f68cdc1d3ec05ca 100644
+index 0976a1295be35dd7c053fb4ee4050011fc3d95fe..87dfc2fd1e2ff9e9449f1ce00dfb63e3e88839cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -368,12 +368,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0830-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0830-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0831-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0831-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0832-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0832-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0833-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0833-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0834-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0834-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0835-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0835-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0836-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0836-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0837-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0837-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0839-WorldCreator-keepSpawnLoaded.patch b/patches/server/0838-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0839-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0838-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0839-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0839-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0840-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0840-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0841-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0841-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0843-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0842-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0843-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0842-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0844-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0843-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0844-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0843-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0845-Add-PlayerStopUsingItemEvent.patch b/patches/server/0844-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0845-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0844-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0846-FallingBlock-auto-expire-setting.patch b/patches/server/0845-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0846-FallingBlock-auto-expire-setting.patch
rename to patches/server/0845-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0847-Don-t-tick-markers.patch b/patches/server/0846-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0847-Don-t-tick-markers.patch
rename to patches/server/0846-Don-t-tick-markers.patch
diff --git a/patches/server/0848-Do-not-accept-invalid-client-settings.patch b/patches/server/0847-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0848-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0847-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0849-Add-support-for-Proxy-Protocol.patch b/patches/server/0848-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0849-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0848-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0850-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0849-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0850-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0849-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0850-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0850-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0852-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0851-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0852-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0851-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0853-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0852-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0853-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0852-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0854-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0853-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0854-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0853-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0855-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0856-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0855-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0857-Dont-resent-entity-on-art-update.patch b/patches/server/0856-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0857-Dont-resent-entity-on-art-update.patch
rename to patches/server/0856-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0858-Add-WardenAngerChangeEvent.patch b/patches/server/0857-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0858-Add-WardenAngerChangeEvent.patch
rename to patches/server/0857-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0858-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0858-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0859-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0859-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0861-Nameable-Banner-API.patch b/patches/server/0860-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0861-Nameable-Banner-API.patch
rename to patches/server/0860-Nameable-Banner-API.patch
diff --git a/patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0862-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0862-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0863-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0863-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0864-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0864-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0866-Add-Player-getFishHook.patch b/patches/server/0865-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0866-Add-Player-getFishHook.patch
rename to patches/server/0865-Add-Player-getFishHook.patch
diff --git a/patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0866-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0866-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0867-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0867-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0868-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0868-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0870-Fix-Bee-flower-NPE.patch b/patches/server/0869-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0870-Fix-Bee-flower-NPE.patch
rename to patches/server/0869-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0870-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0870-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0872-More-Teleport-API.patch b/patches/server/0871-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0872-More-Teleport-API.patch
rename to patches/server/0871-More-Teleport-API.patch
diff --git a/patches/server/0873-Add-EntityPortalReadyEvent.patch b/patches/server/0872-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0873-Add-EntityPortalReadyEvent.patch
rename to patches/server/0872-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0873-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0873-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0875-Send-block-entities-after-destroy-prediction.patch b/patches/server/0874-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0875-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0874-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0875-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0875-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0876-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0876-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0878-Add-missing-BlockFadeEvents.patch b/patches/server/0877-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0878-Add-missing-BlockFadeEvents.patch
rename to patches/server/0877-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0879-Collision-API.patch b/patches/server/0878-Collision-API.patch
similarity index 100%
rename from patches/server/0879-Collision-API.patch
rename to patches/server/0878-Collision-API.patch
diff --git a/patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0879-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0879-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0881-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0880-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0881-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0880-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0881-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 100%
rename from patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0881-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
diff --git a/patches/server/0883-Block-Ticking-API.patch b/patches/server/0882-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0883-Block-Ticking-API.patch
rename to patches/server/0882-Block-Ticking-API.patch
diff --git a/patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0883-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0883-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0884-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0884-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0886-Add-NamespacedKey-biome-methods.patch b/patches/server/0885-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0886-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0885-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0886-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0886-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0887-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0887-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0888-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0888-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0889-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0889-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0890-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0890-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0891-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0891-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0893-Missing-eating-regain-reason.patch b/patches/server/0892-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0893-Missing-eating-regain-reason.patch
rename to patches/server/0892-Missing-eating-regain-reason.patch
diff --git a/patches/server/0894-Missing-effect-cause.patch b/patches/server/0893-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0894-Missing-effect-cause.patch
rename to patches/server/0893-Missing-effect-cause.patch
diff --git a/patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0894-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0894-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0895-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0895-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0897-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0896-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0897-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0896-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0898-Configurable-chat-thread-limit.patch b/patches/server/0897-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0898-Configurable-chat-thread-limit.patch
rename to patches/server/0897-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0898-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0898-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0899-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0899-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0901-fix-Jigsaw-block-kicking-user.patch b/patches/server/0900-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0901-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0900-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0901-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0901-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0902-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0902-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0903-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0903-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0904-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0904-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0906-Fix-custom-piglin-loved-items.patch b/patches/server/0905-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0906-Fix-custom-piglin-loved-items.patch
rename to patches/server/0905-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0907-EntityPickupItemEvent-fixes.patch b/patches/server/0906-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0907-EntityPickupItemEvent-fixes.patch
rename to patches/server/0906-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0907-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0907-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0908-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0908-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0910-Elder-Guardian-appearance-API.patch b/patches/server/0909-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0910-Elder-Guardian-appearance-API.patch
rename to patches/server/0909-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0911-Allow-changing-bed-s-occupied-property.patch b/patches/server/0910-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0911-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0910-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0912-Add-entity-knockback-API.patch b/patches/server/0911-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0912-Add-entity-knockback-API.patch
rename to patches/server/0911-Add-entity-knockback-API.patch
diff --git a/patches/server/0913-Detect-headless-JREs.patch b/patches/server/0912-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0913-Detect-headless-JREs.patch
rename to patches/server/0912-Detect-headless-JREs.patch
diff --git a/patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0913-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0913-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0915-optimized-dirt-and-snow-spreading.patch b/patches/server/0914-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0915-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0914-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0916-Added-EntityToggleSitEvent.patch b/patches/server/0915-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0916-Added-EntityToggleSitEvent.patch
rename to patches/server/0915-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0917-Add-fire-tick-delay-option.patch b/patches/server/0916-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0917-Add-fire-tick-delay-option.patch
rename to patches/server/0916-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0918-Add-Moving-Piston-API.patch b/patches/server/0917-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0918-Add-Moving-Piston-API.patch
rename to patches/server/0917-Add-Moving-Piston-API.patch
diff --git a/patches/server/0919-Ignore-impossible-spawn-tick.patch b/patches/server/0918-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0919-Ignore-impossible-spawn-tick.patch
rename to patches/server/0918-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0919-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0919-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0920-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0920-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0921-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0921-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0923-Prevent-compass-from-loading-chunks.patch b/patches/server/0922-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0923-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0922-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0924-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0923-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0924-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0923-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0924-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0924-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0925-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0925-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/0926-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
similarity index 100%
rename from patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
rename to patches/server/0926-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
diff --git a/patches/server/0928-Add-Player-Warden-Warning-API.patch b/patches/server/0927-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0928-Add-Player-Warden-Warning-API.patch
rename to patches/server/0927-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0929-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0928-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0929-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0928-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0930-Add-paper-dumplisteners-command.patch b/patches/server/0929-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0930-Add-paper-dumplisteners-command.patch
rename to patches/server/0929-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0931-check-global-player-list-where-appropriate.patch b/patches/server/0930-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0931-check-global-player-list-where-appropriate.patch
rename to patches/server/0930-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0932-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0931-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0932-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0931-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0933-ItemStack-damage-API.patch b/patches/server/0932-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0933-ItemStack-damage-API.patch
rename to patches/server/0932-ItemStack-damage-API.patch
diff --git a/patches/server/0934-Friction-API.patch b/patches/server/0933-Friction-API.patch
similarity index 100%
rename from patches/server/0934-Friction-API.patch
rename to patches/server/0933-Friction-API.patch
diff --git a/patches/server/0935-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0934-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0935-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0934-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0936-Fix-player-kick-on-shutdown.patch b/patches/server/0935-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0936-Fix-player-kick-on-shutdown.patch
rename to patches/server/0935-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0937-Sync-offhand-slot-in-menus.patch b/patches/server/0936-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0937-Sync-offhand-slot-in-menus.patch
rename to patches/server/0936-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0938-Player-Entity-Tracking-Events.patch b/patches/server/0937-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0938-Player-Entity-Tracking-Events.patch
rename to patches/server/0937-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0939-Limit-pet-look-distance.patch b/patches/server/0938-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0939-Limit-pet-look-distance.patch
rename to patches/server/0938-Limit-pet-look-distance.patch
diff --git a/patches/server/0940-Properly-resend-entities.patch b/patches/server/0939-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0940-Properly-resend-entities.patch
rename to patches/server/0939-Properly-resend-entities.patch
diff --git a/patches/server/0941-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0940-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0941-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0940-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0942-fix-Instruments.patch b/patches/server/0941-fix-Instruments.patch
similarity index 100%
rename from patches/server/0942-fix-Instruments.patch
rename to patches/server/0941-fix-Instruments.patch
diff --git a/patches/server/0943-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0942-Fix-chunk-snapshot-biome-getter.patch
similarity index 100%
rename from patches/server/0943-Fix-chunk-snapshot-biome-getter.patch
rename to patches/server/0942-Fix-chunk-snapshot-biome-getter.patch
diff --git a/patches/server/0944-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0943-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0944-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0943-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0945-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0944-Fix-MapLike-Codec-missing-key-selector.patch
similarity index 100%
rename from patches/server/0945-Fix-MapLike-Codec-missing-key-selector.patch
rename to patches/server/0944-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0946-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0945-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0946-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0945-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0947-Improve-logging-and-errors.patch b/patches/server/0946-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0947-Improve-logging-and-errors.patch
rename to patches/server/0946-Improve-logging-and-errors.patch
diff --git a/patches/server/0948-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0947-Fix-explosion-yield-with-new-gamerules.patch
similarity index 100%
rename from patches/server/0948-Fix-explosion-yield-with-new-gamerules.patch
rename to patches/server/0947-Fix-explosion-yield-with-new-gamerules.patch