From 622598f1dd467b744e0df1675a95a7f16eae062b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 14 Aug 2021 15:22:21 +0100
Subject: [PATCH] Revert "Remove
 "Implement-Chunk-Priority-Urgency-System-for-Chunks" (Fixes #5980)"

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

diff --git a/patches/removed/1.17/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/removed/1.17/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
similarity index 86%
rename from patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
index abfc15f9ce..d1f6cc775c 100644
--- a/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
@@ -36,10 +36,10 @@ scenario / path:
 Previously would have hopped to SERVER around 12+ times there extra.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 8245e07f6ecfd9dd997c8525b52c6eadd392e6f1..52ae149d22e8b0f3c2321f383351a4244c517b5e 100644
+index 3364ff7e8a829771a84c6f2e61d37bb4c099af87..52fc256c0d4de63ba94625218661db397b6e704e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -113,6 +113,20 @@ public class ChunkHolder {
+@@ -242,6 +242,13 @@ public class ChunkHolder {
      // Paper end - optimise isOutsideOfRange
      long lastAutoSaveTime; // Paper - incremental autosave
      long inactiveTimeStart; // Paper - incremental autosave
@@ -49,22 +49,15 @@ index 8245e07f6ecfd9dd997c8525b52c6eadd392e6f1..52ae149d22e8b0f3c2321f383351a424
 +        ChunkAccess chunk = getAvailableChunkNow();
 +        return chunk != null && (status == null || chunk.getStatus().isOrAfter(getNextStatus(status)));
 +    }
-+    // Yanked from chunk priotisation patch - remove?
-+    public static ChunkStatus getNextStatus(ChunkStatus status) {
-+        if (status == ChunkStatus.FULL) {
-+            return status;
-+        }
-+        return CHUNK_STATUSES.get(status.getIndex() + 1);
-+    }
 +    // Paper end
  
      public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
          this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size());
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f518fc7a39a807bff2e141fd238ab1bfc34ce890..cd76029f2dc3ecfa52bae127ae261a028fa8839a 100644
+index dd0f9ab476735e0a61533bdfed5868fa5f523b68..017ed8e1db45d49de67b17b5979721cfd57fb9c7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -702,7 +702,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -841,7 +841,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return either.mapLeft((list) -> {
                  return (LevelChunk) list.get(list.size() / 2);
              });
@@ -73,7 +66,7 @@ index f518fc7a39a807bff2e141fd238ab1bfc34ce890..cd76029f2dc3ecfa52bae127ae261a02
      }
  
      @Nullable
-@@ -1133,6 +1133,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1282,6 +1282,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return "chunkGenerate " + requiredStatus.getName();
          });
          Executor executor = (runnable) -> {
diff --git a/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0493-Move-range-check-for-block-placing-up.patch b/patches/server/0494-Move-range-check-for-block-placing-up.patch
similarity index 94%
rename from patches/server/0493-Move-range-check-for-block-placing-up.patch
rename to patches/server/0494-Move-range-check-for-block-placing-up.patch
index 2d81d6d87d..3539918f55 100644
--- a/patches/server/0493-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0494-Move-range-check-for-block-placing-up.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae3465cd5be426f3bddc3552b6aad6cad8c8ee25..e307f8695643360289b998a8d2ad244d966f1180 100644
+index 91df850e66aa14b13a679357e02e2f74dc653628..03ad0c0365f85a1536fb35bfdf08d6d44240df80 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1672,17 +1672,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1673,17 +1673,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          BlockPos blockposition = movingobjectpositionblock.getBlockPos();
          Direction enumdirection = movingobjectpositionblock.getDirection();
  
diff --git a/patches/server/0494-Optimize-Light-Engine.patch b/patches/server/0495-Optimize-Light-Engine.patch
similarity index 98%
rename from patches/server/0494-Optimize-Light-Engine.patch
rename to patches/server/0495-Optimize-Light-Engine.patch
index a68e088263..f15d107294 100644
--- a/patches/server/0494-Optimize-Light-Engine.patch
+++ b/patches/server/0495-Optimize-Light-Engine.patch
@@ -25,20 +25,19 @@ Massive update to light to improve performance and chunk loading/generation.
 8) Fix NPE risk that crashes server in getting nibble data
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 52ae149d22e8b0f3c2321f383351a4244c517b5e..72dd0141cb360c346690ecdb1e14d2c94ae6de90 100644
+index 52fc256c0d4de63ba94625218661db397b6e704e..e3c8e7692e8ca005e98d4158de0c961087dfb199 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -639,7 +639,7 @@ public class ChunkHolder {
+@@ -773,6 +773,7 @@ public class ChunkHolder {
+                 ioPriority = com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGH_PRIORITY;
+             }
+             chunkMap.level.asyncChunkTaskManager.raisePriority(pos.x, pos.z, ioPriority);
++            chunkMap.level.getChunkSource().getLightEngine().queue.changePriority(pos.toLong(), this.queueLevel, priority); // Paper
          }
- 
-         this.onLevelChange.onLevelChange(this.pos, this::getQueueLevel, this.ticketLevel, this::setQueueLevel);
--        this.oldTicketLevel = this.ticketLevel;
-+        //chunkMap.level.getChunkSource().getLightEngine().queue.changePriority(pos.toLong(), this.queueLevel, priority); // Paper // Restore this in chunk priority later?
-         // CraftBukkit start
-         // ChunkLoadEvent: Called after the chunk is loaded: isChunkLoaded returns true and chunk is ready to be modified by plugins.
-         if (!playerchunk_state.isOrAfter(ChunkHolder.FullChunkStatus.BORDER) && playerchunk_state1.isOrAfter(ChunkHolder.FullChunkStatus.BORDER)) {
+         if (this.queueLevel != priority) {
+             this.onLevelChange.onLevelChange(this.pos, () -> this.queueLevel, priority, p -> this.queueLevel = p); // use preferred priority
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index cd76029f2dc3ecfa52bae127ae261a028fa8839a..c42f564ecac75f7947c580e7514795c26097761e 100644
+index 017ed8e1db45d49de67b17b5979721cfd57fb9c7..42fd259f4492e539112b5bcb310aaaadab58a443 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -97,6 +97,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
@@ -49,7 +48,7 @@ index cd76029f2dc3ecfa52bae127ae261a028fa8839a..c42f564ecac75f7947c580e7514795c2
  import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet; // Paper
  import org.apache.commons.lang3.mutable.MutableBoolean;
  import org.apache.logging.log4j.LogManager;
-@@ -335,6 +336,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -338,6 +339,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end
  
@@ -57,7 +56,7 @@ index cd76029f2dc3ecfa52bae127ae261a028fa8839a..c42f564ecac75f7947c580e7514795c2
      public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
          super(new File(session.getDimensionPath(world.dimension()), "region"), dataFixer, dsync);
          //this.visibleChunks = this.updatingChunks.clone(); // Paper - no more cloning
-@@ -360,7 +362,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -372,7 +374,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
          this.progressListener = worldGenerationProgressListener;
          this.chunkStatusListener = chunkStatusChangeListener;
@@ -74,7 +73,7 @@ index cd76029f2dc3ecfa52bae127ae261a028fa8839a..c42f564ecac75f7947c580e7514795c2
  
          this.queueSorter = new ChunkTaskPriorityQueueSorter(ImmutableList.of(threadedmailbox, mailbox, threadedmailbox1), executor, Integer.MAX_VALUE);
          this.worldgenMailbox = this.queueSorter.getProcessor(threadedmailbox, false);
-@@ -742,6 +752,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -881,6 +891,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      @Override
      public void close() throws IOException {
          try {
@@ -127,10 +126,10 @@ index d3d6651eb51c852ed1d1eeb5689569d5308b246d..c2d36600a0081c78425868154bdcf7f4
                          m = Long.MAX_VALUE;
                      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index ffe700489cb2d507421abfb48939808de0adc8be..5a2b3c150ceaaae651c3ec6aeff3bb894dd5f94d 100644
+index c63cbb6da6f734c3a93c63af2b28a6e588f22bf2..ddf28939d8037bcea456350093d077c503a3b66e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -1044,7 +1044,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -1076,7 +1076,7 @@ public class ServerChunkCache extends ChunkSource {
              if (ServerChunkCache.this.runDistanceManagerUpdates()) {
                  return true;
              } else {
diff --git a/patches/server/0495-Fix-SPIGOT-5989.patch b/patches/server/0496-Fix-SPIGOT-5989.patch
similarity index 91%
rename from patches/server/0495-Fix-SPIGOT-5989.patch
rename to patches/server/0496-Fix-SPIGOT-5989.patch
index ffb76ae31a..f2057aefc6 100644
--- a/patches/server/0495-Fix-SPIGOT-5989.patch
+++ b/patches/server/0496-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e0c9857a922d8a3f421d7df0f056b82c4775390e..82a646365b5b0619825995c722cf773bf23b64ae 100644
+index 4918f89401cdf6a85d8b71f3e3a6608239a388bd..83df832b1fe5be1c1114ce3ae10c1985bf564a0c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -79,6 +79,7 @@ import net.minecraft.world.level.GameRules;
@@ -21,7 +21,7 @@ index e0c9857a922d8a3f421d7df0f056b82c4775390e..82a646365b5b0619825995c722cf773b
  import net.minecraft.world.level.block.state.BlockState;
  import net.minecraft.world.level.border.BorderChangeListener;
  import net.minecraft.world.level.border.WorldBorder;
-@@ -829,6 +830,7 @@ public abstract class PlayerList {
+@@ -830,6 +831,7 @@ public abstract class PlayerList {
          // Paper start
          boolean isBedSpawn = false;
          boolean isRespawn = false;
@@ -29,7 +29,7 @@ index e0c9857a922d8a3f421d7df0f056b82c4775390e..82a646365b5b0619825995c722cf773b
          // Paper end
  
          // CraftBukkit start - fire PlayerRespawnEvent
-@@ -839,7 +841,7 @@ public abstract class PlayerList {
+@@ -840,7 +842,7 @@ public abstract class PlayerList {
                  Optional optional;
  
                  if (blockposition != null) {
@@ -38,7 +38,7 @@ index e0c9857a922d8a3f421d7df0f056b82c4775390e..82a646365b5b0619825995c722cf773b
                  } else {
                      optional = Optional.empty();
                  }
-@@ -882,7 +884,12 @@ public abstract class PlayerList {
+@@ -883,7 +885,12 @@ public abstract class PlayerList {
              }
              // Spigot End
  
@@ -52,7 +52,7 @@ index e0c9857a922d8a3f421d7df0f056b82c4775390e..82a646365b5b0619825995c722cf773b
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper
          } else {
-@@ -919,8 +926,12 @@ public abstract class PlayerList {
+@@ -921,8 +928,12 @@ public abstract class PlayerList {
          }
          // entityplayer1.syncInventory();
          entityplayer1.setHealth(entityplayer1.getHealth());
diff --git a/patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0497-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0497-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0498-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0498-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0499-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0499-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0500-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 82%
rename from patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0500-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index ff5b446cbe..3429e11fbe 100644
--- a/patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0500-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 32c24f9e37262f2a854556787f61cd7b7336da11..6bcc1a7ddfcdd0da157a65d2d866b28c390e3b41 100644
+index 08b4589c3b565db70e89aea0715e53c7c0529460..7bb0f720d3acd9b0b443446ed639b5c645aa373c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2669,6 +2669,7 @@ public class CraftWorld implements World {
+@@ -2675,6 +2675,7 @@ public class CraftWorld implements World {
              lightning.moveTo( loc.getX(), loc.getY(), loc.getZ() );
              lightning.visualOnly = true;
              lightning.isSilent = isSilent;
diff --git a/patches/server/0500-Incremental-player-saving.patch b/patches/server/0501-Incremental-player-saving.patch
similarity index 96%
rename from patches/server/0500-Incremental-player-saving.patch
rename to patches/server/0501-Incremental-player-saving.patch
index 89c0a3aa98..490397f6d2 100644
--- a/patches/server/0500-Incremental-player-saving.patch
+++ b/patches/server/0501-Incremental-player-saving.patch
@@ -55,7 +55,7 @@ index 3ac5ab881913a90d5b59610e81d598e121320930..2c0b2bb254e9f4d39b526f170c11f481
          } // Paper start
          for (ServerLevel level : this.getAllLevels()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cf09bd17b9d2be04f79edef6debdd815b5f7f86c..7c05dd7489e686af3ce9c0d63cff30827467c263 100644
+index 6cf83d9b1e43ade17cb67843dbdc11937eda1e08..f3e4b9f302fbc4b615a5e735d5aab0f403e16903 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -175,6 +175,7 @@ public class ServerPlayer extends Player {
@@ -67,7 +67,7 @@ index cf09bd17b9d2be04f79edef6debdd815b5f7f86c..7c05dd7489e686af3ce9c0d63cff3082
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 82a646365b5b0619825995c722cf773bf23b64ae..e990c9d936b9b2b510dd9c7f5a507b4ba9e79965 100644
+index 83df832b1fe5be1c1114ce3ae10c1985bf564a0c..13f1b62e6f3adce54f82d6d131dd60976dc6f548 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -569,6 +569,7 @@ public abstract class PlayerList {
@@ -78,7 +78,7 @@ index 82a646365b5b0619825995c722cf773bf23b64ae..e990c9d936b9b2b510dd9c7f5a507b4b
          this.playerIo.save(player);
          ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
  
-@@ -1206,10 +1207,21 @@ public abstract class PlayerList {
+@@ -1208,10 +1209,21 @@ public abstract class PlayerList {
      }
  
      public void saveAll() {
diff --git a/patches/server/0501-Fix-some-rails-connecting-improperly.patch b/patches/server/0502-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0501-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0502-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0502-Fix-MC-187716-Use-configured-height.patch b/patches/server/0503-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0502-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0503-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0503-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0504-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0503-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0504-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0504-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0505-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0504-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0505-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0505-Brand-support.patch b/patches/server/0506-Brand-support.patch
similarity index 90%
rename from patches/server/0505-Brand-support.patch
rename to patches/server/0506-Brand-support.patch
index 5b420b881d..cc13c5df2e 100644
--- a/patches/server/0505-Brand-support.patch
+++ b/patches/server/0506-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e307f8695643360289b998a8d2ad244d966f1180..b7454592b9cee09f41631db6664cb18e2f890479 100644
+index 03ad0c0365f85a1536fb35bfdf08d6d44240df80..27fc9ec7183b100dcfc755d41b3348ccc04c705b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -33,7 +33,7 @@ index e307f8695643360289b998a8d2ad244d966f1180..b7454592b9cee09f41631db6664cb18e
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
          this.server = server;
          this.connection = connection;
-@@ -2980,6 +2984,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2981,6 +2985,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register");
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
@@ -42,7 +42,7 @@ index e307f8695643360289b998a8d2ad244d966f1180..b7454592b9cee09f41631db6664cb18e
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -3007,6 +3013,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3008,6 +3014,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
@@ -58,7 +58,7 @@ index e307f8695643360289b998a8d2ad244d966f1180..b7454592b9cee09f41631db6664cb18e
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -3016,6 +3031,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3017,6 +3032,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      }
  
@@ -72,10 +72,10 @@ index e307f8695643360289b998a8d2ad244d966f1180..b7454592b9cee09f41631db6664cb18e
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a3951039eeb1f5d3529213ca02d11c97d499be38..e87a08d93abd507785ac5c79f97c02236aa6f43d 100644
+index 9ce4ebc9a0ddeefdc9fb3a7bd91be77aeb075011..7257c8fedb6937d925dea592a69fd56ddd05c50d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2431,6 +2431,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2441,6 +2441,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0506-Add-setMaxPlayers-API.patch b/patches/server/0507-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0506-Add-setMaxPlayers-API.patch
rename to patches/server/0507-Add-setMaxPlayers-API.patch
index 622f250204..9068bc19a6 100644
--- a/patches/server/0506-Add-setMaxPlayers-API.patch
+++ b/patches/server/0507-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e990c9d936b9b2b510dd9c7f5a507b4ba9e79965..518c93b7aa7a77c19d0256f3d9c24e3b21ac44de 100644
+index 13f1b62e6f3adce54f82d6d131dd60976dc6f548..f2b139d565662fca1bbad46e50b5ccb0d08c4e37 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -145,7 +145,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0507-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0508-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0507-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0508-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0508-Don-t-require-FACING-data.patch b/patches/server/0509-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0508-Don-t-require-FACING-data.patch
rename to patches/server/0509-Don-t-require-FACING-data.patch
diff --git a/patches/server/0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0510-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from patches/server/0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0510-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index aea9770fdd..8975c5a2dc 100644
--- a/patches/server/0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0510-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -17,7 +17,7 @@ index ac9020467cef648c72ccb350d26f90545f5afb56..e60d2ef3482c002b082ee84f34b9e681
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6bcc1a7ddfcdd0da157a65d2d866b28c390e3b41..bf7ba6d7f1527d4bf8533c655316865f81cde75f 100644
+index d53918ec0911ef2becccb4dc6e11a9b1c8b8bf34..44cec5c379f1c15a323a44cf6721ed2cc043bb2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -387,11 +387,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0510-Add-moon-phase-API.patch b/patches/server/0511-Add-moon-phase-API.patch
similarity index 89%
rename from patches/server/0510-Add-moon-phase-API.patch
rename to patches/server/0511-Add-moon-phase-API.patch
index 3e4e60b223..8e32c9eb1b 100644
--- a/patches/server/0510-Add-moon-phase-API.patch
+++ b/patches/server/0511-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bf7ba6d7f1527d4bf8533c655316865f81cde75f..2bef1c8524944e0327260542a9ebed2d8aa854e0 100644
+index 44cec5c379f1c15a323a44cf6721ed2cc043bb2a..6fc9b8a3daf9ecf3d4231ea872d62025d04a394e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -326,6 +326,11 @@ public class CraftWorld implements World {
diff --git a/patches/server/0511-Prevent-headless-pistons-from-being-created.patch b/patches/server/0512-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0511-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0512-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0512-Add-BellRingEvent.patch b/patches/server/0513-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0512-Add-BellRingEvent.patch
rename to patches/server/0513-Add-BellRingEvent.patch
diff --git a/patches/server/0513-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0514-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0513-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0514-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0514-Buffer-joins-to-world.patch b/patches/server/0515-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0514-Buffer-joins-to-world.patch
rename to patches/server/0515-Buffer-joins-to-world.patch
diff --git a/patches/server/0515-Optimize-redstone-algorithm.patch b/patches/server/0516-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0515-Optimize-redstone-algorithm.patch
rename to patches/server/0516-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0516-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0517-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0516-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0517-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0517-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0518-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0517-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0518-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0518-Fix-CraftTeam-null-check.patch b/patches/server/0519-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0518-Fix-CraftTeam-null-check.patch
rename to patches/server/0519-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0519-Add-more-Evoker-API.patch b/patches/server/0520-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0519-Add-more-Evoker-API.patch
rename to patches/server/0520-Add-more-Evoker-API.patch
diff --git a/patches/server/0520-Add-methods-to-get-translation-keys.patch b/patches/server/0521-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0520-Add-methods-to-get-translation-keys.patch
rename to patches/server/0521-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0521-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0522-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0521-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0522-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0522-Cache-block-data-strings.patch b/patches/server/0523-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0522-Cache-block-data-strings.patch
rename to patches/server/0523-Cache-block-data-strings.patch
diff --git a/patches/server/0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0524-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 92%
rename from patches/server/0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0524-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 2507b868f9..899d1fa7a5 100644
--- a/patches/server/0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0524-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7454592b9cee09f41631db6664cb18e2f890479..5e90c722405f9e00bfaf9e2fed523552d9755c8d 100644
+index 27fc9ec7183b100dcfc755d41b3348ccc04c705b..a6a14c6d3eb6d77997e1763e2dd451e0718511ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -681,7 +681,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -21,16 +21,17 @@ index b7454592b9cee09f41631db6664cb18e2f890479..5e90c722405f9e00bfaf9e2fed523552
              this.lastGoodX = this.awaitingPositionFromClient.x;
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
-@@ -1549,6 +1549,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1548,7 +1548,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+         // CraftBukkit end
  
          this.awaitingTeleportTime = this.tickCount;
-         this.player.absMoveTo(d0, d1, d2, f, f1);
+-        this.player.absMoveTo(d0, d1, d2, f, f1);
 +        this.player.moveTo(d0, d1, d2, f, f1); // Paper - use proper setPositionRotation for teleportation
+         this.player.forceCheckHighPriority(); // Paper
          this.player.connection.send(new ClientboundPlayerPositionPacket(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.awaitingTeleport, flag));
      }
- 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3e951522169fcb071cc578e8bd9a78baa10f4e4d..c94cbd22e465e22cfd66f24c2b0c3858a630f5a4 100644
+index cc4b48f6c62aaccddaf81576865b56f8ece4d040..94a8dabc3dc63e426e093adb4336691161f55d68 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -152,6 +152,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0524-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0525-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0524-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0525-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0525-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0526-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0525-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0526-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0526-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0527-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0526-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0527-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0527-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0528-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 84%
rename from patches/server/0527-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0528-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index afe39860e8..ad005e3765 100644
--- a/patches/server/0527-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0528-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 72dd0141cb360c346690ecdb1e14d2c94ae6de90..ed9588e4f0e9da2c6bdf2b34357d8de46131f84c 100644
+index e3c8e7692e8ca005e98d4158de0c961087dfb199..574434760cb91234b994f101a5ddef595337b42e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -257,6 +257,7 @@ public class ChunkHolder {
+@@ -379,6 +379,7 @@ public class ChunkHolder {
      }
  
      public void blockChanged(BlockPos pos) {
diff --git a/patches/server/0528-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0529-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from patches/server/0528-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0529-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 79560ddaf0..a9ee6d23fe 100644
--- a/patches/server/0528-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0529-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c94cbd22e465e22cfd66f24c2b0c3858a630f5a4..1183406a0c69bb79a51d31480cc5ed17ca317444 100644
+index 94a8dabc3dc63e426e093adb4336691161f55d68..dc89e1ed7fa19e5d9f80bb31377b634c83caecdf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3932,4 +3932,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0529-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0530-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0529-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0530-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0530-Entity-isTicking.patch b/patches/server/0531-Entity-isTicking.patch
similarity index 95%
rename from patches/server/0530-Entity-isTicking.patch
rename to patches/server/0531-Entity-isTicking.patch
index 33f19f3493..c0780df9f4 100644
--- a/patches/server/0530-Entity-isTicking.patch
+++ b/patches/server/0531-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1183406a0c69bb79a51d31480cc5ed17ca317444..60acf347cb5f4fc2e0cab18c5d9b5f4c2dd5121d 100644
+index dc89e1ed7fa19e5d9f80bb31377b634c83caecdf..c9a4598f9856b82f852d79c7c1e33767bc590c21 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -52,6 +52,7 @@ import net.minecraft.resources.ResourceKey;
diff --git a/patches/server/0531-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0532-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0531-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0532-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0532-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0533-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0532-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0533-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0534-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0534-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0535-Fix-for-large-move-vectors-crashing-server.patch
similarity index 97%
rename from patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0535-Fix-for-large-move-vectors-crashing-server.patch
index f0e9347acc..bbbdfba87a 100644
--- a/patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0535-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5e90c722405f9e00bfaf9e2fed523552d9755c8d..4c958e44f2e4627d848cef197167b7f8b0f5e965 100644
+index a6a14c6d3eb6d77997e1763e2dd451e0718511ea..2ec517663ede99f76172376f6a37ce13c6260127 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -506,19 +506,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0535-Optimise-getType-calls.patch b/patches/server/0536-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0535-Optimise-getType-calls.patch
rename to patches/server/0536-Optimise-getType-calls.patch
diff --git a/patches/server/0536-Villager-resetOffers.patch b/patches/server/0537-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0536-Villager-resetOffers.patch
rename to patches/server/0537-Villager-resetOffers.patch
diff --git a/patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0538-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0538-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0539-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0539-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0539-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0540-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0539-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0540-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0540-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0541-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0540-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0541-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0541-Player-elytra-boost-API.patch b/patches/server/0542-Player-elytra-boost-API.patch
similarity index 94%
rename from patches/server/0541-Player-elytra-boost-API.patch
rename to patches/server/0542-Player-elytra-boost-API.patch
index db349af942..7e21328374 100644
--- a/patches/server/0541-Player-elytra-boost-API.patch
+++ b/patches/server/0542-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e87a08d93abd507785ac5c79f97c02236aa6f43d..65f44c7747eea49fffff678fcbfdc32195a4db5d 100644
+index 7257c8fedb6937d925dea592a69fd56ddd05c50d..2b24575e19cd1b24c259711bfd4e6cae6492f927 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -539,6 +539,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0542-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0543-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0542-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0543-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0544-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0544-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0544-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0545-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0544-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0545-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0545-Add-ignore-discounts-API.patch b/patches/server/0546-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0545-Add-ignore-discounts-API.patch
rename to patches/server/0546-Add-ignore-discounts-API.patch
diff --git a/patches/server/0546-Toggle-for-removing-existing-dragon.patch b/patches/server/0547-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0546-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0547-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0547-Fix-client-lag-on-advancement-loading.patch b/patches/server/0548-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0547-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0548-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0548-Item-no-age-no-player-pickup.patch b/patches/server/0549-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0548-Item-no-age-no-player-pickup.patch
rename to patches/server/0549-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0550-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0550-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0550-Beacon-API-custom-effect-ranges.patch b/patches/server/0551-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0550-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0551-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0551-Add-API-for-quit-reason.patch b/patches/server/0552-Add-API-for-quit-reason.patch
similarity index 93%
rename from patches/server/0551-Add-API-for-quit-reason.patch
rename to patches/server/0552-Add-API-for-quit-reason.patch
index 723e808eaf..b32a8fe788 100644
--- a/patches/server/0551-Add-API-for-quit-reason.patch
+++ b/patches/server/0552-Add-API-for-quit-reason.patch
@@ -25,10 +25,10 @@ index 7f6405ac44fef423dc8b21f3dbeaae26a1005077..bdd4f4db9849d9107b5c62d5e83b1277
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          ConnectionProtocol enumprotocol = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7c05dd7489e686af3ce9c0d63cff30827467c263..0e08ae0414fc5f19aecccef559976bf56216841e 100644
+index f3e4b9f302fbc4b615a5e735d5aab0f403e16903..84ef1c60223d421cf515c07342d2296e477dd4b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
+@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      boolean needsChunkCenterUpdate; // Paper - no-tick view distance
@@ -37,7 +37,7 @@ index 7c05dd7489e686af3ce9c0d63cff30827467c263..0e08ae0414fc5f19aecccef559976bf5
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4c958e44f2e4627d848cef197167b7f8b0f5e965..dee3c1d24a1b4a67c79d13106fdab54200023cb9 100644
+index 2ec517663ede99f76172376f6a37ce13c6260127..174ad1120c02ae465117a8fd93094c69589844c0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -443,6 +443,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -49,7 +49,7 @@ index 4c958e44f2e4627d848cef197167b7f8b0f5e965..dee3c1d24a1b4a67c79d13106fdab542
              this.connection.disconnect(ichatbasecomponent);
          });
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 518c93b7aa7a77c19d0256f3d9c24e3b21ac44de..5188f62a581276847695cc457f6fe86d47ec2af5 100644
+index f2b139d565662fca1bbad46e50b5ccb0d08c4e37..b9f6f8441cafeb3e64ce7943bfd1e92fe983a5c5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -596,7 +596,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0552-Seed-based-feature-search.patch b/patches/server/0553-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0552-Seed-based-feature-search.patch
rename to patches/server/0553-Seed-based-feature-search.patch
diff --git a/patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0554-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0554-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0555-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0555-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0555-Expose-world-spawn-angle.patch b/patches/server/0556-Expose-world-spawn-angle.patch
similarity index 88%
rename from patches/server/0555-Expose-world-spawn-angle.patch
rename to patches/server/0556-Expose-world-spawn-angle.patch
index a93a787688..b592d5aa3f 100644
--- a/patches/server/0555-Expose-world-spawn-angle.patch
+++ b/patches/server/0556-Expose-world-spawn-angle.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5188f62a581276847695cc457f6fe86d47ec2af5..523a6163c9ac3eadebdd185d291aad21c33caae8 100644
+index b9f6f8441cafeb3e64ce7943bfd1e92fe983a5c5..f8b917b2d1a1744f7a6c3b9cf60be41764ed2815 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -873,7 +873,7 @@ public abstract class PlayerList {
+@@ -874,7 +874,7 @@ public abstract class PlayerList {
              if (location == null) {
                  worldserver1 = this.server.getLevel(Level.OVERWORLD);
                  blockposition = entityplayer1.getSpawnPoint(worldserver1);
@@ -18,7 +18,7 @@ index 5188f62a581276847695cc457f6fe86d47ec2af5..523a6163c9ac3eadebdd185d291aad21
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2bef1c8524944e0327260542a9ebed2d8aa854e0..fb82c861a457c07dfef0365fa56b4e2a8d2e1650 100644
+index 4ed31e1aae61bdcc498dc7c536f8a3353e20c7d4..ae396e3ec6c5506ed49b5e80cf236d7d2128cee1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -378,7 +378,7 @@ public class CraftWorld implements World {
diff --git a/patches/server/0556-Add-Destroy-Speed-API.patch b/patches/server/0557-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0556-Add-Destroy-Speed-API.patch
rename to patches/server/0557-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 89%
rename from patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index b8fffe3983..3a6360408d 100644
--- a/patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 65f44c7747eea49fffff678fcbfdc32195a4db5d..ca479c2de83b94e30f62cfaf573e108452908930 100644
+index 2b24575e19cd1b24c259711bfd4e6cae6492f927..77a74b47ffe9c9d02daae74a770427ec1da450a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2057,7 +2057,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2067,7 +2067,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null && !particle.getDataType().isInstance(data)) {
              throw new IllegalArgumentException("data should be " + particle.getDataType() + " got " + data.getClass());
          }
diff --git a/patches/server/0558-Add-LivingEntity-clearActiveItem.patch b/patches/server/0559-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0558-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0559-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0559-Add-PlayerItemCooldownEvent.patch b/patches/server/0560-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0559-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0560-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0560-More-lightning-API.patch b/patches/server/0561-More-lightning-API.patch
similarity index 100%
rename from patches/server/0560-More-lightning-API.patch
rename to patches/server/0561-More-lightning-API.patch
diff --git a/patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch
index bb7a924d95..5b2fb3ff2a 100644
--- a/patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -21,7 +21,7 @@ index 935bb237f8ecd63ca4cec64a7c7a341c9d3358e5..208690ceca2485b54acde5123ba494d7
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 60acf347cb5f4fc2e0cab18c5d9b5f4c2dd5121d..41ee12693e87383a0fc1c95b3d68daf22e3545cf 100644
+index c9a4598f9856b82f852d79c7c1e33767bc590c21..e72477c55f6dd932bdd1b692470ddc701da9caaa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1723,6 +1723,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0562-Added-missing-default-perms-for-commands.patch b/patches/server/0563-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0562-Added-missing-default-perms-for-commands.patch
rename to patches/server/0563-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0563-Add-PlayerShearBlockEvent.patch b/patches/server/0564-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0563-Add-PlayerShearBlockEvent.patch
rename to patches/server/0564-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0565-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0565-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0566-Limit-recipe-packets.patch b/patches/server/0567-Limit-recipe-packets.patch
similarity index 97%
rename from patches/server/0566-Limit-recipe-packets.patch
rename to patches/server/0567-Limit-recipe-packets.patch
index 0ef23fac55..5e1c724904 100644
--- a/patches/server/0566-Limit-recipe-packets.patch
+++ b/patches/server/0567-Limit-recipe-packets.patch
@@ -23,7 +23,7 @@ index 22027cdebcde2157b119f37cb1471f7a69c2a31a..ec8afe1bb9881c87c4ee0f15dcfcb4b8
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dee3c1d24a1b4a67c79d13106fdab54200023cb9..f7aecda113cb12b6b392b26f861c8cd55b7f3ddd 100644
+index 174ad1120c02ae465117a8fd93094c69589844c0..7b26b84307effac2805415dce080ec362a621b7a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -231,6 +231,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0567-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0568-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0567-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0568-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0568-MC-4-Fix-item-position-desync.patch b/patches/server/0569-MC-4-Fix-item-position-desync.patch
similarity index 97%
rename from patches/server/0568-MC-4-Fix-item-position-desync.patch
rename to patches/server/0569-MC-4-Fix-item-position-desync.patch
index 33b3d26ce7..331ed8d0d2 100644
--- a/patches/server/0568-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0569-MC-4-Fix-item-position-desync.patch
@@ -41,7 +41,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9
  
      public Vec3 updateEntityPosition(Vec3 orig) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 41ee12693e87383a0fc1c95b3d68daf22e3545cf..37589ece33e787720e9f6bd4c403ac6366893d2d 100644
+index e72477c55f6dd932bdd1b692470ddc701da9caaa..f618490fe7eb56389e86e3c6dca1d223d38c0bb0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3759,6 +3759,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch
similarity index 90%
rename from patches/server/0569-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0570-Player-Chunk-Load-Unload-Events.patch
index 52e35a2283..a41df32b60 100644
--- a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0e08ae0414fc5f19aecccef559976bf56216841e..192cc28464aaa88a8f03dad0e4da7ef7948e83ce 100644
+index 84ef1c60223d421cf515c07342d2296e477dd4b7..82b4805b417b130be3ce9ab6ed886c85e811ba98 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2072,11 +2072,21 @@ public class ServerPlayer extends Player {
+@@ -2096,11 +2096,21 @@ public class ServerPlayer extends Player {
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket, Packet<?> lightUpdatePacket) {
          this.connection.send(lightUpdatePacket);
          this.connection.send(chunkDataPacket);
diff --git a/patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0571-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0571-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0571-Expose-LivingEntity-hurt-direction.patch b/patches/server/0572-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0571-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0572-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0574-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0574-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0574-added-PlayerTradeEvent.patch b/patches/server/0575-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0574-added-PlayerTradeEvent.patch
rename to patches/server/0575-added-PlayerTradeEvent.patch
diff --git a/patches/server/0575-Implement-TargetHitEvent.patch b/patches/server/0576-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0575-Implement-TargetHitEvent.patch
rename to patches/server/0576-Implement-TargetHitEvent.patch
diff --git a/patches/server/0576-Additional-Block-Material-API-s.patch b/patches/server/0577-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0576-Additional-Block-Material-API-s.patch
rename to patches/server/0577-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0577-Fix-harming-potion-dupe.patch b/patches/server/0578-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0577-Fix-harming-potion-dupe.patch
rename to patches/server/0578-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0579-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0579-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0579-Cache-burn-durations.patch b/patches/server/0580-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0579-Cache-burn-durations.patch
rename to patches/server/0580-Cache-burn-durations.patch
diff --git a/patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0581-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0581-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0582-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0582-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0583-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0583-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 95%
rename from patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch
index eb6b3dec5a..4f231acd45 100644
--- a/patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f7aecda113cb12b6b392b26f861c8cd55b7f3ddd..08a0d92187c55dbd9d414e8e6232d0af3c865319 100644
+index 7b26b84307effac2805415dce080ec362a621b7a..30220613e260760d71cfe751356ec1b75d0abe96 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1713,7 +1713,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0584-Zombie-API-breaking-doors.patch b/patches/server/0585-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0584-Zombie-API-breaking-doors.patch
rename to patches/server/0585-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0585-Fix-nerfed-slime-when-splitting.patch b/patches/server/0586-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0585-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0586-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0586-Add-EntityLoadCrossbowEvent.patch b/patches/server/0587-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0586-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0587-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0587-Guardian-beam-workaround.patch b/patches/server/0588-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0587-Guardian-beam-workaround.patch
rename to patches/server/0588-Guardian-beam-workaround.patch
diff --git a/patches/server/0588-Added-WorldGameRuleChangeEvent.patch b/patches/server/0589-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0588-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0589-Added-WorldGameRuleChangeEvent.patch
index 80c0fee433..cf775df60e 100644
--- a/patches/server/0588-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0589-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 888d812118c15c212284687ae5842a94f5715d52..e7ca5d6fb8922e7e8065864f736b0605
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fb82c861a457c07dfef0365fa56b4e2a8d2e1650..085c6b5252b9b7cf64ba186df72bf233c5b6a58e 100644
+index ae396e3ec6c5506ed49b5e80cf236d7d2128cee1..2441a791385c6292d2607de68bfd190e43d9eddc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2409,8 +2409,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0589-Added-ServerResourcesReloadedEvent.patch b/patches/server/0590-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0589-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0590-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0591-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0591-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0591-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0592-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0591-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0592-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0592-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0593-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0592-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0593-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0593-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0594-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0593-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0594-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0594-Configurable-door-breaking-difficulty.patch b/patches/server/0595-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0594-Configurable-door-breaking-difficulty.patch
rename to patches/server/0595-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0595-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0596-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0595-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0596-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0597-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0597-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0597-Remove-stale-POIs.patch b/patches/server/0598-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0597-Remove-stale-POIs.patch
rename to patches/server/0598-Remove-stale-POIs.patch
diff --git a/patches/server/0598-Fix-villager-boat-exploit.patch b/patches/server/0599-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0598-Fix-villager-boat-exploit.patch
rename to patches/server/0599-Fix-villager-boat-exploit.patch
index 5965e48dd8..38a1103c9a 100644
--- a/patches/server/0598-Fix-villager-boat-exploit.patch
+++ b/patches/server/0599-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 523a6163c9ac3eadebdd185d291aad21c33caae8..6c167952102548c5f766eaa8e022e213cc20bd74 100644
+index f8b917b2d1a1744f7a6c3b9cf60be41764ed2815..6ac6d05390359bd858673c4941e7d90f4cf98a02 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -621,6 +621,15 @@ public abstract class PlayerList {
diff --git a/patches/server/0599-Add-sendOpLevel-API.patch b/patches/server/0600-Add-sendOpLevel-API.patch
similarity index 91%
rename from patches/server/0599-Add-sendOpLevel-API.patch
rename to patches/server/0600-Add-sendOpLevel-API.patch
index 159ca2520f..d15db204c4 100644
--- a/patches/server/0599-Add-sendOpLevel-API.patch
+++ b/patches/server/0600-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6c167952102548c5f766eaa8e022e213cc20bd74..9a7b635e2a962f4e1ae689ec7a3bc471d9d940cc 100644
+index 6ac6d05390359bd858673c4941e7d90f4cf98a02..f80e4e2d8311ccfb62b7a61a71d8ae43d5d35cf4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1121,22 +1121,29 @@ public abstract class PlayerList {
+@@ -1123,22 +1123,29 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -46,7 +46,7 @@ index 6c167952102548c5f766eaa8e022e213cc20bd74..9a7b635e2a962f4e1ae689ec7a3bc471
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca479c2de83b94e30f62cfaf573e108452908930..30e042a37692053d8333191487ec48eeb8c6b502 100644
+index 77a74b47ffe9c9d02daae74a770427ec1da450a8..e010e67c58b531d00aee7dde6a1bfa05d67aa942 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -553,6 +553,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0600-Add-StructureLocateEvent.patch b/patches/server/0601-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0600-Add-StructureLocateEvent.patch
rename to patches/server/0601-Add-StructureLocateEvent.patch
diff --git a/patches/server/0601-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0602-Collision-option-for-requiring-a-player-participant.patch
similarity index 98%
rename from patches/server/0601-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0602-Collision-option-for-requiring-a-player-participant.patch
index 6dcec9a928..703aee524f 100644
--- a/patches/server/0601-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0602-Collision-option-for-requiring-a-player-participant.patch
@@ -28,7 +28,7 @@ index 4227e7fc46e22265316b42bbdb166d60e5aed94e..3d16e4a6bf842a209c760fd89f8edf99
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 37589ece33e787720e9f6bd4c403ac6366893d2d..9a59bec7878902a174ce8b2a45de6b2191dc96ac 100644
+index f618490fe7eb56389e86e3c6dca1d223d38c0bb0..8e530b22413764470dcf5862c1a3ef8e504a124f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1606,6 +1606,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0603-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0603-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0603-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0604-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0603-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0604-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0604-Make-schedule-command-per-world.patch b/patches/server/0605-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0604-Make-schedule-command-per-world.patch
rename to patches/server/0605-Make-schedule-command-per-world.patch
diff --git a/patches/server/0605-Configurable-max-leash-distance.patch b/patches/server/0606-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0605-Configurable-max-leash-distance.patch
rename to patches/server/0606-Configurable-max-leash-distance.patch
diff --git a/patches/server/0606-Implement-BlockPreDispenseEvent.patch b/patches/server/0607-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0606-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0607-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0607-Added-Vanilla-Entity-Tags.patch b/patches/server/0608-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0607-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0608-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0608-added-Wither-API.patch b/patches/server/0609-added-Wither-API.patch
similarity index 100%
rename from patches/server/0608-added-Wither-API.patch
rename to patches/server/0609-added-Wither-API.patch
diff --git a/patches/server/0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0610-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0610-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 87%
rename from patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
index 876a9da85b..7149aba02a 100644
--- a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Skip distance map update when spawning disabled.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 5a2b3c150ceaaae651c3ec6aeff3bb894dd5f94d..266a3267833c86a99b01e0d490c992270f00ea1e 100644
+index ddf28939d8037bcea456350093d077c503a3b66e..0d143d073fa7cdfa14f12e9c795350dca8ac5e80 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -784,7 +784,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -816,7 +816,7 @@ public class ServerChunkCache extends ChunkSource {
              int l = this.distanceManager.getNaturalSpawnChunkCount();
              // Paper start - per player mob spawning
              NaturalSpawner.SpawnState spawnercreature_d; // moved down
diff --git a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
similarity index 83%
rename from patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
index f64d694847..28c8cdec51 100644
--- a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 192cc28464aaa88a8f03dad0e4da7ef7948e83ce..54066aa8f14bc19935070593b344368a7d6faa70 100644
+index 82b4805b417b130be3ce9ab6ed886c85e811ba98..460f8ce00894065a15d931906c8a05ca990d6e15 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1120,6 +1120,11 @@ public class ServerPlayer extends Player {
+@@ -1144,6 +1144,11 @@ public class ServerPlayer extends Player {
                  this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }
diff --git a/patches/server/0615-add-DragonEggFormEvent.patch b/patches/server/0616-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0615-add-DragonEggFormEvent.patch
rename to patches/server/0616-add-DragonEggFormEvent.patch
diff --git a/patches/server/0616-EntityMoveEvent.patch b/patches/server/0617-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0616-EntityMoveEvent.patch
rename to patches/server/0617-EntityMoveEvent.patch
diff --git a/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0618-Inline-shift-direction-fields.patch b/patches/server/0619-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0618-Inline-shift-direction-fields.patch
rename to patches/server/0619-Inline-shift-direction-fields.patch
diff --git a/patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0621-living-entity-allow-attribute-registration.patch b/patches/server/0622-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0621-living-entity-allow-attribute-registration.patch
rename to patches/server/0622-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0622-fix-dead-slime-setSize-invincibility.patch b/patches/server/0623-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0622-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0623-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0624-misc-debugging-dumps.patch b/patches/server/0625-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0624-misc-debugging-dumps.patch
rename to patches/server/0625-misc-debugging-dumps.patch
diff --git a/patches/server/0625-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0625-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0626-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0626-Expose-Tracked-Players.patch b/patches/server/0627-Expose-Tracked-Players.patch
similarity index 87%
rename from patches/server/0626-Expose-Tracked-Players.patch
rename to patches/server/0627-Expose-Tracked-Players.patch
index 9e70588214..86f2566dde 100644
--- a/patches/server/0626-Expose-Tracked-Players.patch
+++ b/patches/server/0627-Expose-Tracked-Players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 30e042a37692053d8333191487ec48eeb8c6b502..4a75642cfdf5a6eda43baa76f6a2e2a543e301ce 100644
+index e010e67c58b531d00aee7dde6a1bfa05d67aa942..f79b62c413789353af70b691792fe3abc24746dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2350,6 +2350,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2360,6 +2360,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0627-Remove-streams-from-SensorNearest.patch b/patches/server/0628-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0627-Remove-streams-from-SensorNearest.patch
rename to patches/server/0628-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0630-Improve-ServerGUI.patch b/patches/server/0631-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0630-Improve-ServerGUI.patch
rename to patches/server/0631-Improve-ServerGUI.patch
diff --git a/patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0632-fix-converting-txt-to-json-file.patch b/patches/server/0633-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0632-fix-converting-txt-to-json-file.patch
rename to patches/server/0633-fix-converting-txt-to-json-file.patch
index 5b1eb9d3f2..d1f85c8045 100644
--- a/patches/server/0632-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0633-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 0a930147663850dc2ea7ffe9ced5611d5bab7c6d..41d1816543d0b98bd6a3ff5600cdd262
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9a7b635e2a962f4e1ae689ec7a3bc471d9d940cc..b26f03e163cbff2466f1ed0efd22c8e6059b7b00 100644
+index f80e4e2d8311ccfb62b7a61a71d8ae43d5d35cf4..59626330d8e4a6d53943dfe1f5a8998c579fd1c0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -174,6 +174,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0633-Add-worldborder-events.patch b/patches/server/0634-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0633-Add-worldborder-events.patch
rename to patches/server/0634-Add-worldborder-events.patch
diff --git a/patches/server/0634-added-PlayerNameEntityEvent.patch b/patches/server/0635-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0634-added-PlayerNameEntityEvent.patch
rename to patches/server/0635-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0635-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0636-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0635-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0636-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0636-Add-recipe-to-cook-events.patch b/patches/server/0637-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0636-Add-recipe-to-cook-events.patch
rename to patches/server/0637-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0637-Add-Block-isValidTool.patch b/patches/server/0638-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0637-Add-Block-isValidTool.patch
rename to patches/server/0638-Add-Block-isValidTool.patch
diff --git a/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch
similarity index 96%
rename from patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0639-Allow-using-signs-inside-spawn-protection.patch
index 8aead5b078..3dae3af3b5 100644
--- a/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch
@@ -20,7 +20,7 @@ index 20eb4aea24cc6699747b18b2c00e5b01dafb47c6..acd61a9033fdfb91e29a5fa6a10b8983
  }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 08a0d92187c55dbd9d414e8e6232d0af3c865319..7ca3799e80391e2247f8935028ebebd249dfbd92 100644
+index 30220613e260760d71cfe751356ec1b75d0abe96..277171b776657152ab606ee27294c4963fdd83d2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1702,7 +1702,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0639-Implement-Keyed-on-World.patch b/patches/server/0640-Implement-Keyed-on-World.patch
similarity index 94%
rename from patches/server/0639-Implement-Keyed-on-World.patch
rename to patches/server/0640-Implement-Keyed-on-World.patch
index 587f7fd881..00b8450bc1 100644
--- a/patches/server/0639-Implement-Keyed-on-World.patch
+++ b/patches/server/0640-Implement-Keyed-on-World.patch
@@ -34,10 +34,10 @@ index cfad79b859abfeb9bd83843b04bff3fd5d2e0ac3..210032209b3cdd2cda0e7463e3ee0e02
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 085c6b5252b9b7cf64ba186df72bf233c5b6a58e..271811e769e196e8694e1af37206c3b1b88194e1 100644
+index 2441a791385c6292d2607de68bfd190e43d9eddc..2e2566206a3fd229759b9f5f89aa6d89a6061758 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2626,6 +2626,11 @@ public class CraftWorld implements World {
+@@ -2632,6 +2632,11 @@ public class CraftWorld implements World {
              return java.util.concurrent.CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
          }, net.minecraft.server.MinecraftServer.getServer());
      }
diff --git a/patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0641-Item-Rarity-API.patch b/patches/server/0642-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0641-Item-Rarity-API.patch
rename to patches/server/0642-Item-Rarity-API.patch
diff --git a/patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0643-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0644-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0643-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0644-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
index 0be4115a1a..6a3240a534 100644
--- a/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b26f03e163cbff2466f1ed0efd22c8e6059b7b00..c0b4b4827c03a466752db32734a60813ec98c863 100644
+index 59626330d8e4a6d53943dfe1f5a8998c579fd1c0..27a99d225515ceeb3eff15efc609136cccd2fc30 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -614,6 +614,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0645-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0645-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0646-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index bc4e82dfff..799a18d7be 100644
--- a/patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ca3799e80391e2247f8935028ebebd249dfbd92..8535edf593ff8e155c977adae56f38d16369defd 100644
+index 277171b776657152ab606ee27294c4963fdd83d2..b9bd9ae4a9660ae64604ec4b3962364c350fccce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1171,7 +1171,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0647-Entity-load-save-limit-per-chunk.patch b/patches/server/0648-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0647-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0648-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0648-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0648-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0649-Expose-protocol-version.patch b/patches/server/0650-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0649-Expose-protocol-version.patch
rename to patches/server/0650-Expose-protocol-version.patch
diff --git a/patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 98%
rename from patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index b630d04aae..a404018362 100644
--- a/patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8535edf593ff8e155c977adae56f38d16369defd..686bf9a2711956c86e3fb1d761cb1554b1ac7e26 100644
+index b9bd9ae4a9660ae64604ec4b3962364c350fccce..a680c9723e1966fe1b940e31244495aea89d47f0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -757,12 +757,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0651-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0651-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0653-Add-bypass-host-check.patch b/patches/server/0654-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0653-Add-bypass-host-check.patch
rename to patches/server/0654-Add-bypass-host-check.patch
diff --git a/patches/server/0654-Set-area-affect-cloud-rotation.patch b/patches/server/0655-Set-area-affect-cloud-rotation.patch
similarity index 92%
rename from patches/server/0654-Set-area-affect-cloud-rotation.patch
rename to patches/server/0655-Set-area-affect-cloud-rotation.patch
index 7cb63eb664..022dcb3b0a 100644
--- a/patches/server/0654-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0655-Set-area-affect-cloud-rotation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 271811e769e196e8694e1af37206c3b1b88194e1..4717bd703d3a8bb87c71d14eb851db09c264046e 100644
+index 2e2566206a3fd229759b9f5f89aa6d89a6061758..833010216e868ade5bb3bb815f7c867c3d04979f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1975,6 +1975,7 @@ public class CraftWorld implements World {
diff --git a/patches/server/0655-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0655-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0656-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0656-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0657-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0657-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0658-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0658-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0659-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0659-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0660-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0660-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch
index 22ed91ba08..84739fe1b7 100644
--- a/patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 686bf9a2711956c86e3fb1d761cb1554b1ac7e26..258809d044d100ace0ab38f9d1269234744e718a 100644
+index a680c9723e1966fe1b940e31244495aea89d47f0..44763d90ac377a6b7aa5aa7a8de0db9dd81fc05b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1906,6 +1906,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0662-Added-PlayerDeepSleepEvent.patch b/patches/server/0663-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0662-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0663-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0663-More-World-API.patch b/patches/server/0664-More-World-API.patch
similarity index 96%
rename from patches/server/0663-More-World-API.patch
rename to patches/server/0664-More-World-API.patch
index 42ec6d85dd..8fcd0398cb 100644
--- a/patches/server/0663-More-World-API.patch
+++ b/patches/server/0664-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4717bd703d3a8bb87c71d14eb851db09c264046e..b825673fdd7c8c8dd9e05fe6b317006a64ba913e 100644
+index 833010216e868ade5bb3bb815f7c867c3d04979f..019261b244c4a35592cbfeab24c7ed7c45776433 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2579,6 +2579,60 @@ public class CraftWorld implements World {
diff --git a/patches/server/0664-Added-PlayerBedFailEnterEvent.patch b/patches/server/0665-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0664-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0665-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0665-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0665-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 86%
rename from patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 8f6b76c72c..c780be74e2 100644
--- a/patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c0b4b4827c03a466752db32734a60813ec98c863..29aab99e686702eba9885b440d5755a4e59116f6 100644
+index 27a99d225515ceeb3eff15efc609136cccd2fc30..84548f5786bf0d8715cd7f52e164e647605757ab 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -848,6 +848,7 @@ public abstract class PlayerList {
+@@ -849,6 +849,7 @@ public abstract class PlayerList {
  
          // Paper start
          boolean isBedSpawn = false;
@@ -17,7 +17,7 @@ index c0b4b4827c03a466752db32734a60813ec98c863..29aab99e686702eba9885b440d5755a4
          boolean isRespawn = false;
          boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
          // Paper end
-@@ -868,6 +869,7 @@ public abstract class PlayerList {
+@@ -869,6 +870,7 @@ public abstract class PlayerList {
                  if (optional.isPresent()) {
                      BlockState iblockdata = worldserver1.getBlockState(blockposition);
                      boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
@@ -25,7 +25,7 @@ index c0b4b4827c03a466752db32734a60813ec98c863..29aab99e686702eba9885b440d5755a4
                      Vec3 vec3d = (Vec3) optional.get();
                      float f1;
  
-@@ -895,7 +897,7 @@ public abstract class PlayerList {
+@@ -896,7 +898,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0667-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0668-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0667-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0668-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 91%
rename from patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 9775aa814a..6c51259d33 100644
--- a/patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 258809d044d100ace0ab38f9d1269234744e718a..a154a1c163ef5259c7114dad4eb6e84c89560004 100644
+index 44763d90ac377a6b7aa5aa7a8de0db9dd81fc05b..814a937d41b7887d94fe50f670236bab224d9886 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2440,7 +2440,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -18,10 +18,10 @@ index 258809d044d100ace0ab38f9d1269234744e718a..a154a1c163ef5259c7114dad4eb6e84c
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 29aab99e686702eba9885b440d5755a4e59116f6..a708080ef25bc9596fc8f2b997b534dc5787d495 100644
+index 84548f5786bf0d8715cd7f52e164e647605757ab..fffb31c761625b803ac397799af890df84f26951 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -807,6 +807,12 @@ public abstract class PlayerList {
+@@ -808,6 +808,12 @@ public abstract class PlayerList {
      }
  
      public ServerPlayer moveToWorld(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) {
@@ -34,7 +34,7 @@ index 29aab99e686702eba9885b440d5755a4e59116f6..a708080ef25bc9596fc8f2b997b534dc
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -897,7 +903,7 @@ public abstract class PlayerList {
+@@ -898,7 +904,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0669-Add-Channel-initialization-listeners.patch b/patches/server/0670-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0669-Add-Channel-initialization-listeners.patch
rename to patches/server/0670-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0670-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0670-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0671-Add-more-WanderingTrader-API.patch b/patches/server/0672-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0671-Add-more-WanderingTrader-API.patch
rename to patches/server/0672-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0672-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0673-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0672-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0673-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0675-Inventory-close.patch b/patches/server/0676-Inventory-close.patch
similarity index 100%
rename from patches/server/0675-Inventory-close.patch
rename to patches/server/0676-Inventory-close.patch
diff --git a/patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 91%
rename from patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch
index e7f8b164d9..e01948e59b 100644
--- a/patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] call PortalCreateEvent players and end platform
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 54066aa8f14bc19935070593b344368a7d6faa70..b74fc226bf299e274dcf7a0e5002fea1d9886c24 100644
+index 460f8ce00894065a15d931906c8a05ca990d6e15..8f3ba87bc8d12bd344d81672b5dd96efc27e9e5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1147,15 +1147,21 @@ public class ServerPlayer extends Player {
+@@ -1171,15 +1171,21 @@ public class ServerPlayer extends Player {
      private void createEndPlatform(ServerLevel world, BlockPos centerPos) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable();
  
diff --git a/patches/server/0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0678-Fix-CraftPotionBrewer-cache.patch b/patches/server/0679-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0678-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0679-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0679-Add-basic-Datapack-API.patch b/patches/server/0680-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0679-Add-basic-Datapack-API.patch
rename to patches/server/0680-Add-basic-Datapack-API.patch
diff --git a/patches/server/0680-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0681-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0680-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0681-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch
similarity index 94%
rename from patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch
index 1765e97f76..4e633f999d 100644
--- a/patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,10 +45,10 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b74fc226bf299e274dcf7a0e5002fea1d9886c24..592b2a22f5f971f4445c9b336d04923ba74a64b2 100644
+index 8f3ba87bc8d12bd344d81672b5dd96efc27e9e5d..6dadec179459e606e96c858b5c8ba05e6cd12918 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1768,8 +1768,15 @@ public class ServerPlayer extends Player {
+@@ -1792,8 +1792,15 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -66,7 +66,7 @@ index b74fc226bf299e274dcf7a0e5002fea1d9886c24..592b2a22f5f971f4445c9b336d04923b
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1781,7 +1788,7 @@ public class ServerPlayer extends Player {
+@@ -1805,7 +1812,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -75,7 +75,7 @@ index b74fc226bf299e274dcf7a0e5002fea1d9886c24..592b2a22f5f971f4445c9b336d04923b
          }
      }
  
-@@ -2163,6 +2170,14 @@ public class ServerPlayer extends Player {
+@@ -2187,6 +2194,14 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
@@ -124,7 +124,7 @@ index 5ef649dec31ba6d6b74a7bd757727ffd2a79d71e..1c83fbc96a074c85a3e349e936ff1f31
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a154a1c163ef5259c7114dad4eb6e84c89560004..371221d43109b9aef7790089ac4c2ae4c0496927 100644
+index 814a937d41b7887d94fe50f670236bab224d9886..ed7f43ad0fe7baf7c968ec214f1e32b8c5aa1cd5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2449,7 +2449,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -137,10 +137,10 @@ index a154a1c163ef5259c7114dad4eb6e84c89560004..371221d43109b9aef7790089ac4c2ae4
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4a75642cfdf5a6eda43baa76f6a2e2a543e301ce..1f631bdf64795913b0f6e5c1c4c8522f71b40dd1 100644
+index f79b62c413789353af70b691792fe3abc24746dd..db3582808346711ad416c0a6cfd455f0538b2fa2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1245,7 +1245,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1255,7 +1255,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalArgumentException("Mode cannot be null");
          }
  
diff --git a/patches/server/0682-Clear-SyncLoadInfo.patch b/patches/server/0683-Clear-SyncLoadInfo.patch
similarity index 100%
rename from patches/server/0682-Clear-SyncLoadInfo.patch
rename to patches/server/0683-Clear-SyncLoadInfo.patch
diff --git a/patches/server/0683-ItemStack-repair-check-API.patch b/patches/server/0684-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0683-ItemStack-repair-check-API.patch
rename to patches/server/0684-ItemStack-repair-check-API.patch
diff --git a/patches/server/0684-More-Enchantment-API.patch b/patches/server/0685-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0684-More-Enchantment-API.patch
rename to patches/server/0685-More-Enchantment-API.patch
diff --git a/patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0686-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0686-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0687-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0687-Add-Mob-lookAt-API.patch b/patches/server/0688-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0687-Add-Mob-lookAt-API.patch
rename to patches/server/0688-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0688-Add-Unix-domain-socket-support.patch b/patches/server/0689-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0688-Add-Unix-domain-socket-support.patch
rename to patches/server/0689-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0689-Add-EntityInsideBlockEvent.patch b/patches/server/0690-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0689-Add-EntityInsideBlockEvent.patch
rename to patches/server/0690-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0690-Attributes-API-for-item-defaults.patch b/patches/server/0691-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0690-Attributes-API-for-item-defaults.patch
rename to patches/server/0691-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch
index 01d7305137..dcc4db4209 100644
--- a/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -104,7 +104,7 @@ index cd840dc4a8ca432868fb3e9c912ea928e5303e0d..4d0af984490b556a9911c3b8fdca1e16
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b825673fdd7c8c8dd9e05fe6b317006a64ba913e..43f8dda87654387e95c18e93c0dd8126002b1fe0 100644
+index 019261b244c4a35592cbfeab24c7ed7c45776433..762be168b576247cad2109cbd83518ff237b0632 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1457,7 +1457,7 @@ public class CraftWorld implements World {
diff --git a/patches/server/0693-More-Lidded-Block-API.patch b/patches/server/0694-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0693-More-Lidded-Block-API.patch
rename to patches/server/0694-More-Lidded-Block-API.patch
diff --git a/patches/server/0694-Limit-item-frame-cursors-on-maps.patch b/patches/server/0695-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0694-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0695-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0695-Add-PufferFishStateChangeEvent.patch b/patches/server/0696-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0695-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0696-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0696-Add-PlayerKickEvent-causes.patch b/patches/server/0697-Add-PlayerKickEvent-causes.patch
similarity index 98%
rename from patches/server/0696-Add-PlayerKickEvent-causes.patch
rename to patches/server/0697-Add-PlayerKickEvent-causes.patch
index 69695b00ac..32a86324ca 100644
--- a/patches/server/0696-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0697-Add-PlayerKickEvent-causes.patch
@@ -57,7 +57,7 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 371221d43109b9aef7790089ac4c2ae4c0496927..721d9d2fd93001089ea31ca8fb47cf071ee6a7b0 100644
+index ed7f43ad0fe7baf7c968ec214f1e32b8c5aa1cd5..8815790f0341a5421777781aa127cb064c5be123 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -320,7 +320,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -318,7 +318,7 @@ index 371221d43109b9aef7790089ac4c2ae4c0496927..721d9d2fd93001089ea31ca8fb47cf07
          }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a708080ef25bc9596fc8f2b997b534dc5787d495..047145064e95d3d9cf398e61a17bb8ea8b46a0a0 100644
+index fffb31c761625b803ac397799af890df84f26951..65657c009f6d5a5d5740e80f912a5893333c7085 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -716,7 +716,7 @@ public abstract class PlayerList {
@@ -330,7 +330,7 @@ index a708080ef25bc9596fc8f2b997b534dc5787d495..047145064e95d3d9cf398e61a17bb8ea
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -1366,8 +1366,8 @@ public abstract class PlayerList {
+@@ -1368,8 +1368,8 @@ public abstract class PlayerList {
          // Paper end
          // CraftBukkit start - disconnect safely
          for (ServerPlayer player : this.players) {
@@ -342,7 +342,7 @@ index a708080ef25bc9596fc8f2b997b534dc5787d495..047145064e95d3d9cf398e61a17bb8ea
          // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f631bdf64795913b0f6e5c1c4c8522f71b40dd1..ce827827b0bdec3e4928dda72393aacd2a46ba77 100644
+index db3582808346711ad416c0a6cfd455f0538b2fa2..0587ef4783228f4e4e7f441a47453bb8c91d7f26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -499,16 +499,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0700-Add-BellRevealRaiderEvent.patch b/patches/server/0701-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0700-Add-BellRevealRaiderEvent.patch
rename to patches/server/0701-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0701-Fix-invulnerable-end-crystals.patch b/patches/server/0702-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0701-Fix-invulnerable-end-crystals.patch
rename to patches/server/0702-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0702-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0703-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0702-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0703-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0703-Fix-dangerous-end-portal-logic.patch b/patches/server/0704-Fix-dangerous-end-portal-logic.patch
similarity index 97%
rename from patches/server/0703-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0704-Fix-dangerous-end-portal-logic.patch
index f035589ef3..51357ce406 100644
--- a/patches/server/0703-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0704-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a59bec7878902a174ce8b2a45de6b2191dc96ac..7c6bd61ebb87960c2d769f30c6f1543cee63ddf0 100644
+index 8e530b22413764470dcf5862c1a3ef8e504a124f..1bbfae5171a288a3964ba5b590bd5bab5d96b2a8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -361,6 +361,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0705-Make-item-validations-configurable.patch b/patches/server/0706-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0705-Make-item-validations-configurable.patch
rename to patches/server/0706-Make-item-validations-configurable.patch
diff --git a/patches/server/0706-Line-Of-Sight-Changes.patch b/patches/server/0707-Line-Of-Sight-Changes.patch
similarity index 97%
rename from patches/server/0706-Line-Of-Sight-Changes.patch
rename to patches/server/0707-Line-Of-Sight-Changes.patch
index 5a34c4959a..eb470be34d 100644
--- a/patches/server/0706-Line-Of-Sight-Changes.patch
+++ b/patches/server/0707-Line-Of-Sight-Changes.patch
@@ -19,7 +19,7 @@ index deade89dbbd1d4e548be7be1a46e36b7a9eff809..8443d1531cf361509abfacff296ce277
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 43f8dda87654387e95c18e93c0dd8126002b1fe0..54d4c7aaae20fd8792004bee0f370ac3c629c973 100644
+index 762be168b576247cad2109cbd83518ff237b0632..02269da4bff721682bb6f73ebfef636d140dc0ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -331,6 +331,18 @@ public class CraftWorld implements World {
diff --git a/patches/server/0707-add-per-world-spawn-limits.patch b/patches/server/0708-add-per-world-spawn-limits.patch
similarity index 96%
rename from patches/server/0707-add-per-world-spawn-limits.patch
rename to patches/server/0708-add-per-world-spawn-limits.patch
index 93b7b97d5d..6d103d446d 100644
--- a/patches/server/0707-add-per-world-spawn-limits.patch
+++ b/patches/server/0708-add-per-world-spawn-limits.patch
@@ -30,7 +30,7 @@ index 97a1ca789eb606b263ebabad188baefe4df69b85..435558eb9f3ce277c14ff5e368d489d1
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 54d4c7aaae20fd8792004bee0f370ac3c629c973..8a1bee6a664b8c05b0c2f633d0971cfce5dacad2 100644
+index 02269da4bff721682bb6f73ebfef636d140dc0ef..eda5af586fa9710e8bb945bc65b8fe1579daea5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -352,6 +352,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
diff --git a/patches/server/0710-Add-Feature-Generation-API.patch b/patches/server/0711-Add-Feature-Generation-API.patch
similarity index 100%
rename from patches/server/0710-Add-Feature-Generation-API.patch
rename to patches/server/0711-Add-Feature-Generation-API.patch
diff --git a/patches/server/0711-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0712-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 91%
rename from patches/server/0711-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0712-Fix-PlayerDropItemEvent-using-wrong-item.patch
index c8fd335ad4..f9a347ac3d 100644
--- a/patches/server/0711-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0712-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 592b2a22f5f971f4445c9b336d04923ba74a64b2..c0cb54711b7cf3bb134b4940202280525b407459 100644
+index 6dadec179459e606e96c858b5c8ba05e6cd12918..6a3da6993474a38e7f69b6da49bb11ab16b0f3d2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2139,7 +2139,7 @@ public class ServerPlayer extends Player {
+@@ -2163,7 +2163,7 @@ public class ServerPlayer extends Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {
diff --git a/patches/server/0712-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0713-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0712-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0713-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0713-Missing-Entity-Behavior-API.patch b/patches/server/0714-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0713-Missing-Entity-Behavior-API.patch
rename to patches/server/0714-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0715-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0715-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index da35abd835..6d304a129f 100644
--- a/patches/server/0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0715-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 721d9d2fd93001089ea31ca8fb47cf071ee6a7b0..1266e6a05c4e581eed53ee1abdcc6f089d832d50 100644
+index 8815790f0341a5421777781aa127cb064c5be123..18b9405c17bf5e2d10877eb695dc90654c3ccd27 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1093,7 +1093,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0715-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0716-Add-git-branch-and-commit-to-manifest.patch
similarity index 100%
rename from patches/server/0715-Add-git-branch-and-commit-to-manifest.patch
rename to patches/server/0716-Add-git-branch-and-commit-to-manifest.patch
diff --git a/patches/server/0716-Improve-CraftChunk-getEntities.patch b/patches/server/0717-Improve-CraftChunk-getEntities.patch
similarity index 100%
rename from patches/server/0716-Improve-CraftChunk-getEntities.patch
rename to patches/server/0717-Improve-CraftChunk-getEntities.patch
diff --git a/patches/server/0717-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0718-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0717-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0718-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0718-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0719-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 97%
rename from patches/server/0718-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0719-Use-getChunkIfLoadedImmediately-in-places.patch
index d66c4fdfe7..5c6cfe4aad 100644
--- a/patches/server/0718-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0719-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -21,7 +21,7 @@ index 9da2c0e52618afbfcaf5f7851fa0a5f85f0a12f3..baa25df9f446c8edea9666983425df31
  
      // Paper start - Asynchronous IO
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1266e6a05c4e581eed53ee1abdcc6f089d832d50..8227769f21a0a8589e777c2bb12dd7de7ed37282 100644
+index 18b9405c17bf5e2d10877eb695dc90654c3ccd27..da64ea3f020fdd656101292be19210d70ced7c9a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1298,7 +1298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0719-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0720-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0719-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0720-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0720-Adds-PlayerArmSwingEvent.patch b/patches/server/0721-Adds-PlayerArmSwingEvent.patch
similarity index 92%
rename from patches/server/0720-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0721-Adds-PlayerArmSwingEvent.patch
index e1f7e82744..91b3cc8bee 100644
--- a/patches/server/0720-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0721-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8227769f21a0a8589e777c2bb12dd7de7ed37282..8a8816b27699724ea90329ac291af492b74e2504 100644
+index da64ea3f020fdd656101292be19210d70ced7c9a..83f58717d9c183fe43787ea2982af70204df293c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2204,7 +2204,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0721-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0722-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 96%
rename from patches/server/0721-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0722-Fixes-kick-event-leave-message-not-being-sent.patch
index 498cebf587..a337b4d511 100644
--- a/patches/server/0721-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0722-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8a8816b27699724ea90329ac291af492b74e2504..512e072268ed5eab2d154c38c3c2f7eca93dba77 100644
+index 83f58717d9c183fe43787ea2982af70204df293c..064aecb28f05fcf572ee7d29f611a31cc7b6e49a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -457,7 +457,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -39,7 +39,7 @@ index 8a8816b27699724ea90329ac291af492b74e2504..512e072268ed5eab2d154c38c3c2f7ec
              this.server.getPlayerList().broadcastMessage(PaperAdventure.asVanilla(quitMessage), ChatType.SYSTEM, Util.NIL_UUID);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 047145064e95d3d9cf398e61a17bb8ea8b46a0a0..f2e5b5c1862dd650dc34dcaead68e5ffca0882d4 100644
+index 65657c009f6d5a5d5740e80f912a5893333c7085..48045993c8ad4b014cf4a67f7c4db42e014d1c81 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -587,6 +587,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0722-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0723-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0722-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0723-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0723-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0724-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0723-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0724-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0724-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0725-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
similarity index 100%
rename from patches/server/0724-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
rename to patches/server/0725-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
diff --git a/patches/server/0725-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0726-Don-t-apply-cramming-damage-to-players.patch
similarity index 93%
rename from patches/server/0725-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0726-Don-t-apply-cramming-damage-to-players.patch
index 784fb24168..ce606be256 100644
--- a/patches/server/0725-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0726-Don-t-apply-cramming-damage-to-players.patch
@@ -26,10 +26,10 @@ index 6ff53e138ea17c3e8283a52251c81d5cdf91ebac..0e7d29dbbdb862dd5876adee26fbba02
  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c0cb54711b7cf3bb134b4940202280525b407459..926ae5fdfc8c99f4822c4d4255fd53c2999135f4 100644
+index 6a3da6993474a38e7f69b6da49bb11ab16b0f3d2..9cb2b5f3f2a974d30448529d83b0aade82eb6f97 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1397,7 +1397,7 @@ public class ServerPlayer extends Player {
+@@ -1421,7 +1421,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {
diff --git a/patches/server/0726-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0727-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0726-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0727-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0727-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0728-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0727-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0728-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0728-Stinger-API.patch b/patches/server/0729-Stinger-API.patch
similarity index 100%
rename from patches/server/0728-Stinger-API.patch
rename to patches/server/0729-Stinger-API.patch
diff --git a/patches/server/0729-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0730-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0729-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0730-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0730-Add-System.out.println-catcher.patch b/patches/server/0731-Add-System.out.println-catcher.patch
similarity index 100%
rename from patches/server/0730-Add-System.out.println-catcher.patch
rename to patches/server/0731-Add-System.out.println-catcher.patch
diff --git a/patches/server/0731-Fix-test-not-bootstrapping.patch b/patches/server/0732-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0731-Fix-test-not-bootstrapping.patch
rename to patches/server/0732-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0732-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0733-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0732-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0733-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0733-Improve-boat-collision-performance.patch b/patches/server/0734-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0733-Improve-boat-collision-performance.patch
rename to patches/server/0734-Improve-boat-collision-performance.patch
diff --git a/patches/server/0734-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0735-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0734-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0735-Prevent-AFK-kick-while-watching-end-credits.patch
index 5d52d3da99..158e650685 100644
--- a/patches/server/0734-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0735-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 512e072268ed5eab2d154c38c3c2f7eca93dba77..a8be4f62bb1117a2e47d021d340f4210d5c2ae16 100644
+index 064aecb28f05fcf572ee7d29f611a31cc7b6e49a..ad1a9c6c354d40d5fa589666b1b00792d9cd6161 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0735-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0736-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0735-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0736-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0736-Add-PlayerSetSpawnEvent.patch b/patches/server/0737-Add-PlayerSetSpawnEvent.patch
similarity index 93%
rename from patches/server/0736-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0737-Add-PlayerSetSpawnEvent.patch
index 50fec686aa..ce1470b81e 100644
--- a/patches/server/0736-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0737-Add-PlayerSetSpawnEvent.patch
@@ -18,10 +18,10 @@ index e95f2222814e104bf9194a96385737dffe2cb2b5..249ab7357aa19d87179fa4c3ae89d9d3
  
          String string = resourceKey.location().toString();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 926ae5fdfc8c99f4822c4d4255fd53c2999135f4..84b63753333a5656abbe92b0b04ca2f994317158 100644
+index 9cb2b5f3f2a974d30448529d83b0aade82eb6f97..bc05cc34f6cd526a1d13261f1ac779d5397cbbac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1238,7 +1238,7 @@ public class ServerPlayer extends Player {
+@@ -1262,7 +1262,7 @@ public class ServerPlayer extends Player {
              } else if (this.bedBlocked(blockposition, enumdirection)) {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
@@ -30,7 +30,7 @@ index 926ae5fdfc8c99f4822c4d4255fd53c2999135f4..84b63753333a5656abbe92b0b04ca2f9
                  if (this.level.isDay()) {
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2066,12 +2066,33 @@ public class ServerPlayer extends Player {
+@@ -2090,12 +2090,33 @@ public class ServerPlayer extends Player {
          return this.respawnForced;
      }
  
@@ -67,10 +67,10 @@ index 926ae5fdfc8c99f4822c4d4255fd53c2999135f4..84b63753333a5656abbe92b0b04ca2f9
  
              this.respawnPosition = pos;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f2e5b5c1862dd650dc34dcaead68e5ffca0882d4..4a006309de32e463a454e400d7dd04caccf4001f 100644
+index 48045993c8ad4b014cf4a67f7c4db42e014d1c81..9966d0bb4f85866a46f5e4098416ab9af81f8d9f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -892,7 +892,7 @@ public abstract class PlayerList {
+@@ -893,7 +893,7 @@ public abstract class PlayerList {
                          f1 = (float) Mth.wrapDegrees(Mth.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
                      }
  
@@ -93,10 +93,10 @@ index af4eb4a8814491afef449a2874521636957d7557..0a5d563700c9f806139001181f01fa9d
                      return InteractionResult.SUCCESS;
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ce827827b0bdec3e4928dda72393aacd2a46ba77..bd7d5d8c03fdb836504ad733f137cb180aa1b029 100644
+index 0587ef4783228f4e4e7f441a47453bb8c91d7f26..63aa742c505e14faa9bf5df29a8f759486fac80b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1065,9 +1065,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1075,9 +1075,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0737-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0738-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0737-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0738-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0738-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0739-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0738-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0739-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0739-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0740-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0739-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0740-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0740-Added-EntityDamageItemEvent.patch b/patches/server/0741-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0740-Added-EntityDamageItemEvent.patch
rename to patches/server/0741-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0741-Optimize-indirect-passenger-iteration.patch b/patches/server/0742-Optimize-indirect-passenger-iteration.patch
similarity index 95%
rename from patches/server/0741-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0742-Optimize-indirect-passenger-iteration.patch
index 3c3bc9d0c2..f6f066275f 100644
--- a/patches/server/0741-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0742-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7c6bd61ebb87960c2d769f30c6f1543cee63ddf0..23ca6c3c59de9da965154a1c987d7dc0f960a67f 100644
+index 1bbfae5171a288a3964ba5b590bd5bab5d96b2a8..b8f8f4b369ed5f77a644b6bc8aea5068a0f03582 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3475,26 +3475,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0742-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0743-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0742-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0743-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0744-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0744-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0744-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0745-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0744-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0745-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0746-ChunkMap.mainInvokingExecutor.patch b/patches/server/0746-ChunkMap.mainInvokingExecutor.patch
deleted file mode 100644
index 12cef167f4..0000000000
--- a/patches/server/0746-ChunkMap.mainInvokingExecutor.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sat, 14 Aug 2021 14:49:45 +0100
-Subject: [PATCH] ChunkMap.mainInvokingExecutor
-
-This is a temp patch, this should maybe be moved to a more generic map or potentially wrapped into mcutil for the sake of this being such a generic concept
-anyways
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c42f564ecac75f7947c580e7514795c26097761e..70891232460665ff0d1f80ff09e3773753168d4a 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -150,6 +150,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     public final ServerLevel level;
-     private final ThreadedLevelLightEngine lightEngine;
-     private final BlockableEventLoop<Runnable> mainThreadExecutor;
-+    final java.util.concurrent.Executor mainInvokingExecutor; // Paper // Paper - Move to MCUtil?
-     public final ChunkGenerator generator;
-     public final Supplier<DimensionDataStorage> overworldDataStorage;
-     private final PoiManager poiManager;
-@@ -355,6 +356,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         this.level = world;
-         this.generator = chunkGenerator;
-         this.mainThreadExecutor = mainThreadExecutor;
-+        // Paper start
-+        this.mainInvokingExecutor = (run) -> {
-+            if (MCUtil.isMainThread()) {
-+                run.run();
-+            } else {
-+                mainThreadExecutor.execute(run);
-+            }
-+        };
-+        // Paper end
-         ProcessorMailbox<Runnable> threadedmailbox = ProcessorMailbox.create(executor, "worldgen");
- 
-         Objects.requireNonNull(mainThreadExecutor);
diff --git a/patches/server/0745-Clear-bucket-NBT-after-dispense.patch b/patches/server/0746-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0745-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0746-Clear-bucket-NBT-after-dispense.patch