From 9f8876e92f6f08c36ed7a58a1e0cea6df7c6447b Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 17 Jun 2021 22:51:04 -0700
Subject: [PATCH] add back optimizing ServerLevel chunk checking methods

---
 ...oviderServer-s-chunk-level-checking-.patch | 61 ------------------
 ...rLevels-chunk-level-checking-methods.patch | 64 +++++++++++++++++++
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...packets-to-nearby-locations-sounds-.patch} |  2 +-
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0451-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  2 +-
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...ch => 0456-incremental-chunk-saving.patch} |  2 +-
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  2 +-
 ...uping.patch => 0460-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0463-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...6-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  2 +-
 ...atch => 0470-Paper-dumpitem-command.patch} |  2 +-
 ...71-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...474-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...0480-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0482-Add-entity-liquid-API.patch} |  4 +-
 ...date-itemstack-legacy-name-and-lore.patch} |  2 +-
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0485-Add-PrepareResultEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  2 +-
 ...-Priority-Urgency-System-for-Chunks.patch} |  0
 ...prove-Chunk-Status-Transition-Speed.patch} |  4 +-
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0495-Fix-SPIGOT-5989.patch} |  2 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...h => 0500-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 => 0505-Brand-support.patch} |  0
 ...patch => 0506-Add-setMaxPlayers-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0508-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  2 +-
 ...PI.patch => 0510-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0512-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0514-Buffer-joins-to-world.patch} |  0
 ...=> 0515-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  2 +-
 ...reateEvent-needs-to-know-its-entity.patch} |  6 +-
 ...ch => 0518-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0519-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0522-Cache-block-data-strings.patch} |  2 +-
 ...rtation-and-cancel-velocity-if-tele.patch} |  4 +-
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  2 +-
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0530-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  2 +-
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0536-Optimise-getType-calls.patch} |  0
 ....patch => 0537-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  2 +-
 ...ce-order-when-capturing-blockstates.patch} |  2 +-
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0542-Player-elytra-boost-API.patch} |  0
 ...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} |  2 +-
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 ...> 0549-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  2 +-
 ...551-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0552-Add-API-for-quit-reason.patch} |  6 +-
 ...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} |  2 +-
 ...patch => 0557-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...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} |  0
 ...-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} |  2 +-
 ....patch => 0567-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0569-MC-4-Fix-item-position-desync.patch} |  0
 ...570-Player-Chunk-Load-Unload-Events.patch} |  2 +-
 ...1-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  2 +-
 ...-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} |  0
 ...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} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  2 +-
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  2 +-
 ...-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} |  2 +-
 ...OIs.patch => 0598-Remove-stale-POIs.patch} |  2 +-
 ...h => 0599-Fix-villager-boat-exploit.patch} |  2 +-
 ...I.patch => 0600-Add-sendOpLevel-API.patch} |  2 +-
 ...ch => 0601-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  0
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  2 +-
 ...605-Make-schedule-command-per-world.patch} |  0
 ...606-Configurable-max-leash-distance.patch} |  0
 ...607-Implement-BlockPreDispenseEvent.patch} |  2 +-
 ...h => 0608-Added-Vanilla-Entity-Tags.patch} |  2 +-
 ...-API.patch => 0609-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-spam-when-removing-chests-in-water.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  4 +-
 ...e-map-update-when-spawning-disabled.patch} |  2 +-
 ...shield-blocking-on-dimension-change.patch} |  2 +-
 ...atch => 0617-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0618-EntityMoveEvent.patch} |  6 +-
 ...isable-pathfinding-updates-on-block.patch} |  2 +-
 ... 0620-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  2 +-
 ...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 => 0626-misc-debugging-dumps.patch} |  2 +-
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0628-Expose-Tracked-Players.patch} |  0
 ...9-Remove-streams-from-SensorNearest.patch} |  0
 ...ix-Wither-hostility-towards-players.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0632-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...634-fix-converting-txt-to-json-file.patch} |  2 +-
 ...atch => 0635-Add-worldborder-events.patch} |  0
 ...=> 0636-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0638-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0639-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ...ch => 0641-Implement-Keyed-on-World.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0643-Item-Rarity-API.patch} |  2 +-
 ...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} |  2 +-
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...49-Entity-load-save-limit-per-chunk.patch} |  0
 ...block-falling-causing-client-desync.patch} |  0
 ...tch => 0651-Expose-protocol-version.patch} |  2 +-
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  2 +-
 ...patch => 0655-Add-bypass-host-check.patch} |  0
 ...0656-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...ting-give-items-on-item-drop-cancel.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0664-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0665-More-World-API.patch} |  0
 ... 0666-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  2 +-
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  2 +-
 ...dd-Channel-initialization-listeners.patch} |  0
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0673-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  2 +-
 ...close.patch => 0677-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  2 +-
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0680-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0681-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  2 +-
 ...fo.patch => 0684-Clear-SyncLoadInfo.patch} |  2 +-
 ... => 0685-ItemStack-repair-check-API.patch} |  2 +-
 ....patch => 0686-More-Enchantment-API.patch} |  0
 ...option-to-load-extra-plugin-jars-no.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  6 +-
 ...PI.patch => 0689-Add-Mob-lookAt-API.patch} |  0
 ...0690-Add-Unix-domain-socket-support.patch} |  2 +-
 ... => 0691-Add-EntityInsideBlockEvent.patch} |  0
 ...92-Attributes-API-for-item-defaults.patch} |  2 +-
 ...hantCustom-emit-PlayerPurchaseEvent.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  2 +-
 ...patch => 0695-More-Lidded-Block-API.patch} |  0
 ...96-Limit-item-frame-cursors-on-maps.patch} |  2 +-
 ...0697-Add-PufferFishStateChangeEvent.patch} |  0
 ... => 0698-Add-PlayerKickEvent-causes.patch} |  4 +-
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ReentrantLo.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  2 +-
 ...h => 0702-Add-BellRevealRaiderEvent.patch} |  0
 ... 0703-Fix-invulnerable-end-crystals.patch} |  2 +-
 ...04-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...inventory-on-cancelled-pickup-event.patch} |  2 +-
 ...0706-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...0709-Add-more-line-of-sight-methods.patch} |  2 +-
 ... => 0710-add-per-world-spawn-limits.patch} |  2 +-
 ...plashEvent-for-water-splash-potions.patch} |  0
 ...tus-dataconverter-for-pre-1.13-chun.patch} |  0
 267 files changed, 150 insertions(+), 147 deletions(-)
 delete mode 100644 patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
 create mode 100644 patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch
 rename patches/server/{0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename patches/server/{0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (97%)
 rename patches/server/{0449-Fix-villager-trading-demand-MC-163962.patch => 0450-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0450-Maps-shouldn-t-load-chunks.patch => 0451-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename patches/server/{0453-Optimize-Bit-Operations-by-inlining.patch => 0454-Optimize-Bit-Operations-by-inlining.patch} (99%)
 rename patches/server/{0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0455-incremental-chunk-saving.patch => 0456-incremental-chunk-saving.patch} (99%)
 rename patches/server/{0456-Fix-missing-chunks-due-to-integer-overflow.patch => 0457-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0458-Fix-piston-physics-inconsistency-MC-188840.patch => 0459-Fix-piston-physics-inconsistency-MC-188840.patch} (98%)
 rename patches/server/{0459-Fix-sand-duping.patch => 0460-Fix-sand-duping.patch} (100%)
 rename patches/server/{0460-Prevent-position-desync-in-playerconnection-causing-.patch => 0461-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0461-Inventory-getHolder-method-without-block-snapshot.patch => 0462-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0462-Expose-Arrow-getItemStack.patch => 0463-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0463-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0464-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0464-Hide-sync-chunk-writes-behind-flag.patch => 0465-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0465-Add-permission-for-command-blocks.patch => 0466-Add-permission-for-command-blocks.patch} (100%)
 rename patches/server/{0466-Ensure-Entity-AABB-s-are-never-invalid.patch => 0467-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0467-Optimize-WorldBorder-collision-checks-and-air.patch => 0468-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename patches/server/{0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename patches/server/{0469-Paper-dumpitem-command.patch => 0470-Paper-dumpitem-command.patch} (97%)
 rename patches/server/{0470-Don-t-allow-null-UUID-s-for-chat.patch => 0471-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0471-Improve-Legacy-Component-serialization-size.patch => 0472-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0472-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0473-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0473-Support-old-UUID-format-for-NBT.patch => 0474-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0474-Clean-up-duplicated-GameProfile-Properties.patch => 0475-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0475-Convert-legacy-attributes-in-Item-Meta.patch => 0476-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0476-Remove-some-streams-from-structures.patch => 0477-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0477-Remove-streams-from-classes-related-villager-gossip.patch => 0478-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0478-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0479-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename patches/server/{0479-Support-components-in-ItemMeta.patch => 0480-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0481-Add-entity-liquid-API.patch => 0482-Add-entity-liquid-API.patch} (91%)
 rename patches/server/{0482-Update-itemstack-legacy-name-and-lore.patch => 0483-Update-itemstack-legacy-name-and-lore.patch} (96%)
 rename patches/server/{0483-Spawn-player-in-correct-world-on-login.patch => 0484-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename patches/server/{0484-Add-PrepareResultEvent.patch => 0485-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0485-Allow-delegation-to-vanilla-chunk-gen.patch => 0486-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (90%)
 rename patches/server/{0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 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} (95%)
 rename patches/server/{0489-Optimize-NetworkManager-Exception-Handling.patch => 0490-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0490-Optimize-the-advancement-data-player-iteration-to-be.patch => 0491-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0491-Fix-arrows-never-despawning-MC-125757.patch => 0492-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0492-Thread-Safe-Vanilla-Command-permission-checking.patch => 0493-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0493-Move-range-check-for-block-placing-up.patch => 0494-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0494-Fix-SPIGOT-5989.patch => 0495-Fix-SPIGOT-5989.patch} (97%)
 rename patches/server/{0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0499-Incremental-player-saving.patch => 0500-Incremental-player-saving.patch} (95%)
 rename patches/server/{0500-Fix-some-rails-connecting-improperly.patch => 0501-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0501-Fix-MC-187716-Use-configured-height.patch => 0502-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename patches/server/{0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0503-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0503-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0504-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0504-Brand-support.patch => 0505-Brand-support.patch} (100%)
 rename patches/server/{0505-Add-setMaxPlayers-API.patch => 0506-Add-setMaxPlayers-API.patch} (94%)
 rename patches/server/{0506-Add-playPickupItemAnimation-to-LivingEntity.patch => 0507-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0507-Don-t-require-FACING-data.patch => 0508-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (96%)
 rename patches/server/{0509-Add-moon-phase-API.patch => 0510-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0510-Prevent-headless-pistons-from-being-created.patch => 0511-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0511-Add-BellRingEvent.patch => 0512-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0512-Add-zombie-targets-turtle-egg-config.patch => 0513-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0513-Buffer-joins-to-world.patch => 0514-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0514-Optimize-redstone-algorithm.patch => 0515-Optimize-redstone-algorithm.patch} (100%)
 rename patches/server/{0515-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0516-Fix-hex-colors-not-working-in-some-kick-messages.patch} (98%)
 rename patches/server/{0516-PortalCreateEvent-needs-to-know-its-entity.patch => 0517-PortalCreateEvent-needs-to-know-its-entity.patch} (96%)
 rename patches/server/{0517-Fix-CraftTeam-null-check.patch => 0518-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0518-Add-more-Evoker-API.patch => 0519-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0520-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename patches/server/{0520-Create-HoverEvent-from-ItemStack-Entity.patch => 0521-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0521-Cache-block-data-strings.patch => 0522-Cache-block-data-strings.patch} (97%)
 rename patches/server/{0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (96%)
 rename patches/server/{0523-Add-additional-open-container-api-to-HumanEntity.patch => 0524-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0525-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0525-Extend-block-drop-capture-to-capture-all-items-added.patch => 0526-Extend-block-drop-capture-to-capture-all-items-added.patch} (96%)
 rename patches/server/{0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0527-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0528-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0528-Lazily-track-plugin-scoreboards-by-default.patch => 0529-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0529-Entity-isTicking.patch => 0530-Entity-isTicking.patch} (100%)
 rename patches/server/{0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0531-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (91%)
 rename patches/server/{0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0532-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.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} (100%)
 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} (97%)
 rename patches/server/{0538-Retain-block-place-order-when-capturing-blockstates.patch => 0539-Retain-block-place-order-when-capturing-blockstates.patch} (93%)
 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} (100%)
 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} (98%)
 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} (95%)
 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} (98%)
 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} (94%)
 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} (95%)
 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} (100%)
 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} (100%)
 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} (96%)
 rename patches/server/{0566-Limit-recipe-packets.patch => 0567-Limit-recipe-packets.patch} (100%)
 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} (100%)
 rename patches/server/{0569-Player-Chunk-Load-Unload-Events.patch => 0570-Player-Chunk-Load-Unload-Events.patch} (94%)
 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} (91%)
 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} (100%)
 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} (100%)
 rename patches/server/{0589-Added-ServerResourcesReloadedEvent.patch => 0590-Added-ServerResourcesReloadedEvent.patch} (97%)
 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} (96%)
 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} (97%)
 rename patches/server/{0597-Remove-stale-POIs.patch => 0598-Remove-stale-POIs.patch} (92%)
 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} (96%)
 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} (100%)
 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} (94%)
 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} (95%)
 rename patches/server/{0607-Added-Vanilla-Entity-Tags.patch => 0608-Added-Vanilla-Entity-Tags.patch} (98%)
 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-Fix-console-spam-when-removing-chests-in-water.patch => 0611-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0611-Add-toggle-for-always-placing-the-dragon-egg.patch => 0612-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0612-Added-PlayerStonecutterRecipeSelectEvent.patch => 0613-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (97%)
 rename patches/server/{0614-Skip-distance-map-update-when-spawning-disabled.patch => 0615-Skip-distance-map-update-when-spawning-disabled.patch} (92%)
 rename patches/server/{0615-Reset-shield-blocking-on-dimension-change.patch => 0616-Reset-shield-blocking-on-dimension-change.patch} (89%)
 rename patches/server/{0616-add-DragonEggFormEvent.patch => 0617-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0617-EntityMoveEvent.patch => 0618-EntityMoveEvent.patch} (92%)
 rename patches/server/{0618-added-option-to-disable-pathfinding-updates-on-block.patch => 0619-added-option-to-disable-pathfinding-updates-on-block.patch} (95%)
 rename patches/server/{0619-Inline-shift-direction-fields.patch => 0620-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0620-Allow-adding-items-to-BlockDropItemEvent.patch => 0621-Allow-adding-items-to-BlockDropItemEvent.patch} (95%)
 rename patches/server/{0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0622-living-entity-allow-attribute-registration.patch => 0623-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0623-fix-dead-slime-setSize-invincibility.patch => 0624-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0624-Merchant-getRecipes-should-return-an-immutable-list.patch => 0625-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0625-misc-debugging-dumps.patch => 0626-misc-debugging-dumps.patch} (97%)
 rename patches/server/{0626-Add-support-for-hex-color-codes-in-console.patch => 0627-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0627-Expose-Tracked-Players.patch => 0628-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0628-Remove-streams-from-SensorNearest.patch => 0629-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0629-MC-29274-Fix-Wither-hostility-towards-players.patch => 0630-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename patches/server/{0630-Throw-proper-exception-on-empty-JsonList-file.patch => 0631-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0631-Improve-ServerGUI.patch => 0632-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0633-fix-converting-txt-to-json-file.patch => 0634-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0634-Add-worldborder-events.patch => 0635-Add-worldborder-events.patch} (100%)
 rename patches/server/{0635-added-PlayerNameEntityEvent.patch => 0636-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0636-Prevent-grindstones-from-overstacking-items.patch => 0637-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0637-Add-recipe-to-cook-events.patch => 0638-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0638-Add-Block-isValidTool.patch => 0639-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0639-Allow-using-signs-inside-spawn-protection.patch => 0640-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0640-Implement-Keyed-on-World.patch => 0641-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0641-Add-fast-alternative-constructor-for-Rotations.patch => 0642-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0642-Item-Rarity-API.patch => 0643-Item-Rarity-API.patch} (93%)
 rename patches/server/{0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0644-copy-TESign-isEditable-from-snapshots.patch => 0645-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0645-Drop-carried-item-when-player-has-disconnected.patch => 0646-Drop-carried-item-when-player-has-disconnected.patch} (92%)
 rename patches/server/{0646-forced-whitelist-use-configurable-kick-message.patch => 0647-forced-whitelist-use-configurable-kick-message.patch} (93%)
 rename patches/server/{0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0648-Entity-load-save-limit-per-chunk.patch => 0649-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0649-fix-cancelling-block-falling-causing-client-desync.patch => 0650-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0650-Expose-protocol-version.patch => 0651-Expose-protocol-version.patch} (91%)
 rename patches/server/{0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename patches/server/{0652-Enhance-console-tab-completions-for-brigadier-comman.patch => 0653-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (92%)
 rename patches/server/{0654-Add-bypass-host-check.patch => 0655-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0655-Set-area-affect-cloud-rotation.patch => 0656-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0656-add-isDeeplySleeping-to-HumanEntity.patch => 0657-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0657-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0658-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0658-add-consumeFuel-to-FurnaceBurnEvent.patch => 0659-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0659-add-get-set-drop-chance-to-EntityEquipment.patch => 0660-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0660-fix-PigZombieAngerEvent-cancellation.patch => 0661-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0661-Fix-checkReach-check-for-Shulker-boxes.patch => 0662-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0662-fix-PlayerItemHeldEvent-firing-twice.patch => 0663-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0663-Added-PlayerDeepSleepEvent.patch => 0664-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0664-More-World-API.patch => 0665-More-World-API.patch} (100%)
 rename patches/server/{0665-Added-PlayerBedFailEnterEvent.patch => 0666-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0666-Implement-methods-to-convert-between-Component-and-B.patch => 0667-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (95%)
 rename patches/server/{0668-Introduce-beacon-activation-deactivation-events.patch => 0669-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0669-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0670-add-RespawnFlags-to-PlayerRespawnEvent.patch} (97%)
 rename patches/server/{0670-Add-Channel-initialization-listeners.patch => 0671-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0671-Send-empty-commands-if-tab-completion-is-disabled.patch => 0672-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0672-Add-more-WanderingTrader-API.patch => 0673-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0673-Add-EntityBlockStorage-clearEntities.patch => 0674-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (95%)
 rename patches/server/{0676-Inventory-close.patch => 0677-Inventory-close.patch} (100%)
 rename patches/server/{0677-call-PortalCreateEvent-players-and-end-platform.patch => 0678-call-PortalCreateEvent-players-and-end-platform.patch} (94%)
 rename patches/server/{0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0679-Fix-CraftPotionBrewer-cache.patch => 0680-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0680-Add-basic-Datapack-API.patch => 0681-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0681-Add-environment-variable-to-disable-server-gui.patch => 0682-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0682-additions-to-PlayerGameModeChangeEvent.patch => 0683-additions-to-PlayerGameModeChangeEvent.patch} (98%)
 rename patches/server/{0683-Clear-SyncLoadInfo.patch => 0684-Clear-SyncLoadInfo.patch} (95%)
 rename patches/server/{0684-ItemStack-repair-check-API.patch => 0685-ItemStack-repair-check-API.patch} (97%)
 rename patches/server/{0685-More-Enchantment-API.patch => 0686-More-Enchantment-API.patch} (100%)
 rename patches/server/{0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0687-Fix-and-optimise-world-force-upgrading.patch => 0688-Fix-and-optimise-world-force-upgrading.patch} (98%)
 rename patches/server/{0688-Add-Mob-lookAt-API.patch => 0689-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0689-Add-Unix-domain-socket-support.patch => 0690-Add-Unix-domain-socket-support.patch} (98%)
 rename patches/server/{0690-Add-EntityInsideBlockEvent.patch => 0691-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0691-Attributes-API-for-item-defaults.patch => 0692-Attributes-API-for-item-defaults.patch} (95%)
 rename patches/server/{0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0693-Add-cause-to-Weather-ThunderChangeEvents.patch => 0694-Add-cause-to-Weather-ThunderChangeEvents.patch} (98%)
 rename patches/server/{0694-More-Lidded-Block-API.patch => 0695-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0695-Limit-item-frame-cursors-on-maps.patch => 0696-Limit-item-frame-cursors-on-maps.patch} (95%)
 rename patches/server/{0696-Add-PufferFishStateChangeEvent.patch => 0697-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0697-Add-PlayerKickEvent-causes.patch => 0698-Add-PlayerKickEvent-causes.patch} (99%)
 rename patches/server/{0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0700-Add-option-to-fix-items-merging-through-walls.patch => 0701-Add-option-to-fix-items-merging-through-walls.patch} (96%)
 rename patches/server/{0701-Add-BellRevealRaiderEvent.patch => 0702-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0702-Fix-invulnerable-end-crystals.patch => 0703-Fix-invulnerable-end-crystals.patch} (97%)
 rename patches/server/{0703-Add-ElderGuardianAppearanceEvent.patch => 0704-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0704-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0705-Reset-villager-inventory-on-cancelled-pickup-event.patch} (96%)
 rename patches/server/{0705-Fix-dangerous-end-portal-logic.patch => 0706-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0707-Make-item-validations-configurable.patch => 0708-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0708-Add-more-line-of-sight-methods.patch => 0709-Add-more-line-of-sight-methods.patch} (97%)
 rename patches/server/{0709-add-per-world-spawn-limits.patch => 0710-add-per-world-spawn-limits.patch} (96%)
 rename patches/server/{0710-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0711-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
deleted file mode 100644
index 083f25a75d..0000000000
--- a/patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Thu, 16 Apr 2020 16:13:59 -0700
-Subject: [PATCH] Optimize ChunkProviderServer's chunk level checking helper
- methods
-
-These can be hot functions (i.e entity ticking and block ticking),
-so inline where possible, and avoid the abstraction of the
-Either class.
-
-1.17: needs to be looked at again
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 3744cce8611ac01b1b6c76cd3c4890795c1f06a2..531fe1259a1d60ff69321c3fefbf97f7141e6475 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -24,7 +24,6 @@ import net.minecraft.network.protocol.Packet;
- import net.minecraft.server.MCUtil;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.progress.ChunkProgressListener;
--import net.minecraft.util.Mth;
- import net.minecraft.util.profiling.ProfilerFiller;
- import net.minecraft.util.thread.BlockableEventLoop;
- import net.minecraft.world.entity.Entity;
-@@ -644,21 +643,29 @@ public class ServerChunkCache extends ChunkSource {
- 
-     public final boolean isInEntityTickingChunk(Entity entity) { return this.isEntityTickingChunk(entity); } // Paper - OBFHELPER
-     @Override public boolean isEntityTickingChunk(Entity entity) {
--        long i = ChunkPos.asLong(Mth.floor(entity.getX()) >> 4, Mth.floor(entity.getZ()) >> 4);
--
--        return this.checkChunkFuture(i, (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getEntityTickingChunkFuture); // CraftBukkit - decompile error
-+        // Paper start - optimize is ticking ready type functions
-+        // entity ticking
-+        ChunkHolder playerChunk = this.getVisibleChunkIfPresent(MCUtil.getCoordinateKey(entity));
-+        return playerChunk != null && playerChunk.isEntityTickingReady();
-+        // Paper end - optimize is ticking ready type functions
-     }
- 
-     public final boolean isEntityTickingChunk(ChunkPos chunkcoordintpair) { return this.isEntityTickingChunk(chunkcoordintpair); } // Paper - OBFHELPER
-     @Override public boolean isEntityTickingChunk(ChunkPos pos) {
--        return this.checkChunkFuture(pos.toLong(), (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getEntityTickingChunkFuture); // CraftBukkit - decompile error
-+        // Paper start - optimize is ticking ready type functions
-+        // is entity ticking ready
-+        ChunkHolder playerChunk = this.getVisibleChunkIfPresent(MCUtil.getCoordinateKey(pos));
-+        return playerChunk != null && playerChunk.isEntityTickingReady();
-+        // Paper end - optimize is ticking ready type functions
-     }
- 
-     @Override
-     public boolean isTickingChunk(BlockPos pos) {
--        long i = ChunkPos.asLong(pos.getX() >> 4, pos.getZ() >> 4);
--
--        return this.checkChunkFuture(i, (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getTickingChunkFuture); // CraftBukkit - decompile error
-+        // Paper start - optimize is ticking ready type functions
-+        // is ticking ready
-+        ChunkHolder playerChunk = this.getVisibleChunkIfPresent(MCUtil.getCoordinateKey(pos));
-+        return playerChunk != null && playerChunk.isTickingReady();
-+        // Paper end - optimize is ticking ready type functions
-     }
- 
-     private boolean checkChunkFuture(long pos, Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>> futureFunction) {
diff --git a/patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch
new file mode 100644
index 0000000000..5b4299195f
--- /dev/null
+++ b/patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Thu, 16 Apr 2020 16:13:59 -0700
+Subject: [PATCH] Optimize ServerLevels chunk level checking methods
+
+These can be hot functions (i.e entity ticking and block ticking),
+so inline where possible, and avoid the abstraction of the
+Either class.
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 7e1062df9c2fd2d9be82fb84b7b93eb6fa207e57..3327fb07840e6dc6d2249b05a403f52ccd531b0f 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -2073,15 +2073,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+     public boolean isPositionTickingWithEntitiesLoaded(BlockPos blockposition) {
+         long i = ChunkPos.asLong(blockposition);
+ 
+-        return this.chunkSource.isPositionTicking(i) && this.areEntitiesLoaded(i);
++        // Paper start - optimize is ticking ready type functions
++        ChunkHolder chunkHolder = this.chunkSource.chunkMap.getVisibleChunkIfPresent(i);
++        return chunkHolder != null && chunkHolder.isTickingReady() && this.areEntitiesLoaded(i);
++        // Paper end
+     }
+ 
+     public boolean isPositionEntityTicking(BlockPos blockposition) {
+-        return this.entityManager.isPositionTicking(blockposition);
++        return this.entityManager.isPositionTicking(ChunkPos.asLong(blockposition)); // Paper
+     }
+ 
+     public boolean isPositionEntityTicking(ChunkPos chunkcoordintpair) {
+-        return this.entityManager.isPositionTicking(chunkcoordintpair);
++        return this.entityManager.isPositionTicking(chunkcoordintpair.toLong()); // Paper
+     }
+ 
+     private final class EntityCallbacks implements LevelCallback<Entity> {
+diff --git a/src/main/java/net/minecraft/world/level/ChunkPos.java b/src/main/java/net/minecraft/world/level/ChunkPos.java
+index 439f82a48e6f6ce7b4773505ced32324cacb302d..2a99aa989ac5c19d99bb3cbc0934425e46573cd7 100644
+--- a/src/main/java/net/minecraft/world/level/ChunkPos.java
++++ b/src/main/java/net/minecraft/world/level/ChunkPos.java
+@@ -48,7 +48,7 @@ public class ChunkPos {
+     }
+ 
+     public static long asLong(BlockPos blockPos) {
+-        return asLong(SectionPos.blockToSectionCoord(blockPos.getX()), SectionPos.blockToSectionCoord(blockPos.getZ()));
++        return (((long)blockPos.getX() >> 4) & 4294967295L) | ((((long)blockPos.getZ() >> 4) & 4294967295L) << 32); // Paper - inline
+     }
+ 
+     public static int getX(long pos) {
+diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
+index 624fd443d2cc71605cfff996140b00f37c8d8841..e94b5a7fe47831e2c3e0935e316737a2422e4250 100644
+--- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
++++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
+@@ -326,6 +326,11 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
+     public LevelEntityGetter<T> getEntityGetter() {
+         return this.entityGetter;
+     }
++    // Paper start
++    public final boolean isPositionTicking(long position) {
++        return this.chunkVisibility.get(position).isTicking();
++    }
++    // Paper end
+ 
+     public boolean isPositionTicking(BlockPos blockPos) {
+         return this.chunkVisibility.get(ChunkPos.asLong(blockPos)).isTicking();
diff --git a/patches/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 97%
rename from patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 986355438b..61c833b5e2 100644
--- a/patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch
@@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with
 lots of players in them.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 846b0dcee92f71d1c887ea88744c36f6a870c5e2..4c5a3b53e0fbaeb1a9ae85b499a1e630255f88ea 100644
+index 529fc8732b67a3349672224723725e38925f8f09..28b203a5c8a65ba96bf239c270fa6445f94e887e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1129,16 +1129,40 @@ public abstract class PlayerList {
diff --git a/patches/server/0449-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0450-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0449-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0450-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0450-Maps-shouldn-t-load-chunks.patch b/patches/server/0451-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0450-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0451-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
similarity index 99%
rename from patches/server/0453-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
index c474f730a7..db577042d8 100644
--- a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
@@ -7,7 +7,7 @@ Inline bit operations and reduce instruction count to make these hot
 operations faster
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index c4e622143073edbb4891ac9bd4fe30f32aede8f6..1c980abc4fb5cab2a6dc9d1a8a3e8fdd0a7e3a4b 100644
+index 80d8873bc2512ecde6a531e974b14e9b48402d64..b70aa66732fb5e957aed0901f4c76358b2c56f8e 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -30,15 +30,16 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0455-incremental-chunk-saving.patch b/patches/server/0456-incremental-chunk-saving.patch
similarity index 99%
rename from patches/server/0455-incremental-chunk-saving.patch
rename to patches/server/0456-incremental-chunk-saving.patch
index 7f1213a6c5..2041e93073 100644
--- a/patches/server/0455-incremental-chunk-saving.patch
+++ b/patches/server/0456-incremental-chunk-saving.patch
@@ -260,7 +260,7 @@ index 147f6fd5174a2c489dfb7ea2ce2d2dc7dacfb89d..6c565751c36daa0084196dce5d2f82df
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 16ff687d16bef0a485aacbcd80a3bcfa1bb08224..070bc5f072163b35868ef234e5f34c3eede4c934 100644
+index cd322d31a079dcd50ca62a2898608e2cf89a3edf..4b8748d955fce10536847a44e22d53d6d491ac1d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1003,6 +1003,37 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 98%
rename from patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
index 8910512100..c1c7c9df66 100644
--- a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -47,7 +47,7 @@ index 7f140333c2e62012fa572c1a061d84432426997f..b67ba8f75e4a3358d7c2462918b85b0b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 44cc09006eac6315d167a2628857f9942eb1fc13..aea9a2dc4164f5728e711efb3009bde8862c7345 100644
+index 4eac07022a7d896ee8921afa6d35cba7f0c89941..dd50a29d47a62df8cdfd69358218d1559b6794ef 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -411,14 +411,26 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0459-Fix-sand-duping.patch b/patches/server/0460-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0459-Fix-sand-duping.patch
rename to patches/server/0460-Fix-sand-duping.patch
diff --git a/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0462-Expose-Arrow-getItemStack.patch b/patches/server/0463-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0462-Expose-Arrow-getItemStack.patch
rename to patches/server/0463-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0465-Add-permission-for-command-blocks.patch b/patches/server/0466-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0465-Add-permission-for-command-blocks.patch
rename to patches/server/0466-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 59b5569581..9b6923eb9d 100644
--- a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a465baa097339a5f661c2c331cbd3cbe854e53b2..b4ad624270406d86fb2d18edc1d94979454e779c 100644
+index 9f80206f966689b79df4e3b9b82ef9f4d2170bfe..21c16bf341e846f90a24fe2395ff89f1ace70d73 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1721,11 +1721,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0469-Paper-dumpitem-command.patch b/patches/server/0470-Paper-dumpitem-command.patch
similarity index 97%
rename from patches/server/0469-Paper-dumpitem-command.patch
rename to patches/server/0470-Paper-dumpitem-command.patch
index 76a52b98a8..bcaa088a34 100644
--- a/patches/server/0469-Paper-dumpitem-command.patch
+++ b/patches/server/0470-Paper-dumpitem-command.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command
 Let's you quickly view the item in your hands NBT data
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index de45163023f436d386e90e6ded5e6105ba3ecf35..160f3cdee21d8a3aa2ed726a7fbfce460dff26f3 100644
+index 42583cc3a6e2631614a4b9c303b1cfa4c9ae92c6..847ff34a56b7477996901662c25f50b79262f4e1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.level.ServerPlayer;
diff --git a/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0471-Improve-Legacy-Component-serialization-size.patch b/patches/server/0472-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0471-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0472-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0473-Support-old-UUID-format-for-NBT.patch b/patches/server/0474-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0473-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0474-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0476-Remove-some-streams-from-structures.patch b/patches/server/0477-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0476-Remove-some-streams-from-structures.patch
rename to patches/server/0477-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/0479-Support-components-in-ItemMeta.patch b/patches/server/0480-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0479-Support-components-in-ItemMeta.patch
rename to patches/server/0480-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0481-Add-entity-liquid-API.patch b/patches/server/0482-Add-entity-liquid-API.patch
similarity index 91%
rename from patches/server/0481-Add-entity-liquid-API.patch
rename to patches/server/0482-Add-entity-liquid-API.patch
index 8f896d4f83..597a1d014f 100644
--- a/patches/server/0481-Add-entity-liquid-API.patch
+++ b/patches/server/0482-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4b9af76f9d73b3bdddab2bcaa2b6b2e733ff3e0f..b85537f70f99b245bf15b703898ae69ad5c122e8 100644
+index 895c4d0f8f6b829de426543c51181a88a1fd340f..c0f7b78dbe8f9baf68aa48dd763ab51312e916c6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1339,7 +1339,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -17,7 +17,7 @@ index 4b9af76f9d73b3bdddab2bcaa2b6b2e733ff3e0f..b85537f70f99b245bf15b703898ae69a
          return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5bf488e5ed1981ef121291867062c2c2efaed6fc..9fa6368733b14024b6530684b458b601adc69689 100644
+index a28afbe66363e69a502b66d4124bb8fccf07be37..0455f5f25baeaf23921dffc105c8c39e2063e368 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1178,5 +1178,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0483-Update-itemstack-legacy-name-and-lore.patch
similarity index 96%
rename from patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0483-Update-itemstack-legacy-name-and-lore.patch
index 37bb60bdf8..d9a5f4478b 100644
--- a/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0483-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2fd3d56768f9121c1e5de3f193258bb360bb103b..5bc46a670b1dd9d89f39626a82959410b5987bb1 100644
+index 1496035b925b47c45fa3a9d4f68060d2e0408a9c..41de19cc0cf5d4a2e5963a4226d08585d396fe42 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -170,6 +170,44 @@ public final class ItemStack {
diff --git a/patches/server/0483-Spawn-player-in-correct-world-on-login.patch b/patches/server/0484-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0483-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0484-Spawn-player-in-correct-world-on-login.patch
index aa305e6ffe..e0097f7528 100644
--- a/patches/server/0483-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0484-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4c5a3b53e0fbaeb1a9ae85b499a1e630255f88ea..247d4959c67d41d2f4995c2e19f4c652e97694f5 100644
+index 28b203a5c8a65ba96bf239c270fa6445f94e887e..cd31cc4f8d25e95792c4a2690e3a8df17edc406f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -193,7 +193,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0484-Add-PrepareResultEvent.patch b/patches/server/0485-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0484-Add-PrepareResultEvent.patch
rename to patches/server/0485-Add-PrepareResultEvent.patch
diff --git a/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 90%
rename from patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index f782ea3fe7..6d0e9537b3 100644
--- a/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index de5ea38fd6103cd70b646199b4e0327f981cec9f..5bba20d869463ec859ae7ac1904da7b42b98309a 100644
+index a491ae3aab195b8247bd0caee998c5ec608ce567..a524ea7ff8206036de07d24683adadee8bd41eac 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3353,7 +3353,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0487-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/server/0487-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 95%
rename from patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
index d3741c6cb4..44f0967036 100644
--- a/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch
@@ -36,7 +36,7 @@ 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 914678af675be57fecc92189c709da971b8b0ae8..779b230c18316242f4322d55b8b28900ca793dac 100644
+index f9207e3661ba630ee1791d0842e0de684b22fd17..2d81fce2f5d9320b4cc9310fd0428b96318c7237 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -242,6 +242,13 @@ public class ChunkHolder {
@@ -54,7 +54,7 @@ index 914678af675be57fecc92189c709da971b8b0ae8..779b230c18316242f4322d55b8b28900
      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 b92eaa44434e2ee368b90d43f322cb8601d159bb..34cde879cdec317c31faa19afecdc1fbb0459dff 100644
+index 15dba7f2e6a7c670b415f67345fad37873a1130c..7f7bc04a30a0422b2d589adb488082c0aa5326dc 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -839,7 +839,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0493-Move-range-check-for-block-placing-up.patch b/patches/server/0494-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0493-Move-range-check-for-block-placing-up.patch
rename to patches/server/0494-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0494-Fix-SPIGOT-5989.patch b/patches/server/0495-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0494-Fix-SPIGOT-5989.patch
rename to patches/server/0495-Fix-SPIGOT-5989.patch
index 0f21bf6b8d..5f20e80704 100644
--- a/patches/server/0494-Fix-SPIGOT-5989.patch
+++ b/patches/server/0495-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 f452cddd312793465dedb29c4e52d1c4dd1b4360..99e1e04c28934297f5585d623f0760f9d1bf9d19 100644
+index 576541b061d792a24eaa30df57d00a2945a3ee1f..7acf01ee407555862ad2483eee4543e0284c2199 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -77,6 +77,7 @@ import net.minecraft.world.level.GameRules;
diff --git a/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0499-Incremental-player-saving.patch b/patches/server/0500-Incremental-player-saving.patch
similarity index 95%
rename from patches/server/0499-Incremental-player-saving.patch
rename to patches/server/0500-Incremental-player-saving.patch
index 7861ea880f..ef6a72cd35 100644
--- a/patches/server/0499-Incremental-player-saving.patch
+++ b/patches/server/0500-Incremental-player-saving.patch
@@ -25,7 +25,7 @@ index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b4ad624270406d86fb2d18edc1d94979454e779c..bc839946fd2565ab34278991f09dfddc29257c1b 100644
+index 21c16bf341e846f90a24fe2395ff89f1ace70d73..a962209749c7cc7f6d304073f5f2bce55014a29e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -955,7 +955,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -55,7 +55,7 @@ index b4ad624270406d86fb2d18edc1d94979454e779c..bc839946fd2565ab34278991f09dfddc
          } // 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 29df08d378363d57508dc654a129c60bc38ad21b..486d09f332b2e5efe60a808f93d668e4d24a8051 100644
+index 6acf0fb29261ba005562127894438797d5853573..88a7f2e69ad74303cbb779d06903d34a5ff40a6c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -169,6 +169,7 @@ public class ServerPlayer extends Player {
@@ -67,7 +67,7 @@ index 29df08d378363d57508dc654a129c60bc38ad21b..486d09f332b2e5efe60a808f93d668e4
      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 99e1e04c28934297f5585d623f0760f9d1bf9d19..739d2062fb86726c1b32953c64736e281d488963 100644
+index 7acf01ee407555862ad2483eee4543e0284c2199..8bedc2cad5faf621ac5515fafcd093e3bd180126 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -561,6 +561,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0500-Fix-some-rails-connecting-improperly.patch b/patches/server/0501-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0500-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0501-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0501-Fix-MC-187716-Use-configured-height.patch b/patches/server/0502-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0501-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0502-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0503-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0503-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0504-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0504-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0504-Brand-support.patch b/patches/server/0505-Brand-support.patch
similarity index 100%
rename from patches/server/0504-Brand-support.patch
rename to patches/server/0505-Brand-support.patch
diff --git a/patches/server/0505-Add-setMaxPlayers-API.patch b/patches/server/0506-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0505-Add-setMaxPlayers-API.patch
rename to patches/server/0506-Add-setMaxPlayers-API.patch
index 03c7c1a73a..bb8ca1f5a9 100644
--- a/patches/server/0505-Add-setMaxPlayers-API.patch
+++ b/patches/server/0506-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 739d2062fb86726c1b32953c64736e281d488963..c401a83bf2c0dae63ac6d2a5d5b39f47293e64ea 100644
+index 8bedc2cad5faf621ac5515fafcd093e3bd180126..eb12da04a495166e101b234ec3640363ec2403a5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -142,7 +142,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0507-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0507-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0507-Don-t-require-FACING-data.patch b/patches/server/0508-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0507-Don-t-require-FACING-data.patch
rename to patches/server/0508-Don-t-require-FACING-data.patch
diff --git a/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 1350fdd053..fbc58bad89 100644
--- a/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0509-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index aeaefd8c2a58344d6298e044c060689062b7233d..c72a0158b702fe0ad97bef2a0660cc7d83db11c8 100644
+index 4b8748d955fce10536847a44e22d53d6d491ac1d..82ec9d3a7844dd45433d07c3b48050b5de9b7377 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1660,6 +1660,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0509-Add-moon-phase-API.patch b/patches/server/0510-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0509-Add-moon-phase-API.patch
rename to patches/server/0510-Add-moon-phase-API.patch
diff --git a/patches/server/0510-Prevent-headless-pistons-from-being-created.patch b/patches/server/0511-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0510-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0511-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0511-Add-BellRingEvent.patch b/patches/server/0512-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0511-Add-BellRingEvent.patch
rename to patches/server/0512-Add-BellRingEvent.patch
diff --git a/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0513-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0513-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0513-Buffer-joins-to-world.patch b/patches/server/0514-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0513-Buffer-joins-to-world.patch
rename to patches/server/0514-Buffer-joins-to-world.patch
diff --git a/patches/server/0514-Optimize-redstone-algorithm.patch b/patches/server/0515-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0514-Optimize-redstone-algorithm.patch
rename to patches/server/0515-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0516-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 98%
rename from patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0516-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 1a3323117a..9162d27d8f 100644
--- a/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0516-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -43,7 +43,7 @@ index c09d3cdb3acb04b6a833c30a619ff2af5e8b6b18..2384ae5082afd01c4f28fe2f3f782cdc
                              this.connection.disconnect(chatmessage);
                              return;
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 3a7cc4f8ee62c8ff726ecf3e669c9f9ba5651487..93f52208785c1632e945a49ce1f91a50c4c2fb03 100644
+index 195f5d1519c3fc2fdd03ecd0d49d7fba74037692..b8fb3f99e4af5768d8afc1b143e5585f08cc21a9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -106,14 +106,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0517-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 96%
rename from patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0517-PortalCreateEvent-needs-to-know-its-entity.patch
index 84099519ed..f26ab031fc 100644
--- a/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0517-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b513fa552440da7a722dfe8cbf92e7294495cd67..f85e9fb13ddeb5c3260592e3cdfe958a14bd63f6 100644
+index 41de19cc0cf5d4a2e5963a4226d08585d396fe42..aa0680291d042b9b4510008965d80cfd075f277c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -407,7 +407,7 @@ public final class ItemStack {
@@ -60,7 +60,7 @@ index a36d31caa5bfc82a5fd9b16dc42334955fe7511d..177d1da44c83da5f99ae91891dec41dc
  
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index c86bf175853197dceaa91a2287ef51de87b9d5f9..48d9174f88beb759966bfca4c5861aa25cdb2942 100644
+index 3249b4a7e2267d8c321ae4cf592e9fc26dfdcb98..6754d071fe91f9e89cca0be4a06431007289ab10 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -13,6 +13,7 @@ import net.minecraft.core.Direction;
@@ -87,7 +87,7 @@ index c86bf175853197dceaa91a2287ef51de87b9d5f9..48d9174f88beb759966bfca4c5861aa2
  
      private static int getFireTickDelay(Random random) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 6d4ef15842c6bd230543de19dd1053a4fe6ad270..597bb3b9b638c59c6ddc21095e4fe4503ef36cb1 100644
+index 736e38a6ee3dc36ed886d047484bda9516845324..4383936b07c60a12e4368da1b9c36297f1ca7b01 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -32,6 +32,7 @@ import net.minecraft.world.item.DyeColor;
diff --git a/patches/server/0517-Fix-CraftTeam-null-check.patch b/patches/server/0518-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0517-Fix-CraftTeam-null-check.patch
rename to patches/server/0518-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0518-Add-more-Evoker-API.patch b/patches/server/0519-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0518-Add-more-Evoker-API.patch
rename to patches/server/0519-Add-more-Evoker-API.patch
diff --git a/patches/server/0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0520-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0520-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0521-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0521-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0521-Cache-block-data-strings.patch b/patches/server/0522-Cache-block-data-strings.patch
similarity index 97%
rename from patches/server/0521-Cache-block-data-strings.patch
rename to patches/server/0522-Cache-block-data-strings.patch
index a11ebcbbb2..72c9e2eca1 100644
--- a/patches/server/0521-Cache-block-data-strings.patch
+++ b/patches/server/0522-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bc839946fd2565ab34278991f09dfddc29257c1b..7894e20484c0b4a48f1cb5181bcb792656db9c94 100644
+index a962209749c7cc7f6d304073f5f2bce55014a29e..1f086b02405efbae67299853105b96457825e9fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2037,6 +2037,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 96%
rename from patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 0f0355fbcd..26ecea3bce 100644
--- a/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0523-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index 10126fccdfde8acdb55bbe9c9bfc57435ed13677..32106de96d13b4d5be08c3c85b1e57d3
          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 0fd3d689b80484339f437525130bc34de2e71e54..b2e6426b9d8bcc860f83c3b79577bbc1cdb278db 100644
+index 73c81f0883645dca0ce32efae914d7f40b265c3c..3bf989fe94d53088ae058c19adde652267a231d0 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
@@ -69,7 +69,7 @@ index a87531f4669c7947e02764b5ceb098385ad99159..9228c0bc797fb95c8ac949bdc568eada
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9fa6368733b14024b6530684b458b601adc69689..5929caf68b37470298012fd48dd1b62b005fdf89 100644
+index 0455f5f25baeaf23921dffc105c8c39e2063e368..3c3614f0f8af3fb2c593dd1154bd64c70713a42e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -563,7 +563,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0524-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0524-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0525-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0525-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0526-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0526-Extend-block-drop-capture-to-capture-all-items-added.patch
index f3cd98a35b..7822a86337 100644
--- a/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0526-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9790d6f7f451233e5abcaad24befb8b638ad8df3..8621141c4000001a6c52434dc81994251afc1a5b 100644
+index 82ec9d3a7844dd45433d07c3b48050b5de9b7377..aae3c8d5cbbdc6d736257c7454d97ff985ae4187 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1205,6 +1205,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0527-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0527-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0528-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0528-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0529-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0529-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0529-Entity-isTicking.patch b/patches/server/0530-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0529-Entity-isTicking.patch
rename to patches/server/0530-Entity-isTicking.patch
diff --git a/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0531-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 91%
rename from patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0531-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 17cb3a2f0e..2c6a9fc029 100644
--- a/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0531-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7894e20484c0b4a48f1cb5181bcb792656db9c94..16bb7d28c8b0e3b60def7ef0e93e648df22c6302 100644
+index 1f086b02405efbae67299853105b96457825e9fe..2672f9ea9c1213fea5ec212012cb0fbd173c7324 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2103,6 +2103,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0532-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0532-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.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 100%
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
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 97%
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
index c21e66a43c..d0deb76e6d 100644
--- a/patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/server/0538-Improve-inlinig-for-some-hot-IBlockData-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve inlinig for some hot IBlockData methods
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 597bb3b9b638c59c6ddc21095e4fe4503ef36cb1..933448659367b5f0b323bd91992fc9b59314b8a1 100644
+index 4383936b07c60a12e4368da1b9c36297f1ca7b01..1179c62695da4dcf02590c97d8da3c6fcdbee9ef 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -653,7 +653,14 @@ public abstract class BlockBehaviour {
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 93%
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
index b9df5b1daf..6853301767 100644
--- a/patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0539-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ce5bccd6d76252309e16b946c44674f4cf74450d..54cac6167796360ddaeb0b968f17a3533c4b9775 100644
+index 81c107edb59b2068bdc78617a5ca54aa15f15c0f..6a7882be8d195f5bee39313235771fc711b4d560 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -147,7 +147,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/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 100%
rename from patches/server/0541-Player-elytra-boost-API.patch
rename to patches/server/0542-Player-elytra-boost-API.patch
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 98%
rename from patches/server/0545-Add-ignore-discounts-API.patch
rename to patches/server/0546-Add-ignore-discounts-API.patch
index a947fd725a..469fcd154c 100644
--- a/patches/server/0545-Add-ignore-discounts-API.patch
+++ b/patches/server/0546-Add-ignore-discounts-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ignore discounts API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 23ea91449a04e8457273db34c4a388bdf85d7dfc..fe9ee43bf0c49c0541bc4fb114e63b8a0fcf1967 100644
+index cad80978510b50a3061cc5c898d6e7cb2b62b3b0..4a7de0ae19d49d868a5e6696e1a01871b654bf48 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -474,6 +474,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
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 95%
rename from patches/server/0547-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0548-Fix-client-lag-on-advancement-loading.patch
index 6f05f1a96a..be23d65e4d 100644
--- a/patches/server/0547-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0548-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index cd51115b7c56e7eeab1248f39a690fc91524efd7..2b167b65aae90aefa10dcb852d00b2abd332d2d2 100644
+index a6250143baced61e87900181f8b37cfd89c717ff..9cbe97686394a5c4ae7b401d846b1a3525602d46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -307,7 +307,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
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 98%
rename from patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0550-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index bb6aaed2d5..8f3ad390b4 100644
--- a/patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0550-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
@@ -17,7 +17,7 @@ This lets us get faster foreach iteration, as well as avoids map lookups on
 the values when needed.
 
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-index 800d464207026d145056b39b298045121342b899..6062f5154c55179e1cf3b280e6dc56d2f561987d 100644
+index 076f2dea0e75577ccb0316b3171ed8f44ab6d2ba..3dc896a7ded8d5d109100a393c8299e308954d99 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 @@ -35,27 +35,31 @@ public class PathFinder {
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 94%
rename from patches/server/0551-Add-API-for-quit-reason.patch
rename to patches/server/0552-Add-API-for-quit-reason.patch
index 49aa8ebc7d..a621e10653 100644
--- a/patches/server/0551-Add-API-for-quit-reason.patch
+++ b/patches/server/0552-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index d32b96a5f51d745869cfc40c01c54de58e1eb843..759e563d1ed13249fada8a8eab6b6a10e5ef0d37 100644
+index 01b9c360c6d687c6a774bf3375802be487cb0e0c..35a03d15f87be8eb86d65e1863a3e0cb2dd201ee 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -142,12 +142,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -25,7 +25,7 @@ index d32b96a5f51d745869cfc40c01c54de58e1eb843..759e563d1ed13249fada8a8eab6b6a10
                          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 486d09f332b2e5efe60a808f93d668e4d24a8051..ec86adc73fdf1b7bd36829ef1df6d9760c7b0bb8 100644
+index 88a7f2e69ad74303cbb779d06903d34a5ff40a6c..9a729aecfa8c901159c74c42544ba31b69bab199 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -256,6 +256,7 @@ public class ServerPlayer extends Player {
@@ -49,7 +49,7 @@ index 3db026216308628321a334ccb64b0ea97e524393..1b6610cc04f6bcb6d3153886e62ce117
              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 c401a83bf2c0dae63ac6d2a5d5b39f47293e64ea..b500800e9b30374721d0b855d2389b656f73176f 100644
+index eb12da04a495166e101b234ec3640363ec2403a5..295a2c9328172923d470e2c9e8338e0edb020ede 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -588,7 +588,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 95%
rename from patches/server/0555-Expose-world-spawn-angle.patch
rename to patches/server/0556-Expose-world-spawn-angle.patch
index 78ea094aa2..9213c6e141 100644
--- a/patches/server/0555-Expose-world-spawn-angle.patch
+++ b/patches/server/0556-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ 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 b500800e9b30374721d0b855d2389b656f73176f..6b4bd115c39bbaa9d9dbeb6ac590e6b0138aa5b3 100644
+index 295a2c9328172923d470e2c9e8338e0edb020ede..d9a14f58b9249ff10cc7f5fde60f3aa8bd1e9235 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -866,7 +866,7 @@ public abstract class PlayerList {
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 100%
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
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 100%
rename from patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch
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 96%
rename from patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch
index 27c7932fd3..e9111dfda9 100644
--- a/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch
@@ -24,7 +24,7 @@ index 208690ceca2485b54acde5123ba494d71367791b..561976466cae6e4df63433c4631c516c
      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/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 67ff39fa0a94aec858ee7f9643565b4a16e4444a..1741b04b470443fcc534a49b16bc0b247160f8ea 100644
+index 4a7de0ae19d49d868a5e6696e1a01871b654bf48..2ad93ff0bb46a282df706438b7c039c46323979a 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -1056,6 +1056,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0566-Limit-recipe-packets.patch b/patches/server/0567-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0566-Limit-recipe-packets.patch
rename to patches/server/0567-Limit-recipe-packets.patch
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 100%
rename from patches/server/0568-MC-4-Fix-item-position-desync.patch
rename to patches/server/0569-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch
similarity index 94%
rename from patches/server/0569-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0570-Player-Chunk-Load-Unload-Events.patch
index bad5587824..eaf918519f 100644
--- a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ 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 ec86adc73fdf1b7bd36829ef1df6d9760c7b0bb8..534307c9e7610c4b65d0614a7434ed3212fd0a52 100644
+index 9a729aecfa8c901159c74c42544ba31b69bab199..b057d99f6777b1e051235f228aaa6d10457b76d0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2089,11 +2089,21 @@ public class ServerPlayer extends Player {
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 91%
rename from patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 0c421f800b..2c3377bb01 100644
--- a/patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c25586aa8d2e9ddaa7839020ecb499b12d5fe381..6f2c166ffc128fc3400b6d831274a2957b2d1153 100644
+index 7159d63c7708cebda60da33eefc8a492d8de6219..ef4efe95bfa9058b9f9a6736e111b7cddfee4fbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -257,6 +257,10 @@ public class CraftEventFactory {
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 100%
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
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 100%
rename from patches/server/0588-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0589-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0589-Added-ServerResourcesReloadedEvent.patch b/patches/server/0590-Added-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0589-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0590-Added-ServerResourcesReloadedEvent.patch
index a17fa64312..07768a8c59 100644
--- a/patches/server/0589-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0590-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 16bb7d28c8b0e3b60def7ef0e93e648df22c6302..75782de78255e0d52f85034973dbef3aeca3ac7e 100644
+index 2672f9ea9c1213fea5ec212012cb0fbd173c7324..bbc96d35ffb0d6cd0f8964ea25e1d6585fbee1d7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2016,7 +2016,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
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 96%
rename from patches/server/0591-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0592-Implemented-BlockFailedDispenseEvent.patch
index 1f783330b0..65caf72467 100644
--- a/patches/server/0591-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0592-Implemented-BlockFailedDispenseEvent.patch
@@ -32,7 +32,7 @@ index 51723c8f740c7b0bbd15acc0f1c848790c2ff299..5a95b550c767284563c124df1ff45322
          } else {
              ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6f2c166ffc128fc3400b6d831274a2957b2d1153..ef39fd4842cb5f42a0c7b4f9b72630ac221c7501 100644
+index ef4efe95bfa9058b9f9a6736e111b7cddfee4fbd..9069fdc604cf3ba23dec46479c87b1311dec39e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1791,4 +1791,12 @@ public class CraftEventFactory {
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 97%
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
index e41302d8f0..790566dcc8 100644
--- a/patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0597-Implement-API-to-expose-exact-interaction-point.patch
@@ -18,7 +18,7 @@ index c3cdc5a7ae90b7d2dd5676d66086e1f0c5b23d0d..b096384cdc7596166e010e06272534b8
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ef39fd4842cb5f42a0c7b4f9b72630ac221c7501..dc2a5dc3a3c0bcf3fdee5c5d61ed68f8b0212bb9 100644
+index 9069fdc604cf3ba23dec46479c87b1311dec39e6..7823477b8fc18901014ba397f711de50cb9880f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -55,7 +55,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
diff --git a/patches/server/0597-Remove-stale-POIs.patch b/patches/server/0598-Remove-stale-POIs.patch
similarity index 92%
rename from patches/server/0597-Remove-stale-POIs.patch
rename to patches/server/0598-Remove-stale-POIs.patch
index 021d7baa66..5fbf319318 100644
--- a/patches/server/0597-Remove-stale-POIs.patch
+++ b/patches/server/0598-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6585bcc9dd0ae52d0e3565f546c625c1b0e100ed..550013408a212d1213d6651b71f80698d85290c6 100644
+index aae3c8d5cbbdc6d736257c7454d97ff985ae4187..a194558e5dc0feb57681084240822a9d4b6b9bab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1742,6 +1742,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
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 b64cd147fb..d575515bc7 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 6b4bd115c39bbaa9d9dbeb6ac590e6b0138aa5b3..7ed8baf2942744c4f9cd1bf05aded6c9bc90f542 100644
+index d9a14f58b9249ff10cc7f5fde60f3aa8bd1e9235..043c846936955c8af0d05755bd62b0196d9ca86e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -613,6 +613,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 96%
rename from patches/server/0599-Add-sendOpLevel-API.patch
rename to patches/server/0600-Add-sendOpLevel-API.patch
index d656de8fb8..1f1000b3a9 100644
--- a/patches/server/0599-Add-sendOpLevel-API.patch
+++ b/patches/server/0600-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ 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 7ed8baf2942744c4f9cd1bf05aded6c9bc90f542..077a62f66af639f4506bc4d740e5906b9a5bee2e 100644
+index 043c846936955c8af0d05755bd62b0196d9ca86e..f030701a78aa2065756147531da0d6ffa1a41073 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1115,22 +1115,29 @@ public abstract class PlayerList {
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 100%
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
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 94%
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
index 7b391807e5..bd4cd61eb2 100644
--- 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 766c907f92ca8cb19b22cd19185cc92603aeca03..311ace44ba65d6dd24941b56e78e148134ceb6f9 100644
+index 92681e56cea92a4600ef268b21c1b56e15fe3a03..b4c1e62c6ed1ea0319ebb268bf8032218a306e78 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -20,6 +20,7 @@ import net.minecraft.ReportedException;
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 95%
rename from patches/server/0606-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0607-Implement-BlockPreDispenseEvent.patch
index 8f7d5dd22d..cefd57a26c 100644
--- a/patches/server/0606-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0607-Implement-BlockPreDispenseEvent.patch
@@ -17,7 +17,7 @@ index 501a5483160dba050261bb3448317a097cdb7ef2..2dcac4b638073aa1748f26f61219dbf9
                  tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dc2a5dc3a3c0bcf3fdee5c5d61ed68f8b0212bb9..9e841c20c0333b47b189edca3c31b2c83a889ebb 100644
+index 7823477b8fc18901014ba397f711de50cb9880f3..fefb8ff3caff61d8ea2c52d5b280e5af03b76bbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1809,5 +1809,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0607-Added-Vanilla-Entity-Tags.patch b/patches/server/0608-Added-Vanilla-Entity-Tags.patch
similarity index 98%
rename from patches/server/0607-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0608-Added-Vanilla-Entity-Tags.patch
index e329463f60..7f6941d21c 100644
--- a/patches/server/0607-Added-Vanilla-Entity-Tags.patch
+++ b/patches/server/0608-Added-Vanilla-Entity-Tags.patch
@@ -55,7 +55,7 @@ index 0d29e3163a637c742d100129cb650f53635ef765..4739b4c3035064de328595329ee0b65e
                  throw new IllegalArgumentException();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2b167b65aae90aefa10dcb852d00b2abd332d2d2..008490f3bae5597a95aa0095e53ff9062f0070e3 100644
+index 9cbe97686394a5c4ae7b401d846b1a3525602d46..75240802d17ff6b032c8708700cb2407cca3e56f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -116,8 +116,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
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-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0611-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0610-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0611-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0612-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0612-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0613-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0613-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 97%
rename from patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 3b1959e45b..b7a5b5f779 100644
--- a/patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 9306340721e2aae4dfb2025e47b4624a8e351420..a3df38a9d203d773e78ba51c35faf5908abdcb11 100644
+index 108c5871c2171f22a8e0db8c00bfcaa4438b6137..c4c5c35e37b793f3b74349ff03c0829f4913b91c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1208,12 +1208,15 @@ public abstract class Mob extends LivingEntity {
@@ -122,7 +122,7 @@ index b9b67134f02fd7484ed19905c9ae1f9b8a26ce26..c05f173b7642380900fdd77ce5d2c020
                          }
                      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9e841c20c0333b47b189edca3c31b2c83a889ebb..2c26ac546ae5915c200c616927e8f9ed3dc8c1f5 100644
+index fefb8ff3caff61d8ea2c52d5b280e5af03b76bbf..4991ee6671f73b446e5dff958427b10aac78c63a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1466,8 +1466,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 92%
rename from patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch
index 5b19dd2761..c0cde2b209 100644
--- a/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,7 +5,7 @@ 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 c0bbb1acd7d83a70c9f2c34f7d19cea0039e0567..570875c060896c80d8c75e86e29a918f86b5865f 100644
+index 0b22fd8ac75146bc7b647cfbefc73ce890ccb033..82d3cfb2d346a8b929e9469ae09369f6a639f81d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -811,7 +811,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0616-Reset-shield-blocking-on-dimension-change.patch
similarity index 89%
rename from patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0616-Reset-shield-blocking-on-dimension-change.patch
index 2b77dcb839..bbf7fd6a51 100644
--- a/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0616-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ 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 534307c9e7610c4b65d0614a7434ed3212fd0a52..1d885c1c0709d49c3fddc174300b3fdd478e761b 100644
+index b057d99f6777b1e051235f228aaa6d10457b76d0..25fb48d3ff5b0116a6a942fd9d0958ab9ea0bdeb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1141,6 +1141,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0616-add-DragonEggFormEvent.patch b/patches/server/0617-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0616-add-DragonEggFormEvent.patch
rename to patches/server/0617-add-DragonEggFormEvent.patch
diff --git a/patches/server/0617-EntityMoveEvent.patch b/patches/server/0618-EntityMoveEvent.patch
similarity index 92%
rename from patches/server/0617-EntityMoveEvent.patch
rename to patches/server/0618-EntityMoveEvent.patch
index e1e5d99e54..6792eecb18 100644
--- a/patches/server/0617-EntityMoveEvent.patch
+++ b/patches/server/0618-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 75782de78255e0d52f85034973dbef3aeca3ac7e..bba3905043a4943a920fe48be5b8b591bb19a9ea 100644
+index bbc96d35ffb0d6cd0f8964ea25e1d6585fbee1d7..127691d19e02ef5e725ce338d732fcced428fa66 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1524,6 +1524,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 75782de78255e0d52f85034973dbef3aeca3ac7e..bba3905043a4943a920fe48be5b8b591
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e0f478f234f53d9bfb600ce69463ae6d8bfc100c..a678cab496bbeb757a3b60267e4cc3c0e54dfa2f 100644
+index a194558e5dc0feb57681084240822a9d4b6b9bab..e418bcda3d6b5f219fc8a6431b449ef4de9a8a4e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -200,6 +200,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -29,7 +29,7 @@ index e0f478f234f53d9bfb600ce69463ae6d8bfc100c..a678cab496bbeb757a3b60267e4cc3c0
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6af985b2eba28d3a694afe663e1d76628add940c..9e89e7fc7061bbd9f09744f8fcf706c43bda693f 100644
+index 34304fd25a73b3b7e4f078e85b6bee94ab2cc8c8..89dc5a1a70ab31ea3a1a7924e0ecaadebcfb524d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3217,6 +3217,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 95%
rename from patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch
index 02c877b768..46e44f9106 100644
--- a/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -20,7 +20,7 @@ index 7fc5bf095afa6d5881285b89091d2ff48ffb69f0..0eba516110b82d917c3374a9fe5bbf33
  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f690f20d8dc7c3957aa5287c74e5366db57a5bd4..26024b122c4a7c4339114191a544230a223fd5f7 100644
+index e418bcda3d6b5f219fc8a6431b449ef4de9a8a4e..ecfa6089be3f81704a88877357e3aa0cf45ee332 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1339,6 +1339,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0619-Inline-shift-direction-fields.patch b/patches/server/0620-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0619-Inline-shift-direction-fields.patch
rename to patches/server/0620-Inline-shift-direction-fields.patch
diff --git a/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch
index 8f6f5b70a0..c150fb34b5 100644
--- a/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2c26ac546ae5915c200c616927e8f9ed3dc8c1f5..71571868090062f02579d50ae483d9f367de5016 100644
+index 4991ee6671f73b446e5dff958427b10aac78c63a..a59a449c0a7b76527f009031aee2d11d6b43cadf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -390,13 +390,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0622-living-entity-allow-attribute-registration.patch b/patches/server/0623-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0622-living-entity-allow-attribute-registration.patch
rename to patches/server/0623-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0623-fix-dead-slime-setSize-invincibility.patch b/patches/server/0624-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0623-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0624-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0625-misc-debugging-dumps.patch b/patches/server/0626-misc-debugging-dumps.patch
similarity index 97%
rename from patches/server/0625-misc-debugging-dumps.patch
rename to patches/server/0626-misc-debugging-dumps.patch
index ea7df47132..55f51bd385 100644
--- a/patches/server/0625-misc-debugging-dumps.patch
+++ b/patches/server/0626-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bba3905043a4943a920fe48be5b8b591bb19a9ea..280a7ca4ae3a0ed92dd411c8e4e3f253b60f9a9d 100644
+index 127691d19e02ef5e725ce338d732fcced428fa66..7c1ae542ea9da28ccc40b4608a970ef0617b03e8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -913,6 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0627-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0626-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0627-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0627-Expose-Tracked-Players.patch b/patches/server/0628-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0627-Expose-Tracked-Players.patch
rename to patches/server/0628-Expose-Tracked-Players.patch
diff --git a/patches/server/0628-Remove-streams-from-SensorNearest.patch b/patches/server/0629-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0628-Remove-streams-from-SensorNearest.patch
rename to patches/server/0629-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0630-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0630-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0631-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0631-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0631-Improve-ServerGUI.patch b/patches/server/0632-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0631-Improve-ServerGUI.patch
rename to patches/server/0632-Improve-ServerGUI.patch
diff --git a/patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0633-fix-converting-txt-to-json-file.patch b/patches/server/0634-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0633-fix-converting-txt-to-json-file.patch
rename to patches/server/0634-fix-converting-txt-to-json-file.patch
index 2200c51392..ec98b93f01 100644
--- a/patches/server/0633-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0634-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index a5c1114f9b323e8a49c84d0e68461e473bbcd690..eadacfa8449336c024f6154f46bb514d
          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 077a62f66af639f4506bc4d740e5906b9a5bee2e..41d59666ad40bb0a9c9a383afe845dd185b973c8 100644
+index f030701a78aa2065756147531da0d6ffa1a41073..0a9420fccdb83a9475befdec265b7cf4d65abd11 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -171,6 +171,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0634-Add-worldborder-events.patch b/patches/server/0635-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0634-Add-worldborder-events.patch
rename to patches/server/0635-Add-worldborder-events.patch
diff --git a/patches/server/0635-added-PlayerNameEntityEvent.patch b/patches/server/0636-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0635-added-PlayerNameEntityEvent.patch
rename to patches/server/0636-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0636-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0637-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0636-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0637-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0637-Add-recipe-to-cook-events.patch b/patches/server/0638-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0637-Add-recipe-to-cook-events.patch
rename to patches/server/0638-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0638-Add-Block-isValidTool.patch b/patches/server/0639-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0638-Add-Block-isValidTool.patch
rename to patches/server/0639-Add-Block-isValidTool.patch
diff --git a/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0640-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0639-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0640-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0640-Implement-Keyed-on-World.patch b/patches/server/0641-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0640-Implement-Keyed-on-World.patch
rename to patches/server/0641-Implement-Keyed-on-World.patch
diff --git a/patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0642-Item-Rarity-API.patch b/patches/server/0643-Item-Rarity-API.patch
similarity index 93%
rename from patches/server/0642-Item-Rarity-API.patch
rename to patches/server/0643-Item-Rarity-API.patch
index af15d3e780..5cfcb1f3dd 100644
--- a/patches/server/0642-Item-Rarity-API.patch
+++ b/patches/server/0643-Item-Rarity-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item Rarity API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 008490f3bae5597a95aa0095e53ff9062f0070e3..ca160d2b2899625c0df3c629e844673362954e26 100644
+index 75240802d17ff6b032c8708700cb2407cca3e56f..36cb7e974ed78074ac82ec7d2a4d86d91504872c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -470,6 +470,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0644-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0645-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0644-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0645-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch
index 7df8e940ab..8d3a2cb13d 100644
--- a/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0646-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 41d59666ad40bb0a9c9a383afe845dd185b973c8..47217f2eb65f490b9755f151b446904107cb9211 100644
+index 0a9420fccdb83a9475befdec265b7cf4d65abd11..af2285e1f496111d3dcbddccaf4c1e7dadf4b1b5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -606,6 +606,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0647-forced-whitelist-use-configurable-kick-message.patch
similarity index 93%
rename from patches/server/0646-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0647-forced-whitelist-use-configurable-kick-message.patch
index b6b290a11f..92b1998ac9 100644
--- a/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0647-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 280a7ca4ae3a0ed92dd411c8e4e3f253b60f9a9d..6003dff25e78395a92ab279f1a93f016f4a79c56 100644
+index 7c1ae542ea9da28ccc40b4608a970ef0617b03e8..4ad480092a87b7bede679cf5e86000702ab8ee6a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -77,7 +77,6 @@ import net.minecraft.nbt.NbtOps;
diff --git a/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0648-Entity-load-save-limit-per-chunk.patch b/patches/server/0649-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0648-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0649-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0650-Expose-protocol-version.patch b/patches/server/0651-Expose-protocol-version.patch
similarity index 91%
rename from patches/server/0650-Expose-protocol-version.patch
rename to patches/server/0651-Expose-protocol-version.patch
index 23a1e50c73..5f273b2ba1 100644
--- a/patches/server/0650-Expose-protocol-version.patch
+++ b/patches/server/0651-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ca160d2b2899625c0df3c629e844673362954e26..13c57a457a33746ceb7d43ebac10df17f1a05315 100644
+index 36cb7e974ed78074ac82ec7d2a4d86d91504872c..fa3c5f2b24dc89b07991fae5e463ea53abdd78b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -484,6 +484,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 92%
rename from patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 94a184bf46..6e7ae39e71 100644
--- a/patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9e89e7fc7061bbd9f09744f8fcf706c43bda693f..76400ad859d478139b9fd0433dca2a98ae49d2db 100644
+index 89dc5a1a70ab31ea3a1a7924e0ecaadebcfb524d..0f62182cc570b6a1e687744c01333253456081f4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3696,6 +3696,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0654-Add-bypass-host-check.patch b/patches/server/0655-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0654-Add-bypass-host-check.patch
rename to patches/server/0655-Add-bypass-host-check.patch
diff --git a/patches/server/0655-Set-area-affect-cloud-rotation.patch b/patches/server/0656-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0655-Set-area-affect-cloud-rotation.patch
rename to patches/server/0656-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0663-Added-PlayerDeepSleepEvent.patch b/patches/server/0664-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0663-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0664-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0664-More-World-API.patch b/patches/server/0665-More-World-API.patch
similarity index 100%
rename from patches/server/0664-More-World-API.patch
rename to patches/server/0665-More-World-API.patch
diff --git a/patches/server/0665-Added-PlayerBedFailEnterEvent.patch b/patches/server/0666-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0665-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0666-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 51d8396de5..5cd1fdd003 100644
--- a/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ 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 47217f2eb65f490b9755f151b446904107cb9211..e11bdb3ee9512898dde4575633617658ac4bd951 100644
+index af2285e1f496111d3dcbddccaf4c1e7dadf4b1b5..e7c126e9ed76026c0c814cf4278ae522c9fc39bf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -841,6 +841,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0668-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0669-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0668-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0669-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 0968a75dd8..195666e7d2 100644
--- a/patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,7 +18,7 @@ index 2958ff7f1ac66120fc9880d17ec4b46c72821aaa..d63bc35d37b2d6628ff2fdd97fca7978
                  } 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 e11bdb3ee9512898dde4575633617658ac4bd951..a1a6c03daf2aa3babef6426e7abd3a37c470b100 100644
+index e7c126e9ed76026c0c814cf4278ae522c9fc39bf..1e2ad223ae9c3270548de89acc91f1e6780af539 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -800,6 +800,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0670-Add-Channel-initialization-listeners.patch b/patches/server/0671-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0670-Add-Channel-initialization-listeners.patch
rename to patches/server/0671-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0672-Add-more-WanderingTrader-API.patch b/patches/server/0673-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0672-Add-more-WanderingTrader-API.patch
rename to patches/server/0673-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0673-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0674-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0673-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0674-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 95%
rename from patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 6f98ab292b..c50fbf775b 100644
--- a/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 93f52208785c1632e945a49ce1f91a50c4c2fb03..c6840521fc0734670c50ef4519e13962416ca7a7 100644
+index b8fb3f99e4af5768d8afc1b143e5585f08cc21a9..9e9f0fb1dd6b9a92bd84c50ebdbd79beaf45b58c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -346,12 +346,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0676-Inventory-close.patch b/patches/server/0677-Inventory-close.patch
similarity index 100%
rename from patches/server/0676-Inventory-close.patch
rename to patches/server/0677-Inventory-close.patch
diff --git a/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 94%
rename from patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch
index a150865bea..e4a5972e06 100644
--- a/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch
@@ -5,7 +5,7 @@ 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 1d885c1c0709d49c3fddc174300b3fdd478e761b..90b5bfe7bd0deae842bf6ef228f5a0e09326518e 100644
+index 25fb48d3ff5b0116a6a942fd9d0958ab9ea0bdeb..5de75fb683fb98c8d3948f84e3b65f92665222cd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1168,15 +1168,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0679-Fix-CraftPotionBrewer-cache.patch b/patches/server/0680-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0679-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0680-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0680-Add-basic-Datapack-API.patch b/patches/server/0681-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0680-Add-basic-Datapack-API.patch
rename to patches/server/0681-Add-basic-Datapack-API.patch
diff --git a/patches/server/0681-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0682-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0681-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0682-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch
index e63d24e10b..ec68953d32 100644
--- a/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,7 +45,7 @@ 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 90b5bfe7bd0deae842bf6ef228f5a0e09326518e..5561d878ad47b9cd70aebec3a36a9296041e6e2d 100644
+index 5de75fb683fb98c8d3948f84e3b65f92665222cd..181ab56448796a617f30f1b9e0fec8917b5d8e07 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1785,8 +1785,15 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0683-Clear-SyncLoadInfo.patch b/patches/server/0684-Clear-SyncLoadInfo.patch
similarity index 95%
rename from patches/server/0683-Clear-SyncLoadInfo.patch
rename to patches/server/0684-Clear-SyncLoadInfo.patch
index f25dc4d1a6..b58770b5f0 100644
--- a/patches/server/0683-Clear-SyncLoadInfo.patch
+++ b/patches/server/0684-Clear-SyncLoadInfo.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Clear SyncLoadInfo
 This patch merely adds the extra argument "clear" after /paper syncloadinfo to clear currently stored syncload info.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 160f3cdee21d8a3aa2ed726a7fbfce460dff26f3..f8d282b962f2d63e0245797538f67391d47dab0f 100644
+index 847ff34a56b7477996901662c25f50b79262f4e1..ba8395435482fc4d6e02fc86794cdb0d35d4399c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -205,6 +205,13 @@ public class PaperCommand extends Command {
diff --git a/patches/server/0684-ItemStack-repair-check-API.patch b/patches/server/0685-ItemStack-repair-check-API.patch
similarity index 97%
rename from patches/server/0684-ItemStack-repair-check-API.patch
rename to patches/server/0685-ItemStack-repair-check-API.patch
index 9c063a37d8..6a1f65b969 100644
--- a/patches/server/0684-ItemStack-repair-check-API.patch
+++ b/patches/server/0685-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 13c57a457a33746ceb7d43ebac10df17f1a05315..917b14b338e151c5168a5f7e8a68eea206857500 100644
+index fa3c5f2b24dc89b07991fae5e463ea53abdd78b4..0c720f3a75cff8e62802b1fe6e3c5f594c5cc1a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -485,6 +485,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0685-More-Enchantment-API.patch b/patches/server/0686-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0685-More-Enchantment-API.patch
rename to patches/server/0686-More-Enchantment-API.patch
diff --git a/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0687-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0688-Fix-and-optimise-world-force-upgrading.patch
index 2f1a0edd93..2c2d2f9b40 100644
--- a/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch
@@ -263,7 +263,7 @@ index cf0a74b8a1c31d4bc493eb09a69ee2bd94cb6485..6fa1a7da70896d0ff34d38698769195a
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6003dff25e78395a92ab279f1a93f016f4a79c56..9feb9e64e64e19d99f6ba01e203b81f13235d12d 100644
+index 4ad480092a87b7bede679cf5e86000702ab8ee6a..2b7b63ea08c8e4f43c9678671fb8d08628b48b36 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -563,13 +563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -297,7 +297,7 @@ index 6003dff25e78395a92ab279f1a93f016f4a79c56..9feb9e64e64e19d99f6ba01e203b81f1
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 54cac6167796360ddaeb0b968f17a3533c4b9775..aa4969ea486c8654228d96e48a2192500ee78a63 100644
+index 6a7882be8d195f5bee39313235771fc711b4d560..870ff060e34de4ec49ad5496e79c2bd543297c41 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -174,6 +174,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -317,7 +317,7 @@ index 54cac6167796360ddaeb0b968f17a3533c4b9775..aa4969ea486c8654228d96e48a219250
          return this.world;
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index e1b9051f8537db6f023cfdeaca4fb89305ece363..5885c7c18d165270361d6fde1e1b89b34a578555 100644
+index 43510774d489bfdd30f10d521e424fa1363b8919..6496108953effae82391b5c1ea6fdec8482731cd 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -31,6 +31,28 @@ public class RegionFileStorage implements AutoCloseable {
diff --git a/patches/server/0688-Add-Mob-lookAt-API.patch b/patches/server/0689-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0688-Add-Mob-lookAt-API.patch
rename to patches/server/0689-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0689-Add-Unix-domain-socket-support.patch b/patches/server/0690-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0689-Add-Unix-domain-socket-support.patch
rename to patches/server/0690-Add-Unix-domain-socket-support.patch
index 8eed70b82b..290442e6ba 100644
--- a/patches/server/0689-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0690-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 759e563d1ed13249fada8a8eab6b6a10e5ef0d37..e1ecfe280f97985fadbe22db7e420f04c38dd672 100644
+index 35a03d15f87be8eb86d65e1863a3e0cb2dd201ee..c203a78a28e6457bd25b34b5c5ecaa35e3f9211e 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -614,6 +614,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0690-Add-EntityInsideBlockEvent.patch b/patches/server/0691-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0690-Add-EntityInsideBlockEvent.patch
rename to patches/server/0691-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0691-Attributes-API-for-item-defaults.patch b/patches/server/0692-Attributes-API-for-item-defaults.patch
similarity index 95%
rename from patches/server/0691-Attributes-API-for-item-defaults.patch
rename to patches/server/0692-Attributes-API-for-item-defaults.patch
index e1930631f2..2df94b7e85 100644
--- a/patches/server/0691-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0692-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 917b14b338e151c5168a5f7e8a68eea206857500..5770fbf1e5c32e342c8366688d8514b35f48a075 100644
+index 0c720f3a75cff8e62802b1fe6e3c5f594c5cc1a8..edf7e8d65d7f67f2f34490fdb766eca7d3b17aee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -493,6 +493,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch
index 83adf4714d..1fd63b7892 100644
--- a/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1e2139e7f82009e3f9a8b89b10a1fc031602d430..b9400635ec3c530ccc2734e2dd30a0df16885399 100644
+index ecfa6089be3f81704a88877357e3aa0cf45ee332..746124647657d0ccfc9d6dc3db3657c05327d6ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -425,8 +425,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0694-More-Lidded-Block-API.patch b/patches/server/0695-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0694-More-Lidded-Block-API.patch
rename to patches/server/0695-More-Lidded-Block-API.patch
diff --git a/patches/server/0695-Limit-item-frame-cursors-on-maps.patch b/patches/server/0696-Limit-item-frame-cursors-on-maps.patch
similarity index 95%
rename from patches/server/0695-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0696-Limit-item-frame-cursors-on-maps.patch
index 3cf3896862..f1630e8e78 100644
--- a/patches/server/0695-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0696-Limit-item-frame-cursors-on-maps.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 20ce2c304ba57e2399e966da7dee9a02e57d9fa5..86f84a7ebc7a118187aabaf44c83ea737af34c6e 100644
+index c94579d5db6802ef27c6c64cde1cdfdff5040ed2..05c1aa7c49134e099e3d14a244252173e6755401 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -792,5 +792,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0696-Add-PufferFishStateChangeEvent.patch b/patches/server/0697-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0696-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0697-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0697-Add-PlayerKickEvent-causes.patch b/patches/server/0698-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0697-Add-PlayerKickEvent-causes.patch
rename to patches/server/0698-Add-PlayerKickEvent-causes.patch
index 50dc035441..d06869463a 100644
--- a/patches/server/0697-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0698-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9feb9e64e64e19d99f6ba01e203b81f13235d12d..6620d1a16522d37746c9300768e21b58b52b764d 100644
+index 2b7b63ea08c8e4f43c9678671fb8d08628b48b36..3bf39c2d2aa3fc4fd0815dacea57e4899ec0da0e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2124,7 +2124,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -327,7 +327,7 @@ index 084b17d6496799fd49a9f81bb6bcbff512fd8f78..7d2ac8aa97805e8b022d3982b1332c50
          }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a1a6c03daf2aa3babef6426e7abd3a37c470b100..94f840924682bf65460a05059a655e1200ecbef8 100644
+index 1e2ad223ae9c3270548de89acc91f1e6780af539..d76d8d8db7921d16f87dd162ccd115e351cde106 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -708,7 +708,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch
similarity index 96%
rename from patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch
index 8be866f427..3ae7044699 100644
--- a/patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 86f84a7ebc7a118187aabaf44c83ea737af34c6e..7922192dbe37b9cfcfe85d6ac240c145be467b31 100644
+index 05c1aa7c49134e099e3d14a244252173e6755401..258d54e450ff5aec06eaeb1d57c049d9b0b3ea48 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -797,5 +797,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0701-Add-BellRevealRaiderEvent.patch b/patches/server/0702-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0701-Add-BellRevealRaiderEvent.patch
rename to patches/server/0702-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0702-Fix-invulnerable-end-crystals.patch b/patches/server/0703-Fix-invulnerable-end-crystals.patch
similarity index 97%
rename from patches/server/0702-Fix-invulnerable-end-crystals.patch
rename to patches/server/0703-Fix-invulnerable-end-crystals.patch
index da30eac4e5..b7740d9eb5 100644
--- a/patches/server/0702-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0703-Fix-invulnerable-end-crystals.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7922192dbe37b9cfcfe85d6ac240c145be467b31..4a24d7ae6b65fced643859a965ce1d4f6a3828fd 100644
+index 258d54e450ff5aec06eaeb1d57c049d9b0b3ea48..417cf3d8988f28fa1e0b05f11b89ef2c02d59ed9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -802,5 +802,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0703-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0704-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0703-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0704-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0704-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0705-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 96%
rename from patches/server/0704-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0705-Reset-villager-inventory-on-cancelled-pickup-event.patch
index 4a6a053383..044c2954d7 100644
--- a/patches/server/0704-Reset-villager-inventory-on-cancelled-pickup-event.patch
+++ b/patches/server/0705-Reset-villager-inventory-on-cancelled-pickup-event.patch
@@ -26,7 +26,7 @@ index 502e29644504aabe3834351d3b479e21bd8f4be7..4e47ea7359ae56efeb2b74161dc9e738
          this.transaction.add(who);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 18b35c8d2160d24c31483edef13cc5e8d93ed09b..27530389690ec329bd92a722e4faf87e367bce91 100644
+index 2ad93ff0bb46a282df706438b7c039c46323979a..43bb055f0f9ecb82c25e0f47258f45ce4182a75d 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -888,15 +888,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0705-Fix-dangerous-end-portal-logic.patch b/patches/server/0706-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0705-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0706-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0707-Make-item-validations-configurable.patch b/patches/server/0708-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0707-Make-item-validations-configurable.patch
rename to patches/server/0708-Make-item-validations-configurable.patch
diff --git a/patches/server/0708-Add-more-line-of-sight-methods.patch b/patches/server/0709-Add-more-line-of-sight-methods.patch
similarity index 97%
rename from patches/server/0708-Add-more-line-of-sight-methods.patch
rename to patches/server/0709-Add-more-line-of-sight-methods.patch
index 44b343aeb8..d248fdd76d 100644
--- a/patches/server/0708-Add-more-line-of-sight-methods.patch
+++ b/patches/server/0709-Add-more-line-of-sight-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more line of sight methods
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 76400ad859d478139b9fd0433dca2a98ae49d2db..58b36ed797476f3cec78529e09e913ebb791c5e3 100644
+index 0f62182cc570b6a1e687744c01333253456081f4..57c448ee93df76fc2a17c75fafc78408d720ced3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3424,6 +3424,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0709-add-per-world-spawn-limits.patch b/patches/server/0710-add-per-world-spawn-limits.patch
similarity index 96%
rename from patches/server/0709-add-per-world-spawn-limits.patch
rename to patches/server/0710-add-per-world-spawn-limits.patch
index ecb4643688..133bf76af3 100644
--- a/patches/server/0709-add-per-world-spawn-limits.patch
+++ b/patches/server/0710-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4a24d7ae6b65fced643859a965ce1d4f6a3828fd..a1d02e22bd67f1f1258dfffcf435018a5952afb8 100644
+index 417cf3d8988f28fa1e0b05f11b89ef2c02d59ed9..26e18a08a7f0bd704ff3055ce3a7814191450c85 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -658,6 +658,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0710-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0711-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0710-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0711-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch