From 4d40e87b3364e6e396e1aa43a8111f80859498ac Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 15 Jun 2021 17:50:38 -0700
Subject: [PATCH] Update sync chunk load debug patch

Had to drop some hunks modifying getEntities, as those methods were rewritten by Mojang in 1.17
---
 .../removed/1.17/0372-Reduce-sync-loads.patch | 331 +-----------------
 .../0373-Add-debug-for-sync-chunk-loads.patch | 309 ++++++++++++++++
 ...w-overriding-the-java-version-check.patch} |   0
 ...tch => 0375-Add-ThrownEggHatchEvent.patch} |   0
 ... 0376-Optimise-random-block-ticking.patch} |  14 +-
 ...p-API.patch => 0377-Entity-Jump-API.patch} |   2 +-
 ...-to-nerf-pigmen-from-nether-portals.patch} |   4 +-
 ... => 0379-Make-the-GUI-graph-fancier.patch} |   0
 ...80-add-hand-to-BlockMultiPlaceEvent.patch} |   2 +-
 ...1-Prevent-teleporting-dead-entities.patch} |   2 +-
 ...ipwire-hook-placement-before-update.patch} |   0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |   2 +-
 ...chance-of-villager-zombie-infection.patch} |   0
 ...tch => 0385-Optimise-Chunk-getFluid.patch} |   2 +-
 ...mise-TickListServer-by-rewriting-it.patch} |  12 +-
 ...pawn-settings-and-per-player-option.patch} |   4 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |   0
 ...ow-bees-to-load-chunks-for-beehives.patch} |   2 +-
 ...PlayerChunkMap-adds-crashing-server.patch} |   6 +-
 ...timize-Collision-to-not-load-chunks.patch} |   2 +-
 ...tch => 0392-Don-t-tick-dead-players.patch} |   2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   2 +-
 ...unkMap-memory-use-for-visibleChunks.patch} |   4 +-
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  20 +-
 ...ove-existing-players-to-world-spawn.patch} |   0
 ...Add-tick-times-API-and-mspt-command.patch} |   0
 ...98-Expose-MinecraftServer-isRunning.patch} |   0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |   0
 ...0-Remove-streams-from-Mob-AI-System.patch} |   0
 ... => 0401-Async-command-map-building.patch} |   0
 ...h => 0402-Improved-Watchdog-Support.patch} |   8 +-
 ....patch => 0403-Optimize-Pathfinding.patch} |   0
 ...4-Reduce-Either-Optional-allocation.patch} |   0
 ...405-Remove-streams-from-PairedQueue.patch} |   0
 ...-memory-footprint-of-NBTTagCompound.patch} |   0
 ...ent-opening-inventories-when-frozen.patch} |   2 +-
 ...08-Optimise-ArraySetSorted-removeIf.patch} |   0
 ...entity-collision-code-if-not-needed.patch} |   2 +-
 ...teleport-command-to-valid-locations.patch} |   0
 ...Implement-Player-Client-Options-API.patch} |   0
 ...Chunk-Post-Processing-deadlock-risk.patch} |   6 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |   0
 ...4-Broadcast-join-message-to-console.patch} |   0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |   0
 ...oad-Chunks-for-Login-Asynchronously.patch} |   0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   2 +-
 ...layerAttackEntityCooldownResetEvent.patch} |   2 +-
 ...llbacks-to-schedule-for-Callback-Ex.patch} |   2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   4 +-
 ...-duplication-issues-and-teleport-is.patch} |   6 +-
 ...0423-Implement-Brigadier-Mojang-API.patch} |   2 +-
 ...patch => 0424-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   2 +-
 ...n.patch => 0426-Expose-game-version.patch} |   0
 ...> 0427-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   0
 ...atch => 0429-Implement-Mob-Goal-API.patch} |   0
 ...ance-map-to-optimise-entity-tracker.patch} |   4 +-
 ...isOutsideRange-to-use-distance-maps.patch} |  14 +-
 ...=> 0432-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   4 +-
 ...tch => 0434-ExperienceOrbMergeEvent.patch} |   2 +-
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   0
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0437-Potential-bed-API.patch} |   0
 ...ait-for-Async-Tasks-during-shutdown.patch} |   0
 ...er-respects-game-and-entity-rules-f.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   2 +-
 ...leInt-allocations-from-light-engine.patch} |   0
 ...location-of-Vec3D-by-entity-tracker.patch} |   2 +-
 ...> 0443-Ensure-safe-gateway-teleport.patch} |   0
 ...-for-console-having-all-permissions.patch} |   0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |   0
 ...packets-to-nearby-locations-sounds-.patch} |   0
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0448-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...nk-Unloads-based-on-Player-Movement.patch} |   2 +-
 ...Optimize-Bit-Operations-by-inlining.patch} |   2 +-
 ...ch => 0452-incremental-chunk-saving.patch} |  18 +-
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |   0
 ...sing-chunks-due-to-integer-overflow.patch} |   0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |   0
 ...ton-physics-inconsistency-MC-188840.patch} |   0
 ...uping.patch => 0457-Fix-sand-duping.patch} |   0
 ...desync-in-playerconnection-causing-.patch} |   2 +-
 ...older-method-without-block-snapshot.patch} |   0
 ...h => 0460-Expose-Arrow-getItemStack.patch} |   0
 ...mplement-PlayerRecipeBookClickEvent.patch} |   2 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |   0
 ...3-Add-permission-for-command-blocks.patch} |   2 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |   2 +-
 ...orldBorder-collision-checks-and-air.patch} |   2 +-
 ...d-Difficulty-Remembering-Difficulty.patch} |   2 +-
 ...atch => 0467-Paper-dumpitem-command.patch} |  18 +-
 ...68-Don-t-allow-null-UUID-s-for-chat.patch} |   0
 ...Legacy-Component-serialization-size.patch} |   0
 ...e-operations-for-updating-light-dat.patch} |   0
 ...471-Support-old-UUID-format-for-NBT.patch} |   0
 ...p-duplicated-GameProfile-Properties.patch} |   0
 ...vert-legacy-attributes-in-Item-Meta.patch} |   0
 ...-Priority-Urgency-System-for-Chunks.patch} |  10 +-
 ...Remove-some-streams-from-structures.patch} |   0
 ...rom-classes-related-villager-gossip.patch} |   2 +-
 ...0477-Support-components-in-ItemMeta.patch} |   0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |   0
 ...patch => 0479-Add-entity-liquid-API.patch} |   0
 ...date-itemstack-legacy-name-and-lore.patch} |   2 +-
 ...wn-player-in-correct-world-on-login.patch} |   0
 ...atch => 0482-Add-PrepareResultEvent.patch} |   2 +-
 ...low-delegation-to-vanilla-chunk-gen.patch} |   0
 ...-for-portal-on-world-gen-entity-add.patch} |   2 +-
 ...e-NetworkManager-Exception-Handling.patch} |   0
 ...ncement-data-player-iteration-to-be.patch} |   0
 ...x-arrows-never-despawning-MC-125757.patch} |   2 +-
 ...Vanilla-Command-permission-checking.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   2 +-
 ...-5989.patch => 0490-Fix-SPIGOT-5989.patch} |   0
 ...-Bukkit-world-container-is-not-used.patch} |   0
 ...5885-Unable-to-disable-advancements.patch} |   0
 ...taPlayer-leak-due-from-quitting-ear.patch} |   0
 ...eLighting-call-to-World-spigot-stri.patch} |   0
 ...ix-some-rails-connecting-improperly.patch} |   0
 ...h => 0496-Incremental-player-saving.patch} |   2 +-
 ...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 => 0500-Brand-support.patch} |   2 +-
 ...patch => 0501-Add-setMaxPlayers-API.patch} |   0
 ...PickupItemAnimation-to-LivingEntity.patch} |   0
 ...h => 0503-Don-t-require-FACING-data.patch} |   0
 ...eEvent-not-firing-for-all-use-cases.patch} |   4 +-
 ...PI.patch => 0505-Add-moon-phase-API.patch} |   0
 ...headless-pistons-from-being-created.patch} |   0
 ...ent.patch => 0507-Add-BellRingEvent.patch} |   0
 ...dd-zombie-targets-turtle-egg-config.patch} |   2 +-
 ...patch => 0509-Buffer-joins-to-world.patch} |   0
 ...=> 0510-Optimize-redstone-algorithm.patch} |   0
 ...s-not-working-in-some-kick-messages.patch} |   2 +-
 ...reateEvent-needs-to-know-its-entity.patch} |   2 +-
 ...ch => 0513-Fix-CraftTeam-null-check.patch} |   0
 ...I.patch => 0514-Add-more-Evoker-API.patch} |   0
 ...translation-keys-for-blocks-entitie.patch} |   2 +-
 ...te-HoverEvent-from-ItemStack-Entity.patch} |   0
 ...ch => 0517-Cache-block-data-strings.patch} |   0
 ...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} |   4 +-
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |   2 +-
 ...-Counter-to-allow-plugins-to-use-va.patch} |   4 +-
 ...track-plugin-scoreboards-by-default.patch} |   0
 ...king.patch => 0525-Entity-isTicking.patch} |   2 +-
 ...non-whitelisted-player-when-white-l.patch} |   0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |   2 +-
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |   0
 ...-large-move-vectors-crashing-server.patch} |   2 +-
 ...atch => 0530-Optimise-getType-calls.patch} |   0
 ....patch => 0531-Villager-resetOffers.patch} |   0
 ...nig-for-some-hot-IBlockData-methods.patch} |   0
 ...ce-order-when-capturing-blockstates.patch} |   0
 ...lockpos-allocation-from-pathfinding.patch} |   0
 ...em-locations-dropped-from-campfires.patch} |   0
 ...tch => 0536-Player-elytra-boost-API.patch} |   0
 ...37-Fixed-TileEntityBell-memory-leak.patch} |   0
 ...ing-up-when-item-stack-is-empty-in-.patch} |   0
 ...Add-getOfflinePlayerIfCached-String.patch} |   0
 ...ch => 0540-Add-ignore-discounts-API.patch} |   0
 ...Toggle-for-removing-existing-dragon.patch} |   0
 ...x-client-lag-on-advancement-loading.patch} |   2 +-
 ...> 0543-Item-no-age-no-player-pickup.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...545-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0546-Add-API-for-quit-reason.patch} |   4 +-
 ...h => 0547-Seed-based-feature-search.patch} |   0
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...ch => 0550-Expose-world-spawn-angle.patch} |   0
 ...patch => 0551-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   0
 ...53-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0554-Add-PlayerItemCooldownEvent.patch} |   0
 ...PI.patch => 0555-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   2 +-
 ...-missing-default-perms-for-commands.patch} |   0
 ...h => 0558-Add-PlayerShearBlockEvent.patch} |   0
 ...rbose-world-setting-to-false-by-def.patch} |   2 +-
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0561-Limit-recipe-packets.patch} |   2 +-
 ...-CraftSound-backwards-compatibility.patch} |   0
 ... 0563-MC-4-Fix-item-position-desync.patch} |   2 +-
 ...564-Player-Chunk-Load-Unload-Events.patch} |   2 +-
 ...5-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 => 0569-added-PlayerTradeEvent.patch} |   0
 ...ch => 0570-Implement-TargetHitEvent.patch} |   0
 ...571-Additional-Block-Material-API-s.patch} |   2 +-
 ...tch => 0572-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0574-Cache-burn-durations.patch} |   0
 ...ob-spawner-spawn-egg-transformation.patch} |   0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |   0
 ...event-not-being-called-in-adventure.patch} |   2 +-
 ...h => 0578-Zombie-API-breaking-doors.patch} |   2 +-
 ...579-Fix-nerfed-slime-when-splitting.patch} |   2 +-
 ...=> 0580-Add-EntityLoadCrossbowEvent.patch} |   0
 ...ch => 0581-Guardian-beam-workaround.patch} |   0
 ...0582-Added-WorldGameRuleChangeEvent.patch} |   0
 ...-Added-ServerResourcesReloadedEvent.patch} |   0
 ...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 => 0591-Remove-stale-POIs.patch} |   4 +-
 ...h => 0592-Fix-villager-boat-exploit.patch} |   0
 ...I.patch => 0593-Add-sendOpLevel-API.patch} |   0
 ...ch => 0594-Add-StructureLocateEvent.patch} |   0
 ...-for-requiring-a-player-participant.patch} |   2 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...598-Make-schedule-command-per-world.patch} |   0
 ...599-Configurable-max-leash-distance.patch} |   0
 ...600-Implement-BlockPreDispenseEvent.patch} |   2 +-
 ...h => 0601-Added-Vanilla-Entity-Tags.patch} |   2 +-
 ...-API.patch => 0602-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} |   4 +-
 ...shield-blocking-on-dimension-change.patch} |   2 +-
 ...atch => 0610-add-DragonEggFormEvent.patch} |   0
 ...Event.patch => 0611-EntityMoveEvent.patch} |   4 +-
 ...isable-pathfinding-updates-on-block.patch} |   6 +-
 ... 0613-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 => 0619-misc-debugging-dumps.patch} |   0
 ...port-for-hex-color-codes-in-console.patch} |   0
 ...atch => 0621-Expose-Tracked-Players.patch} |   0
 ...2-Remove-streams-from-SensorNearest.patch} |   0
 ...ix-Wither-hostility-towards-players.patch} |   0
 ...er-exception-on-empty-JsonList-file.patch} |   0
 ...GUI.patch => 0625-Improve-ServerGUI.patch} |   0
 ...ure-plate-EntityInteractEvent-for-i.patch} |   0
 ...627-fix-converting-txt-to-json-file.patch} |   0
 ...atch => 0628-Add-worldborder-events.patch} |   0
 ...=> 0629-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0631-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0632-Add-Block-isValidTool.patch} |   2 +-
 ...using-signs-inside-spawn-protection.patch} |   2 +-
 ...ch => 0634-Implement-Keyed-on-World.patch} |   0
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0636-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} |   0
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   2 +-
 ...block-falling-causing-client-desync.patch} |   0
 ...tch => 0643-Expose-protocol-version.patch} |   2 +-
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |   2 +-
 ...ab-completions-for-brigadier-comman.patch} |   0
 ...temConsumeEvent-cancelling-properly.patch} |   2 +-
 ...patch => 0647-Add-bypass-host-check.patch} |   0
 ...0648-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...ting-give-items-on-item-drop-cancel.patch} |   2 +-
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...-checkReach-check-for-Shulker-boxes.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   2 +-
 ... => 0656-Added-PlayerDeepSleepEvent.patch} |   2 +-
 ...ld-API.patch => 0657-More-World-API.patch} |   0
 ... 0658-Added-PlayerBedFailEnterEvent.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   0
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |   2 +-
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0665-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   2 +-
 ...close.patch => 0669-Inventory-close.patch} |   0
 ...reateEvent-players-and-end-platform.patch} |   2 +-
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   2 +-
 ...=> 0672-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0673-Add-basic-Datapack-API.patch} |   0
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |   4 +-
 ... => 0676-ItemStack-repair-check-API.patch} |   2 +-
 ....patch => 0677-More-Enchantment-API.patch} |   0
 ...option-to-load-extra-plugin-jars-no.patch} |   0
 ...-and-optimise-world-force-upgrading.patch} |   0
 ...PI.patch => 0680-Add-Mob-lookAt-API.patch} |   0
 ...0681-Add-Unix-domain-socket-support.patch} |   0
 ... => 0682-Add-EntityInsideBlockEvent.patch} |   0
 ...83-Attributes-API-for-item-defaults.patch} |   2 +-
 ...hantCustom-emit-PlayerPurchaseEvent.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   8 +-
 ...patch => 0686-More-Lidded-Block-API.patch} |   0
 ...87-Limit-item-frame-cursors-on-maps.patch} |   0
 ...0688-Add-PufferFishStateChangeEvent.patch} |   0
 ... => 0689-Add-PlayerKickEvent-causes.patch} |   2 +-
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ReentrantLo.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0693-Add-BellRevealRaiderEvent.patch} |   0
 ... 0694-Fix-invulnerable-end-crystals.patch} |   0
 ...95-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...inventory-on-cancelled-pickup-event.patch} |   0
 ...0697-Fix-dangerous-end-portal-logic.patch} |   2 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...0700-Add-more-line-of-sight-methods.patch} |   2 +-
 ... => 0701-add-per-world-spawn-limits.patch} |   0
 ...plashEvent-for-water-splash-potions.patch} |   0
 ...tus-dataconverter-for-pre-1.13-chun.patch} |   0
 332 files changed, 501 insertions(+), 509 deletions(-)
 create mode 100644 patches/server/0373-Add-debug-for-sync-chunk-loads.patch
 rename patches/server/{0373-Allow-overriding-the-java-version-check.patch => 0374-Allow-overriding-the-java-version-check.patch} (100%)
 rename patches/server/{0374-Add-ThrownEggHatchEvent.patch => 0375-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0375-Optimise-random-block-ticking.patch => 0376-Optimise-random-block-ticking.patch} (97%)
 rename patches/server/{0376-Entity-Jump-API.patch => 0377-Entity-Jump-API.patch} (97%)
 rename patches/server/{0377-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0378-Add-option-to-nerf-pigmen-from-nether-portals.patch} (94%)
 rename patches/server/{0378-Make-the-GUI-graph-fancier.patch => 0379-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0379-add-hand-to-BlockMultiPlaceEvent.patch => 0380-add-hand-to-BlockMultiPlaceEvent.patch} (93%)
 rename patches/server/{0380-Prevent-teleporting-dead-entities.patch => 0381-Prevent-teleporting-dead-entities.patch} (91%)
 rename patches/server/{0381-Validate-tripwire-hook-placement-before-update.patch => 0382-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0382-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (95%)
 rename patches/server/{0383-Configurable-chance-of-villager-zombie-infection.patch => 0384-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0384-Optimise-Chunk-getFluid.patch => 0385-Optimise-Chunk-getFluid.patch} (96%)
 rename patches/server/{0385-Optimise-TickListServer-by-rewriting-it.patch => 0386-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename patches/server/{0386-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0387-Pillager-patrol-spawn-settings-and-per-player-option.patch} (97%)
 rename patches/server/{0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (95%)
 rename patches/server/{0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (92%)
 rename patches/server/{0390-Optimize-Collision-to-not-load-chunks.patch => 0391-Optimize-Collision-to-not-load-chunks.patch} (98%)
 rename patches/server/{0391-Don-t-tick-dead-players.patch => 0392-Don-t-tick-dead-players.patch} (91%)
 rename patches/server/{0392-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0393-Dead-Player-s-shouldn-t-be-able-to-move.patch} (90%)
 rename patches/server/{0393-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (99%)
 rename patches/server/{0394-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (94%)
 rename patches/server/{0395-Don-t-move-existing-players-to-world-spawn.patch => 0396-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0396-Add-tick-times-API-and-mspt-command.patch => 0397-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0397-Expose-MinecraftServer-isRunning.patch => 0398-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0398-Add-Raw-Byte-ItemStack-Serialization.patch => 0399-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0399-Remove-streams-from-Mob-AI-System.patch => 0400-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename patches/server/{0400-Async-command-map-building.patch => 0401-Async-command-map-building.patch} (100%)
 rename patches/server/{0401-Improved-Watchdog-Support.patch => 0402-Improved-Watchdog-Support.patch} (98%)
 rename patches/server/{0402-Optimize-Pathfinding.patch => 0403-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0403-Reduce-Either-Optional-allocation.patch => 0404-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0404-Remove-streams-from-PairedQueue.patch => 0405-Remove-streams-from-PairedQueue.patch} (100%)
 rename patches/server/{0405-Reduce-memory-footprint-of-NBTTagCompound.patch => 0406-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0406-Prevent-opening-inventories-when-frozen.patch => 0407-Prevent-opening-inventories-when-frozen.patch} (97%)
 rename patches/server/{0407-Optimise-ArraySetSorted-removeIf.patch => 0408-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0408-Don-t-run-entity-collision-code-if-not-needed.patch => 0409-Don-t-run-entity-collision-code-if-not-needed.patch} (93%)
 rename patches/server/{0409-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0410-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename patches/server/{0410-Implement-Player-Client-Options-API.patch => 0411-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0411-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0412-Fix-Chunk-Post-Processing-deadlock-risk.patch} (92%)
 rename patches/server/{0412-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0413-Broadcast-join-message-to-console.patch => 0414-Broadcast-join-message-to-console.patch} (100%)
 rename patches/server/{0414-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename patches/server/{0415-Load-Chunks-for-Login-Asynchronously.patch => 0416-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename patches/server/{0416-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (93%)
 rename patches/server/{0417-Add-PlayerAttackEntityCooldownResetEvent.patch => 0418-Add-PlayerAttackEntityCooldownResetEvent.patch} (95%)
 rename patches/server/{0418-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (95%)
 rename patches/server/{0419-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0420-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0420-Add-phantom-creative-and-insomniac-controls.patch => 0421-Add-phantom-creative-and-insomniac-controls.patch} (95%)
 rename patches/server/{0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (96%)
 rename patches/server/{0422-Implement-Brigadier-Mojang-API.patch => 0423-Implement-Brigadier-Mojang-API.patch} (99%)
 rename patches/server/{0423-Villager-Restocks-API.patch => 0424-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0424-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0425-Validate-PickItem-Packet-and-kick-for-invalid.patch} (95%)
 rename patches/server/{0425-Expose-game-version.patch => 0426-Expose-game-version.patch} (100%)
 rename patches/server/{0426-Optimize-Voxel-Shape-Merging.patch => 0427-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0428-Implement-Mob-Goal-API.patch => 0429-Implement-Mob-Goal-API.patch} (100%)
 rename patches/server/{0429-Use-distance-map-to-optimise-entity-tracker.patch => 0430-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename patches/server/{0430-Optimize-isOutsideRange-to-use-distance-maps.patch => 0431-Optimize-isOutsideRange-to-use-distance-maps.patch} (97%)
 rename patches/server/{0431-Add-villager-reputation-API.patch => 0432-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0432-Option-for-maximum-exp-value-when-merging-orbs.patch => 0433-Option-for-maximum-exp-value-when-merging-orbs.patch} (94%)
 rename patches/server/{0433-ExperienceOrbMergeEvent.patch => 0434-ExperienceOrbMergeEvent.patch} (94%)
 rename patches/server/{0434-Fix-PotionEffect-ignores-icon-flag.patch => 0435-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0435-Optimize-brigadier-child-sorting-performance.patch => 0436-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0436-Potential-bed-API.patch => 0437-Potential-bed-API.patch} (100%)
 rename patches/server/{0437-Wait-for-Async-Tasks-during-shutdown.patch => 0438-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (99%)
 rename patches/server/{0440-Reduce-MutableInt-allocations-from-light-engine.patch => 0441-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (97%)
 rename patches/server/{0442-Ensure-safe-gateway-teleport.patch => 0443-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0443-Add-option-for-console-having-all-permissions.patch => 0444-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0444-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename patches/server/{0445-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename patches/server/{0446-Fix-villager-trading-demand-MC-163962.patch => 0447-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0447-Maps-shouldn-t-load-chunks.patch => 0448-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0448-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0449-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename patches/server/{0450-Optimize-Bit-Operations-by-inlining.patch => 0451-Optimize-Bit-Operations-by-inlining.patch} (99%)
 rename patches/server/{0451-incremental-chunk-saving.patch => 0452-incremental-chunk-saving.patch} (95%)
 rename patches/server/{0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0453-Fix-missing-chunks-due-to-integer-overflow.patch => 0454-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0454-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0455-Fix-piston-physics-inconsistency-MC-188840.patch => 0456-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0456-Fix-sand-duping.patch => 0457-Fix-sand-duping.patch} (100%)
 rename patches/server/{0457-Prevent-position-desync-in-playerconnection-causing-.patch => 0458-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename patches/server/{0458-Inventory-getHolder-method-without-block-snapshot.patch => 0459-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0459-Expose-Arrow-getItemStack.patch => 0460-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0460-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0461-Add-and-implement-PlayerRecipeBookClickEvent.patch} (95%)
 rename patches/server/{0461-Hide-sync-chunk-writes-behind-flag.patch => 0462-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0462-Add-permission-for-command-blocks.patch => 0463-Add-permission-for-command-blocks.patch} (98%)
 rename patches/server/{0463-Ensure-Entity-AABB-s-are-never-invalid.patch => 0464-Ensure-Entity-AABB-s-are-never-invalid.patch} (94%)
 rename patches/server/{0464-Optimize-WorldBorder-collision-checks-and-air.patch => 0465-Optimize-WorldBorder-collision-checks-and-air.patch} (97%)
 rename patches/server/{0465-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename patches/server/{0466-Paper-dumpitem-command.patch => 0467-Paper-dumpitem-command.patch} (83%)
 rename patches/server/{0467-Don-t-allow-null-UUID-s-for-chat.patch => 0468-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0468-Improve-Legacy-Component-serialization-size.patch => 0469-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0469-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0470-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0470-Support-old-UUID-format-for-NBT.patch => 0471-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0471-Clean-up-duplicated-GameProfile-Properties.patch => 0472-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0472-Convert-legacy-attributes-in-Item-Meta.patch => 0473-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename patches/server/{0474-Remove-some-streams-from-structures.patch => 0475-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0475-Remove-streams-from-classes-related-villager-gossip.patch => 0476-Remove-streams-from-classes-related-villager-gossip.patch} (98%)
 rename patches/server/{0476-Support-components-in-ItemMeta.patch => 0477-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0477-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0478-Add-entity-liquid-API.patch => 0479-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0479-Update-itemstack-legacy-name-and-lore.patch => 0480-Update-itemstack-legacy-name-and-lore.patch} (97%)
 rename patches/server/{0480-Spawn-player-in-correct-world-on-login.patch => 0481-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0481-Add-PrepareResultEvent.patch => 0482-Add-PrepareResultEvent.patch} (98%)
 rename patches/server/{0482-Allow-delegation-to-vanilla-chunk-gen.patch => 0483-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0483-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (90%)
 rename patches/server/{0484-Optimize-NetworkManager-Exception-Handling.patch => 0485-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0485-Optimize-the-advancement-data-player-iteration-to-be.patch => 0486-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0486-Fix-arrows-never-despawning-MC-125757.patch => 0487-Fix-arrows-never-despawning-MC-125757.patch} (94%)
 rename patches/server/{0487-Thread-Safe-Vanilla-Command-permission-checking.patch => 0488-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0488-Move-range-check-for-block-placing-up.patch => 0489-Move-range-check-for-block-placing-up.patch} (96%)
 rename patches/server/{0489-Fix-SPIGOT-5989.patch => 0490-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0490-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0491-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0491-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0492-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0492-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0493-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0493-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0494-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0494-Fix-some-rails-connecting-improperly.patch => 0495-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0495-Incremental-player-saving.patch => 0496-Incremental-player-saving.patch} (98%)
 rename patches/server/{0496-Fix-MC-187716-Use-configured-height.patch => 0497-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename patches/server/{0497-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0498-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0498-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0499-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0499-Brand-support.patch => 0500-Brand-support.patch} (97%)
 rename patches/server/{0500-Add-setMaxPlayers-API.patch => 0501-Add-setMaxPlayers-API.patch} (100%)
 rename patches/server/{0501-Add-playPickupItemAnimation-to-LivingEntity.patch => 0502-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0502-Don-t-require-FACING-data.patch => 0503-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0503-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (94%)
 rename patches/server/{0504-Add-moon-phase-API.patch => 0505-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0505-Prevent-headless-pistons-from-being-created.patch => 0506-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0506-Add-BellRingEvent.patch => 0507-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0507-Add-zombie-targets-turtle-egg-config.patch => 0508-Add-zombie-targets-turtle-egg-config.patch} (95%)
 rename patches/server/{0508-Buffer-joins-to-world.patch => 0509-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0509-Optimize-redstone-algorithm.patch => 0510-Optimize-redstone-algorithm.patch} (100%)
 rename patches/server/{0510-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0511-Fix-hex-colors-not-working-in-some-kick-messages.patch} (98%)
 rename patches/server/{0511-PortalCreateEvent-needs-to-know-its-entity.patch => 0512-PortalCreateEvent-needs-to-know-its-entity.patch} (98%)
 rename patches/server/{0512-Fix-CraftTeam-null-check.patch => 0513-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0513-Add-more-Evoker-API.patch => 0514-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0514-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (97%)
 rename patches/server/{0515-Create-HoverEvent-from-ItemStack-Entity.patch => 0516-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0516-Cache-block-data-strings.patch => 0517-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0517-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (96%)
 rename patches/server/{0518-Add-additional-open-container-api-to-HumanEntity.patch => 0519-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0519-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0520-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0520-Extend-block-drop-capture-to-capture-all-items-added.patch => 0521-Extend-block-drop-capture-to-capture-all-items-added.patch} (94%)
 rename patches/server/{0521-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (89%)
 rename patches/server/{0522-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (88%)
 rename patches/server/{0523-Lazily-track-plugin-scoreboards-by-default.patch => 0524-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0524-Entity-isTicking.patch => 0525-Entity-isTicking.patch} (95%)
 rename patches/server/{0525-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0526-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0526-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (89%)
 rename patches/server/{0527-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0528-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0528-Fix-for-large-move-vectors-crashing-server.patch => 0529-Fix-for-large-move-vectors-crashing-server.patch} (97%)
 rename patches/server/{0529-Optimise-getType-calls.patch => 0530-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0530-Villager-resetOffers.patch => 0531-Villager-resetOffers.patch} (100%)
 rename patches/server/{0531-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0532-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0532-Retain-block-place-order-when-capturing-blockstates.patch => 0533-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0533-Reduce-blockpos-allocation-from-pathfinding.patch => 0534-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0534-Fix-item-locations-dropped-from-campfires.patch => 0535-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0535-Player-elytra-boost-API.patch => 0536-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0536-Fixed-TileEntityBell-memory-leak.patch => 0537-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0537-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0538-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0538-Add-getOfflinePlayerIfCached-String.patch => 0539-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0539-Add-ignore-discounts-API.patch => 0540-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0540-Toggle-for-removing-existing-dragon.patch => 0541-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0541-Fix-client-lag-on-advancement-loading.patch => 0542-Fix-client-lag-on-advancement-loading.patch} (96%)
 rename patches/server/{0542-Item-no-age-no-player-pickup.patch => 0543-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0544-Beacon-API-custom-effect-ranges.patch => 0545-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0545-Add-API-for-quit-reason.patch => 0546-Add-API-for-quit-reason.patch} (96%)
 rename patches/server/{0546-Seed-based-feature-search.patch => 0547-Seed-based-feature-search.patch} (100%)
 rename patches/server/{0547-Add-Wandering-Trader-spawn-rate-config-options.patch => 0548-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0548-Significantly-improve-performance-of-the-end-generat.patch => 0549-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0549-Expose-world-spawn-angle.patch => 0550-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0550-Add-Destroy-Speed-API.patch => 0551-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0551-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0552-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0552-Add-LivingEntity-clearActiveItem.patch => 0553-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0553-Add-PlayerItemCooldownEvent.patch => 0554-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0554-More-lightning-API.patch => 0555-More-lightning-API.patch} (100%)
 rename patches/server/{0555-Climbing-should-not-bypass-cramming-gamerule.patch => 0556-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0556-Added-missing-default-perms-for-commands.patch => 0557-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0557-Add-PlayerShearBlockEvent.patch => 0558-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0558-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0559-Set-spigots-verbose-world-setting-to-false-by-def.patch} (89%)
 rename patches/server/{0559-Fix-curing-zombie-villager-discount-exploit.patch => 0560-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0560-Limit-recipe-packets.patch => 0561-Limit-recipe-packets.patch} (97%)
 rename patches/server/{0561-Fix-CraftSound-backwards-compatibility.patch => 0562-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0562-MC-4-Fix-item-position-desync.patch => 0563-MC-4-Fix-item-position-desync.patch} (97%)
 rename patches/server/{0563-Player-Chunk-Load-Unload-Events.patch => 0564-Player-Chunk-Load-Unload-Events.patch} (94%)
 rename patches/server/{0564-Optimize-Dynamic-get-Missing-Keys.patch => 0565-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0565-Expose-LivingEntity-hurt-direction.patch => 0566-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0566-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0567-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (91%)
 rename patches/server/{0567-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0568-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0568-added-PlayerTradeEvent.patch => 0569-added-PlayerTradeEvent.patch} (100%)
 rename patches/server/{0569-Implement-TargetHitEvent.patch => 0570-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0570-Additional-Block-Material-API-s.patch => 0571-Additional-Block-Material-API-s.patch} (93%)
 rename patches/server/{0571-Fix-harming-potion-dupe.patch => 0572-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0572-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0573-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0573-Cache-burn-durations.patch => 0574-Cache-burn-durations.patch} (100%)
 rename patches/server/{0574-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0575-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0575-Implement-PlayerFlowerPotManipulateEvent.patch => 0576-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0576-Fix-interact-event-not-being-called-in-adventure.patch => 0577-Fix-interact-event-not-being-called-in-adventure.patch} (95%)
 rename patches/server/{0577-Zombie-API-breaking-doors.patch => 0578-Zombie-API-breaking-doors.patch} (90%)
 rename patches/server/{0578-Fix-nerfed-slime-when-splitting.patch => 0579-Fix-nerfed-slime-when-splitting.patch} (89%)
 rename patches/server/{0579-Add-EntityLoadCrossbowEvent.patch => 0580-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0580-Guardian-beam-workaround.patch => 0581-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0581-Added-WorldGameRuleChangeEvent.patch => 0582-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0582-Added-ServerResourcesReloadedEvent.patch => 0583-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0583-Added-world-settings-for-mobs-picking-up-loot.patch => 0584-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0584-Implemented-BlockFailedDispenseEvent.patch => 0585-Implemented-BlockFailedDispenseEvent.patch} (96%)
 rename patches/server/{0585-Added-PlayerLecternPageChangeEvent.patch => 0586-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0586-Added-PlayerLoomPatternSelectEvent.patch => 0587-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0587-Configurable-door-breaking-difficulty.patch => 0588-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0588-Empty-commands-shall-not-be-dispatched.patch => 0589-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0589-Implement-API-to-expose-exact-interaction-point.patch => 0590-Implement-API-to-expose-exact-interaction-point.patch} (97%)
 rename patches/server/{0590-Remove-stale-POIs.patch => 0591-Remove-stale-POIs.patch} (87%)
 rename patches/server/{0591-Fix-villager-boat-exploit.patch => 0592-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0592-Add-sendOpLevel-API.patch => 0593-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0593-Add-StructureLocateEvent.patch => 0594-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0594-Collision-option-for-requiring-a-player-participant.patch => 0595-Collision-option-for-requiring-a-player-participant.patch} (98%)
 rename patches/server/{0595-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0596-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0596-Return-chat-component-with-empty-text-instead-of-thr.patch => 0597-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0597-Make-schedule-command-per-world.patch => 0598-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0598-Configurable-max-leash-distance.patch => 0599-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0599-Implement-BlockPreDispenseEvent.patch => 0600-Implement-BlockPreDispenseEvent.patch} (95%)
 rename patches/server/{0600-Added-Vanilla-Entity-Tags.patch => 0601-Added-Vanilla-Entity-Tags.patch} (98%)
 rename patches/server/{0601-added-Wither-API.patch => 0602-added-Wither-API.patch} (100%)
 rename patches/server/{0602-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0603-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0603-Fix-console-spam-when-removing-chests-in-water.patch => 0604-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0604-Add-toggle-for-always-placing-the-dragon-egg.patch => 0605-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0605-Added-PlayerStonecutterRecipeSelectEvent.patch => 0606-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0606-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0607-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (97%)
 rename patches/server/{0607-Skip-distance-map-update-when-spawning-disabled.patch => 0608-Skip-distance-map-update-when-spawning-disabled.patch} (87%)
 rename patches/server/{0608-Reset-shield-blocking-on-dimension-change.patch => 0609-Reset-shield-blocking-on-dimension-change.patch} (89%)
 rename patches/server/{0609-add-DragonEggFormEvent.patch => 0610-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0610-EntityMoveEvent.patch => 0611-EntityMoveEvent.patch} (95%)
 rename patches/server/{0611-added-option-to-disable-pathfinding-updates-on-block.patch => 0612-added-option-to-disable-pathfinding-updates-on-block.patch} (89%)
 rename patches/server/{0612-Inline-shift-direction-fields.patch => 0613-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0613-Allow-adding-items-to-BlockDropItemEvent.patch => 0614-Allow-adding-items-to-BlockDropItemEvent.patch} (95%)
 rename patches/server/{0614-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0615-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0615-living-entity-allow-attribute-registration.patch => 0616-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0616-fix-dead-slime-setSize-invincibility.patch => 0617-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0617-Merchant-getRecipes-should-return-an-immutable-list.patch => 0618-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0618-misc-debugging-dumps.patch => 0619-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0619-Add-support-for-hex-color-codes-in-console.patch => 0620-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0620-Expose-Tracked-Players.patch => 0621-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0621-Remove-streams-from-SensorNearest.patch => 0622-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0622-MC-29274-Fix-Wither-hostility-towards-players.patch => 0623-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename patches/server/{0623-Throw-proper-exception-on-empty-JsonList-file.patch => 0624-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0624-Improve-ServerGUI.patch => 0625-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0625-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0626-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0626-fix-converting-txt-to-json-file.patch => 0627-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0627-Add-worldborder-events.patch => 0628-Add-worldborder-events.patch} (100%)
 rename patches/server/{0628-added-PlayerNameEntityEvent.patch => 0629-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0629-Prevent-grindstones-from-overstacking-items.patch => 0630-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0630-Add-recipe-to-cook-events.patch => 0631-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0631-Add-Block-isValidTool.patch => 0632-Add-Block-isValidTool.patch} (87%)
 rename patches/server/{0632-Allow-using-signs-inside-spawn-protection.patch => 0633-Allow-using-signs-inside-spawn-protection.patch} (96%)
 rename patches/server/{0633-Implement-Keyed-on-World.patch => 0634-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0634-Add-fast-alternative-constructor-for-Rotations.patch => 0635-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0635-Item-Rarity-API.patch => 0636-Item-Rarity-API.patch} (93%)
 rename patches/server/{0636-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0637-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0637-copy-TESign-isEditable-from-snapshots.patch => 0638-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0638-Drop-carried-item-when-player-has-disconnected.patch => 0639-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0639-forced-whitelist-use-configurable-kick-message.patch => 0640-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0640-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0641-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (91%)
 rename patches/server/{0641-fix-cancelling-block-falling-causing-client-desync.patch => 0642-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0642-Expose-protocol-version.patch => 0643-Expose-protocol-version.patch} (91%)
 rename patches/server/{0643-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0644-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (98%)
 rename patches/server/{0644-Enhance-console-tab-completions-for-brigadier-comman.patch => 0645-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0645-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0646-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (92%)
 rename patches/server/{0646-Add-bypass-host-check.patch => 0647-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0647-Set-area-affect-cloud-rotation.patch => 0648-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0648-add-isDeeplySleeping-to-HumanEntity.patch => 0649-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0649-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0650-Fix-duplicating-give-items-on-item-drop-cancel.patch} (97%)
 rename patches/server/{0650-add-consumeFuel-to-FurnaceBurnEvent.patch => 0651-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0651-add-get-set-drop-chance-to-EntityEquipment.patch => 0652-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0652-fix-PigZombieAngerEvent-cancellation.patch => 0653-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0653-Fix-checkReach-check-for-Shulker-boxes.patch => 0654-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0654-fix-PlayerItemHeldEvent-firing-twice.patch => 0655-fix-PlayerItemHeldEvent-firing-twice.patch} (93%)
 rename patches/server/{0655-Added-PlayerDeepSleepEvent.patch => 0656-Added-PlayerDeepSleepEvent.patch} (91%)
 rename patches/server/{0656-More-World-API.patch => 0657-More-World-API.patch} (100%)
 rename patches/server/{0657-Added-PlayerBedFailEnterEvent.patch => 0658-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0658-Implement-methods-to-convert-between-Component-and-B.patch => 0659-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0659-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0660-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0660-Introduce-beacon-activation-deactivation-events.patch => 0661-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0661-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0662-add-RespawnFlags-to-PlayerRespawnEvent.patch} (97%)
 rename patches/server/{0662-Add-Channel-initialization-listeners.patch => 0663-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0663-Send-empty-commands-if-tab-completion-is-disabled.patch => 0664-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0664-Add-more-WanderingTrader-API.patch => 0665-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0665-Add-EntityBlockStorage-clearEntities.patch => 0666-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0666-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0667-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0667-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0668-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (95%)
 rename patches/server/{0668-Inventory-close.patch => 0669-Inventory-close.patch} (100%)
 rename patches/server/{0669-call-PortalCreateEvent-players-and-end-platform.patch => 0670-call-PortalCreateEvent-players-and-end-platform.patch} (96%)
 rename patches/server/{0670-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0671-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (98%)
 rename patches/server/{0671-Fix-CraftPotionBrewer-cache.patch => 0672-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0672-Add-basic-Datapack-API.patch => 0673-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0673-Add-environment-variable-to-disable-server-gui.patch => 0674-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0674-additions-to-PlayerGameModeChangeEvent.patch => 0675-additions-to-PlayerGameModeChangeEvent.patch} (97%)
 rename patches/server/{0675-ItemStack-repair-check-API.patch => 0676-ItemStack-repair-check-API.patch} (97%)
 rename patches/server/{0676-More-Enchantment-API.patch => 0677-More-Enchantment-API.patch} (100%)
 rename patches/server/{0677-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0678-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0678-Fix-and-optimise-world-force-upgrading.patch => 0679-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0679-Add-Mob-lookAt-API.patch => 0680-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0680-Add-Unix-domain-socket-support.patch => 0681-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0681-Add-EntityInsideBlockEvent.patch => 0682-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0682-Attributes-API-for-item-defaults.patch => 0683-Attributes-API-for-item-defaults.patch} (95%)
 rename patches/server/{0683-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0684-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0684-Add-cause-to-Weather-ThunderChangeEvents.patch => 0685-Add-cause-to-Weather-ThunderChangeEvents.patch} (95%)
 rename patches/server/{0685-More-Lidded-Block-API.patch => 0686-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0686-Limit-item-frame-cursors-on-maps.patch => 0687-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0687-Add-PufferFishStateChangeEvent.patch => 0688-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0688-Add-PlayerKickEvent-causes.patch => 0689-Add-PlayerKickEvent-causes.patch} (99%)
 rename patches/server/{0689-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0690-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0690-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0691-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0691-Add-option-to-fix-items-merging-through-walls.patch => 0692-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0692-Add-BellRevealRaiderEvent.patch => 0693-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0693-Fix-invulnerable-end-crystals.patch => 0694-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0694-Add-ElderGuardianAppearanceEvent.patch => 0695-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0695-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0696-Reset-villager-inventory-on-cancelled-pickup-event.patch} (100%)
 rename patches/server/{0696-Fix-dangerous-end-portal-logic.patch => 0697-Fix-dangerous-end-portal-logic.patch} (97%)
 rename patches/server/{0697-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0698-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0698-Make-item-validations-configurable.patch => 0699-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0699-Add-more-line-of-sight-methods.patch => 0700-Add-more-line-of-sight-methods.patch} (97%)
 rename patches/server/{0700-add-per-world-spawn-limits.patch => 0701-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0701-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0702-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0702-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0703-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/patches/removed/1.17/0372-Reduce-sync-loads.patch b/patches/removed/1.17/0372-Reduce-sync-loads.patch
index b8467f22a..f2ae73064 100644
--- a/patches/removed/1.17/0372-Reduce-sync-loads.patch
+++ b/patches/removed/1.17/0372-Reduce-sync-loads.patch
@@ -1,350 +1,33 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Fri, 19 Jul 2019 03:29:14 -0700
-Subject: [PATCH] Reduce sync loads
-1.17: more entity stuff that someone has to figure out!
-This reduces calls to getChunkAt which would load chunks.
+These hunks are for getEntities, which Mojang rewrote in 1.17.
 
-This patch also adds a tool to find calls which are doing this, however
-it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true
-
-To get a debug log for sync loads, the command is /paper syncloadinfo
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 62711d95db62221a2e4e6423c518afe13a6c7dbe..ff718bc7f521575e6a670e17fcf59a2d30841705 100644
---- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -1,12 +1,18 @@
- package com.destroystokyo.paper;
- 
- import com.destroystokyo.paper.io.chunk.ChunkTaskManager;
-+import com.destroystokyo.paper.io.SyncLoadFinder;
- import com.google.common.base.Functions;
- import com.google.common.base.Joiner;
- import com.google.common.collect.ImmutableSet;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
-+import com.google.gson.JsonObject;
-+import com.google.gson.internal.Streams;
-+import com.google.gson.stream.JsonWriter;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.MCUtil;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ChunkHolder;
- import net.minecraft.server.level.ServerChunkCache;
-@@ -14,7 +20,6 @@ import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.level.ChunkPos;
--import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MCUtil;
- import org.apache.commons.lang3.tuple.MutablePair;
- import org.apache.commons.lang3.tuple.Pair;
-@@ -29,6 +34,9 @@ import org.bukkit.craftbukkit.CraftWorld;
- import org.bukkit.entity.Player;
- 
- import java.io.File;
-+import java.io.FileOutputStream;
-+import java.io.PrintStream;
-+import java.io.StringWriter;
- import java.time.LocalDateTime;
- import java.time.format.DateTimeFormatter;
- import java.util.ArrayList;
-@@ -44,7 +52,7 @@ import java.util.stream.Collectors;
- 
- public class PaperCommand extends Command {
-     private static final String BASE_PERM = "bukkit.command.paper.";
--    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "dumpwaiting").build();
-+    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "dumpwaiting", "syncloadinfo").build();
- 
-     public PaperCommand(String name) {
-         super(name);
-@@ -162,6 +170,9 @@ public class PaperCommand extends Command {
-             case "chunkinfo":
-                 doChunkInfo(sender, args);
-                 break;
-+            case "syncloadinfo":
-+                this.doSyncLoadInfo(sender, args);
-+                break;
-             case "ver":
-                 if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
-             case "version":
-@@ -179,6 +190,40 @@ public class PaperCommand extends Command {
-         return true;
-     }
- 
-+    private void doSyncLoadInfo(CommandSender sender, String[] args) {
-+        if (!SyncLoadFinder.ENABLED) {
-+            sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set.");
-+            return;
-+        }
-+        File file = new File(new File(new File("."), "debug"),
-+            "sync-load-info" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
-+        file.getParentFile().mkdirs();
-+        sender.sendMessage(ChatColor.GREEN + "Writing sync load info to " + file.toString());
-+
-+
-+        try {
-+            final JsonObject data = SyncLoadFinder.serialize();
-+
-+            StringWriter stringWriter = new StringWriter();
-+            JsonWriter jsonWriter = new JsonWriter(stringWriter);
-+            jsonWriter.setIndent(" ");
-+            jsonWriter.setLenient(false);
-+            Streams.write(data, jsonWriter);
-+
-+            String fileData = stringWriter.toString();
-+
-+            try (
-+                PrintStream out = new PrintStream(new FileOutputStream(file), false, "UTF-8")
-+            ) {
-+                out.print(fileData);
-+            }
-+            sender.sendMessage(ChatColor.GREEN + "Successfully written sync load information!");
-+        } catch (Throwable thr) {
-+            sender.sendMessage(ChatColor.RED + "Failed to write sync load information");
-+            thr.printStackTrace();
-+        }
-+    }
-+
-     private void doChunkInfo(CommandSender sender, String[] args) {
-         List<org.bukkit.World> worlds;
-         if (args.length < 2 || args[1].equals("*")) {
-diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..524f33371b9de1d4dd6972fe59ffbe1804d7c5f3
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
-@@ -0,0 +1,171 @@
-+package com.destroystokyo.paper.io;
-+
-+import com.google.gson.JsonArray;
-+import com.google.gson.JsonObject;
-+import com.mojang.datafixers.util.Pair;
-+import it.unimi.dsi.fastutil.longs.Long2IntMap;
-+import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.WeakHashMap;
-+import net.minecraft.world.level.Level;
-+
-+public class SyncLoadFinder {
-+
-+    public static final boolean ENABLED = Boolean.getBoolean("paper.debug-sync-loads");
-+
-+    private static final WeakHashMap<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> SYNC_LOADS = new WeakHashMap<>();
-+
-+    private static final class SyncLoadInformation {
-+
-+        public int times;
-+
-+        public final Long2IntOpenHashMap coordinateTimes = new Long2IntOpenHashMap();
-+    }
-+
-+    public static void logSyncLoad(final Level world, final int chunkX, final int chunkZ) {
-+        if (!ENABLED) {
-+            return;
-+        }
-+
-+        final ThrowableWithEquals stacktrace = new ThrowableWithEquals(Thread.currentThread().getStackTrace());
-+
-+        SYNC_LOADS.compute(world, (final Level keyInMap, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation> map) -> {
-+            if (map == null) {
-+                map = new Object2ObjectOpenHashMap<>();
-+            }
-+
-+            map.compute(stacktrace, (ThrowableWithEquals keyInMap0, SyncLoadInformation valueInMap) -> {
-+                if (valueInMap == null) {
-+                    valueInMap = new SyncLoadInformation();
-+                }
-+
-+                ++valueInMap.times;
-+
-+                valueInMap.coordinateTimes.compute(IOUtil.getCoordinateKey(chunkX, chunkZ), (Long keyInMap1, Integer valueInMap1) -> {
-+                    return valueInMap1 == null ? Integer.valueOf(1) : Integer.valueOf(valueInMap1.intValue() + 1);
-+                });
-+
-+                return valueInMap;
-+            });
-+
-+            return map;
-+        });
-+    }
-+
-+    public static JsonObject serialize() {
-+        final JsonObject ret = new JsonObject();
-+
-+        final JsonArray worldsData = new JsonArray();
-+
-+        for (final Map.Entry<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> entry : SYNC_LOADS.entrySet()) {
-+            final Level world = entry.getKey();
-+
-+            final JsonObject worldData = new JsonObject();
-+
-+            worldData.addProperty("name", world.getWorld().getName());
-+
-+            final List<Pair<ThrowableWithEquals, SyncLoadInformation>> data = new ArrayList<>();
-+
-+            entry.getValue().forEach((ThrowableWithEquals stacktrace, SyncLoadInformation times) -> {
-+                data.add(new Pair<>(stacktrace, times));
-+            });
-+
-+            data.sort((Pair<ThrowableWithEquals, SyncLoadInformation> pair1, Pair<ThrowableWithEquals, SyncLoadInformation> pair2) -> {
-+                return Integer.compare(pair2.getSecond().times, pair1.getSecond().times); // reverse order
-+            });
-+
-+            final JsonArray stacktraces = new JsonArray();
-+
-+            for (Pair<ThrowableWithEquals, SyncLoadInformation> pair : data) {
-+                final JsonObject stacktrace = new JsonObject();
-+
-+                stacktrace.addProperty("times", pair.getSecond().times);
-+
-+                final JsonArray traces = new JsonArray();
-+
-+                for (StackTraceElement element : pair.getFirst().stacktrace) {
-+                    traces.add(String.valueOf(element));
-+                }
-+
-+                stacktrace.add("stacktrace", traces);
-+
-+                final JsonArray coordinates = new JsonArray();
-+
-+                for (Long2IntMap.Entry coordinate : pair.getSecond().coordinateTimes.long2IntEntrySet()) {
-+                    final long key = coordinate.getLongKey();
-+                    final int times = coordinate.getIntValue();
-+                    coordinates.add("(" + IOUtil.getCoordinateX(key) + "," + IOUtil.getCoordinateZ(key) + "): " + times);
-+                }
-+
-+                stacktrace.add("coordinates", coordinates);
-+
-+                stacktraces.add(stacktrace);
-+            }
-+
-+
-+            worldData.add("stacktraces", stacktraces);
-+            worldsData.add(worldData);
-+        }
-+
-+        ret.add("worlds", worldsData);
-+
-+        return ret;
-+    }
-+
-+    static final class ThrowableWithEquals {
-+
-+        private final StackTraceElement[] stacktrace;
-+        private final int hash;
-+
-+        public ThrowableWithEquals(final StackTraceElement[] stacktrace) {
-+            this.stacktrace = stacktrace;
-+            this.hash = ThrowableWithEquals.hash(stacktrace);
-+        }
-+
-+        public static int hash(final StackTraceElement[] stacktrace) {
-+            int hash = 0;
-+
-+            for (int i = 0; i < stacktrace.length; ++i) {
-+                hash *= 31;
-+                hash += stacktrace[i].hashCode();
-+            }
-+
-+            return hash;
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            return this.hash;
-+        }
-+
-+        @Override
-+        public boolean equals(final Object obj) {
-+            if (obj == null || obj.getClass() != this.getClass()) {
-+                return false;
-+            }
-+
-+            final ThrowableWithEquals other = (ThrowableWithEquals)obj;
-+            final StackTraceElement[] otherStackTrace = other.stacktrace;
-+
-+            if (this.stacktrace.length != otherStackTrace.length || this.hash != other.hash) {
-+                return false;
-+            }
-+
-+            if (this == obj) {
-+                return true;
-+            }
-+
-+            for (int i = 0; i < this.stacktrace.length; ++i) {
-+                if (!this.stacktrace[i].equals(otherStackTrace[i])) {
-+                    return false;
-+                }
-+            }
-+
-+            return true;
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 120b604d91643248ab375969f95f62a74cbf6be7..5e0d55c3821b1769d20514a8a6c5c74477019778 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -494,6 +494,7 @@ public class ServerChunkCache extends ChunkSource {
-                 this.level.asyncChunkTaskManager.raisePriority(x1, z1, com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGHEST_PRIORITY);
-                 com.destroystokyo.paper.io.chunk.ChunkTaskManager.pushChunkWait(this.level, x1, z1);
-                 // Paper end
-+                com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x1, z1); // Paper - sync load info
-                 this.level.timings.syncChunkLoad.startTiming(); // Paper
-             this.mainThreadProcessor.managedBlock(completablefuture::isDone);
-                 com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9d4c81a4964317a0726171dc6d490d12bd959cc4..01f879a8dd0e1ffec380e02072567330152eaceb 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -276,6 +276,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-     };
-     public final com.destroystokyo.paper.io.chunk.ChunkTaskManager asyncChunkTaskManager;
-     // Paper end
-+    // Paper start
-+    @Override
-+    public boolean hasChunk(int chunkX, int chunkZ) {
-+        return this.getChunkSource().getChunkAtIfLoadedImmediately(chunkX, chunkZ) != null;
-+    }
-+    // Paper end
- 
-     // Add env and gen to constructor, WorldData -> WorldDataServer
-     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, ServerLevelData iworlddataserver, ResourceKey<net.minecraft.world.level.Level> resourcekey, DimensionType dimensionmanager, ChunkProgressListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 3a1b9f1ba19b28cebdafeb3b2476217d47213862..3e2cd6c7a34c1a792d7346019a8b039d1f4a7c04 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1130,7 +1130,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
+
          for (int i1 = i; i1 <= j; ++i1) {
              for (int j1 = k; j1 <= l; ++j1) {
 -                LevelChunk chunk = ichunkprovider.getChunk(i1, j1, false);
 +                LevelChunk chunk = (LevelChunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
- 
+
                  if (chunk != null) {
                      chunk.getEntities(except, box, list, predicate);
 @@ -1151,7 +1151,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
+
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
 -                LevelChunk chunk = this.getChunkSource().getChunk(i1, j1, false);
 +                LevelChunk chunk = (LevelChunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
- 
+
                  if (chunk != null) {
                      chunk.getEntities(type, box, list, predicate);
 @@ -1174,7 +1174,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
+
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
 -                LevelChunk chunk = ichunkprovider.getChunk(i1, j1, false);
 +                LevelChunk chunk = (LevelChunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
- 
+
                  if (chunk != null) {
                      chunk.getEntitiesOfClass(entityClass, box, list, predicate);
diff --git a/patches/server/0373-Add-debug-for-sync-chunk-loads.patch b/patches/server/0373-Add-debug-for-sync-chunk-loads.patch
new file mode 100644
index 000000000..c9a739c99
--- /dev/null
+++ b/patches/server/0373-Add-debug-for-sync-chunk-loads.patch
@@ -0,0 +1,309 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Fri, 19 Jul 2019 03:29:14 -0700
+Subject: [PATCH] Add debug for sync chunk loads
+
+This patch adds a tool to find calls to getChunkAt which would load
+chunks, however it must be enabled by setting the startup flag
+-Dpaper.debug-sync-loads=true
+
+To get a debug log for sync loads, the command is /paper syncloadinfo
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
+index 7b5afc5d34b78e6404c1a5c6bb823d9589471f13..de45163023f436d386e90e6ded5e6105ba3ecf35 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
++++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
+@@ -1,11 +1,17 @@
+ package com.destroystokyo.paper;
+ 
++import com.destroystokyo.paper.io.SyncLoadFinder;
+ import com.google.common.base.Functions;
+ import com.google.common.base.Joiner;
+ import com.google.common.collect.ImmutableSet;
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
++import com.google.gson.JsonObject;
++import com.google.gson.internal.Streams;
++import com.google.gson.stream.JsonWriter;
++import net.minecraft.resources.ResourceLocation;
++import net.minecraft.server.MCUtil;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ChunkHolder;
+ import net.minecraft.server.level.ServerChunkCache;
+@@ -30,6 +36,9 @@ import org.bukkit.craftbukkit.entity.CraftPlayer;
+ import org.bukkit.entity.Player;
+ 
+ import java.io.File;
++import java.io.FileOutputStream;
++import java.io.PrintStream;
++import java.io.StringWriter;
+ import java.time.LocalDateTime;
+ import java.time.format.DateTimeFormatter;
+ import java.util.ArrayDeque;
+@@ -47,7 +56,7 @@ import java.util.stream.Collectors;
+ 
+ public class PaperCommand extends Command {
+     private static final String BASE_PERM = "bukkit.command.paper.";
+-    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight").build();
++    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "syncloadinfo").build();
+ 
+     public PaperCommand(String name) {
+         super(name);
+@@ -165,6 +174,9 @@ public class PaperCommand extends Command {
+             case "fixlight":
+                 this.doFixLight(sender, args);
+                 break;
++            case "syncloadinfo":
++                this.doSyncLoadInfo(sender, args);
++                break;
+             case "ver":
+                 if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
+             case "version":
+@@ -182,6 +194,40 @@ public class PaperCommand extends Command {
+         return true;
+     }
+ 
++    private void doSyncLoadInfo(CommandSender sender, String[] args) {
++        if (!SyncLoadFinder.ENABLED) {
++            sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set.");
++            return;
++        }
++        File file = new File(new File(new File("."), "debug"),
++            "sync-load-info" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
++        file.getParentFile().mkdirs();
++        sender.sendMessage(ChatColor.GREEN + "Writing sync load info to " + file.toString());
++
++
++        try {
++            final JsonObject data = SyncLoadFinder.serialize();
++
++            StringWriter stringWriter = new StringWriter();
++            JsonWriter jsonWriter = new JsonWriter(stringWriter);
++            jsonWriter.setIndent(" ");
++            jsonWriter.setLenient(false);
++            Streams.write(data, jsonWriter);
++
++            String fileData = stringWriter.toString();
++
++            try (
++                PrintStream out = new PrintStream(new FileOutputStream(file), false, "UTF-8")
++            ) {
++                out.print(fileData);
++            }
++            sender.sendMessage(ChatColor.GREEN + "Successfully written sync load information!");
++        } catch (Throwable thr) {
++            sender.sendMessage(ChatColor.RED + "Failed to write sync load information");
++            thr.printStackTrace();
++        }
++    }
++
+     private void doChunkInfo(CommandSender sender, String[] args) {
+         List<org.bukkit.World> worlds;
+         if (args.length < 2 || args[1].equals("*")) {
+diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..524f33371b9de1d4dd6972fe59ffbe1804d7c5f3
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
+@@ -0,0 +1,171 @@
++package com.destroystokyo.paper.io;
++
++import com.google.gson.JsonArray;
++import com.google.gson.JsonObject;
++import com.mojang.datafixers.util.Pair;
++import it.unimi.dsi.fastutil.longs.Long2IntMap;
++import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
++import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
++
++import java.util.ArrayList;
++import java.util.List;
++import java.util.Map;
++import java.util.WeakHashMap;
++import net.minecraft.world.level.Level;
++
++public class SyncLoadFinder {
++
++    public static final boolean ENABLED = Boolean.getBoolean("paper.debug-sync-loads");
++
++    private static final WeakHashMap<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> SYNC_LOADS = new WeakHashMap<>();
++
++    private static final class SyncLoadInformation {
++
++        public int times;
++
++        public final Long2IntOpenHashMap coordinateTimes = new Long2IntOpenHashMap();
++    }
++
++    public static void logSyncLoad(final Level world, final int chunkX, final int chunkZ) {
++        if (!ENABLED) {
++            return;
++        }
++
++        final ThrowableWithEquals stacktrace = new ThrowableWithEquals(Thread.currentThread().getStackTrace());
++
++        SYNC_LOADS.compute(world, (final Level keyInMap, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation> map) -> {
++            if (map == null) {
++                map = new Object2ObjectOpenHashMap<>();
++            }
++
++            map.compute(stacktrace, (ThrowableWithEquals keyInMap0, SyncLoadInformation valueInMap) -> {
++                if (valueInMap == null) {
++                    valueInMap = new SyncLoadInformation();
++                }
++
++                ++valueInMap.times;
++
++                valueInMap.coordinateTimes.compute(IOUtil.getCoordinateKey(chunkX, chunkZ), (Long keyInMap1, Integer valueInMap1) -> {
++                    return valueInMap1 == null ? Integer.valueOf(1) : Integer.valueOf(valueInMap1.intValue() + 1);
++                });
++
++                return valueInMap;
++            });
++
++            return map;
++        });
++    }
++
++    public static JsonObject serialize() {
++        final JsonObject ret = new JsonObject();
++
++        final JsonArray worldsData = new JsonArray();
++
++        for (final Map.Entry<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> entry : SYNC_LOADS.entrySet()) {
++            final Level world = entry.getKey();
++
++            final JsonObject worldData = new JsonObject();
++
++            worldData.addProperty("name", world.getWorld().getName());
++
++            final List<Pair<ThrowableWithEquals, SyncLoadInformation>> data = new ArrayList<>();
++
++            entry.getValue().forEach((ThrowableWithEquals stacktrace, SyncLoadInformation times) -> {
++                data.add(new Pair<>(stacktrace, times));
++            });
++
++            data.sort((Pair<ThrowableWithEquals, SyncLoadInformation> pair1, Pair<ThrowableWithEquals, SyncLoadInformation> pair2) -> {
++                return Integer.compare(pair2.getSecond().times, pair1.getSecond().times); // reverse order
++            });
++
++            final JsonArray stacktraces = new JsonArray();
++
++            for (Pair<ThrowableWithEquals, SyncLoadInformation> pair : data) {
++                final JsonObject stacktrace = new JsonObject();
++
++                stacktrace.addProperty("times", pair.getSecond().times);
++
++                final JsonArray traces = new JsonArray();
++
++                for (StackTraceElement element : pair.getFirst().stacktrace) {
++                    traces.add(String.valueOf(element));
++                }
++
++                stacktrace.add("stacktrace", traces);
++
++                final JsonArray coordinates = new JsonArray();
++
++                for (Long2IntMap.Entry coordinate : pair.getSecond().coordinateTimes.long2IntEntrySet()) {
++                    final long key = coordinate.getLongKey();
++                    final int times = coordinate.getIntValue();
++                    coordinates.add("(" + IOUtil.getCoordinateX(key) + "," + IOUtil.getCoordinateZ(key) + "): " + times);
++                }
++
++                stacktrace.add("coordinates", coordinates);
++
++                stacktraces.add(stacktrace);
++            }
++
++
++            worldData.add("stacktraces", stacktraces);
++            worldsData.add(worldData);
++        }
++
++        ret.add("worlds", worldsData);
++
++        return ret;
++    }
++
++    static final class ThrowableWithEquals {
++
++        private final StackTraceElement[] stacktrace;
++        private final int hash;
++
++        public ThrowableWithEquals(final StackTraceElement[] stacktrace) {
++            this.stacktrace = stacktrace;
++            this.hash = ThrowableWithEquals.hash(stacktrace);
++        }
++
++        public static int hash(final StackTraceElement[] stacktrace) {
++            int hash = 0;
++
++            for (int i = 0; i < stacktrace.length; ++i) {
++                hash *= 31;
++                hash += stacktrace[i].hashCode();
++            }
++
++            return hash;
++        }
++
++        @Override
++        public int hashCode() {
++            return this.hash;
++        }
++
++        @Override
++        public boolean equals(final Object obj) {
++            if (obj == null || obj.getClass() != this.getClass()) {
++                return false;
++            }
++
++            final ThrowableWithEquals other = (ThrowableWithEquals)obj;
++            final StackTraceElement[] otherStackTrace = other.stacktrace;
++
++            if (this.stacktrace.length != otherStackTrace.length || this.hash != other.hash) {
++                return false;
++            }
++
++            if (this == obj) {
++                return true;
++            }
++
++            for (int i = 0; i < this.stacktrace.length; ++i) {
++                if (!this.stacktrace[i].equals(otherStackTrace[i])) {
++                    return false;
++                }
++            }
++
++            return true;
++        }
++    }
++}
+diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+index c22b7cfdcff46161444cd145a50678e982f2f645..acb710c25a3b1a151a6dbf579a871529f077b70f 100644
+--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
++++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+@@ -483,6 +483,7 @@ public class ServerChunkCache extends ChunkSource {
+                 this.level.asyncChunkTaskManager.raisePriority(x1, z1, com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGHEST_PRIORITY);
+                 com.destroystokyo.paper.io.chunk.ChunkTaskManager.pushChunkWait(this.level, x1, z1);
+                 // Paper end
++                com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x1, z1); // Paper - sync load info
+                 this.level.timings.syncChunkLoad.startTiming(); // Paper
+             chunkproviderserver_a.managedBlock(completablefuture::isDone);
+                 com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 5a397c3f0f21ec8dc9b7ceecbc873cdf6843e203..0eed1e0c2c87f9c5ab14ad2d4971e3724ab2135d 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -280,6 +280,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+     };
+     public final com.destroystokyo.paper.io.chunk.ChunkTaskManager asyncChunkTaskManager;
+     // Paper end
++    // Paper start
++    @Override
++    public boolean hasChunk(int chunkX, int chunkZ) {
++        return this.getChunkSource().getChunkAtIfLoadedImmediately(chunkX, chunkZ) != null;
++    }
++    // Paper end
+ 
+     // Paper start - optimise getPlayerByUUID
+     @Nullable
diff --git a/patches/server/0373-Allow-overriding-the-java-version-check.patch b/patches/server/0374-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/0373-Allow-overriding-the-java-version-check.patch
rename to patches/server/0374-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0374-Add-ThrownEggHatchEvent.patch b/patches/server/0375-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0374-Add-ThrownEggHatchEvent.patch
rename to patches/server/0375-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0375-Optimise-random-block-ticking.patch b/patches/server/0376-Optimise-random-block-ticking.patch
similarity index 97%
rename from patches/server/0375-Optimise-random-block-ticking.patch
rename to patches/server/0376-Optimise-random-block-ticking.patch
index 99d760959..dce97879c 100644
--- a/patches/server/0375-Optimise-random-block-ticking.patch
+++ b/patches/server/0376-Optimise-random-block-ticking.patch
@@ -71,10 +71,10 @@ index 0000000000000000000000000000000000000000..3edc8e52e06a62ce9f8cc734fd7458b3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c5070975be1ceeab20ad0b3bab790426adb5e5fa..86ee1b535a6e586fd4e9e3c37f439d81b4508939 100644
+index 0eed1e0c2c87f9c5ab14ad2d4971e3724ab2135d..69207f264d68e7181b8d3681ac18e0f9c5d74ec8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -667,7 +667,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -673,7 +673,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          });
      }
  
@@ -88,7 +88,7 @@ index c5070975be1ceeab20ad0b3bab790426adb5e5fa..86ee1b535a6e586fd4e9e3c37f439d81
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
          int j = chunkcoordintpair.getMinBlockX();
-@@ -675,10 +680,10 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -681,10 +686,10 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -101,7 +101,7 @@ index c5070975be1ceeab20ad0b3bab790426adb5e5fa..86ee1b535a6e586fd4e9e3c37f439d81
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * paperConfig.skeleHorseSpawnChance && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
-@@ -701,66 +706,81 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -707,66 +712,81 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          }
  
          gameprofilerfiller.popPush("iceandsnow");
@@ -253,7 +253,7 @@ index 9b955a027bd2c3cbcfa659a41a6687221c5fea63..6c036335b28258cd8c268173d73707af
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index e638d982b4bd1d261a7282cad6dab98ad0b55213..e305173fd1652a8b88ae8a9b94d0fae083e2da95 100644
+index 925f16d5eb092518ef774f69a8d99689feb0f5d7..01d8af06f19427354cac95d691e65d31253fef94 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -91,7 +91,7 @@ public class Turtle extends Animal {
@@ -266,7 +266,7 @@ index e638d982b4bd1d261a7282cad6dab98ad0b55213..e305173fd1652a8b88ae8a9b94d0fae0
  
      public BlockPos getHomePos() { // Paper - public
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 641f022c4c716e0441a098f4540fd008059a4b51..944b28b55a38352dfb49aeecca3f196502cb04e8 100644
+index f3b100976a374cf9f1c3473788e9ff5b55f00ff5..3468c331208978f37dfed96b02be950e019f8a40 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1305,10 +1305,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -290,7 +290,7 @@ index 641f022c4c716e0441a098f4540fd008059a4b51..944b28b55a38352dfb49aeecca3f1965
  
      public boolean noSave() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index f6b591f045ae992180806fd6aba309c0d04e722b..338e93a1855cf0e535e8a9897cffaff1d2e87279 100644
+index a088cb005525fda2c9d5521ab3bac43cfa38a393..1782be43f1dbe2776abe5087d305e271c62285dd 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -568,6 +568,7 @@ public class LevelChunk implements ChunkAccess {
diff --git a/patches/server/0376-Entity-Jump-API.patch b/patches/server/0377-Entity-Jump-API.patch
similarity index 97%
rename from patches/server/0376-Entity-Jump-API.patch
rename to patches/server/0377-Entity-Jump-API.patch
index 9511d73f6..a03b52adc 100644
--- a/patches/server/0376-Entity-Jump-API.patch
+++ b/patches/server/0377-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 02609533a9c8ae70d50fa81bd0e42af6aca2ee62..40e5324e19e91640ce39245d8d9f69850903f166 100644
+index 13bb9c49847df699263977864dec52752ee4cf28..6f036c7e2fa26359cc850e30c6107180512f7e7b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3158,8 +3158,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0377-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0378-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 94%
rename from patches/server/0377-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0378-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 276ef35f7..a7f4c5548 100644
--- a/patches/server/0377-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0378-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a69efd1a21a667c5eee539f6c761755479375527..8b460378d8c2dd1942404f332d4012acb5687773 100644
+index 154866506a33cf2185891cd5051d51de9e2e4584..5ce5cdb4f6c703fa93f808527d2bca706d748c70 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -443,6 +443,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index a69efd1a21a667c5eee539f6c761755479375527..8b460378d8c2dd1942404f332d4012ac
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b4694693814ca37ca33fef10bd87e05c228c9fa1..eb35b18f4875367723ed2e57f19fabca4360ed54 100644
+index 1569ef6efd811c173dc421761f433152cca9f9ea..745d540572b901ae4a20dd13486d0bbc8aba9573 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -308,6 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0378-Make-the-GUI-graph-fancier.patch b/patches/server/0379-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0378-Make-the-GUI-graph-fancier.patch
rename to patches/server/0379-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0379-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0380-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from patches/server/0379-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0380-add-hand-to-BlockMultiPlaceEvent.patch
index 633352946..a2f176a4a 100644
--- a/patches/server/0379-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0380-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4524d1af433750d763599dc990b8eda511ec0bad..60226f5c408ebd83c958d6644204bfc03365638a 100644
+index 9a84ac5aa03c645037daec23cc4422106a6ace1d..8e4bd4818cf9d50dec7b94e5f1263086b6a6b86a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -339,13 +339,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0380-Prevent-teleporting-dead-entities.patch b/patches/server/0381-Prevent-teleporting-dead-entities.patch
similarity index 91%
rename from patches/server/0380-Prevent-teleporting-dead-entities.patch
rename to patches/server/0381-Prevent-teleporting-dead-entities.patch
index 3def460b5..e6bd62bbc 100644
--- a/patches/server/0380-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0381-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9c5eba2cbd7399c8e3f8c5c3dad228ded6d57832..85a82c8bb98edec526260680ddfbcb36926b97ee 100644
+index 58c5fd6518cf7a05725a840f6051ed0548eb1cd6..2e7b909750ee512dce40b8574dfb62ed68fbbfb6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1501,6 +1501,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0381-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0382-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0381-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0382-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0382-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 95%
rename from patches/server/0382-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 89293c2bd..692500127 100644
--- a/patches/server/0382-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8b460378d8c2dd1942404f332d4012acb5687773..a2b1e2c3c4bd958b6ec7b7de5561747d3a2075d2 100644
+index 5ce5cdb4f6c703fa93f808527d2bca706d748c70..fc1c65a4b3c3d5e52d967a3174d8373ddde95e4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -382,6 +382,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0383-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0384-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0383-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0384-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0384-Optimise-Chunk-getFluid.patch b/patches/server/0385-Optimise-Chunk-getFluid.patch
similarity index 96%
rename from patches/server/0384-Optimise-Chunk-getFluid.patch
rename to patches/server/0385-Optimise-Chunk-getFluid.patch
index 07dd478b1..864d8af90 100644
--- a/patches/server/0384-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0385-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 338e93a1855cf0e535e8a9897cffaff1d2e87279..a4398502dd0cbbceb00cffc68702d34bf8ed7e8f 100644
+index 1782be43f1dbe2776abe5087d305e271c62285dd..30e3dc506ecf7430b4cc5d3ac51627da8de8b1ba 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -461,18 +461,20 @@ public class LevelChunk implements ChunkAccess {
diff --git a/patches/server/0385-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0386-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from patches/server/0385-Optimise-TickListServer-by-rewriting-it.patch
rename to patches/server/0386-Optimise-TickListServer-by-rewriting-it.patch
index 16152bd34..e2b948537 100644
--- a/patches/server/0385-Optimise-TickListServer-by-rewriting-it.patch
+++ b/patches/server/0386-Optimise-TickListServer-by-rewriting-it.patch
@@ -889,7 +889,7 @@ index 0000000000000000000000000000000000000000..118988c39e58f28e8a2851792b9c014f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 995d7977233f0d7683c00a75c3833f9a1eba7f92..58369d70bcd8b2c25609b6f101d9cbe2031df352 100644
+index 8fff5580a88fd1643845967eb7bdab2630777e91..97faf7ece336928f22e518a14653b4fbc672d876 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -86,6 +86,19 @@ public class ChunkHolder {
@@ -924,7 +924,7 @@ index 995d7977233f0d7683c00a75c3833f9a1eba7f92..58369d70bcd8b2c25609b6f101d9cbe2
              });
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 56aa640eb0096e5c5f1a34d6f11a4dd9ac8770df..a81c773cc281ba390d3ce44c52c43710b43829a5 100644
+index acb710c25a3b1a151a6dbf579a871529f077b70f..b0ff4a46807994e3afe4c8dc3810ecdd43b68025 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -220,6 +220,12 @@ public class ServerChunkCache extends ChunkSource {
@@ -941,10 +941,10 @@ index 56aa640eb0096e5c5f1a34d6f11a4dd9ac8770df..a81c773cc281ba390d3ce44c52c43710
      public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean flag, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<DimensionDataStorage> supplier) {
          this.level = world;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 86ee1b535a6e586fd4e9e3c37f439d81b4508939..d037b14b34658e2f13d7e77f06576c406abc8a60 100644
+index 69207f264d68e7181b8d3681ac18e0f9c5d74ec8..ee5d6c21f49749cfd40e81c2cdff72b0b3ed6fba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -289,6 +289,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -295,6 +295,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      }
      // Paper end
  
@@ -960,7 +960,7 @@ index 86ee1b535a6e586fd4e9e3c37f439d81b4508939..d037b14b34658e2f13d7e77f06576c40
      // Add env and gen to constructor, WorldData -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, ServerLevelData iworlddataserver, ResourceKey<net.minecraft.world.level.Level> resourcekey, DimensionType dimensionmanager, ChunkProgressListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-@@ -305,13 +314,19 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -311,13 +320,19 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          DefaultedRegistry registryblocks = Registry.BLOCK;
  
          Objects.requireNonNull(registryblocks);
@@ -981,7 +981,7 @@ index 86ee1b535a6e586fd4e9e3c37f439d81b4508939..d037b14b34658e2f13d7e77f06576c40
          this.navigatingMobs = new ObjectOpenHashSet();
          this.blockEvents = new ObjectLinkedOpenHashSet();
          this.dragonParts = new Int2ObjectOpenHashMap();
-@@ -632,7 +647,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -638,7 +653,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          if (this.tickTime) {
              long i = this.levelData.getGameTime() + 1L;
  
diff --git a/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 97%
rename from patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 2a6264e46..09481b0d3 100644
--- a/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c3f2cdedf7b9c2ff9e33b823cb20890cba0ded8a..8f1dcdb3b1beddb5698f596c048869d99e1f4437 100644
+index 0c9aa7fb4d42c63c920a002050941299e3847d95..11a8b71fb3c7ba24f6e4986d241328ad369407c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -430,10 +430,21 @@ public class PaperWorldConfig {
@@ -36,7 +36,7 @@ index c3f2cdedf7b9c2ff9e33b823cb20890cba0ded8a..8f1dcdb3b1beddb5698f596c048869d9
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ec7804e80f9c6b0fc53eb67823c6325a685c850b..9e6d6db0782751895afe345b4d6f586389ec2392 100644
+index e896224cec9eede23a890975888076bfe94f8a0a..6f976946f742b4139b01dfa692a901b15f02a836 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -214,6 +214,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 95%
rename from patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 2ce1c37a1..aa2b091de 100644
--- a/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 50724baf5eb207ce44be62509f9a024d9a0e10f3..9b6dd82e5e6e4ba6290e1931c2e9756d93f323d8 100644
+index 8e2ebb2ba724d94c5723d82affc01ccb264c95c5..2639f64f1a50faddc0284fb26b73b563b3e9eba9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -409,6 +409,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 92%
rename from patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 3d4273a71..ade168b48 100644
--- a/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -26,10 +26,10 @@ index ebcfe31c8395aa2bbcc9a9ac74d4c6e1f2e5d0f7..46976a0ef5098e6d794653078111a9dc
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 70de3413da219cc79a86e39893abc3f6f658f729..ba58d33810916bb8c3ac649f1e6e41354d17cde0 100644
+index ee5d6c21f49749cfd40e81c2cdff72b0b3ed6fba..5a73812bace35923bb4dbbfcf691427aa9eaa671 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2120,7 +2120,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -2126,7 +2126,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -38,7 +38,7 @@ index 70de3413da219cc79a86e39893abc3f6f658f729..ba58d33810916bb8c3ac649f1e6e4135
              if (entity instanceof ServerPlayer) {
                  ServerLevel.this.players.add((ServerPlayer) entity);
                  ServerLevel.this.updateSleepingPlayerList();
-@@ -2142,6 +2142,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -2148,6 +2148,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              }
  
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0391-Optimize-Collision-to-not-load-chunks.patch
similarity index 98%
rename from patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0391-Optimize-Collision-to-not-load-chunks.patch
index a57bb431d..1566f7452 100644
--- a/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0391-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 2730923bd0bf3b0f928765b9e09e2299fa9a393d..f98a1c32e0c209473cf7268cbd8245ab
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb35b18f4875367723ed2e57f19fabca4360ed54..07630fabdc3e824572d7f551f3a876133fc253fe 100644
+index 745d540572b901ae4a20dd13486d0bbc8aba9573..581f80c490932f66f57e7a91d8738e09521f5a1c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0391-Don-t-tick-dead-players.patch b/patches/server/0392-Don-t-tick-dead-players.patch
similarity index 91%
rename from patches/server/0391-Don-t-tick-dead-players.patch
rename to patches/server/0392-Don-t-tick-dead-players.patch
index 157807e58..bb688ed97 100644
--- a/patches/server/0391-Don-t-tick-dead-players.patch
+++ b/patches/server/0392-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9e6d6db0782751895afe345b4d6f586389ec2392..8fc75890eb7342ff9339789434b031ef9a6a5000 100644
+index 6f976946f742b4139b01dfa692a901b15f02a836..e4a5b89a12c52ccca4f72823e8d7a5d5a689ff16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -638,7 +638,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0393-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 90%
rename from patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0393-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 51a1431c6..ca71554c1 100644
--- a/patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0393-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4c9261c68518ab7429325f0366dfb2930663288c..a3d31cec6d1b8de700b6cd2f7f51398debef5b6d 100644
+index 857346b755454956268cc594bb03dc060f2a4aac..1b47cf893174a64dcbf3771738b6c6d443c193af 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1106,7 +1106,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0393-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 99%
rename from patches/server/0393-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to patches/server/0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index 3765943fe..8c9691af9 100644
--- a/patches/server/0393-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/patches/server/0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -233,10 +233,10 @@ index 46976a0ef5098e6d794653078111a9dcc1a151d2..1e366262306aedcd4b3236a6895d30fb
          while (objectbidirectionaliterator.hasNext()) {
              Entry<ChunkHolder> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 20a99b62b3466e4853e8d23576133dc728f7927f..302313f72b27fc4c58399c8c2d0bb3bf0cb1f8ab 100644
+index b0ff4a46807994e3afe4c8dc3810ecdd43b68025..d8cd652f76232b43b104b11247682288e99d9521 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -766,7 +766,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -767,7 +767,7 @@ public class ServerChunkCache extends ChunkSource {
              };
              // Paper end
              this.level.timings.chunkTicks.startTiming(); // Paper
diff --git a/patches/server/0394-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 94%
rename from patches/server/0394-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to patches/server/0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index f70626a47..48733b701 100644
--- a/patches/server/0394-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/patches/server/0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -147,10 +147,10 @@ index 494a3afaaa0e3496d30e8d97edbab62b21610dfe..fa3a9d763f7072c68b126ce95fee191a
                  // Spigot Start
                  CrashReport crashreport;
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d2140a16b1e 100644
+index d8cd652f76232b43b104b11247682288e99d9521..b464db85829f2f97926791056b339b937e25ed03 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -703,6 +703,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -704,6 +704,7 @@ public class ServerChunkCache extends ChunkSource {
          this.level.getProfiler().push("purge");
          this.level.timings.doChunkMap.startTiming(); // Spigot
          this.distanceManager.purgeStaleTickets();
@@ -158,7 +158,7 @@ index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d21
          this.runDistanceManagerUpdates();
          this.level.timings.doChunkMap.stopTiming(); // Spigot
          this.level.getProfiler().popPush("chunks");
-@@ -712,6 +713,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -713,6 +714,7 @@ public class ServerChunkCache extends ChunkSource {
          this.level.timings.doChunkUnload.startTiming(); // Spigot
          this.level.getProfiler().popPush("unload");
          this.chunkMap.tick(booleansupplier);
@@ -166,7 +166,7 @@ index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d21
          this.level.timings.doChunkUnload.stopTiming(); // Spigot
          this.level.getProfiler().pop();
          this.clearCache();
-@@ -766,7 +768,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -767,7 +769,7 @@ public class ServerChunkCache extends ChunkSource {
              };
              // Paper end
              this.level.timings.chunkTicks.startTiming(); // Paper
@@ -175,7 +175,7 @@ index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d21
                  Optional<LevelChunk> optional = ((Either) playerchunk.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left();
  
                  if (optional.isPresent()) {
-@@ -783,6 +785,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -784,6 +786,7 @@ public class ServerChunkCache extends ChunkSource {
                          chunk.setInhabitedTime(chunk.getInhabitedTime() + j);
                          if (flag1 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunk.getPos()) && !this.chunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot
                              NaturalSpawner.spawnForChunk(this.level, chunk, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag2);
@@ -183,7 +183,7 @@ index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d21
                          }
  
                          // this.level.timings.doTickTiles.startTiming(); // Spigot // Paper
-@@ -950,6 +953,41 @@ public class ServerChunkCache extends ChunkSource {
+@@ -951,6 +954,41 @@ public class ServerChunkCache extends ChunkSource {
              super.doRunTask(task);
          }
  
@@ -226,10 +226,10 @@ index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d21
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
          public boolean pollTask() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9cdfd1c8bce3adb5d3ad6d970c6f46ca75f3a952..70106dda486d685dffafc0d4b3ae95b4861c6342 100644
+index 5a73812bace35923bb4dbbfcf691427aa9eaa671..2188666675192cb02e0bccf845cf7863486a305b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -581,6 +581,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -587,6 +587,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          }
          timings.scheduledBlocks.stopTiming(); // Paper
  
@@ -237,7 +237,7 @@ index 9cdfd1c8bce3adb5d3ad6d970c6f46ca75f3a952..70106dda486d685dffafc0d4b3ae95b4
          gameprofilerfiller.popPush("raid");
          this.timings.raids.startTiming(); // Paper - timings
          this.raids.tick();
-@@ -589,6 +590,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -595,6 +596,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          timings.doSounds.startTiming(); // Spigot
          this.runBlockEvents();
          timings.doSounds.stopTiming(); // Spigot
@@ -245,7 +245,7 @@ index 9cdfd1c8bce3adb5d3ad6d970c6f46ca75f3a952..70106dda486d685dffafc0d4b3ae95b4
          this.handlingTick = false;
          gameprofilerfiller.pop();
          boolean flag3 = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
-@@ -635,10 +637,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -641,10 +643,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              timings.entityTick.stopTiming(); // Spigot
              timings.tickEntities.stopTiming(); // Spigot
              gameprofilerfiller.pop();
diff --git a/patches/server/0395-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0395-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0396-Add-tick-times-API-and-mspt-command.patch b/patches/server/0397-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0396-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0397-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0397-Expose-MinecraftServer-isRunning.patch b/patches/server/0398-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0397-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0398-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0398-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0398-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0399-Remove-streams-from-Mob-AI-System.patch b/patches/server/0400-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from patches/server/0399-Remove-streams-from-Mob-AI-System.patch
rename to patches/server/0400-Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/0400-Async-command-map-building.patch b/patches/server/0401-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0400-Async-command-map-building.patch
rename to patches/server/0401-Async-command-map-building.patch
diff --git a/patches/server/0401-Improved-Watchdog-Support.patch b/patches/server/0402-Improved-Watchdog-Support.patch
similarity index 98%
rename from patches/server/0401-Improved-Watchdog-Support.patch
rename to patches/server/0402-Improved-Watchdog-Support.patch
index b979bd4e0..de067e6a2 100644
--- a/patches/server/0401-Improved-Watchdog-Support.patch
+++ b/patches/server/0402-Improved-Watchdog-Support.patch
@@ -262,7 +262,7 @@ index 0511f1921193b78cbf4d8426136bf1f79746f955..e5f7f043cbdb28d85b8aa0eea7cbaeb5
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a80c4517cd0d2c5e7b71b4f86b6a8d441a9eb64e..3994cefe74481efd5d779f22c752aadc22b4749b 100644
+index 1e366262306aedcd4b3236a6895d30fb35e3cc51..196c0722c15b169cecde139ddd75689298c80949 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -606,6 +606,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -287,7 +287,7 @@ index 18485689bcbf7818c3ca5b82086acef51888603b..3431d28fd69c634ee0a941796308b88b
  
          // Paper start - Remove from collideRule team if needed
 diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
-index 0ef3c4982df88a7991a56d983ac733daa8adc507..cdd797c6fc7507a0e6376f7d9c521be8f1d6decc 100644
+index 7bf4bf5cb2c1b54a7e2733091f48f3a824336d36..dcce05d2f4ab16424db4ab103a12188e207a457b 100644
 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
 +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
 @@ -148,6 +148,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
@@ -299,7 +299,7 @@ index 0ef3c4982df88a7991a56d983ac733daa8adc507..cdd797c6fc7507a0e6376f7d9c521be8
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 944b28b55a38352dfb49aeecca3f196502cb04e8..54fcdcef2a6b68e4b4f4c6a090e84919fe76b073 100644
+index 3468c331208978f37dfed96b02be950e019f8a40..668d6256df12888a5a15109365d9a4f1d004d9d6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -842,6 +842,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -311,7 +311,7 @@ index 944b28b55a38352dfb49aeecca3f196502cb04e8..54fcdcef2a6b68e4b4f4c6a090e84919
              String msg = "Entity threw exception at " + entity.level.getWorld().getName() + ":" + entity.getX() + "," + entity.getY() + "," + entity.getZ();
              System.err.println(msg);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index a4398502dd0cbbceb00cffc68702d34bf8ed7e8f..bde00ca058f32eb55e940614f0fbc361fe3a501d 100644
+index 30e3dc506ecf7430b4cc5d3ac51627da8de8b1ba..be5dfaa7259e5415e3ccbefdc2eae402fe2aebe0 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1320,6 +1320,7 @@ public class LevelChunk implements ChunkAccess {
diff --git a/patches/server/0402-Optimize-Pathfinding.patch b/patches/server/0403-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0402-Optimize-Pathfinding.patch
rename to patches/server/0403-Optimize-Pathfinding.patch
diff --git a/patches/server/0403-Reduce-Either-Optional-allocation.patch b/patches/server/0404-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0403-Reduce-Either-Optional-allocation.patch
rename to patches/server/0404-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0404-Remove-streams-from-PairedQueue.patch b/patches/server/0405-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from patches/server/0404-Remove-streams-from-PairedQueue.patch
rename to patches/server/0405-Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/0405-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0405-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0406-Prevent-opening-inventories-when-frozen.patch b/patches/server/0407-Prevent-opening-inventories-when-frozen.patch
similarity index 97%
rename from patches/server/0406-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0407-Prevent-opening-inventories-when-frozen.patch
index 83b4bcfc7..af5ae17d6 100644
--- a/patches/server/0406-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0407-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 58da115a0c2f34c63ae3614acb0d6f8711069e7b..37fcc83cbaf8e80809c994b18f5a7f3f6d807202 100644
+index 10489f6f76c1ac64365b677acda43efe640093c6..c8adcdbb8075ab8a1645c4dd809f7de31ad13d34 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -609,7 +609,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0407-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0408-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0407-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0408-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0408-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 93%
rename from patches/server/0408-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
index d3c2a05ff..c8a8254e4 100644
--- a/patches/server/0408-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 40e5324e19e91640ce39245d8d9f69850903f166..6d5323acfe22bb6fa8c84ef7ff32fdfc2e4d5f9c 100644
+index 6f036c7e2fa26359cc850e30c6107180512f7e7b..919f230c7ebe3707e9517e2b733db0b57b7853de 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3255,10 +3255,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0409-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from patches/server/0409-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/0410-Implement-Player-Client-Options-API.patch b/patches/server/0411-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0410-Implement-Player-Client-Options-API.patch
rename to patches/server/0411-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0411-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 92%
rename from patches/server/0411-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
index e7af5f978..7d26e3a87 100644
--- a/patches/server/0411-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash
 for heightmaps.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3994cefe74481efd5d779f22c752aadc22b4749b..dede8863193423858f6d60cc942919e52f28b607 100644
+index 196c0722c15b169cecde139ddd75689298c80949..874b7d4947d452c64b7a2f37c3091ba7aed18c4d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -190,6 +190,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -46,10 +46,10 @@ index 3994cefe74481efd5d779f22c752aadc22b4749b..dede8863193423858f6d60cc942919e5
  
          completablefuture1.thenAcceptAsync((either) -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 90decfade57b2f17cdcc9188962c2d2140a16b1e..60cdb1f5c3f329b417f340f1d2651d89c244e439 100644
+index b464db85829f2f97926791056b339b937e25ed03..c8c873f9e7fd1a8ea2d32f37be6d221408b7687d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -1000,6 +1000,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -1001,6 +1001,7 @@ public class ServerChunkCache extends ChunkSource {
                  return super.pollTask() || execChunkTask; // Paper
              }
          } finally {
diff --git a/patches/server/0412-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0412-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0413-Broadcast-join-message-to-console.patch b/patches/server/0414-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0413-Broadcast-join-message-to-console.patch
rename to patches/server/0414-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0414-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0414-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0415-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from patches/server/0415-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0416-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 93%
rename from patches/server/0416-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index ed7c7447a..28b449164 100644
--- a/patches/server/0416-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e9f7191fefa7c0cf33d56abb7b2a30df261a392c..250a9b5cd47114aa4743f9695dadec2ad485f99d 100644
+index 20f861c99b11844849d75ce4606abee80da147de..5ed88a5b233267aef1c7b12fe994262efc3c9dc2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1980,9 +1980,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0417-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0417-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
index 7edc89d1d..a004a0039 100644
--- a/patches/server/0417-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6d5323acfe22bb6fa8c84ef7ff32fdfc2e4d5f9c..be3fd03803bef6de0a4667b1794e73287288feb7 100644
+index 919f230c7ebe3707e9517e2b733db0b57b7853de..88e289cbd8bbf06bd7d7a911b990c4c780232ac4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2032,7 +2032,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0418-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 95%
rename from patches/server/0418-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to patches/server/0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index e74eba128..52c10cf5a 100644
--- a/patches/server/0418-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/patches/server/0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue
 We make sure to also implement a pattern that is recursion safe too.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4fe5b75661de64474698495776ebb8232fd252aa..3e45ddc39d1283661cbfc1057aa0548d940a444a 100644
+index b64a3dd03a22542b070eae34f0eaa9b321dca4ec..218a20e85c9b6d31bcdf5432f4ea9cf0c0d7b952 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -173,17 +173,29 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0420-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0420-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch
similarity index 95%
rename from patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch
index 91912af6f..f42301d63 100644
--- a/patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8f1dcdb3b1beddb5698f596c048869d99e1f4437..98416de3dfc9d16d17124902e19cbd9b916077d2 100644
+index 11a8b71fb3c7ba24f6e4986d241328ad369407c4..5fd9490f57109235d5eae0c0d51831646ee6cdc5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -474,6 +474,13 @@ public class PaperWorldConfig {
@@ -35,7 +35,7 @@ index d17b75ad13bbc8a38cdc2f2d77ee5d88438cec31..8fb89326395a7e70982c0d757b506565
      private EntitySelector() {}
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 2ddb7b4c0a75c6f41910c84c8b9341f56fcb1116..941f86b04fedaf1e3f5d04c9aa8c1cd74da9b7a2 100644
+index f69ad3b2f19a71f1e4a1a8fb37ac63df78548871..2257391ad42219efda0b6a11f1ca0f66e377e412 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -547,6 +547,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 96%
rename from patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index fe2cca76b..a05e1ad9c 100644
--- a/patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 250a9b5cd47114aa4743f9695dadec2ad485f99d..c6e659cd766facba6411e930d3ae1d2143c2f269 100644
+index 5ed88a5b233267aef1c7b12fe994262efc3c9dc2..83dc25cfc557cd79e3e0596d9cb319bb9dafb126 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2126,11 +2126,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -80,7 +80,7 @@ index 250a9b5cd47114aa4743f9695dadec2ad485f99d..c6e659cd766facba6411e930d3ae1d21
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index cb9969d768b13863722aad3dc5daad3c10bb264a..5bfec185e15a54ee5fe6eab1aa59d1963d046262 100644
+index bbde9b758643c087733064a126d90689d71830cf..069cdfce085909991a69ebec3004d407526d469d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -611,7 +611,7 @@ public class ArmorStand extends LivingEntity {
@@ -102,7 +102,7 @@ index cb9969d768b13863722aad3dc5daad3c10bb264a..5bfec185e15a54ee5fe6eab1aa59d196
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 60226f5c408ebd83c958d6644204bfc03365638a..19724497e407c93f738c3bfaec72997dd5fe7ba1 100644
+index 8e4bd4818cf9d50dec7b94e5f1263086b6a6b86a..09c152123d055432266bbb5a1434c21aed64da1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -807,7 +807,8 @@ public class CraftEventFactory {
diff --git a/patches/server/0422-Implement-Brigadier-Mojang-API.patch b/patches/server/0423-Implement-Brigadier-Mojang-API.patch
similarity index 99%
rename from patches/server/0422-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0423-Implement-Brigadier-Mojang-API.patch
index 4916e3c24..8ce200e5b 100644
--- a/patches/server/0422-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0423-Implement-Brigadier-Mojang-API.patch
@@ -81,7 +81,7 @@ index 13e358e0eac3bfd426d924b6f745e001df76c64a..7156dea53be828acd01734fa1f9f7b9a
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 10e4be89803bcdcc8bf7ce64350464c826368ae7..33dfa5a72974f952a08ef9022b8158629a40a153 100644
+index 0d8a8b3d7a13e2384f8614bdc190768c03bb98c2..776d2d663dcbdd935a7ed7927618e2be68a562c4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -760,8 +760,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0423-Villager-Restocks-API.patch b/patches/server/0424-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0423-Villager-Restocks-API.patch
rename to patches/server/0424-Villager-Restocks-API.patch
diff --git a/patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 197d9443c..e33e36109 100644
--- a/patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 33dfa5a72974f952a08ef9022b8158629a40a153..1aa260504c9ff022a32ffbb770c8d133bbd68cfc 100644
+index 776d2d663dcbdd935a7ed7927618e2be68a562c4..7e4e2174665eaf0277c0b547fe6c9e05fdf59c81 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -877,7 +877,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0425-Expose-game-version.patch b/patches/server/0426-Expose-game-version.patch
similarity index 100%
rename from patches/server/0425-Expose-game-version.patch
rename to patches/server/0426-Expose-game-version.patch
diff --git a/patches/server/0426-Optimize-Voxel-Shape-Merging.patch b/patches/server/0427-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0426-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0427-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0428-Implement-Mob-Goal-API.patch b/patches/server/0429-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0428-Implement-Mob-Goal-API.patch
rename to patches/server/0429-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch
index 3df5bd58b..e5721178a 100644
--- a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch
@@ -18,7 +18,7 @@ index 11fd6d24ed0612e4df1a0493907178fb9c455d1c..d7023cb0974f6c28a0fb8a0a6e5a6600
          return initialDistance;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3e45ddc39d1283661cbfc1057aa0548d940a444a..f4a31d340ea9629dea70eec4e339cfd869a73ed9 100644
+index 218a20e85c9b6d31bcdf5432f4ea9cf0c0d7b952..31eabc0260750ab1bf1618fcf666f10fb3e0a877 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -58,6 +58,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
@@ -312,7 +312,7 @@ index 28afe2f238ded241acf77c3272a44068646b9133..6b492b72b177e3c58580561585609b17
          List<Entity> list = this.entity.getPassengers();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c6e659cd766facba6411e930d3ae1d2143c2f269..57d8b712cbdcc1ff082e9313d50dedafa239f50e 100644
+index 83dc25cfc557cd79e3e0596d9cb319bb9dafb126..b2a53fde2ba0316c33a4bfc58020849d5db02b51 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -50,6 +50,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 97%
rename from patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch
index 71825c2d6..68b095a32 100644
--- a/patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize isOutsideRange to use distance maps
 Use a distance map to find the players in range quickly
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 58369d70bcd8b2c25609b6f101d9cbe2031df352..969b0c9cf6d7eb2055d3b804f25a3cbc161ceaea 100644
+index 97faf7ece336928f22e518a14653b4fbc672d876..c2401b2ff0547335ddbbeb05c07b74552c246fc9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -100,6 +100,18 @@ public class ChunkHolder {
@@ -37,7 +37,7 @@ index 58369d70bcd8b2c25609b6f101d9cbe2031df352..969b0c9cf6d7eb2055d3b804f25a3cbc
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f4a31d340ea9629dea70eec4e339cfd869a73ed9..450ab55859304ecda6f752b0e4a04279f4104af1 100644
+index 31eabc0260750ab1bf1618fcf666f10fb3e0a877..bb00445ecf50051cf3966ee10be645e2a0d2519e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -236,6 +236,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -291,10 +291,10 @@ index b49d380ef088aed3204ec71abc437c348ef004fa..577b391dcba1db712c1e2c83296e1c87
  
      public String getDebugStatus() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 3d1c4f8e0db37c6dabece657a17595e7bf1e3dc2..3faa808f41f057a9956c697ec1323330f5920b86 100644
+index c8c873f9e7fd1a8ea2d32f37be6d221408b7687d..e46ccbca0cfa63dd5143080375193a95a9249d60 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -729,6 +729,37 @@ public class ServerChunkCache extends ChunkSource {
+@@ -730,6 +730,37 @@ public class ServerChunkCache extends ChunkSource {
          boolean flag1 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
  
          if (!flag) {
@@ -332,7 +332,7 @@ index 3d1c4f8e0db37c6dabece657a17595e7bf1e3dc2..3faa808f41f057a9956c697ec1323330
              this.level.getProfiler().push("pollingChunks");
              int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
              boolean flag2 = level.ticksPerAnimalSpawns != 0L && worlddata.getGameTime() % level.ticksPerAnimalSpawns == 0L; // CraftBukkit
-@@ -758,15 +789,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -759,15 +790,7 @@ public class ServerChunkCache extends ChunkSource {
              this.level.getProfiler().pop();
              //List<PlayerChunk> list = Lists.newArrayList(this.playerChunkMap.f()); // Paper
              //Collections.shuffle(list); // Paper
@@ -349,7 +349,7 @@ index 3d1c4f8e0db37c6dabece657a17595e7bf1e3dc2..3faa808f41f057a9956c697ec1323330
              this.level.timings.chunkTicks.startTiming(); // Paper
              final int[] chunksTicked = {0}; this.chunkMap.forEachVisibleChunk((playerchunk) -> { // Paper - safe iterator incase chunk loads, also no wrapping
                  Optional<LevelChunk> optional = ((Either) playerchunk.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left();
-@@ -781,9 +804,9 @@ public class ServerChunkCache extends ChunkSource {
+@@ -782,9 +805,9 @@ public class ServerChunkCache extends ChunkSource {
                      this.level.getProfiler().pop();
                      ChunkPos chunkcoordintpair = chunk.getPos();
  
@@ -362,7 +362,7 @@ index 3d1c4f8e0db37c6dabece657a17595e7bf1e3dc2..3faa808f41f057a9956c697ec1323330
                              if (chunksTicked[0]++ % 10 == 0) this.level.getServer().midTickLoadChunks(); // Paper
                          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 61f9eda59684c08884c4a621effb1705db592a53..a01227f1b6d3589a6f56c9289824a1503a32c878 100644
+index f0d574307b24d19d3006e5c53b650c75436bde38..d59e707f28a5f04545208ad33d122fc433b85933 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -244,6 +244,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0431-Add-villager-reputation-API.patch b/patches/server/0432-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0431-Add-villager-reputation-API.patch
rename to patches/server/0432-Add-villager-reputation-API.patch
diff --git a/patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 94%
rename from patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch
index 6b5ce39ed..80fea3882 100644
--- a/patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 98416de3dfc9d16d17124902e19cbd9b916077d2..b10de4e99913030bae7451b3242067312e94df7e 100644
+index 5fd9490f57109235d5eae0c0d51831646ee6cdc5..0fbddcb318e353b54c68dd543355be698e99c2d7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -356,6 +356,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 98416de3dfc9d16d17124902e19cbd9b916077d2..b10de4e99913030bae7451b324206731
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 19724497e407c93f738c3bfaec72997dd5fe7ba1..4ad9dae575ea55b422e7b03b7eaf341ac0796d2c 100644
+index 09c152123d055432266bbb5a1434c21aed64da1f..7b59cfc35968a82c5db78c5107b175d994df3535 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -610,16 +610,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0433-ExperienceOrbMergeEvent.patch b/patches/server/0434-ExperienceOrbMergeEvent.patch
similarity index 94%
rename from patches/server/0433-ExperienceOrbMergeEvent.patch
rename to patches/server/0434-ExperienceOrbMergeEvent.patch
index 1099425eb..725b4bd05 100644
--- a/patches/server/0433-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0434-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4ad9dae575ea55b422e7b03b7eaf341ac0796d2c..e508f75158423e8c4a59af18a094dfa36b9c180c 100644
+index 7b59cfc35968a82c5db78c5107b175d994df3535..1ee76da3b609bf91e9e8529eb402d670b32e4b18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -620,7 +620,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0434-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0435-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0434-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0435-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0435-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0436-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0435-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0436-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0436-Potential-bed-API.patch b/patches/server/0437-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0436-Potential-bed-API.patch
rename to patches/server/0437-Potential-bed-API.patch
diff --git a/patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0438-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0438-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 18f52c03f..557036844 100644
--- a/patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -56,7 +56,7 @@ index cdf214fca3b0055efa56702470d9d2f890a8aead..a12af10e28f2d023ba6f916b5e7a5353
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 54fcdcef2a6b68e4b4f4c6a090e84919fe76b073..f004f5012ce157f9b0fb9c5890b5f3de957418f8 100644
+index 668d6256df12888a5a15109365d9a4f1d004d9d6..d9697003d05ddc344207793b4f266743fcaef16c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -424,6 +424,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0440-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0441-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0440-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0441-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index b595c247f..60d4c2116 100644
--- a/patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 450ab55859304ecda6f752b0e4a04279f4104af1..f722d9e77fa074847a2bdc6a117816d176eb6dca 100644
+index bb00445ecf50051cf3966ee10be645e2a0d2519e..57b95c9e85d2341c00d54cacd71a8784cad3e5e7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -2101,9 +2101,14 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
diff --git a/patches/server/0442-Ensure-safe-gateway-teleport.patch b/patches/server/0443-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0442-Ensure-safe-gateway-teleport.patch
rename to patches/server/0443-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0443-Add-option-for-console-having-all-permissions.patch b/patches/server/0444-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0443-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0444-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0444-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/0444-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0445-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/0445-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0446-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0447-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0446-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0447-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0447-Maps-shouldn-t-load-chunks.patch b/patches/server/0448-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0447-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0448-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0448-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0448-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0449-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from patches/server/0449-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 38b1b71ec..f47b431bf 100644
--- a/patches/server/0449-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b10de4e99913030bae7451b3242067312e94df7e..d2b1ef727004906d184995a840657e22ea127f71 100644
+index 0fbddcb318e353b54c68dd543355be698e99c2d7..1bfa826d36a2e4b72a4b97fc6d4731fac8bf199f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -492,6 +492,15 @@ public class PaperWorldConfig {
diff --git a/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0451-Optimize-Bit-Operations-by-inlining.patch
similarity index 99%
rename from patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0451-Optimize-Bit-Operations-by-inlining.patch
index 0dcb98cfb..6aaa10c4f 100644
--- a/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0451-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 dd1d76867ac3832ad515f304925c595c9a021c8f..fd5c22a3d281d8d913c353c8a668ec51b885066a 100644
+index 86618513e8f777d1d738b230c97eb527ddce7c26..8f0cf4297015f3cbe709e2eb82280cac72489925 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/0451-incremental-chunk-saving.patch b/patches/server/0452-incremental-chunk-saving.patch
similarity index 95%
rename from patches/server/0451-incremental-chunk-saving.patch
rename to patches/server/0452-incremental-chunk-saving.patch
index ad4e15eae..e48e3fc30 100644
--- a/patches/server/0451-incremental-chunk-saving.patch
+++ b/patches/server/0452-incremental-chunk-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2b1ef727004906d184995a840657e22ea127f71..040956f5d714ac014f9a153981d444db299fd826 100644
+index 1bfa826d36a2e4b72a4b97fc6d4731fac8bf199f..a22abda177b0ffc9699fb23aaac8680261f385fe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -44,6 +44,21 @@ public class PaperWorldConfig {
@@ -72,7 +72,7 @@ index 11dbe48c8a8c29cd28d725c43505e326a6e626ff..363dcebb3b2d5a2512776a191f6716ed
          this.profiler.push("snooper");
          if (((DedicatedServer) this).getProperties().snooperEnabled && !this.snooper.isStarted() && this.tickCount > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 969b0c9cf6d7eb2055d3b804f25a3cbc161ceaea..1f67c9c5f7161ea687983e7ae0ec7d259da9acd3 100644
+index c2401b2ff0547335ddbbeb05c07b74552c246fc9..c1db5cc45dbc7dd24a1ef4dbf88a8efb6c7f2d57 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -111,6 +111,8 @@ public class ChunkHolder {
@@ -139,7 +139,7 @@ index 969b0c9cf6d7eb2055d3b804f25a3cbc161ceaea..1f67c9c5f7161ea687983e7ae0ec7d25
          for (int i = 0; i < this.futures.length(); ++i) {
              CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completablefuture = (CompletableFuture) this.futures.get(i);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f722d9e77fa074847a2bdc6a117816d176eb6dca..8982823efd8fd21d403c6c6fb158d57a9da67707 100644
+index 57b95c9e85d2341c00d54cacd71a8784cad3e5e7..89f73e8a7f5b429c89d051b44ea6c9cbecb97730 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -92,6 +92,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
@@ -240,10 +240,10 @@ index f722d9e77fa074847a2bdc6a117816d176eb6dca..8982823efd8fd21d403c6c6fb158d57a
              ChunkPos chunkcoordintpair = chunk.getPos();
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 3faa808f41f057a9956c697ec1323330f5920b86..7ab28e9bd3f785838b7fa4ac5811c0e71cddcb61 100644
+index e46ccbca0cfa63dd5143080375193a95a9249d60..094c07c3208b0c05f918b7ee19f1d5b9ceeece47 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -671,6 +671,15 @@ public class ServerChunkCache extends ChunkSource {
+@@ -672,6 +672,15 @@ public class ServerChunkCache extends ChunkSource {
          } // Paper - Timings
      }
  
@@ -260,10 +260,10 @@ index 3faa808f41f057a9956c697ec1323330f5920b86..7ab28e9bd3f785838b7fa4ac5811c0e7
      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 70106dda486d685dffafc0d4b3ae95b4861c6342..74753639ed095eab305c2facd0f00264a6253cef 100644
+index 2188666675192cb02e0bccf845cf7863486a305b..225823ef8bb4171f770f90f083689850aa6a171e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1017,6 +1017,38 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1023,6 +1023,38 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
@@ -303,7 +303,7 @@ index 70106dda486d685dffafc0d4b3ae95b4861c6342..74753639ed095eab305c2facd0f00264
          ServerChunkCache chunkproviderserver = this.getChunkSource();
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index 91f5106cfe7914389b52a1ed001117b13e4f9768..31ea618547e0e452f9a495796a4197e718abbfa6 100644
+index a857953f3488e79fd601ac63881bc4d87708afa7..3cf3b0486f786d7d043cce75767753e1cdacf781 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 @@ -29,6 +29,7 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
@@ -315,7 +315,7 @@ index 91f5106cfe7914389b52a1ed001117b13e4f9768..31ea618547e0e452f9a495796a4197e7
      default boolean generateFlatBedrock() {
          if (this instanceof ProtoChunk) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index bde00ca058f32eb55e940614f0fbc361fe3a501d..fe46fdb828d630f9dc9b212128608203f6c6f4bb 100644
+index be5dfaa7259e5415e3ccbefdc2eae402fe2aebe0..6d7c90b3f41a2e5a1514fa32e1e088f5be9cb90d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -108,6 +108,13 @@ public class LevelChunk implements ChunkAccess {
diff --git a/patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0453-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0453-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0454-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0454-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0455-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0455-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0456-Fix-sand-duping.patch b/patches/server/0457-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0456-Fix-sand-duping.patch
rename to patches/server/0457-Fix-sand-duping.patch
diff --git a/patches/server/0457-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0457-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch
index e3a18ba40..ebc568335 100644
--- a/patches/server/0457-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1aa260504c9ff022a32ffbb770c8d133bbd68cfc..72d8936660f2f6c43e4f6c220b60eef20ac2d055 100644
+index 7e4e2174665eaf0277c0b547fe6c9e05fdf59c81..3493fb7f526cb713340475734f176aa52ade2d12 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1345,6 +1345,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0458-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0458-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0459-Expose-Arrow-getItemStack.patch b/patches/server/0460-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0459-Expose-Arrow-getItemStack.patch
rename to patches/server/0460-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0460-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from patches/server/0460-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 4d47bb7fc..ee6dbe988 100644
--- a/patches/server/0460-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 72d8936660f2f6c43e4f6c220b60eef20ac2d055..8c182e3e4f81a6fc6554e8014e30c0cecf91cf5c 100644
+index 3493fb7f526cb713340475734f176aa52ade2d12..ff0cb2ca36f052c55f2bd37b74c33b2192a03873 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2778,9 +2778,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0461-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0461-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0462-Add-permission-for-command-blocks.patch b/patches/server/0463-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0462-Add-permission-for-command-blocks.patch
rename to patches/server/0463-Add-permission-for-command-blocks.patch
index e1dcbcf07..a6d7b47ff 100644
--- a/patches/server/0462-Add-permission-for-command-blocks.patch
+++ b/patches/server/0463-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index a695e5a0c2e8846333ccb9aea499b5656af35163..c21c5134308a2a83fb50bfe37f05d19c
                  return false;
              } else if (this.player.blockActionRestricted((Level) this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8c182e3e4f81a6fc6554e8014e30c0cecf91cf5c..2011ef91d026117be267cc3ea84d49a3288dd9ca 100644
+index ff0cb2ca36f052c55f2bd37b74c33b2192a03873..56e93709ce955a7c65dc2b058b5b8b8a646d1775 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -788,7 +788,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0463-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 94%
rename from patches/server/0463-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch
index 2878f8259..372fcd18b 100644
--- a/patches/server/0463-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 57d8b712cbdcc1ff082e9313d50dedafa239f50e..13b6cf4b3d5af77263051a5b17fa2b9da9803596 100644
+index b2a53fde2ba0316c33a4bfc58020849d5db02b51..9d08ebbbf2f3ff710022fb3ef1fce802a15f1b4e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -540,7 +540,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0464-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 97%
rename from patches/server/0464-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch
index 6c43f0ba8..b2caef690 100644
--- a/patches/server/0464-Optimize-WorldBorder-collision-checks-and-air.patch
+++ b/patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 13b6cf4b3d5af77263051a5b17fa2b9da9803596..28f9b58c379306138f1528d91f2112c21ae9cb0a 100644
+index 9d08ebbbf2f3ff710022fb3ef1fce802a15f1b4e..d961faf2609ef820d27837b8f0bf6382f9ce97b6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1024,7 +1024,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0465-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0465-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 6a136884e..74c27d6ed 100644
--- a/patches/server/0465-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -63,7 +63,7 @@ index e5f7f043cbdb28d85b8aa0eea7cbaeb584e5fb85..a5c1114f9b323e8a49c84d0e68461e47
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2011ef91d026117be267cc3ea84d49a3288dd9ca..c4a25ac9aad94c5ef610505db6d7539fa12cd31d 100644
+index 56e93709ce955a7c65dc2b058b5b8b8a646d1775..fecb2a6b8674ca110d6af539396873e9dcdc0edb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3041,7 +3041,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0466-Paper-dumpitem-command.patch b/patches/server/0467-Paper-dumpitem-command.patch
similarity index 83%
rename from patches/server/0466-Paper-dumpitem-command.patch
rename to patches/server/0467-Paper-dumpitem-command.patch
index 730a0fb6c..22793d827 100644
--- a/patches/server/0466-Paper-dumpitem-command.patch
+++ b/patches/server/0467-Paper-dumpitem-command.patch
@@ -6,10 +6,10 @@ 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 7b5afc5d34b78e6404c1a5c6bb823d9589471f13..1700681197ca2ff47ea1618b06d811aa4f06ac7d 100644
+index de45163023f436d386e90e6ded5e6105ba3ecf35..8fdfcf001cf2ed6184d86ee033ede08fdf9aa5d6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerPlayer;
+@@ -20,6 +20,7 @@ import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.server.level.ThreadedLevelLightEngine;
  import net.minecraft.world.entity.EntityType;
  import net.minecraft.world.level.ChunkPos;
@@ -17,7 +17,7 @@ index 7b5afc5d34b78e6404c1a5c6bb823d9589471f13..1700681197ca2ff47ea1618b06d811aa
  import net.minecraft.resources.ResourceLocation;
  import net.minecraft.server.MCUtil;
  import org.apache.commons.lang3.tuple.MutablePair;
-@@ -27,7 +28,9 @@ import org.bukkit.command.CommandSender;
+@@ -33,7 +34,9 @@ import org.bukkit.command.CommandSender;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
  import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -26,17 +26,17 @@ index 7b5afc5d34b78e6404c1a5c6bb823d9589471f13..1700681197ca2ff47ea1618b06d811aa
 +import org.bukkit.inventory.ItemStack;
  
  import java.io.File;
- import java.time.LocalDateTime;
-@@ -47,7 +50,7 @@ import java.util.stream.Collectors;
+ import java.io.FileOutputStream;
+@@ -56,7 +59,7 @@ import java.util.stream.Collectors;
  
  public class PaperCommand extends Command {
      private static final String BASE_PERM = "bukkit.command.paper.";
--    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight").build();
-+    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "dumpitem").build();
+-    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "syncloadinfo").build();
++    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "syncloadinfo", "dumpitem").build();
  
      public PaperCommand(String name) {
          super(name);
-@@ -156,6 +159,9 @@ public class PaperCommand extends Command {
+@@ -165,6 +168,9 @@ public class PaperCommand extends Command {
              case "reload":
                  doReload(sender);
                  break;
@@ -46,7 +46,7 @@ index 7b5afc5d34b78e6404c1a5c6bb823d9589471f13..1700681197ca2ff47ea1618b06d811aa
              case "debug":
                  doDebug(sender, args);
                  break;
-@@ -420,6 +426,19 @@ public class PaperCommand extends Command {
+@@ -466,6 +472,19 @@ public class PaperCommand extends Command {
  
          Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
      }
diff --git a/patches/server/0467-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0467-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0468-Improve-Legacy-Component-serialization-size.patch b/patches/server/0469-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0468-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0469-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0470-Support-old-UUID-format-for-NBT.patch b/patches/server/0471-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0470-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0471-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0471-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0471-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0472-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0472-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 6688abf87..97254f1f3 100644
--- a/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -949,7 +949,7 @@ index d94241bcca4f2fd5e464a860bd356af504dc68b7..864c78ae0f0b3b50b8ea22b709c1f16b
          public void runAllUpdates() {
              super.runAllUpdates();
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 08c3707e67b79de9347db9a66d3d68fedb09ab1d..76a3aafcc191cd4fd6ea43fc08e044a0a87a6ae5 100644
+index 094c07c3208b0c05f918b7ee19f1d5b9ceeece47..275d9bdd884ca4ac7e57fc042d044eb49485191a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -446,6 +446,26 @@ public class ServerChunkCache extends ChunkSource {
@@ -988,7 +988,7 @@ index 08c3707e67b79de9347db9a66d3d68fedb09ab1d..76a3aafcc191cd4fd6ea43fc08e044a0
                  this.level.asyncChunkTaskManager.raisePriority(x1, z1, com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGHEST_PRIORITY);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.pushChunkWait(this.level, x1, z1);
                  // Paper end
-@@ -493,6 +515,8 @@ public class ServerChunkCache extends ChunkSource {
+@@ -494,6 +516,8 @@ public class ServerChunkCache extends ChunkSource {
              chunkproviderserver_a.managedBlock(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
                  this.level.timings.syncChunkLoad.stopTiming(); // Paper
@@ -997,7 +997,7 @@ index 08c3707e67b79de9347db9a66d3d68fedb09ab1d..76a3aafcc191cd4fd6ea43fc08e044a0
              } // Paper
              ichunkaccess = (ChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> {
                  return ichunkaccess1;
-@@ -566,10 +590,12 @@ public class ServerChunkCache extends ChunkSource {
+@@ -567,10 +591,12 @@ public class ServerChunkCache extends ChunkSource {
          if (flag && !currentlyUnloading) {
              // CraftBukkit end
              this.distanceManager.addTicket(TicketType.UNKNOWN, chunkcoordintpair, l, chunkcoordintpair);
@@ -1010,7 +1010,7 @@ index 08c3707e67b79de9347db9a66d3d68fedb09ab1d..76a3aafcc191cd4fd6ea43fc08e044a0
                  this.runDistanceManagerUpdates();
                  playerchunk = this.getVisibleChunkIfPresent(k);
                  gameprofilerfiller.pop();
-@@ -578,8 +604,13 @@ public class ServerChunkCache extends ChunkSource {
+@@ -579,8 +605,13 @@ public class ServerChunkCache extends ChunkSource {
                  }
              }
          }
@@ -1026,7 +1026,7 @@ index 08c3707e67b79de9347db9a66d3d68fedb09ab1d..76a3aafcc191cd4fd6ea43fc08e044a0
      }
  
      private boolean chunkAbsent(@Nullable ChunkHolder holder, int maxLevel) {
-@@ -631,6 +662,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -632,6 +663,7 @@ public class ServerChunkCache extends ChunkSource {
      }
  
      public boolean runDistanceManagerUpdates() {
diff --git a/patches/server/0474-Remove-some-streams-from-structures.patch b/patches/server/0475-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0474-Remove-some-streams-from-structures.patch
rename to patches/server/0475-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 98%
rename from patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch
index d24c65f43..33f04fdb7 100644
--- a/patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove streams from classes related villager gossip
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-index e316f83a7adc7bba06a6a3fdab55cc9c004cb835..bd661bcaf5eb65a4f34eec268ced84894d7d0898 100644
+index 39c0fbae8b94dabd27ee8687015557c6a9279813..5fb4d8f8627d795ca152573d57fc0c8c25105e51 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
 @@ -8,6 +8,7 @@ import com.mojang.serialization.Dynamic;
diff --git a/patches/server/0476-Support-components-in-ItemMeta.patch b/patches/server/0477-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0476-Support-components-in-ItemMeta.patch
rename to patches/server/0477-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0477-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0477-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0478-Add-entity-liquid-API.patch b/patches/server/0479-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0478-Add-entity-liquid-API.patch
rename to patches/server/0479-Add-entity-liquid-API.patch
diff --git a/patches/server/0479-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0480-Update-itemstack-legacy-name-and-lore.patch
similarity index 97%
rename from patches/server/0479-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0480-Update-itemstack-legacy-name-and-lore.patch
index 02b04dfbf..47781d395 100644
--- a/patches/server/0479-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0480-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 10f55ba189d12c46e0ef38b0b96a29894b4fba93..c1667fa43194a17eeeb2ac9c5d57daf5cb131958 100644
+index d0cf2ab939392b8bf6558a69d5110a8c18c092b8..b2a88d2005795d8d92c3f550d9f8eeb316a45298 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/0480-Spawn-player-in-correct-world-on-login.patch b/patches/server/0481-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0480-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0481-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0481-Add-PrepareResultEvent.patch b/patches/server/0482-Add-PrepareResultEvent.patch
similarity index 98%
rename from patches/server/0481-Add-PrepareResultEvent.patch
rename to patches/server/0482-Add-PrepareResultEvent.patch
index 77eb7d1eb..b1ec371b6 100644
--- a/patches/server/0481-Add-PrepareResultEvent.patch
+++ b/patches/server/0482-Add-PrepareResultEvent.patch
@@ -106,7 +106,7 @@ index ddd34b07f7cf39a8b5ad51bdefb6e9d7cbf8f393..eac9765ecf0b33cab8b04204591de8d5
  
      private void setupRecipeList(Container input, ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e508f75158423e8c4a59af18a094dfa36b9c180c..ff5d9baa5f961a6be7d5d73bfb78cb5de1b8cfe9 100644
+index 1ee76da3b609bf91e9e8529eb402d670b32e4b18..c25586aa8d2e9ddaa7839020ecb499b12d5fe381 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1529,19 +1529,44 @@ public class CraftEventFactory {
diff --git a/patches/server/0482-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0482-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0483-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 90%
rename from patches/server/0483-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 5d004d5a0..f106c6611 100644
--- a/patches/server/0483-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0484-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 be3fd03803bef6de0a4667b1794e73287288feb7..42256b8c55c94f5c80834bf3a62b680b70c7cd10 100644
+index 88e289cbd8bbf06bd7d7a911b990c4c780232ac4..d9f867b2d3688c3b5e5ed1d754e3d1d1567af383 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3352,7 +3352,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0484-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0485-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0484-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0485-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0485-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0486-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0485-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0486-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0486-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0487-Fix-arrows-never-despawning-MC-125757.patch
similarity index 94%
rename from patches/server/0486-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0487-Fix-arrows-never-despawning-MC-125757.patch
index 33bedb131..06ffd5248 100644
--- a/patches/server/0486-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0487-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 988986d549dae93cfcb8147126c84f263efe3452..b6b729424dfade696cdf7117fc2bdf0dba03485f 100644
+index 65faf775b786f9c237ee33c1fb0f8ab9f37d738c..8b91d86b8d5594d526e5ce7943572b91c70ef7f2 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -198,6 +198,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0487-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0488-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0487-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0488-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0488-Move-range-check-for-block-placing-up.patch b/patches/server/0489-Move-range-check-for-block-placing-up.patch
similarity index 96%
rename from patches/server/0488-Move-range-check-for-block-placing-up.patch
rename to patches/server/0489-Move-range-check-for-block-placing-up.patch
index dc297131f..38e707701 100644
--- a/patches/server/0488-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0489-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 91a06e1ac325fe80aaadaf213d40495f4ce15e53..d1574bf0a326212898378b72b44c1b08e633dc27 100644
+index 6476d2a478b85116061a13f7ef2a5fec2ade4a04..003cd8a304420671d487c9e55622d9578aa75b3a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1694,17 +1694,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0489-Fix-SPIGOT-5989.patch b/patches/server/0490-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0489-Fix-SPIGOT-5989.patch
rename to patches/server/0490-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0490-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0491-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0490-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0491-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0491-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0492-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0491-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0492-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0492-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0493-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0492-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0493-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0493-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0494-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0493-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0494-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0494-Fix-some-rails-connecting-improperly.patch b/patches/server/0495-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0494-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0495-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0495-Incremental-player-saving.patch b/patches/server/0496-Incremental-player-saving.patch
similarity index 98%
rename from patches/server/0495-Incremental-player-saving.patch
rename to patches/server/0496-Incremental-player-saving.patch
index d2651f5fd..7edc7644c 100644
--- a/patches/server/0495-Incremental-player-saving.patch
+++ b/patches/server/0496-Incremental-player-saving.patch
@@ -55,7 +55,7 @@ index 1feda8b44364c748497174944b26abc4f058f354..1889de77a5e3d9371005b6bd451e2c0e
          } // 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 2bf25f90f760c1a5ee025a0ebaaccd9285a4db7f..fb56655df35c8a2cee8f5c4bb47a155054d850f8 100644
+index 8cbfcbc795c920420bd1906576dfc766910e9e62..76bfe9ce15b76be95397b9cb0c27dd125b8bc423 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 {
diff --git a/patches/server/0496-Fix-MC-187716-Use-configured-height.patch b/patches/server/0497-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0496-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0497-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0497-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0498-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0497-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0498-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0498-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0499-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0498-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0499-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0499-Brand-support.patch b/patches/server/0500-Brand-support.patch
similarity index 97%
rename from patches/server/0499-Brand-support.patch
rename to patches/server/0500-Brand-support.patch
index 9d3791bab..ea8b2ead1 100644
--- a/patches/server/0499-Brand-support.patch
+++ b/patches/server/0500-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d1574bf0a326212898378b72b44c1b08e633dc27..d7c0d82eecb6c601a0ef038ec970a3b657691107 100644
+index 003cd8a304420671d487c9e55622d9578aa75b3a..6caae980ab043b8d48479e0849e1e297a78eb97a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
diff --git a/patches/server/0500-Add-setMaxPlayers-API.patch b/patches/server/0501-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0500-Add-setMaxPlayers-API.patch
rename to patches/server/0501-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0501-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0502-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0501-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0502-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0502-Don-t-require-FACING-data.patch b/patches/server/0503-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0502-Don-t-require-FACING-data.patch
rename to patches/server/0503-Don-t-require-FACING-data.patch
diff --git a/patches/server/0503-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 94%
rename from patches/server/0503-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 8750c499d..5be1afd62 100644
--- a/patches/server/0503-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,10 +5,10 @@ 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 74753639ed095eab305c2facd0f00264a6253cef..93d31c6f4d05625c2fab1bd7166922323dac4b47 100644
+index 225823ef8bb4171f770f90f083689850aa6a171e..8221b271aa18252b9883fbaf3982b467406ec56b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1675,12 +1675,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1681,12 +1681,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      }
      // Paper end
  
diff --git a/patches/server/0504-Add-moon-phase-API.patch b/patches/server/0505-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0504-Add-moon-phase-API.patch
rename to patches/server/0505-Add-moon-phase-API.patch
diff --git a/patches/server/0505-Prevent-headless-pistons-from-being-created.patch b/patches/server/0506-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0505-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0506-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0506-Add-BellRingEvent.patch b/patches/server/0507-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0506-Add-BellRingEvent.patch
rename to patches/server/0507-Add-BellRingEvent.patch
diff --git a/patches/server/0507-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0508-Add-zombie-targets-turtle-egg-config.patch
similarity index 95%
rename from patches/server/0507-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0508-Add-zombie-targets-turtle-egg-config.patch
index b65976440..2d6100cdb 100644
--- a/patches/server/0507-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0508-Add-zombie-targets-turtle-egg-config.patch
@@ -21,7 +21,7 @@ index a22abda177b0ffc9699fb23aaac8680261f385fe..a14989c20275c49b0e6eaba52f3e06b2
      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/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index b036cbb9a1b6bcac91ffc8ee659fc95d6e04d5d4..3125aad3b14a185bbd563827f07c15bbb1ef0895 100644
+index 299dc59535d2cd73de346618731c65bc01063b66..15f445e7d7250f274351cc5e46cc952d3630de5a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -109,7 +109,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0508-Buffer-joins-to-world.patch b/patches/server/0509-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0508-Buffer-joins-to-world.patch
rename to patches/server/0509-Buffer-joins-to-world.patch
diff --git a/patches/server/0509-Optimize-redstone-algorithm.patch b/patches/server/0510-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0509-Optimize-redstone-algorithm.patch
rename to patches/server/0510-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0510-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0511-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 98%
rename from patches/server/0510-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0511-Fix-hex-colors-not-working-in-some-kick-messages.patch
index b6d9c1b71..1a3323117 100644
--- a/patches/server/0510-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0511-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 49308829885a473906d58fb17797127faabfcf31..21ed58d746cb0734cc45574888ed03886e7c411a 100644
+index 3a7cc4f8ee62c8ff726ecf3e669c9f9ba5651487..93f52208785c1632e945a49ce1f91a50c4c2fb03 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/0511-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0512-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 98%
rename from patches/server/0511-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0512-PortalCreateEvent-needs-to-know-its-entity.patch
index 2f93746b8..12974f967 100644
--- a/patches/server/0511-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0512-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 c1667fa43194a17eeeb2ac9c5d57daf5cb131958..a994dd9833ff66eef311b637c59f16a57ddcfe5f 100644
+index b2a88d2005795d8d92c3f550d9f8eeb316a45298..2c73eec83af8bbf7f1dba08315542c94f81512a6 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 {
diff --git a/patches/server/0512-Fix-CraftTeam-null-check.patch b/patches/server/0513-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0512-Fix-CraftTeam-null-check.patch
rename to patches/server/0513-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0513-Add-more-Evoker-API.patch b/patches/server/0514-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0513-Add-more-Evoker-API.patch
rename to patches/server/0514-Add-more-Evoker-API.patch
diff --git a/patches/server/0514-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 97%
rename from patches/server/0514-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index 3a237da51..48d5e01eb 100644
--- a/patches/server/0514-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/patches/server/0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
@@ -45,7 +45,7 @@ index 64c304cab8c7c4c9c29f73465f99c11f224a72bd..b31eaa1459690d7f54989ba7a01f96a3
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 88d5c7a0d7de2e896433d85fbd5425351f51b64d..1e387ba8552484b10ae276e1eea47d77d121e19d 100644
+index d18f8d7c699893740fa709ef1f0caa4390e7eb20..62b5070f9645fec91d016988f0f2262fd61e2e89 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -43,6 +43,7 @@ import org.bukkit.Registry;
diff --git a/patches/server/0515-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0516-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0515-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0516-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0516-Cache-block-data-strings.patch b/patches/server/0517-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0516-Cache-block-data-strings.patch
rename to patches/server/0517-Cache-block-data-strings.patch
diff --git a/patches/server/0517-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 96%
rename from patches/server/0517-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 3689035e0..dedafd733 100644
--- a/patches/server/0517-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d7c0d82eecb6c601a0ef038ec970a3b657691107..5b923254ea7c8106e4ce9f7792c9c044ab06acc9 100644
+index 6caae980ab043b8d48479e0849e1e297a78eb97a..b5b5f36cbdaac7791426ed721ff7db523edbda95 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -682,7 +682,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -31,7 +31,7 @@ index d7c0d82eecb6c601a0ef038ec970a3b657691107..5b923254ea7c8106e4ce9f7792c9c044
          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 0f37c205fe401126a19191fb5382cc1b4d3f43b4..b964efb6afb090ffec505493e9bbbb88ba3efd9d 100644
+index 6ae4da8ccff3627b37c4b0c0b65d23a37513fecc..1e7e1a85195b62ccb379db020fe87bf150cab6ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -152,6 +152,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0518-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0519-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0518-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0519-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0519-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0520-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0519-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0520-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0520-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0521-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/server/0520-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0521-Extend-block-drop-capture-to-capture-all-items-added.patch
index 07fde0b28..f23301727 100644
--- a/patches/server/0520-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0521-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,10 +6,10 @@ 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 93d31c6f4d05625c2fab1bd7166922323dac4b47..fd797376447e121c56a557ea6af277654e3a1831 100644
+index 8221b271aa18252b9883fbaf3982b467406ec56b..fda07a19e9e54adb88ccac2dd0b65d5a0aeeb18a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1220,6 +1220,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1226,6 +1226,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0521-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 89%
rename from patches/server/0521-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index f2b384b6a..f71c5b364 100644
--- a/patches/server/0521-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 6a1c000d693031f0c537112963cfa52e22463f1d..506b1b9d09a0e5a26fdac0192405e8b325ce97c9 100644
+index 7a87258d1725348fe0c343540f6423885a97a560..5d9ab1f5d866f945be0d048537f697cebaa04eda 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -372,6 +372,7 @@ public class ChunkHolder {
diff --git a/patches/server/0522-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 88%
rename from patches/server/0522-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 1500ec007..a288b713c 100644
--- a/patches/server/0522-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b964efb6afb090ffec505493e9bbbb88ba3efd9d..2de83f4f507c87347b58ba2102a87bbb2d7ceb7b 100644
+index 1e7e1a85195b62ccb379db020fe87bf150cab6ba..80b8e5751dd4c2617602ac2fc81263233b549a5e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3904,4 +3904,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -21,7 +21,7 @@ index b964efb6afb090ffec505493e9bbbb88ba3efd9d..2de83f4f507c87347b58ba2102a87bbb
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1e387ba8552484b10ae276e1eea47d77d121e19d..2984f5fa036019bb35a603690c568fc5c7b855d6 100644
+index 62b5070f9645fec91d016988f0f2262fd61e2e89..cd51115b7c56e7eeab1248f39a690fc91524efd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -443,6 +443,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0523-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0524-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0523-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0524-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0524-Entity-isTicking.patch b/patches/server/0525-Entity-isTicking.patch
similarity index 95%
rename from patches/server/0524-Entity-isTicking.patch
rename to patches/server/0525-Entity-isTicking.patch
index 0ddc48599..8d0a7f9bb 100644
--- a/patches/server/0524-Entity-isTicking.patch
+++ b/patches/server/0525-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2de83f4f507c87347b58ba2102a87bbb2d7ceb7b..15b48d9e6caf8d28438e161dcf2c1499e938984c 100644
+index 80b8e5751dd4c2617602ac2fc81263233b549a5e..73b19cfa45225d838e5e7fd6a0903ab9f13a5859 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -52,6 +52,7 @@ import net.minecraft.resources.ResourceKey;
diff --git a/patches/server/0525-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0526-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0525-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0526-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0526-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 89%
rename from patches/server/0526-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
index d08258182..52ce40747 100644
--- a/patches/server/0526-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
+++ b/patches/server/0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CME on adding a passenger in CreatureSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 15b48d9e6caf8d28438e161dcf2c1499e938984c..c3b05e73f9f42bdc2ab5d43fa905dd4cf5e39440 100644
+index 73b19cfa45225d838e5e7fd6a0903ab9f13a5859..2e2effe72235bda3c9ef985840d4322551625ed8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3413,7 +3413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0527-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0528-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0527-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0528-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0528-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0529-Fix-for-large-move-vectors-crashing-server.patch
similarity index 97%
rename from patches/server/0528-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0529-Fix-for-large-move-vectors-crashing-server.patch
index e95f85d44..4eff17681 100644
--- a/patches/server/0528-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0529-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5b923254ea7c8106e4ce9f7792c9c044ab06acc9..70f82d410dd12d4f162ff38f7222f9d099e11e1f 100644
+index b5b5f36cbdaac7791426ed721ff7db523edbda95..36dccc209afb838cd3dbdfd26893cf5481d6653f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -507,19 +507,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0529-Optimise-getType-calls.patch b/patches/server/0530-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0529-Optimise-getType-calls.patch
rename to patches/server/0530-Optimise-getType-calls.patch
diff --git a/patches/server/0530-Villager-resetOffers.patch b/patches/server/0531-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0530-Villager-resetOffers.patch
rename to patches/server/0531-Villager-resetOffers.patch
diff --git a/patches/server/0531-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0532-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0531-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0532-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0532-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0533-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0532-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0533-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0533-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0534-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0533-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0534-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0534-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0535-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0534-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0535-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0535-Player-elytra-boost-API.patch b/patches/server/0536-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0535-Player-elytra-boost-API.patch
rename to patches/server/0536-Player-elytra-boost-API.patch
diff --git a/patches/server/0536-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0537-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0536-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0537-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0537-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0538-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0537-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0538-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0538-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0539-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0538-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0539-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0539-Add-ignore-discounts-API.patch b/patches/server/0540-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0539-Add-ignore-discounts-API.patch
rename to patches/server/0540-Add-ignore-discounts-API.patch
diff --git a/patches/server/0540-Toggle-for-removing-existing-dragon.patch b/patches/server/0541-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0540-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0541-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0541-Fix-client-lag-on-advancement-loading.patch b/patches/server/0542-Fix-client-lag-on-advancement-loading.patch
similarity index 96%
rename from patches/server/0541-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0542-Fix-client-lag-on-advancement-loading.patch
index 94e1148e0..91c7136e5 100644
--- a/patches/server/0541-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0542-Fix-client-lag-on-advancement-loading.patch
@@ -27,7 +27,7 @@ index e05e5710c81b7dbb648afbfe16f843e7ae310752..77e262f2236318e053da136037332fbe
          if (this.isFirstPacket || !this.visibilityChanged.isEmpty() || !this.progressChanged.isEmpty()) {
              Map<ResourceLocation, AdvancementProgress> map = Maps.newHashMap();
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2984f5fa036019bb35a603690c568fc5c7b855d6..3d5f9ac267943fe2487a5cc4f9f059b169b438a8 100644
+index cd51115b7c56e7eeab1248f39a690fc91524efd7..b55d5c14000317db97f2f6e511f97ff6f03fa972 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/0542-Item-no-age-no-player-pickup.patch b/patches/server/0543-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0542-Item-no-age-no-player-pickup.patch
rename to patches/server/0543-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0544-Beacon-API-custom-effect-ranges.patch b/patches/server/0545-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0544-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0545-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0545-Add-API-for-quit-reason.patch b/patches/server/0546-Add-API-for-quit-reason.patch
similarity index 96%
rename from patches/server/0545-Add-API-for-quit-reason.patch
rename to patches/server/0546-Add-API-for-quit-reason.patch
index c43ced524..0c5ff2552 100644
--- a/patches/server/0545-Add-API-for-quit-reason.patch
+++ b/patches/server/0546-Add-API-for-quit-reason.patch
@@ -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 fb56655df35c8a2cee8f5c4bb47a155054d850f8..c289664c317c9059d131f9e8f703d2304999a3cb 100644
+index 76bfe9ce15b76be95397b9cb0c27dd125b8bc423..1caf0b803892c3f0604361835282749d15b66d20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index fb56655df35c8a2cee8f5c4bb47a155054d850f8..c289664c317c9059d131f9e8f703d230
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 70f82d410dd12d4f162ff38f7222f9d099e11e1f..642c525d09fcb580d14dab2e544816e62dc59a7a 100644
+index 36dccc209afb838cd3dbdfd26893cf5481d6653f..c49d9eb34883342e685c5363a4d33bf4519b2b3b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -444,6 +444,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0546-Seed-based-feature-search.patch b/patches/server/0547-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0546-Seed-based-feature-search.patch
rename to patches/server/0547-Seed-based-feature-search.patch
diff --git a/patches/server/0547-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0548-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0547-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0548-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0548-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0549-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0548-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0549-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0549-Expose-world-spawn-angle.patch b/patches/server/0550-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0549-Expose-world-spawn-angle.patch
rename to patches/server/0550-Expose-world-spawn-angle.patch
diff --git a/patches/server/0550-Add-Destroy-Speed-API.patch b/patches/server/0551-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0550-Add-Destroy-Speed-API.patch
rename to patches/server/0551-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0551-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0552-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0551-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0552-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0552-Add-LivingEntity-clearActiveItem.patch b/patches/server/0553-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0552-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0553-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0553-Add-PlayerItemCooldownEvent.patch b/patches/server/0554-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0553-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0554-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0554-More-lightning-API.patch b/patches/server/0555-More-lightning-API.patch
similarity index 100%
rename from patches/server/0554-More-lightning-API.patch
rename to patches/server/0555-More-lightning-API.patch
diff --git a/patches/server/0555-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0556-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0555-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0556-Climbing-should-not-bypass-cramming-gamerule.patch
index 3048c90fb..f0f5d5293 100644
--- a/patches/server/0555-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0556-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -61,7 +61,7 @@ index 8fb89326395a7e70982c0d757b506565e98b12a4..a060cca08631fb42041e3a79a9abc422
              } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 42256b8c55c94f5c80834bf3a62b680b70c7cd10..a64b2043a27261cbf6b12e8185e8a91fe6ffb468 100644
+index d9f867b2d3688c3b5e5ed1d754e3d1d1567af383..df18c754e316335d246091169584419c3b3e2a5d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3270,7 +3270,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0556-Added-missing-default-perms-for-commands.patch b/patches/server/0557-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0556-Added-missing-default-perms-for-commands.patch
rename to patches/server/0557-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0557-Add-PlayerShearBlockEvent.patch b/patches/server/0558-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0557-Add-PlayerShearBlockEvent.patch
rename to patches/server/0558-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0558-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0559-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 89%
rename from patches/server/0558-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0559-Set-spigots-verbose-world-setting-to-false-by-def.patch
index b0df4879c..814f2805e 100644
--- a/patches/server/0558-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0559-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 308de0757c219c1e5fa8bde182343c4095301cde..9f1eba32776a687c6e324ee47a2c099e745db000 100644
+index 769a492305a3ce83e0da0b3de4ebd73859d1e1d9..c931a46650ba4857805bbfa126c75a9b86b1d707 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0559-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0560-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0559-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0560-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0560-Limit-recipe-packets.patch b/patches/server/0561-Limit-recipe-packets.patch
similarity index 97%
rename from patches/server/0560-Limit-recipe-packets.patch
rename to patches/server/0561-Limit-recipe-packets.patch
index 383406629..a0203e607 100644
--- a/patches/server/0560-Limit-recipe-packets.patch
+++ b/patches/server/0561-Limit-recipe-packets.patch
@@ -23,7 +23,7 @@ index 7d50aded88f5b7dfebaea1aebc86231f7b5c4e25..652d87fc5d566dba8018c81676329f0e
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 642c525d09fcb580d14dab2e544816e62dc59a7a..2e8c7703f450e8f6fc872d78fa909f9f3d947b0c 100644
+index c49d9eb34883342e685c5363a4d33bf4519b2b3b..4d4b0c1fd4021367f16a292e6059de7f61a8ca8a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -232,6 +232,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0561-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0562-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0561-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0562-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0562-MC-4-Fix-item-position-desync.patch b/patches/server/0563-MC-4-Fix-item-position-desync.patch
similarity index 97%
rename from patches/server/0562-MC-4-Fix-item-position-desync.patch
rename to patches/server/0563-MC-4-Fix-item-position-desync.patch
index d2b8ffa80..8bffcb67c 100644
--- a/patches/server/0562-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0563-MC-4-Fix-item-position-desync.patch
@@ -41,7 +41,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9
  
      public Vec3 updateEntityPosition(Vec3 orig) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3ca07887bc67587cd820556d160037ca62c32c10..487923bcd5abe933f739e55f17a3c94d80af63b3 100644
+index 75860a8c0373d3675e3b7e20d7b427f787ebd16b..1e82f9b9fc83cd39fecd5e0a99ca457e8c371558 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3731,6 +3731,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0563-Player-Chunk-Load-Unload-Events.patch b/patches/server/0564-Player-Chunk-Load-Unload-Events.patch
similarity index 94%
rename from patches/server/0563-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0564-Player-Chunk-Load-Unload-Events.patch
index 19773457e..8850a111f 100644
--- a/patches/server/0563-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0564-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 c289664c317c9059d131f9e8f703d2304999a3cb..4d29671e38876bc6b8a2b80fa6e6f5d4200f0e9e 100644
+index 1caf0b803892c3f0604361835282749d15b66d20..3a917f0b5b616952fa6c30f492f4420083963679 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2087,11 +2087,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0564-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0565-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0564-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0565-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0565-Expose-LivingEntity-hurt-direction.patch b/patches/server/0566-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0565-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0566-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0566-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0567-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 91%
rename from patches/server/0566-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0567-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index b698f457c..0c421f800 100644
--- a/patches/server/0566-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0567-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 ff5d9baa5f961a6be7d5d73bfb78cb5de1b8cfe9..d6d6bc1ff3b9c1d303434bfc373a784b41557ed9 100644
+index c25586aa8d2e9ddaa7839020ecb499b12d5fe381..6f2c166ffc128fc3400b6d831274a2957b2d1153 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/0567-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0568-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0567-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0568-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0568-added-PlayerTradeEvent.patch b/patches/server/0569-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0568-added-PlayerTradeEvent.patch
rename to patches/server/0569-added-PlayerTradeEvent.patch
diff --git a/patches/server/0569-Implement-TargetHitEvent.patch b/patches/server/0570-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0569-Implement-TargetHitEvent.patch
rename to patches/server/0570-Implement-TargetHitEvent.patch
diff --git a/patches/server/0570-Additional-Block-Material-API-s.patch b/patches/server/0571-Additional-Block-Material-API-s.patch
similarity index 93%
rename from patches/server/0570-Additional-Block-Material-API-s.patch
rename to patches/server/0571-Additional-Block-Material-API-s.patch
index eef88ca62..fa2cbe5de 100644
--- a/patches/server/0570-Additional-Block-Material-API-s.patch
+++ b/patches/server/0571-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 597ac36c6f6748ecfbf64920da172758814b8061..f69ad3ccfe885f3acde930ea844d3bc471ce661b 100644
+index 2209587fbc4240561aeea6e525fbf22f5041e145..2379b61fff76fa39a37348a740ca5ad18fadff4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -623,6 +623,25 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0571-Fix-harming-potion-dupe.patch b/patches/server/0572-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0571-Fix-harming-potion-dupe.patch
rename to patches/server/0572-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0572-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0573-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0572-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0573-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0573-Cache-burn-durations.patch b/patches/server/0574-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0573-Cache-burn-durations.patch
rename to patches/server/0574-Cache-burn-durations.patch
diff --git a/patches/server/0574-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0575-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0574-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0575-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0575-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0576-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0575-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0576-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0576-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0577-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 95%
rename from patches/server/0576-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0577-Fix-interact-event-not-being-called-in-adventure.patch
index 557725c21..f93d83580 100644
--- a/patches/server/0576-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0577-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2e8c7703f450e8f6fc872d78fa909f9f3d947b0c..2eeca5c4cdeaf694700046fd6326608143605efe 100644
+index 4d4b0c1fd4021367f16a292e6059de7f61a8ca8a..703c5de24d2be2462cffe597f3a05d766075b128 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1734,7 +1734,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0577-Zombie-API-breaking-doors.patch b/patches/server/0578-Zombie-API-breaking-doors.patch
similarity index 90%
rename from patches/server/0577-Zombie-API-breaking-doors.patch
rename to patches/server/0578-Zombie-API-breaking-doors.patch
index 0d301fa1a..f82ca45b8 100644
--- a/patches/server/0577-Zombie-API-breaking-doors.patch
+++ b/patches/server/0578-Zombie-API-breaking-doors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie API - breaking doors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 41b5059f6fde8a1afa8c70b983750854ac0207a6..0f6e26030807f5f3011a4bb0bcd598c4674fa772 100644
+index 77e4875484bdaedfba576a6b008245c488b2a112..6caf2496395385a449b093aede3f061d6af8218a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -128,6 +128,16 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/patches/server/0578-Fix-nerfed-slime-when-splitting.patch b/patches/server/0579-Fix-nerfed-slime-when-splitting.patch
similarity index 89%
rename from patches/server/0578-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0579-Fix-nerfed-slime-when-splitting.patch
index 4ad2437b3..b6144ed23 100644
--- a/patches/server/0578-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0579-Fix-nerfed-slime-when-splitting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix nerfed slime when splitting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 6a199e148929d8df9b1f39733dd821c503380973..31ca6e693acb7f2db9ea75a38ec6286ea1ed2bd4 100644
+index e9d3e5eddaee0c8ae98755119b3c0734166cafa9..fdc01dee8a81f0376f3c0a154c4291d03ead7f8f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -241,6 +241,7 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0579-Add-EntityLoadCrossbowEvent.patch b/patches/server/0580-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0579-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0580-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0580-Guardian-beam-workaround.patch b/patches/server/0581-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0580-Guardian-beam-workaround.patch
rename to patches/server/0581-Guardian-beam-workaround.patch
diff --git a/patches/server/0581-Added-WorldGameRuleChangeEvent.patch b/patches/server/0582-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0581-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0582-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0582-Added-ServerResourcesReloadedEvent.patch b/patches/server/0583-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0582-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0583-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0583-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0584-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0583-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0584-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0584-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0585-Implemented-BlockFailedDispenseEvent.patch
similarity index 96%
rename from patches/server/0584-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0585-Implemented-BlockFailedDispenseEvent.patch
index 739be08f2..1f783330b 100644
--- a/patches/server/0584-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0585-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 d6d6bc1ff3b9c1d303434bfc373a784b41557ed9..55e64b4bbb60e793516a684ad877f356d6100db9 100644
+index 6f2c166ffc128fc3400b6d831274a2957b2d1153..ef39fd4842cb5f42a0c7b4f9b72630ac221c7501 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/0585-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0586-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0585-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0586-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0586-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0587-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0586-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0587-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0587-Configurable-door-breaking-difficulty.patch b/patches/server/0588-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0587-Configurable-door-breaking-difficulty.patch
rename to patches/server/0588-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0588-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0589-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0588-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0589-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0589-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0590-Implement-API-to-expose-exact-interaction-point.patch
similarity index 97%
rename from patches/server/0589-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0590-Implement-API-to-expose-exact-interaction-point.patch
index 7d021dd58..e41302d8f 100644
--- a/patches/server/0589-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0590-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 55e64b4bbb60e793516a684ad877f356d6100db9..223029264288c6470f624d2cdc19282dddd13240 100644
+index ef39fd4842cb5f42a0c7b4f9b72630ac221c7501..dc2a5dc3a3c0bcf3fdee5c5d61ed68f8b0212bb9 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/0590-Remove-stale-POIs.patch b/patches/server/0591-Remove-stale-POIs.patch
similarity index 87%
rename from patches/server/0590-Remove-stale-POIs.patch
rename to patches/server/0591-Remove-stale-POIs.patch
index 89164a2d2..22293e01c 100644
--- a/patches/server/0590-Remove-stale-POIs.patch
+++ b/patches/server/0591-Remove-stale-POIs.patch
@@ -5,10 +5,10 @@ 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 fd797376447e121c56a557ea6af277654e3a1831..d5cfcba5e9a496deafa32f162b6ef634eae06214 100644
+index fda07a19e9e54adb88ccac2dd0b65d5a0aeeb18a..bbdabc00ea2ca0db7fd50ddb4ecd3e14661199f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1764,6 +1764,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1770,6 +1770,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              });
              optional1.ifPresent((villageplacetype) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0591-Fix-villager-boat-exploit.patch b/patches/server/0592-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0591-Fix-villager-boat-exploit.patch
rename to patches/server/0592-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0592-Add-sendOpLevel-API.patch b/patches/server/0593-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0592-Add-sendOpLevel-API.patch
rename to patches/server/0593-Add-sendOpLevel-API.patch
diff --git a/patches/server/0593-Add-StructureLocateEvent.patch b/patches/server/0594-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0593-Add-StructureLocateEvent.patch
rename to patches/server/0594-Add-StructureLocateEvent.patch
diff --git a/patches/server/0594-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0595-Collision-option-for-requiring-a-player-participant.patch
similarity index 98%
rename from patches/server/0594-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0595-Collision-option-for-requiring-a-player-participant.patch
index c8a256ef0..6722fc23f 100644
--- a/patches/server/0594-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0595-Collision-option-for-requiring-a-player-participant.patch
@@ -28,7 +28,7 @@ index 75b4da3d38912e52e7ca4d99d51bd97e06808303..013c6f898faca8c22b805c8a476666a0
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 487923bcd5abe933f739e55f17a3c94d80af63b3..5d4bee5470795bd9f362fff5ae653794223fa182 100644
+index 1e82f9b9fc83cd39fecd5e0a99ca457e8c371558..1d29f8bb0829705aeae1b387ebf484e5eb504ef5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1587,6 +1587,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0595-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0596-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0595-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0596-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0596-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0597-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0596-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0597-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0597-Make-schedule-command-per-world.patch b/patches/server/0598-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0597-Make-schedule-command-per-world.patch
rename to patches/server/0598-Make-schedule-command-per-world.patch
diff --git a/patches/server/0598-Configurable-max-leash-distance.patch b/patches/server/0599-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0598-Configurable-max-leash-distance.patch
rename to patches/server/0599-Configurable-max-leash-distance.patch
diff --git a/patches/server/0599-Implement-BlockPreDispenseEvent.patch b/patches/server/0600-Implement-BlockPreDispenseEvent.patch
similarity index 95%
rename from patches/server/0599-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0600-Implement-BlockPreDispenseEvent.patch
index 2e97f6d99..8f7d5dd22 100644
--- a/patches/server/0599-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0600-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 223029264288c6470f624d2cdc19282dddd13240..d66622db96abb553abe05eb917e233f1be7c873b 100644
+index dc2a5dc3a3c0bcf3fdee5c5d61ed68f8b0212bb9..9e841c20c0333b47b189edca3c31b2c83a889ebb 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/0600-Added-Vanilla-Entity-Tags.patch b/patches/server/0601-Added-Vanilla-Entity-Tags.patch
similarity index 98%
rename from patches/server/0600-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0601-Added-Vanilla-Entity-Tags.patch
index 09623d60c..5085fc88e 100644
--- a/patches/server/0600-Added-Vanilla-Entity-Tags.patch
+++ b/patches/server/0601-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 3d5f9ac267943fe2487a5cc4f9f059b169b438a8..f70d7b1c9b10f59b4d9c8575b9cc35409fec11e4 100644
+index b55d5c14000317db97f2f6e511f97ff6f03fa972..af60eff6d3665f152762fa1e5a36a2461efa2c98 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/0601-added-Wither-API.patch b/patches/server/0602-added-Wither-API.patch
similarity index 100%
rename from patches/server/0601-added-Wither-API.patch
rename to patches/server/0602-added-Wither-API.patch
diff --git a/patches/server/0602-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0603-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0602-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0603-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0603-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0604-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0603-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0604-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0604-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0605-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0604-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0605-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0605-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0606-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0605-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0606-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0606-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0607-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 97%
rename from patches/server/0606-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0607-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index c0cf8f7c1..0820728b8 100644
--- a/patches/server/0606-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0607-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 c9324245d18f8268191c0a89b465ef3054dd014d..c25f80baea8857c35a3faaa82d80e2e358449a83 100644
+index 623fd2220007eec7a8e799a647e7c657aae5ee6d..ecd6ce01f541a2885384dac47095422b86e194fa 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 d66622db96abb553abe05eb917e233f1be7c873b..badba94d2a797952507d422b4ea92fc23bc5550f 100644
+index 9e841c20c0333b47b189edca3c31b2c83a889ebb..2c26ac546ae5915c200c616927e8f9ed3dc8c1f5 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/0607-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0608-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 87%
rename from patches/server/0607-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0608-Skip-distance-map-update-when-spawning-disabled.patch
index f68ef8f36..d2d3b95a7 100644
--- a/patches/server/0607-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0608-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Skip distance map update when spawning disabled.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index d13abec908dbb756272888e9ccdedbefff719012..d013d693a94369da6df00934b986b303160f5a07 100644
+index 275d9bdd884ca4ac7e57fc042d044eb49485191a..ef14a262f74865484c6ba409d29e8f5db71d76ae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -810,7 +810,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -811,7 +811,7 @@ public class ServerChunkCache extends ChunkSource {
              int l = this.distanceManager.getNaturalSpawnChunkCount();
              // Paper start - per player mob spawning
              NaturalSpawner.SpawnState spawnercreature_d; // moved down
diff --git a/patches/server/0608-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0609-Reset-shield-blocking-on-dimension-change.patch
similarity index 89%
rename from patches/server/0608-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0609-Reset-shield-blocking-on-dimension-change.patch
index f718d3b81..019470a23 100644
--- a/patches/server/0608-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0609-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 4d29671e38876bc6b8a2b80fa6e6f5d4200f0e9e..76e179089a419d4dae6bc64ef0122d03bcdd26e5 100644
+index 3a917f0b5b616952fa6c30f492f4420083963679..3d56324f65ceb7fd361244eb770792af54e5e320 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1139,6 +1139,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0609-add-DragonEggFormEvent.patch b/patches/server/0610-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0609-add-DragonEggFormEvent.patch
rename to patches/server/0610-add-DragonEggFormEvent.patch
diff --git a/patches/server/0610-EntityMoveEvent.patch b/patches/server/0611-EntityMoveEvent.patch
similarity index 95%
rename from patches/server/0610-EntityMoveEvent.patch
rename to patches/server/0611-EntityMoveEvent.patch
index 988494380..5f445a6e2 100644
--- a/patches/server/0610-EntityMoveEvent.patch
+++ b/patches/server/0611-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index 51bbb11ff8d3da95fa6d9890be3135a34b3eafac..c8213692e658f6eb82d3bd843b9525ff
  
              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 a988dcc693ab7f42fac39c4e4b5734ee1a1d72d4..a8576bbf964a9eab61c5b2ab7a8fba4be516b9ad 100644
+index bbdabc00ea2ca0db7fd50ddb4ecd3e14661199f3..e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44 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 a988dcc693ab7f42fac39c4e4b5734ee1a1d72d4..a8576bbf964a9eab61c5b2ab7a8fba4b
          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 a64b2043a27261cbf6b12e8185e8a91fe6ffb468..caf1607e5ed4d76469a5c8db7356e5911853c5d9 100644
+index df18c754e316335d246091169584419c3b3e2a5d..738d0b2e9169d6ce24c6394eb7e4fb1e396826e8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3216,6 +3216,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0611-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0612-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 89%
rename from patches/server/0611-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0612-added-option-to-disable-pathfinding-updates-on-block.patch
index 89d9ba621..6114a9121 100644
--- a/patches/server/0611-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0612-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -20,10 +20,10 @@ index 2e5321e41ece132f61718816d8f16015cee9aadd..9b507c67d12b9117671d31b9b1581764
  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 103d32b360095c179e681bd354d0b9316b050339..1f1b1a62ea9b37bc671e4df60a00c16c1027d3f6 100644
+index e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44..9a8b3647c161be8d8b87df8fff3b2d204dab6a8b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1360,6 +1360,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1366,6 +1366,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      @Override
      public void sendBlockUpdated(BlockPos pos, BlockState oldState, BlockState newState, int flags) {
          this.getChunkSource().blockChanged(pos);
@@ -31,7 +31,7 @@ index 103d32b360095c179e681bd354d0b9316b050339..1f1b1a62ea9b37bc671e4df60a00c16c
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
  
-@@ -1387,6 +1388,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1393,6 +1394,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              }
  
          }
diff --git a/patches/server/0612-Inline-shift-direction-fields.patch b/patches/server/0613-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0612-Inline-shift-direction-fields.patch
rename to patches/server/0613-Inline-shift-direction-fields.patch
diff --git a/patches/server/0613-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0614-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0613-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0614-Allow-adding-items-to-BlockDropItemEvent.patch
index d15def057..8f6f5b70a 100644
--- a/patches/server/0613-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0614-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 badba94d2a797952507d422b4ea92fc23bc5550f..f2bb96b13b3621af0079bd075798ed7f9bcb0b54 100644
+index 2c26ac546ae5915c200c616927e8f9ed3dc8c1f5..71571868090062f02579d50ae483d9f367de5016 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/0614-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0615-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0614-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0615-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0615-living-entity-allow-attribute-registration.patch b/patches/server/0616-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0615-living-entity-allow-attribute-registration.patch
rename to patches/server/0616-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0616-fix-dead-slime-setSize-invincibility.patch b/patches/server/0617-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0616-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0617-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0617-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0618-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0617-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0618-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0618-misc-debugging-dumps.patch b/patches/server/0619-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0618-misc-debugging-dumps.patch
rename to patches/server/0619-misc-debugging-dumps.patch
diff --git a/patches/server/0619-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0620-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0619-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0620-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0620-Expose-Tracked-Players.patch b/patches/server/0621-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0620-Expose-Tracked-Players.patch
rename to patches/server/0621-Expose-Tracked-Players.patch
diff --git a/patches/server/0621-Remove-streams-from-SensorNearest.patch b/patches/server/0622-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0621-Remove-streams-from-SensorNearest.patch
rename to patches/server/0622-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0622-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0623-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0622-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0623-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0623-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0624-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0623-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0624-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0624-Improve-ServerGUI.patch b/patches/server/0625-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0624-Improve-ServerGUI.patch
rename to patches/server/0625-Improve-ServerGUI.patch
diff --git a/patches/server/0625-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0626-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0625-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0626-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0626-fix-converting-txt-to-json-file.patch b/patches/server/0627-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0626-fix-converting-txt-to-json-file.patch
rename to patches/server/0627-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0627-Add-worldborder-events.patch b/patches/server/0628-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0627-Add-worldborder-events.patch
rename to patches/server/0628-Add-worldborder-events.patch
diff --git a/patches/server/0628-added-PlayerNameEntityEvent.patch b/patches/server/0629-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0628-added-PlayerNameEntityEvent.patch
rename to patches/server/0629-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0629-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0630-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0629-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0630-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0630-Add-recipe-to-cook-events.patch b/patches/server/0631-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0630-Add-recipe-to-cook-events.patch
rename to patches/server/0631-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0631-Add-Block-isValidTool.patch b/patches/server/0632-Add-Block-isValidTool.patch
similarity index 87%
rename from patches/server/0631-Add-Block-isValidTool.patch
rename to patches/server/0632-Add-Block-isValidTool.patch
index 7a3a143ae..689d2f7d8 100644
--- a/patches/server/0631-Add-Block-isValidTool.patch
+++ b/patches/server/0632-Add-Block-isValidTool.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index f69ad3ccfe885f3acde930ea844d3bc471ce661b..2f50a731216780ee6d592370c49f3a7a4d93948a 100644
+index 2379b61fff76fa39a37348a740ca5ad18fadff4f..4270431061b5a52d709b7db4ebc8c322bdd7cfdb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -819,5 +819,9 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0632-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0633-Allow-using-signs-inside-spawn-protection.patch
similarity index 96%
rename from patches/server/0632-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0633-Allow-using-signs-inside-spawn-protection.patch
index 4473da3be..104bfdd64 100644
--- a/patches/server/0632-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0633-Allow-using-signs-inside-spawn-protection.patch
@@ -20,7 +20,7 @@ index 7ef033def7bf5bfc7b9f054e3c4dd9914a0d2146..c0e4f56dc0d17322ab1ea8923f9f215e
  }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2eeca5c4cdeaf694700046fd6326608143605efe..7f7b34cc8a2c5fbf7dff8e785b067cb777808c52 100644
+index 703c5de24d2be2462cffe597f3a05d766075b128..f6cd3c60f1d07b48ce953b1e2eb71121b3790730 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1723,7 +1723,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0633-Implement-Keyed-on-World.patch b/patches/server/0634-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0633-Implement-Keyed-on-World.patch
rename to patches/server/0634-Implement-Keyed-on-World.patch
diff --git a/patches/server/0634-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0635-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0634-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0635-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0635-Item-Rarity-API.patch b/patches/server/0636-Item-Rarity-API.patch
similarity index 93%
rename from patches/server/0635-Item-Rarity-API.patch
rename to patches/server/0636-Item-Rarity-API.patch
index 0fc250e89..c6064a942 100644
--- a/patches/server/0635-Item-Rarity-API.patch
+++ b/patches/server/0636-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 f70d7b1c9b10f59b4d9c8575b9cc35409fec11e4..6816c2a5487d96e65acacef438fa43a0e3808b99 100644
+index af60eff6d3665f152762fa1e5a36a2461efa2c98..63f998b4b3008854da66f78486e1d27172d9e0e0 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/0636-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0637-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0636-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0637-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0637-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0638-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0637-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0638-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0638-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0639-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0638-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0639-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0639-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0640-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0639-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0640-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0640-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0641-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0640-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0641-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index fa05aced0..c4ee13479 100644
--- a/patches/server/0640-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0641-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f7b34cc8a2c5fbf7dff8e785b067cb777808c52..11c2dac045e78b778a82246123ced159bfd2c1de 100644
+index f6cd3c60f1d07b48ce953b1e2eb71121b3790730..435669e88d5b366531cef42df835e4d6e243f3c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1191,7 +1191,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0641-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0642-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0641-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0642-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0642-Expose-protocol-version.patch b/patches/server/0643-Expose-protocol-version.patch
similarity index 91%
rename from patches/server/0642-Expose-protocol-version.patch
rename to patches/server/0643-Expose-protocol-version.patch
index 065e44668..b8b21715c 100644
--- a/patches/server/0642-Expose-protocol-version.patch
+++ b/patches/server/0643-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 6816c2a5487d96e65acacef438fa43a0e3808b99..5c49c4e671b9d44c12f8d8efcf97305a41e5dbe1 100644
+index 63f998b4b3008854da66f78486e1d27172d9e0e0..3feebd181d0fb7ea5e08c38eb132efd2c4aac47e 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/0643-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0644-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 98%
rename from patches/server/0643-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0644-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index c3c570375..8c460a53c 100644
--- a/patches/server/0643-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0644-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 11c2dac045e78b778a82246123ced159bfd2c1de..65219df9409c6c5165288a4e255b548c06e5f307 100644
+index 435669e88d5b366531cef42df835e4d6e243f3c8..1f7ac37a1640d5fa4c93929e21bf8b84af136eea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -758,12 +758,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0644-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0645-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0644-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0645-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0645-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0646-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 92%
rename from patches/server/0645-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0646-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index be87e4558..b28922f4b 100644
--- a/patches/server/0645-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0646-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 caf1607e5ed4d76469a5c8db7356e5911853c5d9..60a7f238c721551e00f2eb60990a5d9743a8a3a7 100644
+index 738d0b2e9169d6ce24c6394eb7e4fb1e396826e8..cceba2e3dd2570962efd20d0cbbf238ccc726702 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3695,6 +3695,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0646-Add-bypass-host-check.patch b/patches/server/0647-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0646-Add-bypass-host-check.patch
rename to patches/server/0647-Add-bypass-host-check.patch
diff --git a/patches/server/0647-Set-area-affect-cloud-rotation.patch b/patches/server/0648-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0647-Set-area-affect-cloud-rotation.patch
rename to patches/server/0648-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0648-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0649-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0648-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0649-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0649-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0650-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 97%
rename from patches/server/0649-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0650-Fix-duplicating-give-items-on-item-drop-cancel.patch
index ee7bccc6a..18a1af609 100644
--- a/patches/server/0649-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0650-Fix-duplicating-give-items-on-item-drop-cancel.patch
@@ -42,7 +42,7 @@ index 58941830a4bd024fcdb97df47783c82062e9167f..a0dc380e90415de9068ea408d62a1605
                              itemEntity2.makeFakeItem();
                          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b916f629c2a0fb018cba19aaa612cbbcbb597dc1..c0b18656637cdc1ee6938c70aa281a71551e75dd 100644
+index 1b47cf893174a64dcbf3771738b6c6d443c193af..183b621cbf6fbe7cec144af69fd74461b2471142 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -689,6 +689,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0650-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0651-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0650-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0651-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0651-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0652-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0651-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0652-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0652-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0653-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0652-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0653-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0653-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0654-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0653-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0654-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0654-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0655-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0654-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0655-fix-PlayerItemHeldEvent-firing-twice.patch
index 82e941936..5070149b9 100644
--- a/patches/server/0654-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0655-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 65219df9409c6c5165288a4e255b548c06e5f307..efec476df92cd6563d7eafe120ff90bf3f959685 100644
+index 1f7ac37a1640d5fa4c93929e21bf8b84af136eea..924a2e7fbc9afbda52dda50ddf68fd408462246e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1927,6 +1927,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0655-Added-PlayerDeepSleepEvent.patch b/patches/server/0656-Added-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0655-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0656-Added-PlayerDeepSleepEvent.patch
index 70b0dcea3..dc30dd152 100644
--- a/patches/server/0655-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0656-Added-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c0b18656637cdc1ee6938c70aa281a71551e75dd..20b286fc905fa77f0d862305b73f3f74f73cfccd 100644
+index 183b621cbf6fbe7cec144af69fd74461b2471142..d286d88a3c3f93dbfa92de9421e320c92cd96350 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -247,6 +247,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0656-More-World-API.patch b/patches/server/0657-More-World-API.patch
similarity index 100%
rename from patches/server/0656-More-World-API.patch
rename to patches/server/0657-More-World-API.patch
diff --git a/patches/server/0657-Added-PlayerBedFailEnterEvent.patch b/patches/server/0658-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0657-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0658-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0658-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0659-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0658-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0659-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0659-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0660-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0659-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0660-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0660-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0661-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0660-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0661-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0661-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0662-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0661-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0662-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 1cf0db1c8..4b38ce86d 100644
--- a/patches/server/0661-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0662-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index efec476df92cd6563d7eafe120ff90bf3f959685..3bee52c6a9d449599b8547437db50daee5014017 100644
+index 924a2e7fbc9afbda52dda50ddf68fd408462246e..0b2cb820b912ddb6366f7ffb79c71047d03f2001 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2461,7 +2461,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0662-Add-Channel-initialization-listeners.patch b/patches/server/0663-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0662-Add-Channel-initialization-listeners.patch
rename to patches/server/0663-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0663-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0664-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0663-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0664-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0664-Add-more-WanderingTrader-API.patch b/patches/server/0665-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0664-Add-more-WanderingTrader-API.patch
rename to patches/server/0665-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0665-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0666-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0665-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0666-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0666-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0667-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0666-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0667-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0667-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0668-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 95%
rename from patches/server/0667-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0668-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index ce5c6a07d..6f98ab292 100644
--- a/patches/server/0667-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0668-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 21ed58d746cb0734cc45574888ed03886e7c411a..8cc84be906fc8b50429af96c346f7114a2191535 100644
+index 93f52208785c1632e945a49ce1f91a50c4c2fb03..c6840521fc0734670c50ef4519e13962416ca7a7 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/0668-Inventory-close.patch b/patches/server/0669-Inventory-close.patch
similarity index 100%
rename from patches/server/0668-Inventory-close.patch
rename to patches/server/0669-Inventory-close.patch
diff --git a/patches/server/0669-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0670-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 96%
rename from patches/server/0669-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0670-call-PortalCreateEvent-players-and-end-platform.patch
index 821306464..d6f12c46a 100644
--- a/patches/server/0669-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0670-call-PortalCreateEvent-players-and-end-platform.patch
@@ -17,7 +17,7 @@ index 8f0cf4297015f3cbe709e2eb82280cac72489925..22ea0da3836b61bb018ae974d2b8c754
              return this.set(this.getX() + dx, this.getY() + dy, this.getZ() + dz);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 76e179089a419d4dae6bc64ef0122d03bcdd26e5..753ad5a12bc523eddfffa336a20ab3e3284e6f7c 100644
+index 3d56324f65ceb7fd361244eb770792af54e5e320..a5bf54d6ad99d2cd860e9a8dc87a5dcfac5c18ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1166,15 +1166,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0670-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0671-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 98%
rename from patches/server/0670-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0671-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index f553f149e..4330fb378 100644
--- a/patches/server/0670-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0671-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -44,7 +44,7 @@ index 6b4163f5601a0961055c8451ec7ef2204938cf69..c54a37516ef1d8a76f7161917bf44812
      @Override
      public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 941f86b04fedaf1e3f5d04c9aa8c1cd74da9b7a2..11940597e0f9f87b5906f1d51a34e35046de1d1f 100644
+index 2257391ad42219efda0b6a11f1ca0f66e377e412..1ffe939bb66358391d92d3e5378865b1cc8690fd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -145,7 +145,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0671-Fix-CraftPotionBrewer-cache.patch b/patches/server/0672-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0671-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0672-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0672-Add-basic-Datapack-API.patch b/patches/server/0673-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0672-Add-basic-Datapack-API.patch
rename to patches/server/0673-Add-basic-Datapack-API.patch
diff --git a/patches/server/0673-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0674-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0673-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0674-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0674-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0675-additions-to-PlayerGameModeChangeEvent.patch
similarity index 97%
rename from patches/server/0674-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0675-additions-to-PlayerGameModeChangeEvent.patch
index 85945daee..5e4be2664 100644
--- a/patches/server/0674-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0675-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 753ad5a12bc523eddfffa336a20ab3e3284e6f7c..9f218a4b253fe2ab0e70e871eeee05bb4f0b3fcf 100644
+index a5bf54d6ad99d2cd860e9a8dc87a5dcfac5c18ac..53f6a45a505725c81ab15bd2daa1c61b024f1d68 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1783,8 +1783,15 @@ public class ServerPlayer extends Player {
@@ -123,7 +123,7 @@ index b096384cdc7596166e010e06272534b8001693c9..4b756c0a4b607faa03b00ab81761335b
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bee52c6a9d449599b8547437db50daee5014017..7ea9f362c19e5f3a67e4b5a46e708014953db480 100644
+index 0b2cb820b912ddb6366f7ffb79c71047d03f2001..52294f5cfce86faf301c835bf1a9c2a5f4f5d721 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2470,7 +2470,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0675-ItemStack-repair-check-API.patch b/patches/server/0676-ItemStack-repair-check-API.patch
similarity index 97%
rename from patches/server/0675-ItemStack-repair-check-API.patch
rename to patches/server/0676-ItemStack-repair-check-API.patch
index b8be99842..dc7bbf8b2 100644
--- a/patches/server/0675-ItemStack-repair-check-API.patch
+++ b/patches/server/0676-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 5c49c4e671b9d44c12f8d8efcf97305a41e5dbe1..e1b1c754c4ca38331cbb524358becd64957295d0 100644
+index 3feebd181d0fb7ea5e08c38eb132efd2c4aac47e..47b14e0700dca279347e5a6b5252ceba2e6a6c72 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/0676-More-Enchantment-API.patch b/patches/server/0677-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0676-More-Enchantment-API.patch
rename to patches/server/0677-More-Enchantment-API.patch
diff --git a/patches/server/0677-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0678-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0677-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0678-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0678-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0679-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0678-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0679-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0679-Add-Mob-lookAt-API.patch b/patches/server/0680-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0679-Add-Mob-lookAt-API.patch
rename to patches/server/0680-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0680-Add-Unix-domain-socket-support.patch b/patches/server/0681-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0680-Add-Unix-domain-socket-support.patch
rename to patches/server/0681-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0681-Add-EntityInsideBlockEvent.patch b/patches/server/0682-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0681-Add-EntityInsideBlockEvent.patch
rename to patches/server/0682-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0682-Attributes-API-for-item-defaults.patch b/patches/server/0683-Attributes-API-for-item-defaults.patch
similarity index 95%
rename from patches/server/0682-Attributes-API-for-item-defaults.patch
rename to patches/server/0683-Attributes-API-for-item-defaults.patch
index f6dd86b8a..21f66da58 100644
--- a/patches/server/0682-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0683-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 e1b1c754c4ca38331cbb524358becd64957295d0..e5fc463e2d2e4a1b3c394ceb21e25f1c286aeb0a 100644
+index 47b14e0700dca279347e5a6b5252ceba2e6a6c72..a2a62bfb747994c43b8b0b607af90d3be2836873 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/0683-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0684-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0683-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0684-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0684-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0685-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 95%
rename from patches/server/0684-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0685-Add-cause-to-Weather-ThunderChangeEvents.patch
index 501e76c03..5e76428a7 100644
--- a/patches/server/0684-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0685-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,10 +5,10 @@ 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 1f1b1a62ea9b37bc671e4df60a00c16c1027d3f6..6c8d18c4ea8a332a6973c3bb257cb443fe844d17 100644
+index 9a8b3647c161be8d8b87df8fff3b2d204dab6a8b..f893d8ab74293feec6ef69c5a4ddec57b11ca751 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -419,8 +419,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -425,8 +425,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          this.serverLevelData.setClearWeatherTime(clearDuration);
          this.serverLevelData.setRainTime(rainDuration);
          this.serverLevelData.setThunderTime(rainDuration);
@@ -19,7 +19,7 @@ index 1f1b1a62ea9b37bc671e4df60a00c16c1027d3f6..6c8d18c4ea8a332a6973c3bb257cb443
      }
  
      @Override
-@@ -483,8 +483,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -489,8 +489,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
                  this.serverLevelData.setThunderTime(j);
                  this.serverLevelData.setRainTime(k);
                  this.serverLevelData.setClearWeatherTime(i);
@@ -30,7 +30,7 @@ index 1f1b1a62ea9b37bc671e4df60a00c16c1027d3f6..6c8d18c4ea8a332a6973c3bb257cb443
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -887,14 +887,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -893,14 +893,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
  
      private void stopWeather() {
          // CraftBukkit start
diff --git a/patches/server/0685-More-Lidded-Block-API.patch b/patches/server/0686-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0685-More-Lidded-Block-API.patch
rename to patches/server/0686-More-Lidded-Block-API.patch
diff --git a/patches/server/0686-Limit-item-frame-cursors-on-maps.patch b/patches/server/0687-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0686-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0687-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0687-Add-PufferFishStateChangeEvent.patch b/patches/server/0688-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0687-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0688-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0688-Add-PlayerKickEvent-causes.patch b/patches/server/0689-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0688-Add-PlayerKickEvent-causes.patch
rename to patches/server/0689-Add-PlayerKickEvent-causes.patch
index 3e374dcff..4386a9c9c 100644
--- a/patches/server/0688-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0689-Add-PlayerKickEvent-causes.patch
@@ -57,7 +57,7 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ea9f362c19e5f3a67e4b5a46e708014953db480..f1ffabb1226e568b64e3aadd695197d0c9742de8 100644
+index 52294f5cfce86faf301c835bf1a9c2a5f4f5d721..40d0dac02bb1922483d68f3cdd09a228f66d09f6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -321,7 +321,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0689-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0690-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0689-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0690-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0690-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0691-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0690-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0691-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0691-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0692-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0691-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0692-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0692-Add-BellRevealRaiderEvent.patch b/patches/server/0693-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0692-Add-BellRevealRaiderEvent.patch
rename to patches/server/0693-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0693-Fix-invulnerable-end-crystals.patch b/patches/server/0694-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0693-Fix-invulnerable-end-crystals.patch
rename to patches/server/0694-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0694-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0695-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0694-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0695-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0695-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0696-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0695-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0696-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0696-Fix-dangerous-end-portal-logic.patch b/patches/server/0697-Fix-dangerous-end-portal-logic.patch
similarity index 97%
rename from patches/server/0696-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0697-Fix-dangerous-end-portal-logic.patch
index d7b1eefe9..59b141b5d 100644
--- a/patches/server/0696-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0697-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5d4bee5470795bd9f362fff5ae653794223fa182..b2478c6aee858c362f92c292635bb14f812ccf0b 100644
+index 1d29f8bb0829705aeae1b387ebf484e5eb504ef5..05e0d36b2241c2950b8741444b32aae8a5e4fc98 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -341,6 +341,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0697-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0698-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0697-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0698-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0698-Make-item-validations-configurable.patch b/patches/server/0699-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0698-Make-item-validations-configurable.patch
rename to patches/server/0699-Make-item-validations-configurable.patch
diff --git a/patches/server/0699-Add-more-line-of-sight-methods.patch b/patches/server/0700-Add-more-line-of-sight-methods.patch
similarity index 97%
rename from patches/server/0699-Add-more-line-of-sight-methods.patch
rename to patches/server/0700-Add-more-line-of-sight-methods.patch
index c29cb2b15..cebb48de5 100644
--- a/patches/server/0699-Add-more-line-of-sight-methods.patch
+++ b/patches/server/0700-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 60a7f238c721551e00f2eb60990a5d9743a8a3a7..e946981ccb07c94072f9470d1b8a00d0f9b6778b 100644
+index cceba2e3dd2570962efd20d0cbbf238ccc726702..46bf9aaa8406228e74f007e153afc9bcc0efd6b5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3423,6 +3423,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0700-add-per-world-spawn-limits.patch b/patches/server/0701-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0700-add-per-world-spawn-limits.patch
rename to patches/server/0701-add-per-world-spawn-limits.patch
diff --git a/patches/server/0701-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0702-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0701-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0702-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0702-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0703-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0702-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0703-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch