From 7480cf008a8e36141e5ea26c1b3e864fb3f50219 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Tue, 15 Jun 2021 17:43:00 +0200
Subject: [PATCH] Port Stop-copy-on-write-operations-for-updating-light-dat

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

diff --git a/patches/removed/1.17/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 52%
rename from patches/removed/1.17/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
index d2b1599c09..86a2778202 100644
--- a/patches/removed/1.17/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/server/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
@@ -5,25 +5,23 @@ Subject: [PATCH] Stop copy-on-write operations for updating light data
 
 Causes huge memory allocations + gc issues
 
-1.17 update note: Needs updating, temp skipped
-
 diff --git a/src/main/java/net/minecraft/world/level/lighting/BlockLightSectionStorage.java b/src/main/java/net/minecraft/world/level/lighting/BlockLightSectionStorage.java
-index 9f33fa8f84d10f8f4089030074ad6c0d81269ce8..a1ad4d73ddaf6afe97a1f1ff7e0622b52fac8761 100644
+index 573cdb0897978eef8f5fc906ed4928293f4b2ab9..314b46f0becd088d26956b45981217b128d539cb 100644
 --- a/src/main/java/net/minecraft/world/level/lighting/BlockLightSectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/lighting/BlockLightSectionStorage.java
-@@ -10,7 +10,7 @@ import net.minecraft.world.level.chunk.LightChunkGetter;
- public class BlockLightSectionStorage extends LayerLightSectionStorage<BlockLightSectionStorage.BlockDataLayerStorageMap> {
+@@ -9,7 +9,7 @@ import net.minecraft.world.level.chunk.LightChunkGetter;
  
+ public class BlockLightSectionStorage extends LayerLightSectionStorage<BlockLightSectionStorage.BlockDataLayerStorageMap> {
      protected BlockLightSectionStorage(LightChunkGetter chunkProvider) {
--        super(LightLayer.BLOCK, chunkProvider, new BlockLightSectionStorage.BlockDataLayerStorageMap(new Long2ObjectOpenHashMap()));
+-        super(LightLayer.BLOCK, chunkProvider, new BlockLightSectionStorage.BlockDataLayerStorageMap(new Long2ObjectOpenHashMap<>()));
 +        super(LightLayer.BLOCK, chunkProvider, new BlockLightSectionStorage.BlockDataLayerStorageMap(new com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<>(), false)); // Paper - avoid copying light data
      }
  
      @Override
-@@ -23,13 +23,13 @@ public class BlockLightSectionStorage extends LayerLightSectionStorage<BlockLigh
- 
-     public static final class BlockDataLayerStorageMap extends DataLayerStorageMap<BlockLightSectionStorage.BlockDataLayerStorageMap> {
+@@ -20,13 +20,13 @@ public class BlockLightSectionStorage extends LayerLightSectionStorage<BlockLigh
+     }
  
+     protected static final class BlockDataLayerStorageMap extends DataLayerStorageMap<BlockLightSectionStorage.BlockDataLayerStorageMap> {
 -        public BlockDataLayerStorageMap(Long2ObjectOpenHashMap<DataLayer> arrays) {
 -            super(arrays);
 +        public BlockDataLayerStorageMap(com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<DataLayer> long2objectopenhashmap, boolean isVisible) { // Paper - avoid copying light data
@@ -38,7 +36,7 @@ index 9f33fa8f84d10f8f4089030074ad6c0d81269ce8..a1ad4d73ddaf6afe97a1f1ff7e0622b5
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/lighting/DataLayerStorageMap.java b/src/main/java/net/minecraft/world/level/lighting/DataLayerStorageMap.java
-index 01ae1c811862f56317a90e3811fe2ef4b593695f..4c9041f1c1cb4b3ec114fbd0c5d4db50a6f2526d 100644
+index 67ff66e232592203cf8dad605ad01eabc4dded89..f357a3473682c2d37a20fb862522c67b9979402a 100644
 --- a/src/main/java/net/minecraft/world/level/lighting/DataLayerStorageMap.java
 +++ b/src/main/java/net/minecraft/world/level/lighting/DataLayerStorageMap.java
 @@ -9,10 +9,23 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
@@ -46,13 +44,12 @@ index 01ae1c811862f56317a90e3811fe2ef4b593695f..4c9041f1c1cb4b3ec114fbd0c5d4db50
      private final DataLayer[] lastSections = new DataLayer[2];
      private boolean cacheEnabled;
 -    protected final Long2ObjectOpenHashMap<DataLayer> map;
--
--    protected DataLayerStorageMap(Long2ObjectOpenHashMap<DataLayer> arrays) {
--        this.map = arrays;
 +    protected final com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<DataLayer> data; // Paper - avoid copying light data
 +    protected final boolean isVisible; // Paper - avoid copying light data
 +    java.util.function.Function<Long, DataLayer> lookup; // Paper - faster branchless lookup
-+
+ 
+-    protected DataLayerStorageMap(Long2ObjectOpenHashMap<DataLayer> arrays) {
+-        this.map = arrays;
 +    // Paper start - avoid copying light data
 +    protected DataLayerStorageMap(com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<DataLayer> data, boolean isVisible) {
 +        if (isVisible) {
@@ -73,7 +70,7 @@ index 01ae1c811862f56317a90e3811fe2ef4b593695f..4c9041f1c1cb4b3ec114fbd0c5d4db50
      public abstract M copy();
  
      public void copyDataLayer(long pos) {
--        this.map.put(pos, ((DataLayer) this.map.get(pos)).copy());
+-        this.map.put(pos, this.map.get(pos).copy());
 +        if (this.isVisible) { throw new IllegalStateException("writing to visible data"); } // Paper - avoid copying light data
 +        this.data.queueUpdate(pos, ((DataLayer) this.data.getUpdating(pos)).copy()); // Paper - avoid copying light data
          this.clearCache();
@@ -88,22 +85,22 @@ index 01ae1c811862f56317a90e3811fe2ef4b593695f..4c9041f1c1cb4b3ec114fbd0c5d4db50
 -    public DataLayer getLayer(long chunkPos) {
 +    public final DataLayer getLayer(long chunkPos) { // Paper - final
          if (this.cacheEnabled) {
-             for (int j = 0; j < 2; ++j) {
-                 if (chunkPos == this.lastSectionKeys[j]) {
+             for(int i = 0; i < 2; ++i) {
+                 if (chunkPos == this.lastSectionKeys[i]) {
 @@ -38,7 +52,7 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
              }
          }
  
--        DataLayer nibblearray = (DataLayer) this.map.get(chunkPos);
-+        DataLayer nibblearray = lookup.apply(chunkPos); // Paper - avoid copying light data
- 
-         if (nibblearray == null) {
+-        DataLayer dataLayer = this.map.get(chunkPos);
++        DataLayer dataLayer = lookup.apply(chunkPos); // Paper - avoid copying light data
+         if (dataLayer == null) {
              return null;
-@@ -59,11 +73,13 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
+         } else {
+@@ -58,11 +72,13 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
  
      @Nullable
      public DataLayer removeLayer(long chunkPos) {
--        return (DataLayer) this.map.remove(chunkPos);
+-        return this.map.remove(chunkPos);
 +        if (this.isVisible) { throw new IllegalStateException("writing to visible data"); } // Paper - avoid copying light data
 +        return (DataLayer) this.data.queueRemove(chunkPos); // Paper - avoid copying light data
      }
@@ -115,45 +112,35 @@ index 01ae1c811862f56317a90e3811fe2ef4b593695f..4c9041f1c1cb4b3ec114fbd0c5d4db50
      }
  
      public void clearCache() {
-@@ -71,7 +87,6 @@ public abstract class DataLayerStorageMap<M extends DataLayerStorageMap<M>> {
-             this.lastSectionKeys[i] = Long.MAX_VALUE;
-             this.lastSections[i] = null;
-         }
--
-     }
- 
-     public void disableCache() {
 diff --git a/src/main/java/net/minecraft/world/level/lighting/LayerLightSectionStorage.java b/src/main/java/net/minecraft/world/level/lighting/LayerLightSectionStorage.java
-index 45be10a0d7c26e4b6e5738ba994ce343265210f5..177dae992d13674bb285a60b8427df9ea843dc99 100644
+index ee32aba07aad4a3f101a6a57f7aa6c07f74dd0c3..cc9eb8273d5157fb649d84a3ec589b0b923b5bc9 100644
 --- a/src/main/java/net/minecraft/world/level/lighting/LayerLightSectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/lighting/LayerLightSectionStorage.java
-@@ -26,8 +26,8 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
+@@ -28,7 +28,7 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
      protected final LongSet dataSectionSet = new LongOpenHashSet();
      protected final LongSet toMarkNoData = new LongOpenHashSet();
      protected final LongSet toMarkData = new LongOpenHashSet();
 -    protected volatile M visibleSectionData;
--    protected final M updatingSectionData;
 +    protected volatile M e_visible; protected final Object visibleUpdateLock = new Object(); // Paper - diff on change, should be "visible" - force compile fail on usage change
-+    protected final M updatingSectionData; // Paper - diff on change, should be "updating"
+     protected final M updatingSectionData;
      protected final LongSet changedSections = new LongOpenHashSet();
      protected final LongSet sectionsAffectedByLightUpdates = new LongOpenHashSet();
-     protected final Long2ObjectMap<DataLayer> queuedSections = Long2ObjectMaps.synchronize(new Long2ObjectOpenHashMap());
-@@ -41,8 +41,8 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
+@@ -43,8 +43,8 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
          this.layer = lightType;
          this.chunkSource = chunkProvider;
          this.updatingSectionData = lightData;
 -        this.visibleSectionData = lightData.copy();
 -        this.visibleSectionData.disableCache();
-+        this.e_visible = lightData.copy(); // Paper - avoid copying light data
-+        this.e_visible.disableCache(); // Paper - avoid copying light data
++        this.e_visible = lightData.copy(); // Paper - avoid copying light dat
++        this.e_visible.disableCache(); // Paper - avoid copying light dat
      }
  
      protected boolean storingLightForSection(long sectionPos) {
-@@ -51,7 +51,15 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
+@@ -53,7 +53,15 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
  
      @Nullable
      protected DataLayer getDataLayer(long sectionPos, boolean cached) {
--        return this.getDataLayer(cached ? this.updatingSectionData : this.visibleSectionData, sectionPos);
+-        return this.getDataLayer((M)(cached ? this.updatingSectionData : this.visibleSectionData), sectionPos);
 +        // Paper start - avoid copying light data
 +        if (cached) {
 +            return this.getDataLayer(this.updatingSectionData, sectionPos);
@@ -166,150 +153,138 @@ index 45be10a0d7c26e4b6e5738ba994ce343265210f5..177dae992d13674bb285a60b8427df9e
      }
  
      @Nullable
-@@ -364,10 +372,12 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
+@@ -346,9 +354,11 @@ public abstract class LayerLightSectionStorage<M extends DataLayerStorageMap<M>>
  
      protected void swapSectionMap() {
          if (!this.changedSections.isEmpty()) {
 +            synchronized (this.visibleUpdateLock) { // Paper - avoid copying light data
-             M m0 = this.updatingSectionData.copy();
- 
-             m0.disableCache();
--            this.visibleSectionData = m0;
-+            this.e_visible = m0; // Paper - avoid copying light data
+             M dataLayerStorageMap = this.updatingSectionData.copy();
+             dataLayerStorageMap.disableCache();
+-            this.visibleSectionData = dataLayerStorageMap;
++            this.e_visible = dataLayerStorageMap; // Paper - avoid copying light data
 +            } // Paper - avoid copying light data
              this.changedSections.clear();
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/lighting/SkyLightSectionStorage.java b/src/main/java/net/minecraft/world/level/lighting/SkyLightSectionStorage.java
-index c304637ae8f80c65b58e8ba8a27609b532bb1184..410fcfa8c01b7e3d3e3829ebdb92a11badff16ea 100644
+index fb41fddaee27097b8b503ae13d6a775b207f883a..f6df52403a1068a0779e4ff8c2ce5dc06176e061 100644
 --- a/src/main/java/net/minecraft/world/level/lighting/SkyLightSectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/lighting/SkyLightSectionStorage.java
-@@ -23,15 +23,16 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+@@ -21,7 +21,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
      private volatile boolean hasSourceInconsistencies;
  
      protected SkyLightSectionStorage(LightChunkGetter chunkProvider) {
--        super(LightLayer.SKY, chunkProvider, new SkyLightSectionStorage.SkyDataLayerStorageMap(new Long2ObjectOpenHashMap(), new Long2IntOpenHashMap(), Integer.MAX_VALUE));
+-        super(LightLayer.SKY, chunkProvider, new SkyLightSectionStorage.SkyDataLayerStorageMap(new Long2ObjectOpenHashMap<>(), new Long2IntOpenHashMap(), Integer.MAX_VALUE));
 +        super(LightLayer.SKY, chunkProvider, new SkyLightSectionStorage.SkyDataLayerStorageMap(new com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<>(), new com.destroystokyo.paper.util.map.QueuedChangesMapLong2Int(), Integer.MAX_VALUE, false)); // Paper - avoid copying light data
      }
  
      @Override
-     protected int getLightValue(long blockPos) {
-         long j = SectionPos.blockToSection(blockPos);
-         int k = SectionPos.y(j);
--        SkyLightSectionStorage.SkyDataLayerStorageMap lightenginestoragesky_a = (SkyLightSectionStorage.SkyDataLayerStorageMap) this.visibleSectionData;
--        int l = lightenginestoragesky_a.topSections.get(SectionPos.getZeroNode(j));
+@@ -32,8 +32,9 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+     protected int getLightValue(long l, boolean bl) {
+         long m = SectionPos.blockToSection(l);
+         int i = SectionPos.y(m);
+-        SkyLightSectionStorage.SkyDataLayerStorageMap skyDataLayerStorageMap = bl ? this.updatingSectionData : this.visibleSectionData;
+-        int j = skyDataLayerStorageMap.topSections.get(SectionPos.getZeroNode(m));
 +        synchronized (this.visibleUpdateLock) { // Paper - avoid copying light data
-+        SkyLightSectionStorage.SkyDataLayerStorageMap lightenginestoragesky_a = (SkyLightSectionStorage.SkyDataLayerStorageMap) this.e_visible; // Paper - avoid copying light data - must be after lock acquire
-+        int l = lightenginestoragesky_a.otherData.getVisibleAsync(SectionPos.getZeroNode(j)); // Paper - avoid copying light data
- 
-         if (l != lightenginestoragesky_a.currentLowestY && k < l) {
-             DataLayer nibblearray = this.getDataLayer(lightenginestoragesky_a, j); // Paper - decompile fix
++        SkyLightSectionStorage.SkyDataLayerStorageMap skyDataLayerStorageMap = (SkyLightSectionStorage.SkyDataLayerStorageMap) this.e_visible; // Paper - avoid copying light data - must be after lock acquire
++        int j = skyDataLayerStorageMap.otherData.getVisibleAsync(SectionPos.getZeroNode(m)); // Paper - avoid copying light data
+         if (j != skyDataLayerStorageMap.currentLowestY && i < j) {
+             DataLayer dataLayer = this.getDataLayer(skyDataLayerStorageMap, m);
+             if (dataLayer == null) {
 @@ -52,6 +53,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
          } else {
-             return 15;
+             return bl && !this.lightOnInSection(m) ? 0 : 15;
          }
 +        } // Paper - avoid copying light data
      }
  
      @Override
-@@ -60,14 +62,14 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
- 
-         if (((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY > j) {
-             ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY = j;
--            ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.defaultReturnValue(((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY);
-+            ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.queueDefaultReturnValue(((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY); // Paper - avoid copying light data
+@@ -59,13 +61,13 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+         int i = SectionPos.y(sectionPos);
+         if ((this.updatingSectionData).currentLowestY > i) {
+             (this.updatingSectionData).currentLowestY = i;
+-            (this.updatingSectionData).topSections.defaultReturnValue((this.updatingSectionData).currentLowestY);
++            (this.updatingSectionData).otherData.queueDefaultReturnValue((this.updatingSectionData).currentLowestY); // Paper - avoid copying light data
          }
  
-         long k = SectionPos.getZeroNode(sectionPos);
--        int l = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.get(k);
-+        int l = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.getUpdating(k); // Paper - avoid copying light data
- 
-         if (l < j + 1) {
--            ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.put(k, j + 1);
-+            ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.queueUpdate(k, j + 1); // Paper - avoid copying light data
-             if (this.columnsWithSkySources.contains(k)) {
+         long l = SectionPos.getZeroNode(sectionPos);
+-        int j = (this.updatingSectionData).topSections.get(l);
++        int j = (this.updatingSectionData).otherData.getUpdating(l); // Paper - avoid copying light data
+         if (j < i + 1) {
+-            (this.updatingSectionData).topSections.put(l, i + 1);
++            (this.updatingSectionData).otherData.queueUpdate(l, i + 1); // Paper - avoid copying light data
+             if (this.columnsWithSkySources.contains(l)) {
                  this.queueAddSource(sectionPos);
-                 if (l > ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY) {
-@@ -107,7 +109,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+                 if (j > (this.updatingSectionData).currentLowestY) {
+@@ -102,19 +104,19 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+         }
  
-         int k = SectionPos.y(sectionPos);
- 
--        if (((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.get(j) == k + 1) {
-+        if (((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.getUpdating(j) == k + 1) { // Paper - avoid copying light data
-             long l;
- 
-             for (l = sectionPos; !this.storingLightForSection(l) && this.hasSectionsBelow(k); l = SectionPos.offset(l, Direction.DOWN)) {
-@@ -115,12 +117,12 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+         int i = SectionPos.y(sectionPos);
+-        if ((this.updatingSectionData).topSections.get(l) == i + 1) {
++        if ((this.updatingSectionData).otherData.getUpdating(l) == i + 1) { // Paper - avoid copying light data
+             long m;
+             for(m = sectionPos; !this.storingLightForSection(m) && this.hasSectionsBelow(i); m = SectionPos.offset(m, Direction.DOWN)) {
+                 --i;
              }
  
-             if (this.storingLightForSection(l)) {
--                ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.put(j, k + 1);
-+                ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.queueUpdate(j, k + 1); // Paper - avoid copying light data
-                 if (flag) {
-                     this.queueAddSource(l);
+             if (this.storingLightForSection(m)) {
+-                (this.updatingSectionData).topSections.put(l, i + 1);
++                (this.updatingSectionData).otherData.queueUpdate(l, i + 1); // Paper - avoid copying light data
+                 if (bl) {
+                     this.queueAddSource(m);
                  }
              } else {
--                ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.remove(j);
-+                ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.queueRemove(j); // Paper - avoid copying light data
+-                (this.updatingSectionData).topSections.remove(l);
++                (this.updatingSectionData).otherData.queueRemove(l); // Paper - avoid copying light data
              }
          }
  
-@@ -134,7 +136,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+@@ -128,7 +130,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
      protected void enableLightSources(long columnPos, boolean enabled) {
          this.runAllUpdates();
          if (enabled && this.columnsWithSkySources.add(columnPos)) {
--            int j = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.get(columnPos);
-+            int j = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.getUpdating(columnPos); // Paper - avoid copying light data
- 
-             if (j != ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY) {
-                 long k = SectionPos.asLong(SectionPos.x(columnPos), j - 1, SectionPos.z(columnPos));
-@@ -161,7 +163,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
-             return nibblearray;
+-            int i = (this.updatingSectionData).topSections.get(columnPos);
++            int i = (this.updatingSectionData).otherData.getUpdating(columnPos); // Paper - avoid copying light data
+             if (i != (this.updatingSectionData).currentLowestY) {
+                 long l = SectionPos.asLong(SectionPos.x(columnPos), i - 1, SectionPos.z(columnPos));
+                 this.queueAddSource(l);
+@@ -152,7 +154,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+             return dataLayer;
          } else {
-             long j = SectionPos.offset(sectionPos, Direction.UP);
--            int k = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.get(SectionPos.getZeroNode(sectionPos));
-+            int k = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.getUpdating(SectionPos.getZeroNode(sectionPos)); // Paper - avoid copying light data
- 
-             if (k != ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY && SectionPos.y(j) < k) {
-                 DataLayer nibblearray1;
-@@ -304,7 +306,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
-             if (!this.columnsWithSkySources.contains(l)) {
-                 return false;
-             } else {
--                int i1 = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.get(l);
-+                int i1 = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.getUpdating(l); // Paper - avoid copying light data
- 
-                 return SectionPos.sectionToBlockCoord(i1) == j + 16;
-             }
-@@ -313,7 +315,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+             long l = SectionPos.offset(sectionPos, Direction.UP);
+-            int i = (this.updatingSectionData).topSections.get(SectionPos.getZeroNode(sectionPos));
++            int i = (this.updatingSectionData).otherData.getUpdating(SectionPos.getZeroNode(sectionPos)); // Paper - avoid copying light data
+             if (i != (this.updatingSectionData).currentLowestY && SectionPos.y(l) < i) {
+                 DataLayer dataLayer2;
+                 while((dataLayer2 = this.getDataLayer(l, true)) == null) {
+@@ -260,7 +262,7 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
  
      protected boolean isAboveData(long sectionPos) {
-         long j = SectionPos.getZeroNode(sectionPos);
--        int k = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).topSections.get(j);
-+        int k = ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).otherData.getUpdating(j); // Paper - avoid copying light data
- 
-         return k == ((SkyLightSectionStorage.SkyDataLayerStorageMap) this.updatingSectionData).currentLowestY || SectionPos.y(sectionPos) >= k;
+         long l = SectionPos.getZeroNode(sectionPos);
+-        int i = (this.updatingSectionData).topSections.get(l);
++        int i = (this.updatingSectionData).otherData.getUpdating(l); // Paper - avoid copying light data
+         return i == (this.updatingSectionData).currentLowestY || SectionPos.y(sectionPos) >= i;
      }
-@@ -327,18 +329,21 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
-     public static final class SkyDataLayerStorageMap extends DataLayerStorageMap<SkyLightSectionStorage.SkyDataLayerStorageMap> {
  
-         private int currentLowestY;
--        private final Long2IntOpenHashMap topSections;
+@@ -271,18 +273,21 @@ public class SkyLightSectionStorage extends LayerLightSectionStorage<SkyLightSec
+ 
+     protected static final class SkyDataLayerStorageMap extends DataLayerStorageMap<SkyLightSectionStorage.SkyDataLayerStorageMap> {
+         int currentLowestY;
+-        final Long2IntOpenHashMap topSections;
 -
 -        public SkyDataLayerStorageMap(Long2ObjectOpenHashMap<DataLayer> arrays, Long2IntOpenHashMap columnToTopSection, int minSectionY) {
 -            super(arrays);
 -            this.topSections = columnToTopSection;
 -            columnToTopSection.defaultReturnValue(minSectionY);
--            this.currentLowestY = minSectionY;
 +        private final com.destroystokyo.paper.util.map.QueuedChangesMapLong2Int otherData; // Paper - avoid copying light data
 +
 +        // Paper start - avoid copying light data
-+        public SkyDataLayerStorageMap(com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<DataLayer> data, com.destroystokyo.paper.util.map.QueuedChangesMapLong2Int otherData, int i, boolean isVisible) {
-+            super(data, isVisible);
-+            this.otherData = otherData;
-+            otherData.queueDefaultReturnValue(i);
-+            // Paper end - avoid copying light data
-+            this.currentLowestY = i;
++        public SkyDataLayerStorageMap(com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object<DataLayer> arrays, com.destroystokyo.paper.util.map.QueuedChangesMapLong2Int columnToTopSection, int minSectionY, boolean isVisible) {
++            super(arrays, isVisible);
++            this.otherData = columnToTopSection;
++            otherData.queueDefaultReturnValue(minSectionY);
++            // Paper end
+             this.currentLowestY = minSectionY;
          }
  
          @Override
diff --git a/patches/server/0469-Support-old-UUID-format-for-NBT.patch b/patches/server/0470-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0469-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0470-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0470-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0471-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0470-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0471-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0471-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0472-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0471-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0472-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0473-Remove-some-streams-from-structures.patch b/patches/server/0474-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0473-Remove-some-streams-from-structures.patch
rename to patches/server/0474-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0474-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0474-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0475-Support-components-in-ItemMeta.patch b/patches/server/0476-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0475-Support-components-in-ItemMeta.patch
rename to patches/server/0476-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0476-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0477-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0476-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0477-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0477-Add-entity-liquid-API.patch b/patches/server/0478-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0477-Add-entity-liquid-API.patch
rename to patches/server/0478-Add-entity-liquid-API.patch
diff --git a/patches/server/0478-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0479-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0478-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0479-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0479-Spawn-player-in-correct-world-on-login.patch b/patches/server/0480-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0479-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0480-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0480-Add-PrepareResultEvent.patch b/patches/server/0481-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0480-Add-PrepareResultEvent.patch
rename to patches/server/0481-Add-PrepareResultEvent.patch
diff --git a/patches/server/0481-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0482-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0481-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0482-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0482-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0483-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0482-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0483-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0483-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0484-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0483-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0484-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0484-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0485-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0484-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0485-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0485-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0486-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0485-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0486-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0486-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0487-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0486-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0487-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0487-Move-range-check-for-block-placing-up.patch b/patches/server/0488-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0487-Move-range-check-for-block-placing-up.patch
rename to patches/server/0488-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0488-Fix-SPIGOT-5989.patch b/patches/server/0489-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0488-Fix-SPIGOT-5989.patch
rename to patches/server/0489-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0489-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0490-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0489-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0490-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0490-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0491-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0490-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0491-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0491-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0492-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0491-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0492-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0492-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0493-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0492-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0493-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0493-Fix-some-rails-connecting-improperly.patch b/patches/server/0494-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0493-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0494-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0494-Incremental-player-saving.patch b/patches/server/0495-Incremental-player-saving.patch
similarity index 100%
rename from patches/server/0494-Incremental-player-saving.patch
rename to patches/server/0495-Incremental-player-saving.patch
diff --git a/patches/server/0495-Fix-MC-187716-Use-configured-height.patch b/patches/server/0496-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0495-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0496-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0496-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0497-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0496-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0497-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0497-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0498-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0497-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0498-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0498-Brand-support.patch b/patches/server/0499-Brand-support.patch
similarity index 100%
rename from patches/server/0498-Brand-support.patch
rename to patches/server/0499-Brand-support.patch
diff --git a/patches/server/0499-Add-setMaxPlayers-API.patch b/patches/server/0500-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0499-Add-setMaxPlayers-API.patch
rename to patches/server/0500-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0500-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0501-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0500-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0501-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0501-Don-t-require-FACING-data.patch b/patches/server/0502-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0501-Don-t-require-FACING-data.patch
rename to patches/server/0502-Don-t-require-FACING-data.patch
diff --git a/patches/server/0502-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0503-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0502-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0503-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0503-Add-moon-phase-API.patch b/patches/server/0504-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0503-Add-moon-phase-API.patch
rename to patches/server/0504-Add-moon-phase-API.patch
diff --git a/patches/server/0504-Prevent-headless-pistons-from-being-created.patch b/patches/server/0505-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0504-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0505-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0505-Add-BellRingEvent.patch b/patches/server/0506-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0505-Add-BellRingEvent.patch
rename to patches/server/0506-Add-BellRingEvent.patch
diff --git a/patches/server/0506-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0507-Add-zombie-targets-turtle-egg-config.patch
similarity index 95%
rename from patches/server/0506-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0507-Add-zombie-targets-turtle-egg-config.patch
index 2f5c2120c0..b65976440a 100644
--- a/patches/server/0506-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0507-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 040956f5d714ac014f9a153981d444db299fd826..83a4a3bbea1c076788cb7746adcee61e128b90fe 100644
+index a22abda177b0ffc9699fb23aaac8680261f385fe..a14989c20275c49b0e6eaba52f3e06b28b043445 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/0507-Buffer-joins-to-world.patch b/patches/server/0508-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0507-Buffer-joins-to-world.patch
rename to patches/server/0508-Buffer-joins-to-world.patch
diff --git a/patches/server/0508-Optimize-redstone-algorithm.patch b/patches/server/0509-Optimize-redstone-algorithm.patch
similarity index 99%
rename from patches/server/0508-Optimize-redstone-algorithm.patch
rename to patches/server/0509-Optimize-redstone-algorithm.patch
index 4ed4d3c38a..fc9c369c29 100644
--- a/patches/server/0508-Optimize-redstone-algorithm.patch
+++ b/patches/server/0509-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 83a4a3bbea1c076788cb7746adcee61e128b90fe..acbaa00167d60ca6c6019b2dcd0947ef1d0557ee 100644
+index a14989c20275c49b0e6eaba52f3e06b28b043445..631b68a4a661ceadac02c032e9199c54580f4079 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/0509-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0510-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0509-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0510-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0510-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0511-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0510-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0511-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0511-Fix-CraftTeam-null-check.patch b/patches/server/0512-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0511-Fix-CraftTeam-null-check.patch
rename to patches/server/0512-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0512-Add-more-Evoker-API.patch b/patches/server/0513-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0512-Add-more-Evoker-API.patch
rename to patches/server/0513-Add-more-Evoker-API.patch
diff --git a/patches/server/0513-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0514-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0513-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0514-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0514-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0515-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0514-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0515-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0515-Cache-block-data-strings.patch b/patches/server/0516-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0515-Cache-block-data-strings.patch
rename to patches/server/0516-Cache-block-data-strings.patch
diff --git a/patches/server/0516-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0517-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0516-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0517-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0517-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0518-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0517-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0518-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0518-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0519-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0518-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0519-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0519-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0520-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0519-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0520-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0520-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0521-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0520-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0521-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0521-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0522-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0521-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0522-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0522-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0523-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0522-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0523-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0523-Entity-isTicking.patch b/patches/server/0524-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0523-Entity-isTicking.patch
rename to patches/server/0524-Entity-isTicking.patch
diff --git a/patches/server/0524-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0525-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0524-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0525-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0525-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0526-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0525-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0526-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/patches/server/0526-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0527-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0526-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0527-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0527-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0528-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0527-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0528-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0528-Optimise-getType-calls.patch b/patches/server/0529-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0528-Optimise-getType-calls.patch
rename to patches/server/0529-Optimise-getType-calls.patch
diff --git a/patches/server/0529-Villager-resetOffers.patch b/patches/server/0530-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0529-Villager-resetOffers.patch
rename to patches/server/0530-Villager-resetOffers.patch
diff --git a/patches/server/0530-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0531-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0530-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0531-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0531-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0532-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0531-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0532-Retain-block-place-order-when-capturing-blockstates.patch
index c81368ec8e..9825acb711 100644
--- a/patches/server/0531-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0532-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f004f5012ce157f9b0fb9c5890b5f3de957418f8..febc4fececb4bf527a69e47a06d782ec81616c1e 100644
+index d9697003d05ddc344207793b4f266743fcaef16c..c820cc7f3be693f445937a157ac2477e36f906b4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -147,7 +147,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0532-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0533-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0532-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0533-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0533-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0534-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0533-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0534-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0534-Player-elytra-boost-API.patch b/patches/server/0535-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0534-Player-elytra-boost-API.patch
rename to patches/server/0535-Player-elytra-boost-API.patch
diff --git a/patches/server/0535-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0536-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0535-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0536-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0536-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0537-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0536-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0537-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0537-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0538-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0537-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0538-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0538-Add-ignore-discounts-API.patch b/patches/server/0539-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0538-Add-ignore-discounts-API.patch
rename to patches/server/0539-Add-ignore-discounts-API.patch
diff --git a/patches/server/0539-Toggle-for-removing-existing-dragon.patch b/patches/server/0540-Toggle-for-removing-existing-dragon.patch
similarity index 95%
rename from patches/server/0539-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0540-Toggle-for-removing-existing-dragon.patch
index c7654f7d44..64a9a031ad 100644
--- a/patches/server/0539-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0540-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 acbaa00167d60ca6c6019b2dcd0947ef1d0557ee..b3e9149dbbc1cd6a6d01bb9f7109136b995afb0a 100644
+index 631b68a4a661ceadac02c032e9199c54580f4079..f46890906f324d8c3f4d1917d38b0f8f8604e2f2 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/0540-Fix-client-lag-on-advancement-loading.patch b/patches/server/0541-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0540-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0541-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0541-Item-no-age-no-player-pickup.patch b/patches/server/0542-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0541-Item-no-age-no-player-pickup.patch
rename to patches/server/0542-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0543-Beacon-API-custom-effect-ranges.patch b/patches/server/0544-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0543-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0544-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0544-Add-API-for-quit-reason.patch b/patches/server/0545-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0544-Add-API-for-quit-reason.patch
rename to patches/server/0545-Add-API-for-quit-reason.patch
diff --git a/patches/server/0545-Seed-based-feature-search.patch b/patches/server/0546-Seed-based-feature-search.patch
similarity index 98%
rename from patches/server/0545-Seed-based-feature-search.patch
rename to patches/server/0546-Seed-based-feature-search.patch
index 46be6bfd43..359f0d7a61 100644
--- a/patches/server/0545-Seed-based-feature-search.patch
+++ b/patches/server/0546-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 b3e9149dbbc1cd6a6d01bb9f7109136b995afb0a..2523aabf499ef3807af02f7e61a3b13dbca08ee3 100644
+index f46890906f324d8c3f4d1917d38b0f8f8604e2f2..72bfeb3d465585ea6de4e896eee65b5bed75188d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -376,6 +376,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0546-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0547-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 98%
rename from patches/server/0546-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0547-Add-Wandering-Trader-spawn-rate-config-options.patch
index 22e1ab6f8c..fccbad4b4d 100644
--- a/patches/server/0546-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0547-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 2523aabf499ef3807af02f7e61a3b13dbca08ee3..d76b292cdfa2ae4d84a449da7f66faba494f6b03 100644
+index 72bfeb3d465585ea6de4e896eee65b5bed75188d..19c42a9863341f1d06ad57e95049b3cd5b88aeb2 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/0547-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0548-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0547-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0548-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0548-Expose-world-spawn-angle.patch b/patches/server/0549-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0548-Expose-world-spawn-angle.patch
rename to patches/server/0549-Expose-world-spawn-angle.patch
diff --git a/patches/server/0549-Add-Destroy-Speed-API.patch b/patches/server/0550-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0549-Add-Destroy-Speed-API.patch
rename to patches/server/0550-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0550-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0551-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0550-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0551-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0551-Add-LivingEntity-clearActiveItem.patch b/patches/server/0552-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0551-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0552-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0552-Add-PlayerItemCooldownEvent.patch b/patches/server/0553-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0552-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0553-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0553-More-lightning-API.patch b/patches/server/0554-More-lightning-API.patch
similarity index 100%
rename from patches/server/0553-More-lightning-API.patch
rename to patches/server/0554-More-lightning-API.patch
diff --git a/patches/server/0554-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0555-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0554-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0555-Climbing-should-not-bypass-cramming-gamerule.patch
index af8c479a90..71d40d33a8 100644
--- a/patches/server/0554-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0555-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 d76b292cdfa2ae4d84a449da7f66faba494f6b03..0ec093e5d8865e909d0d105e27b81b31bdb5c192 100644
+index 19c42a9863341f1d06ad57e95049b3cd5b88aeb2..aef38974128c7986864571a3552a566ad672dccd 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/0555-Added-missing-default-perms-for-commands.patch b/patches/server/0556-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0555-Added-missing-default-perms-for-commands.patch
rename to patches/server/0556-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0556-Add-PlayerShearBlockEvent.patch b/patches/server/0557-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0556-Add-PlayerShearBlockEvent.patch
rename to patches/server/0557-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0557-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0558-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0557-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0558-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0558-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0559-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 96%
rename from patches/server/0558-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0559-Fix-curing-zombie-villager-discount-exploit.patch
index b6a6b16e0f..9e23cbc2fd 100644
--- a/patches/server/0558-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0559-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 0ec093e5d8865e909d0d105e27b81b31bdb5c192..1a8e7a495c38f617932825185378b2e494158175 100644
+index aef38974128c7986864571a3552a566ad672dccd..dd23c6dc5e680006c10329433c059fc9b85dd1cc 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/0559-Limit-recipe-packets.patch b/patches/server/0560-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0559-Limit-recipe-packets.patch
rename to patches/server/0560-Limit-recipe-packets.patch
diff --git a/patches/server/0560-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0561-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0560-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0561-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0561-MC-4-Fix-item-position-desync.patch b/patches/server/0562-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0561-MC-4-Fix-item-position-desync.patch
rename to patches/server/0562-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0562-Player-Chunk-Load-Unload-Events.patch b/patches/server/0563-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0562-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0563-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0563-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0564-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0563-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0564-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0564-Expose-LivingEntity-hurt-direction.patch b/patches/server/0565-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0564-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0565-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0565-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0566-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0565-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0566-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0566-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0567-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0566-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0567-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0567-added-PlayerTradeEvent.patch b/patches/server/0568-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0567-added-PlayerTradeEvent.patch
rename to patches/server/0568-added-PlayerTradeEvent.patch
diff --git a/patches/server/0568-Implement-TargetHitEvent.patch b/patches/server/0569-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0568-Implement-TargetHitEvent.patch
rename to patches/server/0569-Implement-TargetHitEvent.patch
diff --git a/patches/server/0569-Additional-Block-Material-API-s.patch b/patches/server/0570-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0569-Additional-Block-Material-API-s.patch
rename to patches/server/0570-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0570-Fix-harming-potion-dupe.patch b/patches/server/0571-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0570-Fix-harming-potion-dupe.patch
rename to patches/server/0571-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0571-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0572-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0571-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0572-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0572-Cache-burn-durations.patch b/patches/server/0573-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0572-Cache-burn-durations.patch
rename to patches/server/0573-Cache-burn-durations.patch
diff --git a/patches/server/0573-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0574-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 95%
rename from patches/server/0573-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0574-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index df86b299c0..3bd5f9edeb 100644
--- a/patches/server/0573-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0574-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 1a8e7a495c38f617932825185378b2e494158175..3c9bc0684f25d511b05b724d4d52aaa82e965397 100644
+index dd23c6dc5e680006c10329433c059fc9b85dd1cc..adf3ddd9ea295aafc8f8a5c0196d7c6ef54d0c4b 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/0574-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0575-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0574-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0575-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0575-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0576-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0575-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0576-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0576-Zombie-API-breaking-doors.patch b/patches/server/0577-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0576-Zombie-API-breaking-doors.patch
rename to patches/server/0577-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0577-Fix-nerfed-slime-when-splitting.patch b/patches/server/0578-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0577-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0578-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0578-Add-EntityLoadCrossbowEvent.patch b/patches/server/0579-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0578-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0579-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0579-Guardian-beam-workaround.patch b/patches/server/0580-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0579-Guardian-beam-workaround.patch
rename to patches/server/0580-Guardian-beam-workaround.patch
diff --git a/patches/server/0580-Added-WorldGameRuleChangeEvent.patch b/patches/server/0581-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0580-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0581-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0581-Added-ServerResourcesReloadedEvent.patch b/patches/server/0582-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0581-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0582-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0582-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0583-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 97%
rename from patches/server/0582-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0583-Added-world-settings-for-mobs-picking-up-loot.patch
index 84060c5b85..ef1e217c08 100644
--- a/patches/server/0582-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0583-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 3c9bc0684f25d511b05b724d4d52aaa82e965397..4a9fedb40acc72bec29fe71634406b06ce6b53cd 100644
+index adf3ddd9ea295aafc8f8a5c0196d7c6ef54d0c4b..db9d8d1f30c671207617fc75c24b771cd7a23391 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -430,6 +430,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0583-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0584-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0583-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0584-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0584-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0585-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0584-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0585-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0585-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0586-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0585-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0586-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0586-Configurable-door-breaking-difficulty.patch b/patches/server/0587-Configurable-door-breaking-difficulty.patch
similarity index 98%
rename from patches/server/0586-Configurable-door-breaking-difficulty.patch
rename to patches/server/0587-Configurable-door-breaking-difficulty.patch
index a2bac6f78b..de65c8bc54 100644
--- a/patches/server/0586-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0587-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 4a9fedb40acc72bec29fe71634406b06ce6b53cd..48e0f9b8dbb94d56200b0b46c2a50d9bfa44b398 100644
+index db9d8d1f30c671207617fc75c24b771cd7a23391..75b4da3d38912e52e7ca4d99d51bd97e06808303 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/0587-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0588-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0587-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0588-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0588-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0589-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0588-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0589-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0589-Remove-stale-POIs.patch b/patches/server/0590-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0589-Remove-stale-POIs.patch
rename to patches/server/0590-Remove-stale-POIs.patch
diff --git a/patches/server/0590-Fix-villager-boat-exploit.patch b/patches/server/0591-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0590-Fix-villager-boat-exploit.patch
rename to patches/server/0591-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0591-Add-sendOpLevel-API.patch b/patches/server/0592-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0591-Add-sendOpLevel-API.patch
rename to patches/server/0592-Add-sendOpLevel-API.patch
diff --git a/patches/server/0592-Add-StructureLocateEvent.patch b/patches/server/0593-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0592-Add-StructureLocateEvent.patch
rename to patches/server/0593-Add-StructureLocateEvent.patch
diff --git a/patches/server/0593-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0594-Collision-option-for-requiring-a-player-participant.patch
similarity index 98%
rename from patches/server/0593-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0594-Collision-option-for-requiring-a-player-participant.patch
index ab0cf7aa4c..c8a256ef02 100644
--- a/patches/server/0593-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0594-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 48e0f9b8dbb94d56200b0b46c2a50d9bfa44b398..bc39e5fe8c9f5d1e5b5c4ea7bd80193af8574211 100644
+index 75b4da3d38912e52e7ca4d99d51bd97e06808303..013c6f898faca8c22b805c8a476666a0b73828f3 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/0594-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0595-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0594-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0595-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0595-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0596-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0595-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0596-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0596-Make-schedule-command-per-world.patch b/patches/server/0597-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0596-Make-schedule-command-per-world.patch
rename to patches/server/0597-Make-schedule-command-per-world.patch
diff --git a/patches/server/0597-Configurable-max-leash-distance.patch b/patches/server/0598-Configurable-max-leash-distance.patch
similarity index 96%
rename from patches/server/0597-Configurable-max-leash-distance.patch
rename to patches/server/0598-Configurable-max-leash-distance.patch
index 39b2c1b3a2..fd6ea75e17 100644
--- a/patches/server/0597-Configurable-max-leash-distance.patch
+++ b/patches/server/0598-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 bc39e5fe8c9f5d1e5b5c4ea7bd80193af8574211..214b7ab71c4717faa3c949e18f268bef3e066305 100644
+index 013c6f898faca8c22b805c8a476666a0b73828f3..a001f5cd737cf5c76dc14b2b3442238adaa5f79e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -263,6 +263,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0598-Implement-BlockPreDispenseEvent.patch b/patches/server/0599-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0598-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0599-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0599-Added-Vanilla-Entity-Tags.patch b/patches/server/0600-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0599-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0600-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0600-added-Wither-API.patch b/patches/server/0601-added-Wither-API.patch
similarity index 100%
rename from patches/server/0600-added-Wither-API.patch
rename to patches/server/0601-added-Wither-API.patch
diff --git a/patches/server/0601-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0602-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0601-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0602-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0602-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0603-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0602-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0603-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0603-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0604-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0603-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0604-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0604-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0605-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0604-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0605-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0605-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0606-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0605-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0606-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0606-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0607-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0606-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0607-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0607-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0608-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0607-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0608-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0608-add-DragonEggFormEvent.patch b/patches/server/0609-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0608-add-DragonEggFormEvent.patch
rename to patches/server/0609-add-DragonEggFormEvent.patch
diff --git a/patches/server/0609-EntityMoveEvent.patch b/patches/server/0610-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0609-EntityMoveEvent.patch
rename to patches/server/0610-EntityMoveEvent.patch
diff --git a/patches/server/0610-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0611-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0610-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0611-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0611-Inline-shift-direction-fields.patch b/patches/server/0612-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0611-Inline-shift-direction-fields.patch
rename to patches/server/0612-Inline-shift-direction-fields.patch
diff --git a/patches/server/0612-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0613-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0612-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0613-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0613-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0614-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0613-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0614-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0614-living-entity-allow-attribute-registration.patch b/patches/server/0615-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0614-living-entity-allow-attribute-registration.patch
rename to patches/server/0615-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0615-fix-dead-slime-setSize-invincibility.patch b/patches/server/0616-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0615-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0616-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0616-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0617-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0616-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0617-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0617-misc-debugging-dumps.patch b/patches/server/0618-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0617-misc-debugging-dumps.patch
rename to patches/server/0618-misc-debugging-dumps.patch
diff --git a/patches/server/0618-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0619-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0618-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0619-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0619-Expose-Tracked-Players.patch b/patches/server/0620-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0619-Expose-Tracked-Players.patch
rename to patches/server/0620-Expose-Tracked-Players.patch
diff --git a/patches/server/0620-Remove-streams-from-SensorNearest.patch b/patches/server/0621-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0620-Remove-streams-from-SensorNearest.patch
rename to patches/server/0621-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0621-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0622-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0621-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0622-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0622-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0623-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0622-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0623-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0623-Improve-ServerGUI.patch b/patches/server/0624-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0623-Improve-ServerGUI.patch
rename to patches/server/0624-Improve-ServerGUI.patch
diff --git a/patches/server/0624-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0625-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0624-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0625-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0625-fix-converting-txt-to-json-file.patch b/patches/server/0626-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0625-fix-converting-txt-to-json-file.patch
rename to patches/server/0626-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0626-Add-worldborder-events.patch b/patches/server/0627-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0626-Add-worldborder-events.patch
rename to patches/server/0627-Add-worldborder-events.patch
diff --git a/patches/server/0627-added-PlayerNameEntityEvent.patch b/patches/server/0628-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0627-added-PlayerNameEntityEvent.patch
rename to patches/server/0628-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0628-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0629-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0628-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0629-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0629-Add-recipe-to-cook-events.patch b/patches/server/0630-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0629-Add-recipe-to-cook-events.patch
rename to patches/server/0630-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0630-Add-Block-isValidTool.patch b/patches/server/0631-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0630-Add-Block-isValidTool.patch
rename to patches/server/0631-Add-Block-isValidTool.patch
diff --git a/patches/server/0631-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0632-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0631-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0632-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0632-Implement-Keyed-on-World.patch b/patches/server/0633-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0632-Implement-Keyed-on-World.patch
rename to patches/server/0633-Implement-Keyed-on-World.patch
diff --git a/patches/server/0633-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0634-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0633-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0634-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0634-Item-Rarity-API.patch b/patches/server/0635-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0634-Item-Rarity-API.patch
rename to patches/server/0635-Item-Rarity-API.patch
diff --git a/patches/server/0635-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0636-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0635-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0636-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0636-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0637-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0636-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0637-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0637-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0638-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0637-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0638-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0638-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0639-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0638-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0639-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0639-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0640-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0639-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0640-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0640-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0641-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0640-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0641-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0641-Expose-protocol-version.patch b/patches/server/0642-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0641-Expose-protocol-version.patch
rename to patches/server/0642-Expose-protocol-version.patch
diff --git a/patches/server/0642-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0643-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0642-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0643-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0643-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0644-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0643-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0644-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0644-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0645-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0644-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0645-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0645-Add-bypass-host-check.patch b/patches/server/0646-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0645-Add-bypass-host-check.patch
rename to patches/server/0646-Add-bypass-host-check.patch
diff --git a/patches/server/0646-Set-area-affect-cloud-rotation.patch b/patches/server/0647-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0646-Set-area-affect-cloud-rotation.patch
rename to patches/server/0647-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0647-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0648-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0647-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0648-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0648-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0649-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0648-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0649-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0649-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0650-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0649-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0650-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0650-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0651-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0650-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0651-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0651-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0652-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0651-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0652-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0652-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0653-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0652-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0653-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0653-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0654-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0653-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0654-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0654-Added-PlayerDeepSleepEvent.patch b/patches/server/0655-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0654-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0655-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0655-More-World-API.patch b/patches/server/0656-More-World-API.patch
similarity index 100%
rename from patches/server/0655-More-World-API.patch
rename to patches/server/0656-More-World-API.patch
diff --git a/patches/server/0656-Added-PlayerBedFailEnterEvent.patch b/patches/server/0657-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0656-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0657-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0657-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0658-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0657-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0658-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0658-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0659-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0658-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0659-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0659-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0660-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0659-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0660-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0660-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0661-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0660-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0661-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0661-Add-Channel-initialization-listeners.patch b/patches/server/0662-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0661-Add-Channel-initialization-listeners.patch
rename to patches/server/0662-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0662-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0663-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0662-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0663-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0663-Add-more-WanderingTrader-API.patch b/patches/server/0664-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0663-Add-more-WanderingTrader-API.patch
rename to patches/server/0664-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0664-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0665-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0664-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0665-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0665-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0666-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0665-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0666-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0666-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0667-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0666-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0667-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0667-Inventory-close.patch b/patches/server/0668-Inventory-close.patch
similarity index 100%
rename from patches/server/0667-Inventory-close.patch
rename to patches/server/0668-Inventory-close.patch
diff --git a/patches/server/0668-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0669-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0668-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0669-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0669-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0670-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0669-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0670-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0670-Fix-CraftPotionBrewer-cache.patch b/patches/server/0671-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0670-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0671-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0671-Add-basic-Datapack-API.patch b/patches/server/0672-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0671-Add-basic-Datapack-API.patch
rename to patches/server/0672-Add-basic-Datapack-API.patch
diff --git a/patches/server/0672-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0673-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0672-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0673-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0673-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0674-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0673-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0674-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0674-ItemStack-repair-check-API.patch b/patches/server/0675-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0674-ItemStack-repair-check-API.patch
rename to patches/server/0675-ItemStack-repair-check-API.patch
diff --git a/patches/server/0675-More-Enchantment-API.patch b/patches/server/0676-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0675-More-Enchantment-API.patch
rename to patches/server/0676-More-Enchantment-API.patch
diff --git a/patches/server/0676-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0677-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0676-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0677-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0677-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0678-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0677-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0678-Fix-and-optimise-world-force-upgrading.patch
index 8b74933f38..ac027dc065 100644
--- a/patches/server/0677-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0678-Fix-and-optimise-world-force-upgrading.patch
@@ -297,7 +297,7 @@ index 73ac55de9059a1d0f1da5bec0688dcd4bf5c8973..db2d6e7b2dc82c60d524dd2a018d28c2
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index febc4fececb4bf527a69e47a06d782ec81616c1e..ccf6c79293ca046174b94a61a28aea3fa9c2a37f 100644
+index c820cc7f3be693f445937a157ac2477e36f906b4..ac7d3da1ca3b41e37daacb13865667614fde321b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -174,6 +174,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0678-Add-Mob-lookAt-API.patch b/patches/server/0679-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0678-Add-Mob-lookAt-API.patch
rename to patches/server/0679-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0679-Add-Unix-domain-socket-support.patch b/patches/server/0680-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0679-Add-Unix-domain-socket-support.patch
rename to patches/server/0680-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0680-Add-EntityInsideBlockEvent.patch b/patches/server/0681-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0680-Add-EntityInsideBlockEvent.patch
rename to patches/server/0681-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0681-Attributes-API-for-item-defaults.patch b/patches/server/0682-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0681-Attributes-API-for-item-defaults.patch
rename to patches/server/0682-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0682-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0683-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0682-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0683-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0683-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0684-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0683-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0684-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0684-More-Lidded-Block-API.patch b/patches/server/0685-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0684-More-Lidded-Block-API.patch
rename to patches/server/0685-More-Lidded-Block-API.patch
diff --git a/patches/server/0685-Limit-item-frame-cursors-on-maps.patch b/patches/server/0686-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0685-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0686-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0686-Add-PufferFishStateChangeEvent.patch b/patches/server/0687-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0686-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0687-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0687-Add-PlayerKickEvent-causes.patch b/patches/server/0688-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0687-Add-PlayerKickEvent-causes.patch
rename to patches/server/0688-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0688-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0689-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0688-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0689-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0689-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0690-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0689-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0690-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0690-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0691-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0690-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0691-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0691-Add-BellRevealRaiderEvent.patch b/patches/server/0692-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0691-Add-BellRevealRaiderEvent.patch
rename to patches/server/0692-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0692-Fix-invulnerable-end-crystals.patch b/patches/server/0693-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0692-Fix-invulnerable-end-crystals.patch
rename to patches/server/0693-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0693-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0694-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0693-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0694-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0694-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0695-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0694-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0695-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0695-Fix-dangerous-end-portal-logic.patch b/patches/server/0696-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0695-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0696-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0696-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0697-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0696-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0697-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0697-Make-item-validations-configurable.patch b/patches/server/0698-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0697-Make-item-validations-configurable.patch
rename to patches/server/0698-Make-item-validations-configurable.patch
diff --git a/patches/server/0698-Add-more-line-of-sight-methods.patch b/patches/server/0699-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0698-Add-more-line-of-sight-methods.patch
rename to patches/server/0699-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0699-add-per-world-spawn-limits.patch b/patches/server/0700-add-per-world-spawn-limits.patch
similarity index 96%
rename from patches/server/0699-add-per-world-spawn-limits.patch
rename to patches/server/0700-add-per-world-spawn-limits.patch
index 4bfb3570ac..b5bb36f0e0 100644
--- a/patches/server/0699-add-per-world-spawn-limits.patch
+++ b/patches/server/0700-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 31be320d7d4cf8659d2d4281186b3f0d424a99e1..cc2d40ba72a904baf2c39cd011cf7e1c746b2ca9 100644
+index 43ab68f1822e92973e57a40f63376b467df3bdc7..c7bf1926bf2e02aae02585681c974f8e2f66d7c5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -602,6 +602,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0700-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0701-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0700-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0701-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0701-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0702-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0701-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0702-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch