diff --git a/patches/server/0613-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0612-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0613-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0612-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0612-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0612-Fix-console-spam-when-removing-chests-in-water.patch
deleted file mode 100644
index 717ceaeacc..0000000000
--- a/patches/server/0612-Fix-console-spam-when-removing-chests-in-water.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Thu, 19 Nov 2020 02:07:10 +0000
-Subject: [PATCH] Fix console spam when removing chests in water
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index eecb8c089b5f426b1395b47f714af32c210555ef..d980a556785b52fe827310b83638139df0816b11 100644
---- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -248,7 +248,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
-     @Override
-     public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
-         if (!state.is(newState.getBlock())) {
--            BlockEntity tileentity = world.getBlockEntity(pos);
-+            BlockEntity tileentity = world.getTileEntity(pos, false); // Paper - Don't validate TE - Fix console spam when removing chests in water
- 
-             if (tileentity instanceof Container) {
-                 Containers.dropContents(world, pos, (Container) tileentity);
diff --git a/patches/server/0614-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0613-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0614-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0613-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0615-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0615-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0616-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0616-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0617-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0616-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0617-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0616-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0618-add-DragonEggFormEvent.patch b/patches/server/0617-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0618-add-DragonEggFormEvent.patch
rename to patches/server/0617-add-DragonEggFormEvent.patch
diff --git a/patches/server/0619-EntityMoveEvent.patch b/patches/server/0618-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0619-EntityMoveEvent.patch
rename to patches/server/0618-EntityMoveEvent.patch
diff --git a/patches/server/0620-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0620-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0621-Inline-shift-direction-fields.patch b/patches/server/0620-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0621-Inline-shift-direction-fields.patch
rename to patches/server/0620-Inline-shift-direction-fields.patch
diff --git a/patches/server/0622-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0622-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0623-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0623-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0624-living-entity-allow-attribute-registration.patch b/patches/server/0623-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0624-living-entity-allow-attribute-registration.patch
rename to patches/server/0623-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0625-fix-dead-slime-setSize-invincibility.patch b/patches/server/0624-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0625-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0624-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0626-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0626-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0627-misc-debugging-dumps.patch b/patches/server/0626-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0627-misc-debugging-dumps.patch
rename to patches/server/0626-misc-debugging-dumps.patch
diff --git a/patches/server/0628-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0627-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0628-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0627-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0629-Expose-Tracked-Players.patch b/patches/server/0628-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0629-Expose-Tracked-Players.patch
rename to patches/server/0628-Expose-Tracked-Players.patch
diff --git a/patches/server/0630-Remove-streams-from-SensorNearest.patch b/patches/server/0629-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0630-Remove-streams-from-SensorNearest.patch
rename to patches/server/0629-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0631-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0630-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0631-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0630-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0632-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0631-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0632-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0631-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0633-Improve-ServerGUI.patch b/patches/server/0632-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0633-Improve-ServerGUI.patch
rename to patches/server/0632-Improve-ServerGUI.patch
diff --git a/patches/server/0634-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0634-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0635-fix-converting-txt-to-json-file.patch b/patches/server/0634-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0635-fix-converting-txt-to-json-file.patch
rename to patches/server/0634-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0636-Add-worldborder-events.patch b/patches/server/0635-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0636-Add-worldborder-events.patch
rename to patches/server/0635-Add-worldborder-events.patch
diff --git a/patches/server/0637-added-PlayerNameEntityEvent.patch b/patches/server/0636-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0637-added-PlayerNameEntityEvent.patch
rename to patches/server/0636-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0638-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0637-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0638-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0637-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0639-Add-recipe-to-cook-events.patch b/patches/server/0638-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0639-Add-recipe-to-cook-events.patch
rename to patches/server/0638-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0640-Add-Block-isValidTool.patch b/patches/server/0639-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0640-Add-Block-isValidTool.patch
rename to patches/server/0639-Add-Block-isValidTool.patch
diff --git a/patches/server/0641-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0640-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0641-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0640-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0642-Implement-Keyed-on-World.patch b/patches/server/0641-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0642-Implement-Keyed-on-World.patch
rename to patches/server/0641-Implement-Keyed-on-World.patch
diff --git a/patches/server/0643-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0643-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0644-Item-Rarity-API.patch b/patches/server/0643-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0644-Item-Rarity-API.patch
rename to patches/server/0643-Item-Rarity-API.patch
diff --git a/patches/server/0645-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0645-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0646-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0645-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0646-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0645-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0647-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0647-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0648-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0647-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0648-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0647-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0649-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0649-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0650-Entity-load-save-limit-per-chunk.patch b/patches/server/0649-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0650-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0649-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0651-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0651-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0652-Expose-protocol-version.patch b/patches/server/0651-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0652-Expose-protocol-version.patch
rename to patches/server/0651-Expose-protocol-version.patch
diff --git a/patches/server/0653-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0653-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0654-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0654-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0655-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0655-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0656-Add-bypass-host-check.patch b/patches/server/0655-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0656-Add-bypass-host-check.patch
rename to patches/server/0655-Add-bypass-host-check.patch
diff --git a/patches/server/0657-Set-area-affect-cloud-rotation.patch b/patches/server/0656-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0657-Set-area-affect-cloud-rotation.patch
rename to patches/server/0656-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0658-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0658-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0659-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0659-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0660-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0660-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0661-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0661-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0662-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0662-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0663-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0663-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0664-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0664-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0665-Added-PlayerDeepSleepEvent.patch b/patches/server/0664-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0665-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0664-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0666-More-World-API.patch b/patches/server/0665-More-World-API.patch
similarity index 100%
rename from patches/server/0666-More-World-API.patch
rename to patches/server/0665-More-World-API.patch
diff --git a/patches/server/0667-Added-PlayerBedFailEnterEvent.patch b/patches/server/0666-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0667-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0666-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0668-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0668-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0669-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0669-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0670-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0669-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0670-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0669-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0671-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0671-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0672-Add-Channel-initialization-listeners.patch b/patches/server/0671-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0672-Add-Channel-initialization-listeners.patch
rename to patches/server/0671-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0673-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0673-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0674-Add-more-WanderingTrader-API.patch b/patches/server/0673-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0674-Add-more-WanderingTrader-API.patch
rename to patches/server/0673-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0675-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0674-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0675-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0674-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0676-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0676-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0677-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0677-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0678-Inventory-close.patch b/patches/server/0677-Inventory-close.patch
similarity index 100%
rename from patches/server/0678-Inventory-close.patch
rename to patches/server/0677-Inventory-close.patch
diff --git a/patches/server/0679-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0679-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0680-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0680-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0681-Fix-CraftPotionBrewer-cache.patch b/patches/server/0680-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0681-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0680-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0682-Add-basic-Datapack-API.patch b/patches/server/0681-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0682-Add-basic-Datapack-API.patch
rename to patches/server/0681-Add-basic-Datapack-API.patch
diff --git a/patches/server/0683-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0682-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0683-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0682-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0684-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0684-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0685-Clear-SyncLoadInfo.patch b/patches/server/0684-Clear-SyncLoadInfo.patch
similarity index 100%
rename from patches/server/0685-Clear-SyncLoadInfo.patch
rename to patches/server/0684-Clear-SyncLoadInfo.patch
diff --git a/patches/server/0686-ItemStack-repair-check-API.patch b/patches/server/0685-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0686-ItemStack-repair-check-API.patch
rename to patches/server/0685-ItemStack-repair-check-API.patch
diff --git a/patches/server/0687-More-Enchantment-API.patch b/patches/server/0686-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0687-More-Enchantment-API.patch
rename to patches/server/0686-More-Enchantment-API.patch
diff --git a/patches/server/0688-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0688-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0689-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0689-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0688-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0690-Add-Mob-lookAt-API.patch b/patches/server/0689-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0690-Add-Mob-lookAt-API.patch
rename to patches/server/0689-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0691-Add-Unix-domain-socket-support.patch b/patches/server/0690-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0691-Add-Unix-domain-socket-support.patch
rename to patches/server/0690-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0692-Add-EntityInsideBlockEvent.patch b/patches/server/0691-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0692-Add-EntityInsideBlockEvent.patch
rename to patches/server/0691-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0693-Attributes-API-for-item-defaults.patch b/patches/server/0692-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0693-Attributes-API-for-item-defaults.patch
rename to patches/server/0692-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0694-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0694-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0695-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0695-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0696-More-Lidded-Block-API.patch b/patches/server/0695-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0696-More-Lidded-Block-API.patch
rename to patches/server/0695-More-Lidded-Block-API.patch
diff --git a/patches/server/0697-Limit-item-frame-cursors-on-maps.patch b/patches/server/0696-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0697-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0696-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0698-Add-PufferFishStateChangeEvent.patch b/patches/server/0697-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0698-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0697-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0699-Add-PlayerKickEvent-causes.patch b/patches/server/0698-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0699-Add-PlayerKickEvent-causes.patch
rename to patches/server/0698-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0700-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0700-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0701-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0701-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0702-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0702-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0703-Add-BellRevealRaiderEvent.patch b/patches/server/0702-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0703-Add-BellRevealRaiderEvent.patch
rename to patches/server/0702-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0704-Fix-invulnerable-end-crystals.patch b/patches/server/0703-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0704-Fix-invulnerable-end-crystals.patch
rename to patches/server/0703-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0705-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0704-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0705-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0704-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0706-Fix-dangerous-end-portal-logic.patch b/patches/server/0705-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0706-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0705-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0708-Make-item-validations-configurable.patch b/patches/server/0707-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0708-Make-item-validations-configurable.patch
rename to patches/server/0707-Make-item-validations-configurable.patch
diff --git a/patches/server/0709-Line-Of-Sight-Changes.patch b/patches/server/0708-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0709-Line-Of-Sight-Changes.patch
rename to patches/server/0708-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0710-add-per-world-spawn-limits.patch b/patches/server/0709-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0710-add-per-world-spawn-limits.patch
rename to patches/server/0709-add-per-world-spawn-limits.patch
diff --git a/patches/server/0711-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0710-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0711-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0710-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
diff --git a/patches/server/0713-Add-Feature-Generation-API.patch b/patches/server/0712-Add-Feature-Generation-API.patch
similarity index 100%
rename from patches/server/0713-Add-Feature-Generation-API.patch
rename to patches/server/0712-Add-Feature-Generation-API.patch
diff --git a/patches/server/0714-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0713-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0714-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0713-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0715-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0715-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0716-Missing-Entity-Behavior-API.patch b/patches/server/0715-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0716-Missing-Entity-Behavior-API.patch
rename to patches/server/0715-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0717-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0716-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0717-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0716-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0718-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0717-Add-git-branch-and-commit-to-manifest.patch
similarity index 100%
rename from patches/server/0718-Add-git-branch-and-commit-to-manifest.patch
rename to patches/server/0717-Add-git-branch-and-commit-to-manifest.patch
diff --git a/patches/server/0719-Improve-CraftChunk-getEntities.patch b/patches/server/0718-Improve-CraftChunk-getEntities.patch
similarity index 100%
rename from patches/server/0719-Improve-CraftChunk-getEntities.patch
rename to patches/server/0718-Improve-CraftChunk-getEntities.patch
diff --git a/patches/server/0720-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0719-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0720-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0719-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0721-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0720-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0721-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0720-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0722-Config-option-for-named-entity-death-logging.patch b/patches/server/0721-Config-option-for-named-entity-death-logging.patch
similarity index 100%
rename from patches/server/0722-Config-option-for-named-entity-death-logging.patch
rename to patches/server/0721-Config-option-for-named-entity-death-logging.patch
diff --git a/patches/server/0723-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0722-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0723-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0722-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0724-Adds-PlayerArmSwingEvent.patch b/patches/server/0723-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0724-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0723-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0725-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0724-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0725-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0724-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0726-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0725-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0726-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0725-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0727-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0726-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0727-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0726-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0728-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0727-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
similarity index 100%
rename from patches/server/0728-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
rename to patches/server/0727-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
diff --git a/patches/server/0729-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0728-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0729-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0728-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0730-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0729-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0730-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0729-Rate-options-and-timings-for-sensors-and-behaviors.patch