From 05623c47ec541cdc17bd9ba390608a1c9ea07bea Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Wed, 16 Jun 2021 15:47:07 +0200
Subject: [PATCH] Port improve chunk status transition speed

---
 ...prove-Chunk-Status-Transition-Speed.patch} | 48 +++++--------------
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0495-Fix-SPIGOT-5989.patch} |  0
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0504-Brand-support.patch} |  0
 ...patch => 0505-Add-setMaxPlayers-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0507-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0509-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0511-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  2 +-
 ...patch => 0513-Buffer-joins-to-world.patch} |  0
 ...=> 0514-Optimize-redstone-algorithm.patch} |  2 +-
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0517-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0518-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0521-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  4 +-
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0529-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0535-Optimise-getType-calls.patch} |  0
 ....patch => 0536-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0541-Player-elytra-boost-API.patch} |  0
 ...42-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0545-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  2 +-
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0548-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...550-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0551-Add-API-for-quit-reason.patch} |  0
 ...h => 0552-Seed-based-feature-search.patch} |  2 +-
 ...ng-Trader-spawn-rate-config-options.patch} |  2 +-
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0555-Expose-world-spawn-angle.patch} |  0
 ...patch => 0556-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...58-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0559-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0560-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  2 +-
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0563-Add-PlayerShearBlockEvent.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  2 +-
 ....patch => 0566-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0568-MC-4-Fix-item-position-desync.patch} |  0
 ...569-Player-Chunk-Load-Unload-Events.patch} |  0
 ...0-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 => 0574-added-PlayerTradeEvent.patch} |  0
 ...ch => 0575-Implement-TargetHitEvent.patch} |  0
 ...576-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0577-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0579-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  2 +-
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0584-Zombie-API-breaking-doors.patch} |  0
 ...585-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0586-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0587-Guardian-beam-workaround.patch} |  0
 ...0588-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  2 +-
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  2 +-
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0597-Remove-stale-POIs.patch} |  0
 ...h => 0598-Fix-villager-boat-exploit.patch} |  0
 ...I.patch => 0599-Add-sendOpLevel-API.patch} |  0
 ...ch => 0600-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  2 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...604-Make-schedule-command-per-world.patch} |  0
 ...605-Configurable-max-leash-distance.patch} |  2 +-
 ...606-Implement-BlockPreDispenseEvent.patch} |  0
 ...h => 0607-Added-Vanilla-Entity-Tags.patch} |  0
 ...-API.patch => 0608-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 => 0616-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0617-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0619-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 => 0625-misc-debugging-dumps.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0627-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 => 0631-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...633-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0634-Add-worldborder-events.patch} |  0
 ...=> 0635-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0637-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0638-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ...ch => 0640-Implement-Keyed-on-World.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0642-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 => 0649-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 => 0653-Add-bypass-host-check.patch} |  0
 ...0654-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
 ... => 0662-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0663-More-World-API.patch} |  0
 ... 0664-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
 ...> 0671-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0675-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0678-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0679-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ...fo.patch => 0682-Clear-SyncLoadInfo.patch} |  0
 ... => 0683-ItemStack-repair-check-API.patch} |  0
 ....patch => 0684-More-Enchantment-API.patch} |  0
 ...option-to-load-extra-plugin-jars-no.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0687-Add-Mob-lookAt-API.patch} |  0
 ...0688-Add-Unix-domain-socket-support.patch} |  0
 ... => 0689-Add-EntityInsideBlockEvent.patch} |  0
 ...90-Attributes-API-for-item-defaults.patch} |  0
 ...hantCustom-emit-PlayerPurchaseEvent.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0693-More-Lidded-Block-API.patch} |  0
 ...94-Limit-item-frame-cursors-on-maps.patch} |  0
 ...0695-Add-PufferFishStateChangeEvent.patch} |  0
 ... => 0696-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 => 0700-Add-BellRevealRaiderEvent.patch} |  0
 ... 0701-Fix-invulnerable-end-crystals.patch} |  0
 ...02-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...inventory-on-cancelled-pickup-event.patch} |  0
 ...0704-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...0707-Add-more-line-of-sight-methods.patch} |  0
 ... => 0708-add-per-world-spawn-limits.patch} |  2 +-
 ...plashEvent-for-water-splash-potions.patch} |  0
 ...tus-dataconverter-for-pre-1.13-chun.patch} |  0
 222 files changed, 28 insertions(+), 50 deletions(-)
 rename patches/{removed/1.17/0488-Improve-Chunk-Status-Transition-Speed.patch => server/0489-Improve-Chunk-Status-Transition-Speed.patch} (65%)
 rename patches/server/{0489-Optimize-NetworkManager-Exception-Handling.patch => 0490-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0490-Optimize-the-advancement-data-player-iteration-to-be.patch => 0491-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0491-Fix-arrows-never-despawning-MC-125757.patch => 0492-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0492-Thread-Safe-Vanilla-Command-permission-checking.patch => 0493-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0493-Move-range-check-for-block-placing-up.patch => 0494-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0494-Fix-SPIGOT-5989.patch => 0495-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0499-Fix-some-rails-connecting-improperly.patch => 0500-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0500-Fix-MC-187716-Use-configured-height.patch => 0501-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename patches/server/{0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0502-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0503-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0503-Brand-support.patch => 0504-Brand-support.patch} (100%)
 rename patches/server/{0504-Add-setMaxPlayers-API.patch => 0505-Add-setMaxPlayers-API.patch} (100%)
 rename patches/server/{0505-Add-playPickupItemAnimation-to-LivingEntity.patch => 0506-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0506-Don-t-require-FACING-data.patch => 0507-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0508-Add-moon-phase-API.patch => 0509-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0509-Prevent-headless-pistons-from-being-created.patch => 0510-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0510-Add-BellRingEvent.patch => 0511-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0511-Add-zombie-targets-turtle-egg-config.patch => 0512-Add-zombie-targets-turtle-egg-config.patch} (95%)
 rename patches/server/{0512-Buffer-joins-to-world.patch => 0513-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0513-Optimize-redstone-algorithm.patch => 0514-Optimize-redstone-algorithm.patch} (99%)
 rename patches/server/{0514-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0515-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0515-PortalCreateEvent-needs-to-know-its-entity.patch => 0516-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0516-Fix-CraftTeam-null-check.patch => 0517-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0517-Add-more-Evoker-API.patch => 0518-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename patches/server/{0519-Create-HoverEvent-from-ItemStack-Entity.patch => 0520-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0520-Cache-block-data-strings.patch => 0521-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0522-Add-additional-open-container-api-to-HumanEntity.patch => 0523-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0524-Extend-block-drop-capture-to-capture-all-items-added.patch => 0525-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (84%)
 rename patches/server/{0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0527-Lazily-track-plugin-scoreboards-by-default.patch => 0528-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0528-Entity-isTicking.patch => 0529-Entity-isTicking.patch} (100%)
 rename patches/server/{0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename patches/server/{0531-Fix-Concurrency-issue-in-WeightedList.patch => 0532-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0533-Fix-for-large-move-vectors-crashing-server.patch => 0534-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0534-Optimise-getType-calls.patch => 0535-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0535-Villager-resetOffers.patch => 0536-Villager-resetOffers.patch} (100%)
 rename patches/server/{0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0537-Retain-block-place-order-when-capturing-blockstates.patch => 0538-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0538-Reduce-blockpos-allocation-from-pathfinding.patch => 0539-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0539-Fix-item-locations-dropped-from-campfires.patch => 0540-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0540-Player-elytra-boost-API.patch => 0541-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0541-Fixed-TileEntityBell-memory-leak.patch => 0542-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0543-Add-getOfflinePlayerIfCached-String.patch => 0544-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0544-Add-ignore-discounts-API.patch => 0545-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0545-Toggle-for-removing-existing-dragon.patch => 0546-Toggle-for-removing-existing-dragon.patch} (95%)
 rename patches/server/{0546-Fix-client-lag-on-advancement-loading.patch => 0547-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0547-Item-no-age-no-player-pickup.patch => 0548-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0549-Beacon-API-custom-effect-ranges.patch => 0550-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0550-Add-API-for-quit-reason.patch => 0551-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0551-Seed-based-feature-search.patch => 0552-Seed-based-feature-search.patch} (98%)
 rename patches/server/{0552-Add-Wandering-Trader-spawn-rate-config-options.patch => 0553-Add-Wandering-Trader-spawn-rate-config-options.patch} (98%)
 rename patches/server/{0553-Significantly-improve-performance-of-the-end-generat.patch => 0554-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0554-Expose-world-spawn-angle.patch => 0555-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0555-Add-Destroy-Speed-API.patch => 0556-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0557-Add-LivingEntity-clearActiveItem.patch => 0558-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0558-Add-PlayerItemCooldownEvent.patch => 0559-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0559-More-lightning-API.patch => 0560-More-lightning-API.patch} (100%)
 rename patches/server/{0560-Climbing-should-not-bypass-cramming-gamerule.patch => 0561-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0561-Added-missing-default-perms-for-commands.patch => 0562-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0562-Add-PlayerShearBlockEvent.patch => 0563-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0563-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0564-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0564-Fix-curing-zombie-villager-discount-exploit.patch => 0565-Fix-curing-zombie-villager-discount-exploit.patch} (96%)
 rename patches/server/{0565-Limit-recipe-packets.patch => 0566-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0566-Fix-CraftSound-backwards-compatibility.patch => 0567-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0567-MC-4-Fix-item-position-desync.patch => 0568-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0568-Player-Chunk-Load-Unload-Events.patch => 0569-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0569-Optimize-Dynamic-get-Missing-Keys.patch => 0570-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0570-Expose-LivingEntity-hurt-direction.patch => 0571-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0573-added-PlayerTradeEvent.patch => 0574-added-PlayerTradeEvent.patch} (100%)
 rename patches/server/{0574-Implement-TargetHitEvent.patch => 0575-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0575-Additional-Block-Material-API-s.patch => 0576-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0576-Fix-harming-potion-dupe.patch => 0577-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0578-Cache-burn-durations.patch => 0579-Cache-burn-durations.patch} (100%)
 rename patches/server/{0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (95%)
 rename patches/server/{0580-Fix-Not-a-string-Map-Conversion-spam.patch => 0581-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0581-Implement-PlayerFlowerPotManipulateEvent.patch => 0582-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0582-Fix-interact-event-not-being-called-in-adventure.patch => 0583-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0583-Zombie-API-breaking-doors.patch => 0584-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0584-Fix-nerfed-slime-when-splitting.patch => 0585-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0585-Add-EntityLoadCrossbowEvent.patch => 0586-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0586-Guardian-beam-workaround.patch => 0587-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0587-Added-WorldGameRuleChangeEvent.patch => 0588-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0588-Added-ServerResourcesReloadedEvent.patch => 0589-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0589-Added-world-settings-for-mobs-picking-up-loot.patch => 0590-Added-world-settings-for-mobs-picking-up-loot.patch} (97%)
 rename patches/server/{0590-Implemented-BlockFailedDispenseEvent.patch => 0591-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0591-Added-PlayerLecternPageChangeEvent.patch => 0592-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0592-Added-PlayerLoomPatternSelectEvent.patch => 0593-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0593-Configurable-door-breaking-difficulty.patch => 0594-Configurable-door-breaking-difficulty.patch} (97%)
 rename patches/server/{0594-Empty-commands-shall-not-be-dispatched.patch => 0595-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0595-Implement-API-to-expose-exact-interaction-point.patch => 0596-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0596-Remove-stale-POIs.patch => 0597-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0597-Fix-villager-boat-exploit.patch => 0598-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0598-Add-sendOpLevel-API.patch => 0599-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0599-Add-StructureLocateEvent.patch => 0600-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0600-Collision-option-for-requiring-a-player-participant.patch => 0601-Collision-option-for-requiring-a-player-participant.patch} (98%)
 rename patches/server/{0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0602-Return-chat-component-with-empty-text-instead-of-thr.patch => 0603-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0603-Make-schedule-command-per-world.patch => 0604-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0604-Configurable-max-leash-distance.patch => 0605-Configurable-max-leash-distance.patch} (96%)
 rename patches/server/{0605-Implement-BlockPreDispenseEvent.patch => 0606-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0606-Added-Vanilla-Entity-Tags.patch => 0607-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/server/{0607-added-Wither-API.patch => 0608-added-Wither-API.patch} (100%)
 rename patches/server/{0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0609-Fix-console-spam-when-removing-chests-in-water.patch => 0610-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0610-Add-toggle-for-always-placing-the-dragon-egg.patch => 0611-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0611-Added-PlayerStonecutterRecipeSelectEvent.patch => 0612-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0613-Skip-distance-map-update-when-spawning-disabled.patch => 0614-Skip-distance-map-update-when-spawning-disabled.patch} (100%)
 rename patches/server/{0614-Reset-shield-blocking-on-dimension-change.patch => 0615-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0615-add-DragonEggFormEvent.patch => 0616-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0616-EntityMoveEvent.patch => 0617-EntityMoveEvent.patch} (100%)
 rename patches/server/{0617-added-option-to-disable-pathfinding-updates-on-block.patch => 0618-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0618-Inline-shift-direction-fields.patch => 0619-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0619-Allow-adding-items-to-BlockDropItemEvent.patch => 0620-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0621-living-entity-allow-attribute-registration.patch => 0622-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0622-fix-dead-slime-setSize-invincibility.patch => 0623-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0623-Merchant-getRecipes-should-return-an-immutable-list.patch => 0624-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0624-misc-debugging-dumps.patch => 0625-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0625-Add-support-for-hex-color-codes-in-console.patch => 0626-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0626-Expose-Tracked-Players.patch => 0627-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0627-Remove-streams-from-SensorNearest.patch => 0628-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0628-MC-29274-Fix-Wither-hostility-towards-players.patch => 0629-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename patches/server/{0629-Throw-proper-exception-on-empty-JsonList-file.patch => 0630-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0630-Improve-ServerGUI.patch => 0631-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0632-fix-converting-txt-to-json-file.patch => 0633-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0633-Add-worldborder-events.patch => 0634-Add-worldborder-events.patch} (100%)
 rename patches/server/{0634-added-PlayerNameEntityEvent.patch => 0635-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0635-Prevent-grindstones-from-overstacking-items.patch => 0636-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0636-Add-recipe-to-cook-events.patch => 0637-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0637-Add-Block-isValidTool.patch => 0638-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0638-Allow-using-signs-inside-spawn-protection.patch => 0639-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0639-Implement-Keyed-on-World.patch => 0640-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0640-Add-fast-alternative-constructor-for-Rotations.patch => 0641-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0641-Item-Rarity-API.patch => 0642-Item-Rarity-API.patch} (100%)
 rename patches/server/{0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0643-copy-TESign-isEditable-from-snapshots.patch => 0644-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0644-Drop-carried-item-when-player-has-disconnected.patch => 0645-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0645-forced-whitelist-use-configurable-kick-message.patch => 0646-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0647-fix-cancelling-block-falling-causing-client-desync.patch => 0648-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0648-Expose-protocol-version.patch => 0649-Expose-protocol-version.patch} (100%)
 rename patches/server/{0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename patches/server/{0650-Enhance-console-tab-completions-for-brigadier-comman.patch => 0651-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0652-Add-bypass-host-check.patch => 0653-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0653-Set-area-affect-cloud-rotation.patch => 0654-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0654-add-isDeeplySleeping-to-HumanEntity.patch => 0655-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0655-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0656-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0656-add-consumeFuel-to-FurnaceBurnEvent.patch => 0657-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0657-add-get-set-drop-chance-to-EntityEquipment.patch => 0658-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0658-fix-PigZombieAngerEvent-cancellation.patch => 0659-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0659-Fix-checkReach-check-for-Shulker-boxes.patch => 0660-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0660-fix-PlayerItemHeldEvent-firing-twice.patch => 0661-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0661-Added-PlayerDeepSleepEvent.patch => 0662-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0662-More-World-API.patch => 0663-More-World-API.patch} (100%)
 rename patches/server/{0663-Added-PlayerBedFailEnterEvent.patch => 0664-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0664-Implement-methods-to-convert-between-Component-and-B.patch => 0665-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0666-Introduce-beacon-activation-deactivation-events.patch => 0667-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0667-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0668-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0668-Add-Channel-initialization-listeners.patch => 0669-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0669-Send-empty-commands-if-tab-completion-is-disabled.patch => 0670-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0670-Add-more-WanderingTrader-API.patch => 0671-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0671-Add-EntityBlockStorage-clearEntities.patch => 0672-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0674-Inventory-close.patch => 0675-Inventory-close.patch} (100%)
 rename patches/server/{0675-call-PortalCreateEvent-players-and-end-platform.patch => 0676-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename patches/server/{0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0677-Fix-CraftPotionBrewer-cache.patch => 0678-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0678-Add-basic-Datapack-API.patch => 0679-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0679-Add-environment-variable-to-disable-server-gui.patch => 0680-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0680-additions-to-PlayerGameModeChangeEvent.patch => 0681-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0681-Clear-SyncLoadInfo.patch => 0682-Clear-SyncLoadInfo.patch} (100%)
 rename patches/server/{0682-ItemStack-repair-check-API.patch => 0683-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0683-More-Enchantment-API.patch => 0684-More-Enchantment-API.patch} (100%)
 rename patches/server/{0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0685-Fix-and-optimise-world-force-upgrading.patch => 0686-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0686-Add-Mob-lookAt-API.patch => 0687-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0687-Add-Unix-domain-socket-support.patch => 0688-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0688-Add-EntityInsideBlockEvent.patch => 0689-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0689-Attributes-API-for-item-defaults.patch => 0690-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0691-Add-cause-to-Weather-ThunderChangeEvents.patch => 0692-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0692-More-Lidded-Block-API.patch => 0693-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0693-Limit-item-frame-cursors-on-maps.patch => 0694-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0694-Add-PufferFishStateChangeEvent.patch => 0695-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0695-Add-PlayerKickEvent-causes.patch => 0696-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0698-Add-option-to-fix-items-merging-through-walls.patch => 0699-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0699-Add-BellRevealRaiderEvent.patch => 0700-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0700-Fix-invulnerable-end-crystals.patch => 0701-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0701-Add-ElderGuardianAppearanceEvent.patch => 0702-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0702-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0703-Reset-villager-inventory-on-cancelled-pickup-event.patch} (100%)
 rename patches/server/{0703-Fix-dangerous-end-portal-logic.patch => 0704-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0705-Make-item-validations-configurable.patch => 0706-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0706-Add-more-line-of-sight-methods.patch => 0707-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/server/{0707-add-per-world-spawn-limits.patch => 0708-add-per-world-spawn-limits.patch} (96%)
 rename patches/server/{0708-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0709-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/patches/removed/1.17/0488-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
similarity index 65%
rename from patches/removed/1.17/0488-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
index 56552887a..21f3ffd21 100644
--- a/patches/removed/1.17/0488-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
@@ -3,10 +3,6 @@ From: Aikar <aikar@aikar.co>
 Date: Fri, 29 May 2020 23:32:14 -0400
 Subject: [PATCH] Improve Chunk Status Transition Speed
 
-
-1.17 Update note: Depends on not yet applied patch: Implement Chunk Priority / Urgency System for Chunks
-
-
 When a chunk is loaded from disk that has already been generated,
 the server has to promote the chunk through the system to reach
 it's current desired status level.
@@ -40,10 +36,10 @@ scenario / path:
 Previously would have hopped to SERVER around 12+ times there extra.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index ce320672d7602c94dd75ad857435dca6ac3bab56..8260636da673ef095728c208db2d6237bab2db19 100644
+index 377993f325400a9bc77f5fbc77d9ec50f5d76638..c28f693bf7da42570d95ab97ccb0ec2bf06f53ee 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -83,6 +83,13 @@ public class ChunkHolder {
+@@ -240,6 +240,13 @@ public class ChunkHolder {
          this.playersInChunkTickRange = this.chunkMap.playerChunkTickRangeMap.getObjectsInRange(key);
      }
      // Paper end - optimise isOutsideOfRange
@@ -51,17 +47,17 @@ index ce320672d7602c94dd75ad857435dca6ac3bab56..8260636da673ef095728c208db2d6237
 +    public boolean canAdvanceStatus() {
 +        ChunkStatus status = getChunkHolderStatus();
 +        ChunkAccess chunk = getAvailableChunkNow();
-+        return chunk != null && (status == null || chunk.getStatus().isAtLeastStatus(getNextStatus(status)));
++        return chunk != null && (status == null || chunk.getStatus().isOrAfter(getNextStatus(status)));
 +    }
 +    // Paper end
  
-     // Paper start - no-tick view distance
-     public final LevelChunk getSendingChunk() {
+     public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
+         this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size());
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7a1f6d1807757a43a7aa471db651404c06720820..acc566d14926dcf9e88f3e0837884e4c823d777c 100644
+index c544529908dd5af63a829f54985eefc236e290db..4c8e5e3e69c629485b7118dfcc1eb04ac3c5f6c9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -792,7 +792,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -838,7 +838,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return either.mapLeft((list) -> {
                  return (LevelChunk) list.get(list.size() / 2);
              });
@@ -70,28 +66,10 @@ index 7a1f6d1807757a43a7aa471db651404c06720820..acc566d14926dcf9e88f3e0837884e4c
      }
  
      @Nullable
-@@ -1142,7 +1142,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                     ChunkAccess ichunkaccess = (ChunkAccess) optional.get();
- 
-                     if (ichunkaccess.getStatus().isOrAfter(requiredStatus)) {
--                        CompletableFuture completablefuture1;
-+                        CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completablefuture1; // Paper
- 
-                         if (requiredStatus == ChunkStatus.LIGHT) {
-                             completablefuture1 = this.scheduleChunkGeneration(holder, requiredStatus);
-@@ -1158,7 +1158,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                         return this.scheduleChunkGeneration(holder, requiredStatus);
-                     }
-                 }
--            }, this.mainThreadExecutor);
-+            }, this.mainInvokingExecutor).thenComposeAsync(CompletableFuture::completedFuture, this.mainInvokingExecutor); // Paper - optimize chunk status progression without jumping through thread pool - ensure main
-         }
-     }
- 
-@@ -1279,6 +1279,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 return CompletableFuture.completedFuture(Either.right(playerchunk_failure));
-             });
-         }, (runnable) -> {
+@@ -1222,6 +1222,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             return "chunkGenerate " + requiredStatus.getName();
+         });
+         Executor executor = (runnable) -> {
 +            // Paper start - optimize chunk status progression without jumping through thread pool
 +            if (holder.canAdvanceStatus()) {
 +                this.mainInvokingExecutor.execute(runnable);
@@ -99,5 +77,5 @@ index 7a1f6d1807757a43a7aa471db651404c06720820..acc566d14926dcf9e88f3e0837884e4c
 +            }
 +            // Paper end
              this.worldgenMailbox.tell(ChunkTaskPriorityQueueSorter.message(holder, runnable));
-         });
-     }
+         };
+ 
diff --git a/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0493-Move-range-check-for-block-placing-up.patch b/patches/server/0494-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0493-Move-range-check-for-block-placing-up.patch
rename to patches/server/0494-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0494-Fix-SPIGOT-5989.patch b/patches/server/0495-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0494-Fix-SPIGOT-5989.patch
rename to patches/server/0495-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0499-Fix-some-rails-connecting-improperly.patch b/patches/server/0500-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0499-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0500-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0500-Fix-MC-187716-Use-configured-height.patch b/patches/server/0501-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0500-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0501-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0503-Brand-support.patch b/patches/server/0504-Brand-support.patch
similarity index 100%
rename from patches/server/0503-Brand-support.patch
rename to patches/server/0504-Brand-support.patch
diff --git a/patches/server/0504-Add-setMaxPlayers-API.patch b/patches/server/0505-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0504-Add-setMaxPlayers-API.patch
rename to patches/server/0505-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0506-Don-t-require-FACING-data.patch b/patches/server/0507-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0506-Don-t-require-FACING-data.patch
rename to patches/server/0507-Don-t-require-FACING-data.patch
diff --git a/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0508-Add-moon-phase-API.patch b/patches/server/0509-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0508-Add-moon-phase-API.patch
rename to patches/server/0509-Add-moon-phase-API.patch
diff --git a/patches/server/0509-Prevent-headless-pistons-from-being-created.patch b/patches/server/0510-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0509-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0510-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0510-Add-BellRingEvent.patch b/patches/server/0511-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0510-Add-BellRingEvent.patch
rename to patches/server/0511-Add-BellRingEvent.patch
diff --git a/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
similarity index 95%
rename from patches/server/0511-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
index d9e6db9ef..b28ae8c71 100644
--- a/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2216fc05ef5f1c2f7e4dcab7bb20b9944838c5f4..f3d98b40b5adb5b6aa76371e9d3eb974b551d4f3 100644
+index 9e5810eb0085ad956f0bd1cd69fa88909d9d638a..fbd433f7d48282365c73e2a76f14c2755b49d930 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -38,6 +38,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0512-Buffer-joins-to-world.patch b/patches/server/0513-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0512-Buffer-joins-to-world.patch
rename to patches/server/0513-Buffer-joins-to-world.patch
diff --git a/patches/server/0513-Optimize-redstone-algorithm.patch b/patches/server/0514-Optimize-redstone-algorithm.patch
similarity index 99%
rename from patches/server/0513-Optimize-redstone-algorithm.patch
rename to patches/server/0514-Optimize-redstone-algorithm.patch
index 88314fe88..ed7013bf1 100644
--- a/patches/server/0513-Optimize-redstone-algorithm.patch
+++ b/patches/server/0514-Optimize-redstone-algorithm.patch
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f3d98b40b5adb5b6aa76371e9d3eb974b551d4f3..b1ae749b2178dc8c49a7adf4a3e93339d8b99dfb 100644
+index fbd433f7d48282365c73e2a76f14c2755b49d930..1ecf4ba21f0e7dd620804d952e11140ffd5af30b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -43,6 +43,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0516-Fix-CraftTeam-null-check.patch b/patches/server/0517-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0516-Fix-CraftTeam-null-check.patch
rename to patches/server/0517-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0517-Add-more-Evoker-API.patch b/patches/server/0518-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0517-Add-more-Evoker-API.patch
rename to patches/server/0518-Add-more-Evoker-API.patch
diff --git a/patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0520-Cache-block-data-strings.patch b/patches/server/0521-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0520-Cache-block-data-strings.patch
rename to patches/server/0521-Cache-block-data-strings.patch
diff --git a/patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 84%
rename from patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index b3714943b..ab1c08fa5 100644
--- a/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 377993f325400a9bc77f5fbc77d9ec50f5d76638..6be677e618ca5b5d5a969a02e77457dd6e3d2e11 100644
+index c28f693bf7da42570d95ab97ccb0ec2bf06f53ee..bcb2750a1b3a8cef6eb4e22c6409f77614390f7b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -373,6 +373,7 @@ public class ChunkHolder {
+@@ -380,6 +380,7 @@ public class ChunkHolder {
      }
  
      public void blockChanged(BlockPos pos) {
diff --git a/patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0528-Entity-isTicking.patch b/patches/server/0529-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0528-Entity-isTicking.patch
rename to patches/server/0529-Entity-isTicking.patch
diff --git a/patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0532-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0532-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0534-Optimise-getType-calls.patch b/patches/server/0535-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0534-Optimise-getType-calls.patch
rename to patches/server/0535-Optimise-getType-calls.patch
diff --git a/patches/server/0535-Villager-resetOffers.patch b/patches/server/0536-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0535-Villager-resetOffers.patch
rename to patches/server/0536-Villager-resetOffers.patch
diff --git a/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0539-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0539-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0540-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0540-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0540-Player-elytra-boost-API.patch b/patches/server/0541-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0540-Player-elytra-boost-API.patch
rename to patches/server/0541-Player-elytra-boost-API.patch
diff --git a/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0542-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0542-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0544-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0544-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0544-Add-ignore-discounts-API.patch b/patches/server/0545-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0544-Add-ignore-discounts-API.patch
rename to patches/server/0545-Add-ignore-discounts-API.patch
diff --git a/patches/server/0545-Toggle-for-removing-existing-dragon.patch b/patches/server/0546-Toggle-for-removing-existing-dragon.patch
similarity index 95%
rename from patches/server/0545-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0546-Toggle-for-removing-existing-dragon.patch
index 38144034b..13a8b48ee 100644
--- a/patches/server/0545-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0546-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b1ae749b2178dc8c49a7adf4a3e93339d8b99dfb..c484da4558e918c1456588e540a3b34e78581f81 100644
+index 1ecf4ba21f0e7dd620804d952e11140ffd5af30b..1f673932e329f7e713a37a8c06345a184650f0eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -53,6 +53,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0546-Fix-client-lag-on-advancement-loading.patch b/patches/server/0547-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0546-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0547-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0547-Item-no-age-no-player-pickup.patch b/patches/server/0548-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0547-Item-no-age-no-player-pickup.patch
rename to patches/server/0548-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0549-Beacon-API-custom-effect-ranges.patch b/patches/server/0550-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0549-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0550-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0550-Add-API-for-quit-reason.patch b/patches/server/0551-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0550-Add-API-for-quit-reason.patch
rename to patches/server/0551-Add-API-for-quit-reason.patch
diff --git a/patches/server/0551-Seed-based-feature-search.patch b/patches/server/0552-Seed-based-feature-search.patch
similarity index 98%
rename from patches/server/0551-Seed-based-feature-search.patch
rename to patches/server/0552-Seed-based-feature-search.patch
index 0beec6efd..d623e8506 100644
--- a/patches/server/0551-Seed-based-feature-search.patch
+++ b/patches/server/0552-Seed-based-feature-search.patch
@@ -21,7 +21,7 @@ changes but this should usually not happen. A config option to disable
 this completely is added though in case that should ever be necessary.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c484da4558e918c1456588e540a3b34e78581f81..cac404e1c7ede7b1076532555d35e6c18f158b16 100644
+index 1f673932e329f7e713a37a8c06345a184650f0eb..a3c76e0515ee38cb5dc55e7dbf3f91cac5ef4c28 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -361,6 +361,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 98%
rename from patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch
index 83f41c493..d2f671b97 100644
--- a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cac404e1c7ede7b1076532555d35e6c18f158b16..f4b533b8e8b6c4bb59d032e91a94353f4b201b69 100644
+index a3c76e0515ee38cb5dc55e7dbf3f91cac5ef4c28..5f25edb32b3e1194cf03c19574fc2ebd07b9a15e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -61,6 +61,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0554-Expose-world-spawn-angle.patch b/patches/server/0555-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0554-Expose-world-spawn-angle.patch
rename to patches/server/0555-Expose-world-spawn-angle.patch
diff --git a/patches/server/0555-Add-Destroy-Speed-API.patch b/patches/server/0556-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0555-Add-Destroy-Speed-API.patch
rename to patches/server/0556-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0557-Add-LivingEntity-clearActiveItem.patch b/patches/server/0558-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0557-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0558-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0558-Add-PlayerItemCooldownEvent.patch b/patches/server/0559-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0558-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0559-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0559-More-lightning-API.patch b/patches/server/0560-More-lightning-API.patch
similarity index 100%
rename from patches/server/0559-More-lightning-API.patch
rename to patches/server/0560-More-lightning-API.patch
diff --git a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch
index 45ec21ca3..451e9edc2 100644
--- a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f4b533b8e8b6c4bb59d032e91a94353f4b201b69..5344d25e7bef34954aa058ec019b4ba8ab4de515 100644
+index 5f25edb32b3e1194cf03c19574fc2ebd07b9a15e..edf82e84c2938ed70d51eb1199a4e92504c8c604 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -74,6 +74,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0561-Added-missing-default-perms-for-commands.patch b/patches/server/0562-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0561-Added-missing-default-perms-for-commands.patch
rename to patches/server/0562-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0562-Add-PlayerShearBlockEvent.patch b/patches/server/0563-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0562-Add-PlayerShearBlockEvent.patch
rename to patches/server/0563-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 96%
rename from patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch
index 559a2303d..800cef982 100644
--- a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch
@@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of
 the reputation when it is cured.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5344d25e7bef34954aa058ec019b4ba8ab4de515..cf8bc5432de023968ecdae6e48045c93021ad243 100644
+index edf82e84c2938ed70d51eb1199a4e92504c8c604..89bab0807b568cd19e3c84cc1314bdbb6463fb7e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -79,6 +79,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0565-Limit-recipe-packets.patch b/patches/server/0566-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0565-Limit-recipe-packets.patch
rename to patches/server/0566-Limit-recipe-packets.patch
diff --git a/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0567-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0567-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0567-MC-4-Fix-item-position-desync.patch b/patches/server/0568-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0567-MC-4-Fix-item-position-desync.patch
rename to patches/server/0568-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch b/patches/server/0569-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0568-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0569-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0570-Expose-LivingEntity-hurt-direction.patch b/patches/server/0571-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0570-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0571-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0573-added-PlayerTradeEvent.patch b/patches/server/0574-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0573-added-PlayerTradeEvent.patch
rename to patches/server/0574-added-PlayerTradeEvent.patch
diff --git a/patches/server/0574-Implement-TargetHitEvent.patch b/patches/server/0575-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0574-Implement-TargetHitEvent.patch
rename to patches/server/0575-Implement-TargetHitEvent.patch
diff --git a/patches/server/0575-Additional-Block-Material-API-s.patch b/patches/server/0576-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0575-Additional-Block-Material-API-s.patch
rename to patches/server/0576-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0576-Fix-harming-potion-dupe.patch b/patches/server/0577-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0576-Fix-harming-potion-dupe.patch
rename to patches/server/0577-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0578-Cache-burn-durations.patch b/patches/server/0579-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0578-Cache-burn-durations.patch
rename to patches/server/0579-Cache-burn-durations.patch
diff --git a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 95%
rename from patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 11b781e1d..26e26f398 100644
--- a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cf8bc5432de023968ecdae6e48045c93021ad243..f1cc0579654877fde716a3f99e4ea28044941b4b 100644
+index 89bab0807b568cd19e3c84cc1314bdbb6463fb7e..592717db9c9e8efda88c6a464c51a5d76f9694dc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -84,6 +84,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0583-Zombie-API-breaking-doors.patch b/patches/server/0584-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0583-Zombie-API-breaking-doors.patch
rename to patches/server/0584-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0584-Fix-nerfed-slime-when-splitting.patch b/patches/server/0585-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0584-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0585-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0585-Add-EntityLoadCrossbowEvent.patch b/patches/server/0586-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0585-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0586-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0586-Guardian-beam-workaround.patch b/patches/server/0587-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0586-Guardian-beam-workaround.patch
rename to patches/server/0587-Guardian-beam-workaround.patch
diff --git a/patches/server/0587-Added-WorldGameRuleChangeEvent.patch b/patches/server/0588-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0587-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0588-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch b/patches/server/0589-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0588-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0589-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 97%
rename from patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch
index 1ab57d3b3..9b788267a 100644
--- a/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added world settings for mobs picking up loot
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f1cc0579654877fde716a3f99e4ea28044941b4b..6fd1e1e36b8af32521adffc908c9a8e165cc3ac2 100644
+index 592717db9c9e8efda88c6a464c51a5d76f9694dc..ede1116c48182e3bb33b560b724fd0b36e8d5a38 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -415,6 +415,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0591-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0591-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0592-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0592-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0593-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0593-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0593-Configurable-door-breaking-difficulty.patch b/patches/server/0594-Configurable-door-breaking-difficulty.patch
similarity index 97%
rename from patches/server/0593-Configurable-door-breaking-difficulty.patch
rename to patches/server/0594-Configurable-door-breaking-difficulty.patch
index 058ac8694..e53e7805e 100644
--- a/patches/server/0593-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0594-Configurable-door-breaking-difficulty.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable door breaking difficulty
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6fd1e1e36b8af32521adffc908c9a8e165cc3ac2..aefc43e5fdcecb268a83a31cb6d4e4c4facebe4d 100644
+index ede1116c48182e3bb33b560b724fd0b36e8d5a38..ef1c9b4676ce993740af150953e8ba86b6568bf4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,10 @@ package com.destroystokyo.paper;
diff --git a/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0595-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0595-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0596-Remove-stale-POIs.patch b/patches/server/0597-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0596-Remove-stale-POIs.patch
rename to patches/server/0597-Remove-stale-POIs.patch
diff --git a/patches/server/0597-Fix-villager-boat-exploit.patch b/patches/server/0598-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0597-Fix-villager-boat-exploit.patch
rename to patches/server/0598-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0598-Add-sendOpLevel-API.patch b/patches/server/0599-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0598-Add-sendOpLevel-API.patch
rename to patches/server/0599-Add-sendOpLevel-API.patch
diff --git a/patches/server/0599-Add-StructureLocateEvent.patch b/patches/server/0600-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0599-Add-StructureLocateEvent.patch
rename to patches/server/0600-Add-StructureLocateEvent.patch
diff --git a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0601-Collision-option-for-requiring-a-player-participant.patch
similarity index 98%
rename from patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0601-Collision-option-for-requiring-a-player-participant.patch
index 9b6faa8e2..8667059d7 100644
--- a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0601-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index aefc43e5fdcecb268a83a31cb6d4e4c4facebe4d..cc15735a8a63952724facf3e053c6776dc6ad017 100644
+index ef1c9b4676ce993740af150953e8ba86b6568bf4..b1b27ea88850d85ed247541c8f26f30e2884676b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -64,6 +64,18 @@ public class PaperWorldConfig {
diff --git a/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0603-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0603-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0603-Make-schedule-command-per-world.patch b/patches/server/0604-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0603-Make-schedule-command-per-world.patch
rename to patches/server/0604-Make-schedule-command-per-world.patch
diff --git a/patches/server/0604-Configurable-max-leash-distance.patch b/patches/server/0605-Configurable-max-leash-distance.patch
similarity index 96%
rename from patches/server/0604-Configurable-max-leash-distance.patch
rename to patches/server/0605-Configurable-max-leash-distance.patch
index 0ea9f2b13..ed60a7ee4 100644
--- a/patches/server/0604-Configurable-max-leash-distance.patch
+++ b/patches/server/0605-Configurable-max-leash-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cc15735a8a63952724facf3e053c6776dc6ad017..3c1a84a33743b635e789024a5575fbe59b83bfe0 100644
+index b1b27ea88850d85ed247541c8f26f30e2884676b..5a7ad59aba34364f8832b2f532325f9d9241952b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -248,6 +248,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0605-Implement-BlockPreDispenseEvent.patch b/patches/server/0606-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0605-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0606-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0606-Added-Vanilla-Entity-Tags.patch b/patches/server/0607-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0606-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0607-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0607-added-Wither-API.patch b/patches/server/0608-added-Wither-API.patch
similarity index 100%
rename from patches/server/0607-added-Wither-API.patch
rename to patches/server/0608-added-Wither-API.patch
diff --git a/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0610-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0610-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0615-add-DragonEggFormEvent.patch b/patches/server/0616-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0615-add-DragonEggFormEvent.patch
rename to patches/server/0616-add-DragonEggFormEvent.patch
diff --git a/patches/server/0616-EntityMoveEvent.patch b/patches/server/0617-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0616-EntityMoveEvent.patch
rename to patches/server/0617-EntityMoveEvent.patch
diff --git a/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0618-Inline-shift-direction-fields.patch b/patches/server/0619-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0618-Inline-shift-direction-fields.patch
rename to patches/server/0619-Inline-shift-direction-fields.patch
diff --git a/patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0621-living-entity-allow-attribute-registration.patch b/patches/server/0622-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0621-living-entity-allow-attribute-registration.patch
rename to patches/server/0622-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0622-fix-dead-slime-setSize-invincibility.patch b/patches/server/0623-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0622-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0623-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0624-misc-debugging-dumps.patch b/patches/server/0625-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0624-misc-debugging-dumps.patch
rename to patches/server/0625-misc-debugging-dumps.patch
diff --git a/patches/server/0625-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0625-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0626-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0626-Expose-Tracked-Players.patch b/patches/server/0627-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0626-Expose-Tracked-Players.patch
rename to patches/server/0627-Expose-Tracked-Players.patch
diff --git a/patches/server/0627-Remove-streams-from-SensorNearest.patch b/patches/server/0628-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0627-Remove-streams-from-SensorNearest.patch
rename to patches/server/0628-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0630-Improve-ServerGUI.patch b/patches/server/0631-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0630-Improve-ServerGUI.patch
rename to patches/server/0631-Improve-ServerGUI.patch
diff --git a/patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0632-fix-converting-txt-to-json-file.patch b/patches/server/0633-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0632-fix-converting-txt-to-json-file.patch
rename to patches/server/0633-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0633-Add-worldborder-events.patch b/patches/server/0634-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0633-Add-worldborder-events.patch
rename to patches/server/0634-Add-worldborder-events.patch
diff --git a/patches/server/0634-added-PlayerNameEntityEvent.patch b/patches/server/0635-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0634-added-PlayerNameEntityEvent.patch
rename to patches/server/0635-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0635-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0636-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0635-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0636-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0636-Add-recipe-to-cook-events.patch b/patches/server/0637-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0636-Add-recipe-to-cook-events.patch
rename to patches/server/0637-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0637-Add-Block-isValidTool.patch b/patches/server/0638-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0637-Add-Block-isValidTool.patch
rename to patches/server/0638-Add-Block-isValidTool.patch
diff --git a/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0639-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0639-Implement-Keyed-on-World.patch b/patches/server/0640-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0639-Implement-Keyed-on-World.patch
rename to patches/server/0640-Implement-Keyed-on-World.patch
diff --git a/patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0641-Item-Rarity-API.patch b/patches/server/0642-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0641-Item-Rarity-API.patch
rename to patches/server/0642-Item-Rarity-API.patch
diff --git a/patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0643-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0644-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0643-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0644-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0645-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0645-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0646-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0648-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0648-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0648-Expose-protocol-version.patch b/patches/server/0649-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0648-Expose-protocol-version.patch
rename to patches/server/0649-Expose-protocol-version.patch
diff --git a/patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0651-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0651-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0652-Add-bypass-host-check.patch b/patches/server/0653-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0652-Add-bypass-host-check.patch
rename to patches/server/0653-Add-bypass-host-check.patch
diff --git a/patches/server/0653-Set-area-affect-cloud-rotation.patch b/patches/server/0654-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0653-Set-area-affect-cloud-rotation.patch
rename to patches/server/0654-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0655-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0655-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0656-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0656-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0657-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0657-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0658-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0658-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0659-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0659-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0660-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0660-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0661-Added-PlayerDeepSleepEvent.patch b/patches/server/0662-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0661-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0662-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0662-More-World-API.patch b/patches/server/0663-More-World-API.patch
similarity index 100%
rename from patches/server/0662-More-World-API.patch
rename to patches/server/0663-More-World-API.patch
diff --git a/patches/server/0663-Added-PlayerBedFailEnterEvent.patch b/patches/server/0664-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0663-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0664-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0665-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0665-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0666-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0667-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0666-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0667-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0668-Add-Channel-initialization-listeners.patch b/patches/server/0669-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0668-Add-Channel-initialization-listeners.patch
rename to patches/server/0669-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0670-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0670-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0670-Add-more-WanderingTrader-API.patch b/patches/server/0671-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0670-Add-more-WanderingTrader-API.patch
rename to patches/server/0671-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0671-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0672-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0671-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0672-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0674-Inventory-close.patch b/patches/server/0675-Inventory-close.patch
similarity index 100%
rename from patches/server/0674-Inventory-close.patch
rename to patches/server/0675-Inventory-close.patch
diff --git a/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0677-Fix-CraftPotionBrewer-cache.patch b/patches/server/0678-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0677-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0678-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0678-Add-basic-Datapack-API.patch b/patches/server/0679-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0678-Add-basic-Datapack-API.patch
rename to patches/server/0679-Add-basic-Datapack-API.patch
diff --git a/patches/server/0679-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0680-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0679-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0680-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0681-Clear-SyncLoadInfo.patch b/patches/server/0682-Clear-SyncLoadInfo.patch
similarity index 100%
rename from patches/server/0681-Clear-SyncLoadInfo.patch
rename to patches/server/0682-Clear-SyncLoadInfo.patch
diff --git a/patches/server/0682-ItemStack-repair-check-API.patch b/patches/server/0683-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0682-ItemStack-repair-check-API.patch
rename to patches/server/0683-ItemStack-repair-check-API.patch
diff --git a/patches/server/0683-More-Enchantment-API.patch b/patches/server/0684-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0683-More-Enchantment-API.patch
rename to patches/server/0684-More-Enchantment-API.patch
diff --git a/patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0686-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0685-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0686-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0686-Add-Mob-lookAt-API.patch b/patches/server/0687-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0686-Add-Mob-lookAt-API.patch
rename to patches/server/0687-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0687-Add-Unix-domain-socket-support.patch b/patches/server/0688-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0687-Add-Unix-domain-socket-support.patch
rename to patches/server/0688-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0688-Add-EntityInsideBlockEvent.patch b/patches/server/0689-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0688-Add-EntityInsideBlockEvent.patch
rename to patches/server/0689-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0689-Attributes-API-for-item-defaults.patch b/patches/server/0690-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0689-Attributes-API-for-item-defaults.patch
rename to patches/server/0690-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0692-More-Lidded-Block-API.patch b/patches/server/0693-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0692-More-Lidded-Block-API.patch
rename to patches/server/0693-More-Lidded-Block-API.patch
diff --git a/patches/server/0693-Limit-item-frame-cursors-on-maps.patch b/patches/server/0694-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0693-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0694-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0694-Add-PufferFishStateChangeEvent.patch b/patches/server/0695-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0694-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0695-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0695-Add-PlayerKickEvent-causes.patch b/patches/server/0696-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0695-Add-PlayerKickEvent-causes.patch
rename to patches/server/0696-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0699-Add-BellRevealRaiderEvent.patch b/patches/server/0700-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0699-Add-BellRevealRaiderEvent.patch
rename to patches/server/0700-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0700-Fix-invulnerable-end-crystals.patch b/patches/server/0701-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0700-Fix-invulnerable-end-crystals.patch
rename to patches/server/0701-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0701-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0702-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0701-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0702-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0703-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0703-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0703-Fix-dangerous-end-portal-logic.patch b/patches/server/0704-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0703-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0704-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0705-Make-item-validations-configurable.patch b/patches/server/0706-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0705-Make-item-validations-configurable.patch
rename to patches/server/0706-Make-item-validations-configurable.patch
diff --git a/patches/server/0706-Add-more-line-of-sight-methods.patch b/patches/server/0707-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0706-Add-more-line-of-sight-methods.patch
rename to patches/server/0707-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0707-add-per-world-spawn-limits.patch b/patches/server/0708-add-per-world-spawn-limits.patch
similarity index 96%
rename from patches/server/0707-add-per-world-spawn-limits.patch
rename to patches/server/0708-add-per-world-spawn-limits.patch
index b6996ad35..0f1dd93b1 100644
--- a/patches/server/0707-add-per-world-spawn-limits.patch
+++ b/patches/server/0708-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d55bebc250a6d43a292477811a938575c2a65452..e36b13dedcdb60cbd014a4c3b450442f38dffe74 100644
+index 9974151e3bcc7db9acf3f6adacb68331f6085824..913b0a9b5a31aba4e28e1fe15d5d58b4c8edfc3c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -626,6 +626,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch