From ebbfe2749b22ac9d012bd53f6b7772730eb1273d Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:43:03 -0700
Subject: [PATCH] update Optimize Pathfinder - Remove Streams / Optimized
 collections

---
 ...der-Remove-Streams-Optimized-collect.patch | 159 ------------------
 ...der-Remove-Streams-Optimized-collect.patch | 130 ++++++++++++++
 ...541-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0542-Add-API-for-quit-reason.patch} |   0
 ...h => 0543-Seed-based-feature-search.patch} |   0
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...ch => 0546-Expose-world-spawn-angle.patch} |   0
 ...patch => 0547-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   0
 ...49-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0550-Add-PlayerItemCooldownEvent.patch} |   0
 ...PI.patch => 0551-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   0
 ...-missing-default-perms-for-commands.patch} |   0
 ...h => 0554-Add-PlayerShearBlockEvent.patch} |   0
 ...rbose-world-setting-to-false-by-def.patch} |   0
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0557-Limit-recipe-packets.patch} |   0
 ...-CraftSound-backwards-compatibility.patch} |   0
 ... 0559-MC-4-Fix-item-position-desync.patch} |   0
 ...560-Player-Chunk-Load-Unload-Events.patch} |   0
 ...1-Optimize-Dynamic-get-Missing-Keys.patch} |   0
 ...-Expose-LivingEntity-hurt-direction.patch} |   0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |   0
 ...-invalid-ingredient-lists-in-Villag.patch} |   0
 ...atch => 0565-added-PlayerTradeEvent.patch} |   0
 ...ch => 0566-Implement-TargetHitEvent.patch} |   0
 ...567-Additional-Block-Material-API-s.patch} |   0
 ...tch => 0568-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0570-Cache-burn-durations.patch} |   0
 ...ob-spawner-spawn-egg-transformation.patch} |   0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |   0
 ...event-not-being-called-in-adventure.patch} |   0
 ...h => 0574-Zombie-API-breaking-doors.patch} |   0
 ...575-Fix-nerfed-slime-when-splitting.patch} |   0
 ...=> 0576-Add-EntityLoadCrossbowEvent.patch} |   0
 ...ch => 0577-Guardian-beam-workaround.patch} |   0
 ...0578-Added-WorldGameRuleChangeEvent.patch} |   0
 ...-Added-ServerResourcesReloadedEvent.patch} |   0
 ...d-settings-for-mobs-picking-up-loot.patch} |   0
 ...mplemented-BlockFailedDispenseEvent.patch} |   0
 ...-Added-PlayerLecternPageChangeEvent.patch} |   0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |   0
 ...nfigurable-door-breaking-difficulty.patch} |   0
 ...ty-commands-shall-not-be-dispatched.patch} |   0
 ...I-to-expose-exact-interaction-point.patch} |   0
 ...OIs.patch => 0587-Remove-stale-POIs.patch} |   0
 ...h => 0588-Fix-villager-boat-exploit.patch} |   0
 ...I.patch => 0589-Add-sendOpLevel-API.patch} |   0
 ...ch => 0590-Add-StructureLocateEvent.patch} |   0
 ...-for-requiring-a-player-participant.patch} |   0
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...594-Make-schedule-command-per-world.patch} |   0
 ...595-Configurable-max-leash-distance.patch} |   0
 ...596-Implement-BlockPreDispenseEvent.patch} |   0
 ...h => 0597-Added-Vanilla-Entity-Tags.patch} |   0
 ...-API.patch => 0598-added-Wither-API.patch} |   0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |   0
 ...-spam-when-removing-chests-in-water.patch} |   0
 ...e-for-always-placing-the-dragon-egg.patch} |   0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |   0
 ...eash-variable-to-EntityUnleashEvent.patch} |   0
 ...e-map-update-when-spawning-disabled.patch} |   0
 ...shield-blocking-on-dimension-change.patch} |   0
 ...atch => 0606-add-DragonEggFormEvent.patch} |   0
 ...Event.patch => 0607-EntityMoveEvent.patch} |   0
 ...isable-pathfinding-updates-on-block.patch} |   0
 ... 0609-Inline-shift-direction-fields.patch} |   0
 ...-adding-items-to-BlockDropItemEvent.patch} |   0
 ...inThreadExecutor-to-BukkitScheduler.patch} |   0
 ...entity-allow-attribute-registration.patch} |   0
 ...ix-dead-slime-setSize-invincibility.patch} |   0
 ...pes-should-return-an-immutable-list.patch} |   0
 ....patch => 0615-misc-debugging-dumps.patch} |   0
 ...port-for-hex-color-codes-in-console.patch} |   0
 ...atch => 0617-Expose-Tracked-Players.patch} |   0
 ...8-Remove-streams-from-SensorNearest.patch} |   0
 ...ix-Wither-hostility-towards-players.patch} |   0
 ...er-exception-on-empty-JsonList-file.patch} |   0
 ...GUI.patch => 0621-Improve-ServerGUI.patch} |   0
 ...ure-plate-EntityInteractEvent-for-i.patch} |   0
 ...623-fix-converting-txt-to-json-file.patch} |   0
 ...atch => 0624-Add-worldborder-events.patch} |   0
 ...=> 0625-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0627-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0628-Add-Block-isValidTool.patch} |   0
 ...using-signs-inside-spawn-protection.patch} |   0
 ...ch => 0630-Implement-Keyed-on-World.patch} |   0
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0632-Item-Rarity-API.patch} |   0
 ...imer-for-Wandering-Traders-spawned-.patch} |   0
 ...py-TESign-isEditable-from-snapshots.patch} |   0
 ...d-item-when-player-has-disconnected.patch} |   0
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   0
 ...block-falling-causing-client-desync.patch} |   0
 ...tch => 0639-Expose-protocol-version.patch} |   0
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |   0
 ...ab-completions-for-brigadier-comman.patch} |   0
 ...temConsumeEvent-cancelling-properly.patch} |   0
 ...patch => 0643-Add-bypass-host-check.patch} |   0
 ...0644-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...ting-give-items-on-item-drop-cancel.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...-checkReach-check-for-Shulker-boxes.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   0
 ... => 0652-Added-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0653-More-World-API.patch} |   0
 ... 0654-Added-PlayerBedFailEnterEvent.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   0
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |   0
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0661-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...close.patch => 0665-Inventory-close.patch} |   0
 ...reateEvent-players-and-end-platform.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...=> 0668-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0669-Add-basic-Datapack-API.patch} |   0
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |   0
 ... => 0672-ItemStack-repair-check-API.patch} |   0
 ....patch => 0673-More-Enchantment-API.patch} |   0
 ...option-to-load-extra-plugin-jars-no.patch} |   0
 ...-and-optimise-world-force-upgrading.patch} |   0
 ...PI.patch => 0676-Add-Mob-lookAt-API.patch} |   0
 ...0677-Add-Unix-domain-socket-support.patch} |   0
 ... => 0678-Add-EntityInsideBlockEvent.patch} |   0
 ...79-Attributes-API-for-item-defaults.patch} |   0
 ...hantCustom-emit-PlayerPurchaseEvent.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   0
 ...patch => 0682-More-Lidded-Block-API.patch} |   0
 ...83-Limit-item-frame-cursors-on-maps.patch} |   0
 ...0684-Add-PufferFishStateChangeEvent.patch} |   0
 ... => 0685-Add-PlayerKickEvent-causes.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ReentrantLo.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0689-Add-BellRevealRaiderEvent.patch} |   0
 ... 0690-Fix-invulnerable-end-crystals.patch} |   0
 ...91-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...inventory-on-cancelled-pickup-event.patch} |   0
 ...0693-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...0696-Add-more-line-of-sight-methods.patch} |   0
 ... => 0697-add-per-world-spawn-limits.patch} |   0
 ...plashEvent-for-water-splash-potions.patch} |   0
 ...tus-dataconverter-for-pre-1.13-chun.patch} |   0
 161 files changed, 130 insertions(+), 159 deletions(-)
 delete mode 100644 patches/removed/1.17/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
 create mode 100644 patches/server/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
 rename patches/server/{0540-Beacon-API-custom-effect-ranges.patch => 0541-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0541-Add-API-for-quit-reason.patch => 0542-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0542-Seed-based-feature-search.patch => 0543-Seed-based-feature-search.patch} (100%)
 rename patches/server/{0543-Add-Wandering-Trader-spawn-rate-config-options.patch => 0544-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0544-Significantly-improve-performance-of-the-end-generat.patch => 0545-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0545-Expose-world-spawn-angle.patch => 0546-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0546-Add-Destroy-Speed-API.patch => 0547-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0547-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0548-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0548-Add-LivingEntity-clearActiveItem.patch => 0549-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0549-Add-PlayerItemCooldownEvent.patch => 0550-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0550-More-lightning-API.patch => 0551-More-lightning-API.patch} (100%)
 rename patches/server/{0551-Climbing-should-not-bypass-cramming-gamerule.patch => 0552-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0552-Added-missing-default-perms-for-commands.patch => 0553-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0553-Add-PlayerShearBlockEvent.patch => 0554-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0554-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0555-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0555-Fix-curing-zombie-villager-discount-exploit.patch => 0556-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0556-Limit-recipe-packets.patch => 0557-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0557-Fix-CraftSound-backwards-compatibility.patch => 0558-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0558-MC-4-Fix-item-position-desync.patch => 0559-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0559-Player-Chunk-Load-Unload-Events.patch => 0560-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0560-Optimize-Dynamic-get-Missing-Keys.patch => 0561-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0561-Expose-LivingEntity-hurt-direction.patch => 0562-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0562-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0563-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0563-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0564-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0564-added-PlayerTradeEvent.patch => 0565-added-PlayerTradeEvent.patch} (100%)
 rename patches/server/{0565-Implement-TargetHitEvent.patch => 0566-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0566-Additional-Block-Material-API-s.patch => 0567-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0567-Fix-harming-potion-dupe.patch => 0568-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0568-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0569-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0569-Cache-burn-durations.patch => 0570-Cache-burn-durations.patch} (100%)
 rename patches/server/{0570-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0571-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0571-Implement-PlayerFlowerPotManipulateEvent.patch => 0572-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0572-Fix-interact-event-not-being-called-in-adventure.patch => 0573-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0573-Zombie-API-breaking-doors.patch => 0574-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0574-Fix-nerfed-slime-when-splitting.patch => 0575-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0575-Add-EntityLoadCrossbowEvent.patch => 0576-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0576-Guardian-beam-workaround.patch => 0577-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0577-Added-WorldGameRuleChangeEvent.patch => 0578-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0578-Added-ServerResourcesReloadedEvent.patch => 0579-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0579-Added-world-settings-for-mobs-picking-up-loot.patch => 0580-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0580-Implemented-BlockFailedDispenseEvent.patch => 0581-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0581-Added-PlayerLecternPageChangeEvent.patch => 0582-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0582-Added-PlayerLoomPatternSelectEvent.patch => 0583-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0583-Configurable-door-breaking-difficulty.patch => 0584-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0584-Empty-commands-shall-not-be-dispatched.patch => 0585-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0585-Implement-API-to-expose-exact-interaction-point.patch => 0586-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0586-Remove-stale-POIs.patch => 0587-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0587-Fix-villager-boat-exploit.patch => 0588-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0588-Add-sendOpLevel-API.patch => 0589-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0589-Add-StructureLocateEvent.patch => 0590-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0590-Collision-option-for-requiring-a-player-participant.patch => 0591-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0591-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0592-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0592-Return-chat-component-with-empty-text-instead-of-thr.patch => 0593-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0593-Make-schedule-command-per-world.patch => 0594-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0594-Configurable-max-leash-distance.patch => 0595-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0595-Implement-BlockPreDispenseEvent.patch => 0596-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0596-Added-Vanilla-Entity-Tags.patch => 0597-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/server/{0597-added-Wither-API.patch => 0598-added-Wither-API.patch} (100%)
 rename patches/server/{0598-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0599-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0599-Fix-console-spam-when-removing-chests-in-water.patch => 0600-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0600-Add-toggle-for-always-placing-the-dragon-egg.patch => 0601-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0601-Added-PlayerStonecutterRecipeSelectEvent.patch => 0602-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0602-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0603-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0603-Skip-distance-map-update-when-spawning-disabled.patch => 0604-Skip-distance-map-update-when-spawning-disabled.patch} (100%)
 rename patches/server/{0604-Reset-shield-blocking-on-dimension-change.patch => 0605-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0605-add-DragonEggFormEvent.patch => 0606-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0606-EntityMoveEvent.patch => 0607-EntityMoveEvent.patch} (100%)
 rename patches/server/{0607-added-option-to-disable-pathfinding-updates-on-block.patch => 0608-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0608-Inline-shift-direction-fields.patch => 0609-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0609-Allow-adding-items-to-BlockDropItemEvent.patch => 0610-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0610-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0611-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0611-living-entity-allow-attribute-registration.patch => 0612-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0612-fix-dead-slime-setSize-invincibility.patch => 0613-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0613-Merchant-getRecipes-should-return-an-immutable-list.patch => 0614-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0614-misc-debugging-dumps.patch => 0615-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0615-Add-support-for-hex-color-codes-in-console.patch => 0616-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0616-Expose-Tracked-Players.patch => 0617-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0617-Remove-streams-from-SensorNearest.patch => 0618-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0618-MC-29274-Fix-Wither-hostility-towards-players.patch => 0619-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename patches/server/{0619-Throw-proper-exception-on-empty-JsonList-file.patch => 0620-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0620-Improve-ServerGUI.patch => 0621-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0621-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0622-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0622-fix-converting-txt-to-json-file.patch => 0623-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0623-Add-worldborder-events.patch => 0624-Add-worldborder-events.patch} (100%)
 rename patches/server/{0624-added-PlayerNameEntityEvent.patch => 0625-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0625-Prevent-grindstones-from-overstacking-items.patch => 0626-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0626-Add-recipe-to-cook-events.patch => 0627-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0627-Add-Block-isValidTool.patch => 0628-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0628-Allow-using-signs-inside-spawn-protection.patch => 0629-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0629-Implement-Keyed-on-World.patch => 0630-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0630-Add-fast-alternative-constructor-for-Rotations.patch => 0631-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0631-Item-Rarity-API.patch => 0632-Item-Rarity-API.patch} (100%)
 rename patches/server/{0632-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0633-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0633-copy-TESign-isEditable-from-snapshots.patch => 0634-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0634-Drop-carried-item-when-player-has-disconnected.patch => 0635-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0635-forced-whitelist-use-configurable-kick-message.patch => 0636-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0636-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0637-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0637-fix-cancelling-block-falling-causing-client-desync.patch => 0638-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0638-Expose-protocol-version.patch => 0639-Expose-protocol-version.patch} (100%)
 rename patches/server/{0639-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0640-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename patches/server/{0640-Enhance-console-tab-completions-for-brigadier-comman.patch => 0641-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0641-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0642-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0642-Add-bypass-host-check.patch => 0643-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0643-Set-area-affect-cloud-rotation.patch => 0644-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0644-add-isDeeplySleeping-to-HumanEntity.patch => 0645-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0645-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0646-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0646-add-consumeFuel-to-FurnaceBurnEvent.patch => 0647-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0647-add-get-set-drop-chance-to-EntityEquipment.patch => 0648-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0648-fix-PigZombieAngerEvent-cancellation.patch => 0649-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0649-Fix-checkReach-check-for-Shulker-boxes.patch => 0650-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0650-fix-PlayerItemHeldEvent-firing-twice.patch => 0651-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0651-Added-PlayerDeepSleepEvent.patch => 0652-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0652-More-World-API.patch => 0653-More-World-API.patch} (100%)
 rename patches/server/{0653-Added-PlayerBedFailEnterEvent.patch => 0654-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0654-Implement-methods-to-convert-between-Component-and-B.patch => 0655-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0655-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0656-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0656-Introduce-beacon-activation-deactivation-events.patch => 0657-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0657-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0658-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0658-Add-Channel-initialization-listeners.patch => 0659-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0659-Send-empty-commands-if-tab-completion-is-disabled.patch => 0660-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0660-Add-more-WanderingTrader-API.patch => 0661-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0661-Add-EntityBlockStorage-clearEntities.patch => 0662-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0662-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0663-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0663-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0664-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0664-Inventory-close.patch => 0665-Inventory-close.patch} (100%)
 rename patches/server/{0665-call-PortalCreateEvent-players-and-end-platform.patch => 0666-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename patches/server/{0666-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0667-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0667-Fix-CraftPotionBrewer-cache.patch => 0668-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0668-Add-basic-Datapack-API.patch => 0669-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0669-Add-environment-variable-to-disable-server-gui.patch => 0670-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0670-additions-to-PlayerGameModeChangeEvent.patch => 0671-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0671-ItemStack-repair-check-API.patch => 0672-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0672-More-Enchantment-API.patch => 0673-More-Enchantment-API.patch} (100%)
 rename patches/server/{0673-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0674-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0674-Fix-and-optimise-world-force-upgrading.patch => 0675-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0675-Add-Mob-lookAt-API.patch => 0676-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0676-Add-Unix-domain-socket-support.patch => 0677-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0677-Add-EntityInsideBlockEvent.patch => 0678-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0678-Attributes-API-for-item-defaults.patch => 0679-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0679-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0680-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0680-Add-cause-to-Weather-ThunderChangeEvents.patch => 0681-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0681-More-Lidded-Block-API.patch => 0682-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0682-Limit-item-frame-cursors-on-maps.patch => 0683-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0683-Add-PufferFishStateChangeEvent.patch => 0684-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0684-Add-PlayerKickEvent-causes.patch => 0685-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0685-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0686-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0686-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0687-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0687-Add-option-to-fix-items-merging-through-walls.patch => 0688-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0688-Add-BellRevealRaiderEvent.patch => 0689-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0689-Fix-invulnerable-end-crystals.patch => 0690-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0690-Add-ElderGuardianAppearanceEvent.patch => 0691-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0691-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0692-Reset-villager-inventory-on-cancelled-pickup-event.patch} (100%)
 rename patches/server/{0692-Fix-dangerous-end-portal-logic.patch => 0693-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0693-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0694-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0694-Make-item-validations-configurable.patch => 0695-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0695-Add-more-line-of-sight-methods.patch => 0696-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/server/{0696-add-per-world-spawn-limits.patch => 0697-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0697-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0698-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0698-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0699-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/patches/removed/1.17/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/removed/1.17/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
deleted file mode 100644
index 4d8b1d0357..0000000000
--- a/patches/removed/1.17/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 4 Aug 2020 22:24:15 +0200
-Subject: [PATCH] Optimize Pathfinder - Remove Streams / Optimized collections
-1.17 Update: Please do this k thx bb
-I utilized the IDE to convert streams to non streams code, so shouldn't
-be any risk of behavior change. Only did minor optimization of the
-generated code set to remove unnecessary things.
-
-I expect us to just drop this patch on next major update and re-apply
-it with the IDE again and re-apply the collections optimization.
-
-Optimize collection by creating a list instead of a set of the key and value.
-
-This lets us get faster foreach iteration, as well as avoids map lookups on
-the values when needed.
-
-diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-index ba8ee93032aabe7ec4ecf52d452e1a580d6ebc20..2ef0e04af771e14f8d71aef4ccb81d3b81db7df5 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-@@ -33,28 +33,31 @@ public class PathFinder {
-         this.openSet.a();
-         this.nodeEvaluator.prepare(world, mob);
-         Node pathpoint = this.nodeEvaluator.getStart();
--        Map<Target, BlockPos> map = (Map) positions.stream().collect(Collectors.toMap((blockposition) -> {
--            return this.nodeEvaluator.getGoal((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
--        }, Function.identity()));
--        Path pathentity = this.findPath(pathpoint, map, followRange, distance, rangeMultiplier);
-+        // Paper start - remove streams - and optimize collection
-+        List<Map.Entry<Target, BlockPos>> map = Lists.newArrayList();
-+        for (BlockPos blockposition : positions) {
-+            map.add(new java.util.AbstractMap.SimpleEntry<>(this.nodeEvaluator.getGoal((double) blockposition.getX(), blockposition.getY(), blockposition.getZ()), blockposition));
-+        }
-+        // Paper end
-+        Path pathentity = this.a(pathpoint, map, followRange, distance, rangeMultiplier);
- 
-         this.nodeEvaluator.done();
-         return pathentity;
-     }
- 
-     @Nullable
--    private Path findPath(Node startNode, Map<Target, BlockPos> positions, float followRange, int distance, float rangeMultiplier) {
--        Set<Target> set = positions.keySet();
-+    private Path a(Node pathpoint, List<Map.Entry<Target, BlockPos>> list, float f, int i, float f1) { // Paper - optimize collection
-+        //Set<PathDestination> set = map.keySet(); // Paper
- 
--        startNode.g = 0.0F;
--        startNode.h = this.getBestH(startNode, set);
--        startNode.f = startNode.h;
-+        pathpoint.g = 0.0F;
-+        pathpoint.h = this.a(pathpoint, list); // Paper - optimize collection
-+        pathpoint.f = pathpoint.h;
-         this.openSet.a();
--        this.openSet.a(startNode);
-+        this.openSet.a(pathpoint);
-         Set<Node> set1 = ImmutableSet.of();
-         int j = 0;
--        Set<Target> set2 = Sets.newHashSetWithExpectedSize(set.size());
--        int k = (int) ((float) this.maxVisitedNodes * rangeMultiplier);
-+        List<Map.Entry<Target, BlockPos>> set2 = Lists.newArrayListWithExpectedSize(list.size()); // Paper - optimize collection
-+        int k = (int) ((float) this.maxVisitedNodes * f1);
- 
-         while (!this.openSet.e()) {
-             ++j;
-@@ -65,14 +68,15 @@ public class PathFinder {
-             Node pathpoint1 = this.openSet.c();
- 
-             pathpoint1.closed = true;
--            Iterator iterator = set.iterator();
--
--            while (iterator.hasNext()) {
--                Target pathdestination = (Target) iterator.next();
-+            // Paper start - optimize collection
-+            for (int i1 = 0; i1 < list.size(); i1++) {
-+                Map.Entry<Target, BlockPos> entry = list.get(i1);
-+                Target pathdestination = entry.getKey();
- 
--                if (pathpoint1.distanceManhattan((Node) pathdestination) <= (float) distance) {
-+                if (pathpoint1.distanceManhattan((Node) pathdestination) <= (float) i) {
-                     pathdestination.setReached();
--                    set2.add(pathdestination);
-+                    set2.add(entry);
-+                    // Paper end
-                 }
-             }
- 
-@@ -80,7 +84,7 @@ public class PathFinder {
-                 break;
-             }
- 
--            if (pathpoint1.distanceTo(startNode) < followRange) {
-+            if (pathpoint1.distanceTo(pathpoint) < f) {
-                 int l = this.nodeEvaluator.getNeighbors(this.neighbors, pathpoint1);
- 
-                 for (int i1 = 0; i1 < l; ++i1) {
-@@ -90,10 +94,10 @@ public class PathFinder {
-                     pathpoint2.walkedDistance = pathpoint1.walkedDistance + f2;
-                     float f3 = pathpoint1.g + f2 + pathpoint2.costMalus;
- 
--                    if (pathpoint2.walkedDistance < followRange && (!pathpoint2.inOpenSet() || f3 < pathpoint2.g)) {
-+                    if (pathpoint2.walkedDistance < f && (!pathpoint2.inOpenSet() || f3 < pathpoint2.g)) {
-                         pathpoint2.cameFrom = pathpoint1;
-                         pathpoint2.g = f3;
--                        pathpoint2.h = this.getBestH(pathpoint2, set) * 1.5F;
-+                        pathpoint2.h = this.a(pathpoint2, list) * 1.5F; // Paper - list instead of set
-                         if (pathpoint2.inOpenSet()) {
-                             this.openSet.a(pathpoint2, pathpoint2.g + pathpoint2.h);
-                         } else {
-@@ -105,31 +109,32 @@ public class PathFinder {
-             }
-         }
- 
--        Optional<Path> optional = !set2.isEmpty() ? set2.stream().map((pathdestination1) -> {
--            return this.reconstructPath(pathdestination1.getBestNode(), (BlockPos) positions.get(pathdestination1), true);
--        }).min(Comparator.comparingInt(Path::getNodeCount)) : set.stream().map((pathdestination1) -> {
--            return this.reconstructPath(pathdestination1.getBestNode(), (BlockPos) positions.get(pathdestination1), false);
--        }).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
--
--        if (!optional.isPresent()) {
--            return null;
--        } else {
--            Path pathentity = (Path) optional.get();
--
--            return pathentity;
-+        // Paper start - remove streams - and optimize collection
-+        Path best = null;
-+        boolean useSet1 = set2.isEmpty();
-+        Comparator<Path> comparator = useSet1 ? Comparator.comparingInt(Path::getNodeCount)
-+            : Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount);
-+        for (Map.Entry<Target, BlockPos> entry : useSet1 ? list : set2) {
-+            Path pathEntity = this.reconstructPath(entry.getKey().getBestNode(), entry.getValue(), !useSet1);
-+            if (best == null || comparator.compare(pathEntity, best) < 0)
-+                best = pathEntity;
-         }
-+        return best;
-+        // Paper end
-     }
- 
--    private float getBestH(Node node, Set<Target> targets) {
-+    private float a(Node pathpoint, List<Map.Entry<Target, BlockPos>> list) { // Paper - optimize collection
-         float f = Float.MAX_VALUE;
- 
-         float f1;
- 
--        for (Iterator iterator = targets.iterator(); iterator.hasNext(); f = Math.min(f1, f)) {
--            Target pathdestination = (Target) iterator.next();
-+        // Paper start - optimize collection
-+        for (int i = 0, listSize = list.size(); i < listSize; f = Math.min(f1, f), i++) { // Paper
-+            Target pathdestination = list.get(i).getKey(); // Paper
-+            // Paper end
- 
--            f1 = node.distanceTo(pathdestination);
--            pathdestination.updateBest(f1, node);
-+            f1 = pathpoint.distanceTo(pathdestination);
-+            pathdestination.updateBest(f1, pathpoint);
-         }
- 
-         return f;
diff --git a/patches/server/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
new file mode 100644
index 0000000000..bb6aaed2d5
--- /dev/null
+++ b/patches/server/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
@@ -0,0 +1,130 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 4 Aug 2020 22:24:15 +0200
+Subject: [PATCH] Optimize Pathfinder - Remove Streams / Optimized collections
+
+1.17 Update: Please do this k thx bb
+I utilized the IDE to convert streams to non streams code, so shouldn't
+be any risk of behavior change. Only did minor optimization of the
+generated code set to remove unnecessary things.
+
+I expect us to just drop this patch on next major update and re-apply
+it with the IDE again and re-apply the collections optimization.
+
+Optimize collection by creating a list instead of a set of the key and value.
+
+This lets us get faster foreach iteration, as well as avoids map lookups on
+the values when needed.
+
+diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
+index 800d464207026d145056b39b298045121342b899..6062f5154c55179e1cf3b280e6dc56d2f561987d 100644
+--- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
++++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
+@@ -35,27 +35,31 @@ public class PathFinder {
+         this.openSet.clear();
+         this.nodeEvaluator.prepare(world, mob);
+         Node node = this.nodeEvaluator.getStart();
+-        Map<Target, BlockPos> map = positions.stream().collect(Collectors.toMap((blockPos) -> {
+-            return this.nodeEvaluator.getGoal((double)blockPos.getX(), (double)blockPos.getY(), (double)blockPos.getZ());
+-        }, Function.identity()));
++        // Paper start - remove streams - and optimize collection
++        List<Map.Entry<Target, BlockPos>> map = Lists.newArrayList();
++        for (BlockPos blockPos : positions) {
++            map.add(new java.util.AbstractMap.SimpleEntry<>(this.nodeEvaluator.getGoal(blockPos.getX(), blockPos.getY(), blockPos.getZ()), blockPos));
++        }
++        // Paper end
+         Path path = this.findPath(world.getProfiler(), node, map, followRange, distance, rangeMultiplier);
+         this.nodeEvaluator.done();
+         return path;
+     }
+ 
+     @Nullable
+-    private Path findPath(ProfilerFiller profiler, Node startNode, Map<Target, BlockPos> positions, float followRange, int distance, float rangeMultiplier) {
++    // Paper start - optimize collection
++    private Path findPath(ProfilerFiller profiler, Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) {
+         profiler.push("find_path");
+         profiler.markForCharting(MetricCategory.PATH_FINDING);
+-        Set<Target> set = positions.keySet();
++        //Set<Target> set = positions.keySet();
+         startNode.g = 0.0F;
+-        startNode.h = this.getBestH(startNode, set);
++        startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection
+         startNode.f = startNode.h;
+         this.openSet.clear();
+         this.openSet.insert(startNode);
+-        Set<Node> set2 = ImmutableSet.of();
++        //Set<Node> set2 = ImmutableSet.of(); // Paper - unused - diff on change
+         int i = 0;
+-        Set<Target> set3 = Sets.newHashSetWithExpectedSize(set.size());
++        List<Map.Entry<Target, BlockPos>> entryList = Lists.newArrayListWithExpectedSize(positions.size()); // Paper - optimize collection
+         int j = (int)((float)this.maxVisitedNodes * rangeMultiplier);
+ 
+         while(!this.openSet.isEmpty()) {
+@@ -67,14 +71,18 @@ public class PathFinder {
+             Node node = this.openSet.pop();
+             node.closed = true;
+ 
+-            for(Target target : set) {
++            // Paper start - optimize collection
++            for(int i1 = 0; i1 < positions.size(); i1++) {
++                final Map.Entry<Target, BlockPos> entry = positions.get(i1);
++                Target target = entry.getKey();
+                 if (node.distanceManhattan(target) <= (float)distance) {
+                     target.setReached();
+-                    set3.add(target);
++                    entryList.add(entry);
++                    // Paper end
+                 }
+             }
+ 
+-            if (!set3.isEmpty()) {
++            if (!entryList.isEmpty()) { // Paper - rename variable
+                 break;
+             }
+ 
+@@ -89,7 +97,7 @@ public class PathFinder {
+                     if (node2.walkedDistance < followRange && (!node2.inOpenSet() || g < node2.g)) {
+                         node2.cameFrom = node;
+                         node2.g = g;
+-                        node2.h = this.getBestH(node2, set) * 1.5F;
++                        node2.h = this.getBestH(node2, positions) * 1.5F; // Paper - list instead of set
+                         if (node2.inOpenSet()) {
+                             this.openSet.changeCost(node2, node2.g + node2.h);
+                         } else {
+@@ -101,19 +109,27 @@ public class PathFinder {
+             }
+         }
+ 
+-        Optional<Path> optional = !set3.isEmpty() ? set3.stream().map((target) -> {
+-            return this.reconstructPath(target.getBestNode(), positions.get(target), true);
+-        }).min(Comparator.comparingInt(Path::getNodeCount)) : set.stream().map((target) -> {
+-            return this.reconstructPath(target.getBestNode(), positions.get(target), false);
+-        }).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
+-        profiler.pop();
+-        return !optional.isPresent() ? null : optional.get();
++        // Paper start - remove streams - and optimize collection
++        Path best = null;
++        boolean entryListIsEmpty = entryList.isEmpty();
++        Comparator<Path> comparator = entryListIsEmpty ? Comparator.comparingInt(Path::getNodeCount)
++            : Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount);
++        for (Map.Entry<Target, BlockPos> entry : entryListIsEmpty ? positions : entryList) {
++            Path path = this.reconstructPath(entry.getKey().getBestNode(), entry.getValue(), !entryListIsEmpty);
++            if (best == null || comparator.compare(path, best) < 0)
++                best = path;
++        }
++        return best;
++        // Paper end
+     }
+ 
+-    private float getBestH(Node node, Set<Target> targets) {
++    private float getBestH(Node node, List<Map.Entry<Target, BlockPos>> targets) { // Paper - optimize collection - Set<Target> -> List<Map.Entry<Target, BlockPos>>
+         float f = Float.MAX_VALUE;
+ 
+-        for(Target target : targets) {
++        // Paper start - optimize collection
++        for (int i = 0, targetsSize = targets.size(); i < targetsSize; i++) {
++            final Target target = targets.get(i).getKey();
++            // Paper end
+             float g = node.distanceTo(target);
+             target.updateBest(g, node);
+             f = Math.min(g, f);
diff --git a/patches/server/0540-Beacon-API-custom-effect-ranges.patch b/patches/server/0541-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0540-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0541-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0541-Add-API-for-quit-reason.patch b/patches/server/0542-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0541-Add-API-for-quit-reason.patch
rename to patches/server/0542-Add-API-for-quit-reason.patch
diff --git a/patches/server/0542-Seed-based-feature-search.patch b/patches/server/0543-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0542-Seed-based-feature-search.patch
rename to patches/server/0543-Seed-based-feature-search.patch
diff --git a/patches/server/0543-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0544-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0543-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0544-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0544-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0545-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0544-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0545-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0545-Expose-world-spawn-angle.patch b/patches/server/0546-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0545-Expose-world-spawn-angle.patch
rename to patches/server/0546-Expose-world-spawn-angle.patch
diff --git a/patches/server/0546-Add-Destroy-Speed-API.patch b/patches/server/0547-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0546-Add-Destroy-Speed-API.patch
rename to patches/server/0547-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0547-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0548-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0547-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0548-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0548-Add-LivingEntity-clearActiveItem.patch b/patches/server/0549-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0548-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0549-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0549-Add-PlayerItemCooldownEvent.patch b/patches/server/0550-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0549-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0550-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0550-More-lightning-API.patch b/patches/server/0551-More-lightning-API.patch
similarity index 100%
rename from patches/server/0550-More-lightning-API.patch
rename to patches/server/0551-More-lightning-API.patch
diff --git a/patches/server/0551-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0552-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0551-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0552-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0552-Added-missing-default-perms-for-commands.patch b/patches/server/0553-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0552-Added-missing-default-perms-for-commands.patch
rename to patches/server/0553-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0553-Add-PlayerShearBlockEvent.patch b/patches/server/0554-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0553-Add-PlayerShearBlockEvent.patch
rename to patches/server/0554-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0554-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0555-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0554-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0555-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0555-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0556-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0555-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0556-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0556-Limit-recipe-packets.patch b/patches/server/0557-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0556-Limit-recipe-packets.patch
rename to patches/server/0557-Limit-recipe-packets.patch
diff --git a/patches/server/0557-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0558-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0557-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0558-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0558-MC-4-Fix-item-position-desync.patch b/patches/server/0559-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0558-MC-4-Fix-item-position-desync.patch
rename to patches/server/0559-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0559-Player-Chunk-Load-Unload-Events.patch b/patches/server/0560-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0559-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0560-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0560-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0561-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0560-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0561-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0561-Expose-LivingEntity-hurt-direction.patch b/patches/server/0562-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0561-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0562-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0562-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0563-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0562-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0563-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0563-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0564-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0563-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0564-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0564-added-PlayerTradeEvent.patch b/patches/server/0565-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0564-added-PlayerTradeEvent.patch
rename to patches/server/0565-added-PlayerTradeEvent.patch
diff --git a/patches/server/0565-Implement-TargetHitEvent.patch b/patches/server/0566-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0565-Implement-TargetHitEvent.patch
rename to patches/server/0566-Implement-TargetHitEvent.patch
diff --git a/patches/server/0566-Additional-Block-Material-API-s.patch b/patches/server/0567-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0566-Additional-Block-Material-API-s.patch
rename to patches/server/0567-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0567-Fix-harming-potion-dupe.patch b/patches/server/0568-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0567-Fix-harming-potion-dupe.patch
rename to patches/server/0568-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0568-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0569-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0568-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0569-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0569-Cache-burn-durations.patch b/patches/server/0570-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0569-Cache-burn-durations.patch
rename to patches/server/0570-Cache-burn-durations.patch
diff --git a/patches/server/0570-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0571-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0570-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0571-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0571-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0572-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0571-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0572-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0572-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0573-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0572-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0573-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0573-Zombie-API-breaking-doors.patch b/patches/server/0574-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0573-Zombie-API-breaking-doors.patch
rename to patches/server/0574-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0574-Fix-nerfed-slime-when-splitting.patch b/patches/server/0575-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0574-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0575-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0575-Add-EntityLoadCrossbowEvent.patch b/patches/server/0576-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0575-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0576-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0576-Guardian-beam-workaround.patch b/patches/server/0577-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0576-Guardian-beam-workaround.patch
rename to patches/server/0577-Guardian-beam-workaround.patch
diff --git a/patches/server/0577-Added-WorldGameRuleChangeEvent.patch b/patches/server/0578-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0577-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0578-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0578-Added-ServerResourcesReloadedEvent.patch b/patches/server/0579-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0578-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0579-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0579-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0580-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0579-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0580-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0580-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0581-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0580-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0581-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0581-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0582-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0581-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0582-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0582-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0583-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0582-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0583-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0583-Configurable-door-breaking-difficulty.patch b/patches/server/0584-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0583-Configurable-door-breaking-difficulty.patch
rename to patches/server/0584-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0584-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0585-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0584-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0585-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0585-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0586-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0585-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0586-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0586-Remove-stale-POIs.patch b/patches/server/0587-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0586-Remove-stale-POIs.patch
rename to patches/server/0587-Remove-stale-POIs.patch
diff --git a/patches/server/0587-Fix-villager-boat-exploit.patch b/patches/server/0588-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0587-Fix-villager-boat-exploit.patch
rename to patches/server/0588-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0588-Add-sendOpLevel-API.patch b/patches/server/0589-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0588-Add-sendOpLevel-API.patch
rename to patches/server/0589-Add-sendOpLevel-API.patch
diff --git a/patches/server/0589-Add-StructureLocateEvent.patch b/patches/server/0590-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0589-Add-StructureLocateEvent.patch
rename to patches/server/0590-Add-StructureLocateEvent.patch
diff --git a/patches/server/0590-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0591-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0590-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0591-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0591-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0592-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0591-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0592-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0592-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0593-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0592-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0593-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0593-Make-schedule-command-per-world.patch b/patches/server/0594-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0593-Make-schedule-command-per-world.patch
rename to patches/server/0594-Make-schedule-command-per-world.patch
diff --git a/patches/server/0594-Configurable-max-leash-distance.patch b/patches/server/0595-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0594-Configurable-max-leash-distance.patch
rename to patches/server/0595-Configurable-max-leash-distance.patch
diff --git a/patches/server/0595-Implement-BlockPreDispenseEvent.patch b/patches/server/0596-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0595-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0596-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0596-Added-Vanilla-Entity-Tags.patch b/patches/server/0597-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0596-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0597-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0597-added-Wither-API.patch b/patches/server/0598-added-Wither-API.patch
similarity index 100%
rename from patches/server/0597-added-Wither-API.patch
rename to patches/server/0598-added-Wither-API.patch
diff --git a/patches/server/0598-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0599-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0598-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0599-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0599-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0600-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0599-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0600-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0600-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0601-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0600-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0601-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0601-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0602-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0601-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0602-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0602-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0603-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0602-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0603-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0603-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0604-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0603-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0604-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0604-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0605-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0604-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0605-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0605-add-DragonEggFormEvent.patch b/patches/server/0606-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0605-add-DragonEggFormEvent.patch
rename to patches/server/0606-add-DragonEggFormEvent.patch
diff --git a/patches/server/0606-EntityMoveEvent.patch b/patches/server/0607-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0606-EntityMoveEvent.patch
rename to patches/server/0607-EntityMoveEvent.patch
diff --git a/patches/server/0607-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0608-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0607-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0608-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0608-Inline-shift-direction-fields.patch b/patches/server/0609-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0608-Inline-shift-direction-fields.patch
rename to patches/server/0609-Inline-shift-direction-fields.patch
diff --git a/patches/server/0609-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0610-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0609-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0610-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0610-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0611-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0610-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0611-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0611-living-entity-allow-attribute-registration.patch b/patches/server/0612-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0611-living-entity-allow-attribute-registration.patch
rename to patches/server/0612-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0612-fix-dead-slime-setSize-invincibility.patch b/patches/server/0613-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0612-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0613-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0613-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0614-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0613-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0614-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0614-misc-debugging-dumps.patch b/patches/server/0615-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0614-misc-debugging-dumps.patch
rename to patches/server/0615-misc-debugging-dumps.patch
diff --git a/patches/server/0615-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0616-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0615-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0616-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0616-Expose-Tracked-Players.patch b/patches/server/0617-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0616-Expose-Tracked-Players.patch
rename to patches/server/0617-Expose-Tracked-Players.patch
diff --git a/patches/server/0617-Remove-streams-from-SensorNearest.patch b/patches/server/0618-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0617-Remove-streams-from-SensorNearest.patch
rename to patches/server/0618-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0618-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0619-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0618-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0619-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0619-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0620-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0619-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0620-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0620-Improve-ServerGUI.patch b/patches/server/0621-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0620-Improve-ServerGUI.patch
rename to patches/server/0621-Improve-ServerGUI.patch
diff --git a/patches/server/0621-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0622-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0621-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0622-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0622-fix-converting-txt-to-json-file.patch b/patches/server/0623-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0622-fix-converting-txt-to-json-file.patch
rename to patches/server/0623-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0623-Add-worldborder-events.patch b/patches/server/0624-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0623-Add-worldborder-events.patch
rename to patches/server/0624-Add-worldborder-events.patch
diff --git a/patches/server/0624-added-PlayerNameEntityEvent.patch b/patches/server/0625-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0624-added-PlayerNameEntityEvent.patch
rename to patches/server/0625-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0625-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0626-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0625-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0626-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0626-Add-recipe-to-cook-events.patch b/patches/server/0627-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0626-Add-recipe-to-cook-events.patch
rename to patches/server/0627-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0627-Add-Block-isValidTool.patch b/patches/server/0628-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0627-Add-Block-isValidTool.patch
rename to patches/server/0628-Add-Block-isValidTool.patch
diff --git a/patches/server/0628-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0629-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0628-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0629-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0629-Implement-Keyed-on-World.patch b/patches/server/0630-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0629-Implement-Keyed-on-World.patch
rename to patches/server/0630-Implement-Keyed-on-World.patch
diff --git a/patches/server/0630-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0631-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0630-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0631-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0631-Item-Rarity-API.patch b/patches/server/0632-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0631-Item-Rarity-API.patch
rename to patches/server/0632-Item-Rarity-API.patch
diff --git a/patches/server/0632-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0633-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0632-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0633-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0633-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0634-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0633-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0634-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0634-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0635-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0634-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0635-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0635-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0636-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0635-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0636-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0636-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0637-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0636-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0637-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0637-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0638-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0637-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0638-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0638-Expose-protocol-version.patch b/patches/server/0639-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0638-Expose-protocol-version.patch
rename to patches/server/0639-Expose-protocol-version.patch
diff --git a/patches/server/0639-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0640-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0639-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0640-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0640-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0641-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0640-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0641-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0641-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0642-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0641-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0642-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0642-Add-bypass-host-check.patch b/patches/server/0643-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0642-Add-bypass-host-check.patch
rename to patches/server/0643-Add-bypass-host-check.patch
diff --git a/patches/server/0643-Set-area-affect-cloud-rotation.patch b/patches/server/0644-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0643-Set-area-affect-cloud-rotation.patch
rename to patches/server/0644-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0644-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0645-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0644-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0645-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0645-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0646-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0645-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0646-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0646-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0647-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0646-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0647-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0647-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0648-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0647-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0648-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0648-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0649-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0648-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0649-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0649-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0650-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0649-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0650-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0650-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0651-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0650-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0651-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0651-Added-PlayerDeepSleepEvent.patch b/patches/server/0652-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0651-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0652-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0652-More-World-API.patch b/patches/server/0653-More-World-API.patch
similarity index 100%
rename from patches/server/0652-More-World-API.patch
rename to patches/server/0653-More-World-API.patch
diff --git a/patches/server/0653-Added-PlayerBedFailEnterEvent.patch b/patches/server/0654-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0653-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0654-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0654-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0655-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0654-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0655-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0655-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0656-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0655-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0656-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0656-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0657-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0656-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0657-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0657-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0658-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0657-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0658-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0658-Add-Channel-initialization-listeners.patch b/patches/server/0659-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0658-Add-Channel-initialization-listeners.patch
rename to patches/server/0659-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0659-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0660-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0659-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0660-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0660-Add-more-WanderingTrader-API.patch b/patches/server/0661-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0660-Add-more-WanderingTrader-API.patch
rename to patches/server/0661-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0661-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0662-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0661-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0662-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0662-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0663-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0662-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0663-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0663-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0664-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0663-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0664-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0664-Inventory-close.patch b/patches/server/0665-Inventory-close.patch
similarity index 100%
rename from patches/server/0664-Inventory-close.patch
rename to patches/server/0665-Inventory-close.patch
diff --git a/patches/server/0665-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0666-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0665-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0666-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0666-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0667-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0666-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0667-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0667-Fix-CraftPotionBrewer-cache.patch b/patches/server/0668-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0667-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0668-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0668-Add-basic-Datapack-API.patch b/patches/server/0669-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0668-Add-basic-Datapack-API.patch
rename to patches/server/0669-Add-basic-Datapack-API.patch
diff --git a/patches/server/0669-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0670-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0669-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0670-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0670-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0671-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0670-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0671-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0671-ItemStack-repair-check-API.patch b/patches/server/0672-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0671-ItemStack-repair-check-API.patch
rename to patches/server/0672-ItemStack-repair-check-API.patch
diff --git a/patches/server/0672-More-Enchantment-API.patch b/patches/server/0673-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0672-More-Enchantment-API.patch
rename to patches/server/0673-More-Enchantment-API.patch
diff --git a/patches/server/0673-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0674-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0673-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0674-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0674-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0675-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0674-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0675-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0675-Add-Mob-lookAt-API.patch b/patches/server/0676-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0675-Add-Mob-lookAt-API.patch
rename to patches/server/0676-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0676-Add-Unix-domain-socket-support.patch b/patches/server/0677-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0676-Add-Unix-domain-socket-support.patch
rename to patches/server/0677-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0677-Add-EntityInsideBlockEvent.patch b/patches/server/0678-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0677-Add-EntityInsideBlockEvent.patch
rename to patches/server/0678-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0678-Attributes-API-for-item-defaults.patch b/patches/server/0679-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0678-Attributes-API-for-item-defaults.patch
rename to patches/server/0679-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0679-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0680-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0679-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0680-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0680-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0681-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0680-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0681-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0681-More-Lidded-Block-API.patch b/patches/server/0682-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0681-More-Lidded-Block-API.patch
rename to patches/server/0682-More-Lidded-Block-API.patch
diff --git a/patches/server/0682-Limit-item-frame-cursors-on-maps.patch b/patches/server/0683-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0682-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0683-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0683-Add-PufferFishStateChangeEvent.patch b/patches/server/0684-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0683-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0684-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0684-Add-PlayerKickEvent-causes.patch b/patches/server/0685-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0684-Add-PlayerKickEvent-causes.patch
rename to patches/server/0685-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0685-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0686-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0685-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0686-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0686-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0687-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0686-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0687-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0687-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0688-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0687-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0688-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0688-Add-BellRevealRaiderEvent.patch b/patches/server/0689-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0688-Add-BellRevealRaiderEvent.patch
rename to patches/server/0689-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0689-Fix-invulnerable-end-crystals.patch b/patches/server/0690-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0689-Fix-invulnerable-end-crystals.patch
rename to patches/server/0690-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0690-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0691-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0690-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0691-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0691-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0692-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0691-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0692-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0692-Fix-dangerous-end-portal-logic.patch b/patches/server/0693-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0692-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0693-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0693-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0694-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0693-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0694-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0694-Make-item-validations-configurable.patch b/patches/server/0695-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0694-Make-item-validations-configurable.patch
rename to patches/server/0695-Make-item-validations-configurable.patch
diff --git a/patches/server/0695-Add-more-line-of-sight-methods.patch b/patches/server/0696-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0695-Add-more-line-of-sight-methods.patch
rename to patches/server/0696-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0696-add-per-world-spawn-limits.patch b/patches/server/0697-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0696-add-per-world-spawn-limits.patch
rename to patches/server/0697-add-per-world-spawn-limits.patch
diff --git a/patches/server/0697-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0698-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0697-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0698-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0698-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0699-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0698-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0699-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch