From e88856dd75de742fa10099af4fe06a07500b34fd Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 22 Sep 2023 13:13:57 -0700
Subject: [PATCH] Chunk system patch

---
 .../0018-Rewrite-chunk-system.patch}          | 836 +++++++++++-------
 ...option-to-load-extra-plugin-jars-no.patch} |   2 +-
 ...ctus-bamboo-and-reed-growth-heights.patch} |   0
 ...igurable-baby-zombie-movement-speed.patch} |   0
 ...22-Configurable-fishing-time-ranges.patch} |   0
 ...-mobs-to-jump-and-take-water-damage.patch} |   0
 ...despawn-distances-for-living-entiti.patch} |   0
 ...-Allow-for-toggling-of-spawn-chunks.patch} |   2 +-
 ...k-and-tnt-entities-at-the-specified.patch} |   0
 ...ent-crashes-server-lists-and-Mojang.patch} |  16 +-
 ...0028-Implement-Paper-VersionChecker.patch} |   0
 ...-version-history-to-version-command.patch} |   2 +-
 ...=> 0030-Player-affects-spawning-API.patch} |  10 +-
 ...31-Further-improve-server-tick-loop.patch} |  20 +-
 ...32-Only-refresh-abilities-if-needed.patch} |   4 +-
 ...API.patch => 0033-Entity-Origin-API.patch} |  10 +-
 ...vent-tile-entity-and-entity-crashes.patch} |   8 +-
 ...figurable-top-of-nether-void-damage.patch} |   4 +-
 ...-before-converting-and-renaming-pla.patch} |   0
 ... => 0037-Always-tick-falling-blocks.patch} |   2 +-
 ...ch => 0038-Configurable-end-credits.patch} |   4 +-
 ...explosions-processing-dead-entities.patch} |   0
 ...s.patch => 0040-Optimize-explosions.patch} |   6 +-
 ...=> 0041-Disable-explosion-knockback.patch} |   0
 ...under.patch => 0042-Disable-thunder.patch} |   4 +-
 ....patch => 0043-Disable-ice-and-snow.patch} |   4 +-
 ...-Configurable-mob-spawner-tick-rate.patch} |   0
 ...5-Implement-PlayerLocaleChangeEvent.patch} |  10 +-
 ...patch => 0046-Add-BeaconEffectEvent.patch} |   0
 ...igurable-container-update-tick-rate.patch} |   4 +-
 ...0048-Use-UserCache-for-player-heads.patch} |   0
 ...> 0049-Disable-spigot-tick-limiters.patch} |   4 +-
 ...=> 0050-Add-PlayerInitialSpawnEvent.patch} |   2 +-
 ...rable-Disabling-Cat-Chest-Detection.patch} |   0
 ...52-Improve-Player-chat-API-handling.patch} |  12 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |   4 +-
 ...ch => 0054-Expose-server-CommandMap.patch} |   2 +-
 ...-informative-in-maxHealth-exception.patch} |   0
 ...0056-Player-Tab-List-and-Title-APIs.patch} |   4 +-
 ...d-configurable-portal-search-radius.patch} |   4 +-
 ...patch => 0058-Add-velocity-warnings.patch} |   8 +-
 ...le-inter-world-teleportation-safety.patch} |   4 +-
 ... 0060-Add-exception-reporting-event.patch} |  14 +-
 ...don-t-need-to-when-cerealising-text.patch} |   0
 ...reboards-for-non-players-by-default.patch} |   4 +-
 ...orking-with-arrows-stuck-in-living-.patch} |   0
 ....patch => 0064-Chunk-Save-Reattempt.patch} |  22 +-
 ... => 0065-Complete-resource-pack-API.patch} |   4 +-
 ...ding-permissions.yml-before-plugins.patch} |   2 +-
 ...low-Reloading-of-Custom-Permissions.patch} |   2 +-
 ...h => 0068-Remove-Metadata-on-reload.patch} |   2 +-
 ...69-Handle-Item-Meta-Inconsistencies.patch} |   0
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |   0
 ...atch => 0071-Add-World-Util-Methods.patch} |   4 +-
 ...-Custom-replacement-for-eaten-items.patch} |   0
 ...ing-for-EntityLiving-hasLineOfSight.patch} |   2 +-
 ...h-absorb-values-and-repair-bad-data.patch} |   4 +-
 ...75-Use-a-Shared-Random-for-Entities.patch} |   4 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |   4 +-
 ...dBounds-and-getBlockState-for-inlin.patch} |   4 +-
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  10 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   6 +-
 ...0-Configurable-Chunk-Inhabited-Time.patch} |   2 +-
 ...t.patch => 0081-EntityPathfindEvent.patch} |   0
 ...gionFileCache-and-make-configurable.patch} |  10 +-
 ...-Do-not-load-chunks-for-Pathfinding.patch} |   0
 ...084-Add-PlayerUseUnknownEntityEvent.patch} |   4 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   0
 ...-BlockPlaceEvent-triggering-physics.patch} |   4 +-
 ...its.patch => 0087-Optimize-DataBits.patch} |   0
 ...illa-per-world-scoreboard-coloring-.patch} |   0
 ... 0089-Configurable-Player-Collision.patch} |   4 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |   0
 ...> 0091-Configurable-RCON-IP-address.patch} |   0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   0
 ...to-configure-frosted_ice-properties.patch} |   0
 ...possibility-for-getServer-singleton.patch} |   4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |   4 +-
 ...API-Replenishable-Lootables-Feature.patch} |   2 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   0
 ...em-property-for-disabling-watchdoge.patch} |   4 +-
 ... 0099-Async-GameProfileCache-saving.patch} |   8 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |   0
 ...-redstone-torch-rapid-clock-removal.patch} |   2 +-
 ...h => 0102-Add-server-name-parameter.patch} |   0
 ...sounds-to-same-world-if-limiting-ra.patch} |   0
 ...locking-on-Network-Manager-creation.patch} |   0
 ...-profiles-that-have-no-UUID-and-no-.patch} |   0
 ...etting-for-proxy-online-mode-status.patch} |   2 +-
 ...timise-BlockState-s-hashCode-equals.patch} |   0
 ...nfigurable-packet-in-spam-threshold.patch} |   4 +-
 ...9-Configurable-flying-kick-messages.patch} |   2 +-
 ...nt.patch => 0110-Add-EntityZapEvent.patch} |   0
 ...entity-nbt-data-from-falling-blocks.patch} |   0
 ...12-Cache-user-authenticator-threads.patch} |   0
 ...-Allow-Reloading-of-Command-Aliases.patch} |   2 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   0
 ... => 0115-Add-ProjectileCollideEvent.patch} |   0
 ...ent-Pathfinding-out-of-World-Border.patch} |   0
 ...mize-World.isLoaded-BlockPosition-Z.patch} |   2 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |   2 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |   0
 ...o-control-if-armour-stands-can-move.patch} |   0
 ...=> 0121-String-based-Action-Bar-API.patch} |   4 +-
 ...2-Properly-fix-item-duplication-bug.patch} |   4 +-
 ...-API-s.patch => 0123-Firework-API-s.patch} |   0
 ... 0124-PlayerTeleportEndGatewayEvent.patch} |   0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   4 +-
 ...h => 0126-Enforce-Sync-Player-Saves.patch} |   2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |   0
 ...patch => 0128-Cap-Entity-Collisions.patch} |   2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |   0
 ...> 0130-Do-not-let-armorstands-drown.patch} |   0
 ...e-async-calls-to-restart-the-server.patch} |   8 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |   4 +-
 ...-option-to-prevent-player-names-fro.patch} |   2 +-
 ...leAppender-for-console-improvements.patch} |  12 +-
 ...rable-option-to-disable-creeper-lin.patch} |   0
 ....patch => 0136-Item-canEntityPickup.patch} |   0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   0
 ...> 0138-PlayerAttemptPickupItemEvent.patch} |   0
 ...profile-lookups-to-worldgen-threads.patch} |   0
 ...tch => 0140-Add-UnknownCommandEvent.patch} |   2 +-
 ...tch => 0141-Basic-PlayerProfile-API.patch} |  12 +-
 ... 0142-Shoulder-Entities-Release-API.patch} |   0
 ...patch => 0143-Profile-Lookup-Events.patch} |   0
 ...layer-logins-during-server-shutdown.patch} |   0
 ...patch => 0145-Entity-fromMobSpawner.patch} |   6 +-
 ...6-Improve-the-Saddle-API-for-Horses.patch} |   0
 ...plement-ensureServerConversions-API.patch} |   0
 ...> 0148-Implement-getI18NDisplayName.patch} |   0
 ...=> 0149-ProfileWhitelistVerifyEvent.patch} |   2 +-
 ...ch => 0150-Fix-this-stupid-bullshit.patch} |   0
 ...atch => 0151-LivingEntity-setKiller.patch} |   0
 ...wns-should-honor-nametags-and-leash.patch} |   0
 ...mer-when-spawner-event-is-cancelled.patch} |   0
 ...a-custom-authentication-servers-dow.patch} |   0
 ...-prefixes-using-Log4J-configuration.patch} |   0
 ...-Log4J-Configuration-Plugin-Loggers.patch} |   0
 ...t.patch => 0157-Add-PlayerJumpEvent.patch} |   4 +-
 ...le-ServerboundKeepAlivePacket-async.patch} |   0
 ...t-protocol-version-and-virtual-host.patch} |  14 +-
 ...t-serverside-behavior-of-keepalives.patch} |   0
 ...Effects-only-to-players-who-can-see.patch} |   0
 ... => 0162-Add-PlayerArmorChangeEvent.patch} |   0
 ...om-being-processed-when-the-player-.patch} |   0
 ...4-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   8 +-
 ...-implementations-for-captured-block.patch} |   4 +-
 ...get-a-BlockState-without-a-snapshot.patch} |   0
 ...patch => 0167-AsyncTabCompleteEvent.patch} |  10 +-
 ...=> 0168-PlayerPickupExperienceEvent.patch} |   0
 ...-Ability-to-apply-mending-to-XP-API.patch} |   4 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  16 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   0
 ...patch => 0172-PreCreatureSpawnEvent.patch} |   0
 ...> 0173-Fill-Profile-Property-Events.patch} |   0
 ...layerAdvancementCriterionGrantEvent.patch} |   0
 ...ch => 0175-Add-ArmorStand-Item-Meta.patch} |   0
 ...Extend-Player-Interact-cancellation.patch} |   0
 ... 0177-Tameable-getOwnerUniqueId-API.patch} |   0
 ...-crits-helps-mitigate-hacked-client.patch} |   0
 ...e-Explicit-Network-Manager-Flushing.patch} |   6 +-
 ...t-extended-PaperServerListPingEvent.patch} |   4 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |   0
 ...=> 0182-Player.setPlayerProfile-API.patch} |  18 +-
 ...patch => 0183-getPlayerUniqueId-API.patch} |   2 +-
 ... 0184-Improved-Async-Task-Scheduler.patch} |   0
 ...e-legacy-ping-handler-more-reliable.patch} |   0
 ...erverListPingEvent-for-legacy-pings.patch} |   0
 ...7-Flag-to-disable-the-channel-limit.patch} |   4 +-
 ...-Add-openSign-method-to-HumanEntity.patch} |   0
 ...rable-sprint-interruption-on-attack.patch} |   0
 ...t.patch => 0190-EndermanEscapeEvent.patch} |   0
 ...h => 0191-Enderman.teleportRandomly.patch} |   0
 ...192-Block-Enderpearl-Travel-Exploit.patch} |   4 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |   8 +-
 ...allowed-colored-signs-to-be-created.patch} |   0
 ...ted-Ice-from-loading-holding-chunks.patch} |   0
 ...h => 0196-EndermanAttackPlayerEvent.patch} |   0
 ...tch => 0197-WitchConsumePotionEvent.patch} |   0
 ...patch => 0198-WitchThrowPotionEvent.patch} |   0
 ...tem-entities-with-World.spawnEntity.patch} |   0
 ...patch => 0200-WitchReadyPotionEvent.patch} |   0
 ...201-ItemStack-getMaxItemUseDuration.patch} |   0
 ...ement-EntityTeleportEndGatewayEvent.patch} |   0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   0
 ...ch => 0204-Fix-CraftEntity-hashCode.patch} |   0
 ...e-Alternative-LootPool-Luck-Formula.patch} |   0
 ...ls-when-failing-to-save-player-data.patch} |   0
 ...-shield-blocking-delay-configurable.patch} |   0
 ...=> 0208-Improve-EntityShootBowEvent.patch} |   0
 ...patch => 0209-PlayerReadyArrowEvent.patch} |   0
 ...nockbackByEntityEvent-and-EntityPus.patch} |   4 +-
 ...patch => 0211-Expand-Explosions-API.patch} |   4 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   0
 ...-API.patch => 0213-RangedEntity-API.patch} |   0
 ...o-disable-ender-dragon-legacy-check.patch} |   0
 ...-Implement-World.getEntity-UUID-API.patch} |   4 +-
 ...0216-InventoryCloseEvent-Reason-API.patch} |  26 +-
 ...tch => 0217-Vex-get-setSummoner-API.patch} |   0
 ...ventory-when-cancelling-PlayerInter.patch} |   4 +-
 ...-to-keep-logging-IO-off-main-thread.patch} |   0
 ...more-information-to-Entity.toString.patch} |   4 +-
 ...ts.patch => 0221-EnderDragon-Events.patch} |   0
 ...atch => 0222-PlayerElytraBoostEvent.patch} |   0
 ...=> 0223-PlayerLaunchProjectileEvent.patch} |   0
 ...0224-Improve-BlockPosition-inlining.patch} |   0
 ...-armor-stands-from-doing-entity-loo.patch} |   4 +-
 ...-Vanished-players-don-t-have-rights.patch} |   2 +-
 ...llow-disabling-armour-stand-ticking.patch} |   0
 ...tch => 0228-SkeletonHorse-Additions.patch} |   4 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   0
 ...0-Implement-Expanded-ArmorStand-API.patch} |   0
 ...vent.patch => 0231-AnvilDamageEvent.patch} |   0
 ...ent.patch => 0232-Add-TNTPrimeEvent.patch} |   0
 ...d-make-tab-spam-limits-configurable.patch} |   2 +-
 ...s.patch => 0234-Fix-NBT-type-issues.patch} |   0
 ...emove-unnecessary-itemmeta-handling.patch} |   0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  14 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  19 +-
 ...8-Use-ConcurrentHashMap-in-JsonList.patch} |   2 +-
 ...9-Use-a-Queue-for-Queueing-Commands.patch} |  10 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   6 +-
 ...timize-BlockPosition-helper-methods.patch} |   0
 ...efault-mob-spawn-range-and-water-an.patch} |   0
 ...tch => 0243-Slime-Pathfinder-Events.patch} |   0
 ...e-speed-for-water-flowing-over-lava.patch} |   0
 ...45-Optimize-CraftBlockData-Creation.patch} |   0
 ...tch => 0246-Optimize-MappedRegistry.patch} |   0
 ...ch => 0247-Add-PhantomPreSpawnEvent.patch} |   0
 ....patch => 0248-Add-More-Creeper-API.patch} |   0
 ...=> 0249-Inventory-removeItemAnySlot.patch} |   0
 ...oadChunk-int-int-false-load-unconve.patch} |   4 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   0
 ...-attack-cooldown-methods-for-Player.patch} |   4 +-
 ....patch => 0253-Improve-death-events.patch} |  10 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |   0
 ...I.patch => 0255-Mob-Pathfinding-API.patch} |   0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |   0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   0
 ...ning-from-loading-generating-chunks.patch} |   0
 ...t-furnace-cook-speed-multiplier-API.patch} |   0
 ...=> 0260-Honor-EntityAgeable.ageLock.patch} |   0
 ...le-connection-throttle-kick-message.patch} |   0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   0
 ...> 0263-Hook-into-CB-plugin-rewrites.patch} |   0
 ....patch => 0264-PreSpawnerSpawnEvent.patch} |   0
 ...65-Add-LivingEntity-getTargetEntity.patch} |   0
 ...I.patch => 0266-Add-sun-related-API.patch} |   4 +-
 ...rseException-in-Entity-and-TE-names.patch} |   4 +-
 ...Turtle-API.patch => 0268-Turtle-API.patch} |   0
 ...ator-target-events-and-improve-impl.patch} |   6 +-
 ...her-worlds-for-shooter-of-projectil.patch} |   0
 ...PI.patch => 0271-Add-more-Witch-API.patch} |   0
 ...wned-for-Villager-Aggression-Config.patch} |   0
 ...vent-players-from-moving-into-unloa.patch} |   6 +-
 ...4-Reset-players-airTicks-on-respawn.patch} |   4 +-
 ...after-profile-lookups-if-not-needed.patch} |   0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |   2 +-
 ...=> 0277-Optimize-World-Time-Updates.patch} |   4 +-
 ...tore-custom-InventoryHolder-support.patch} |   0
 ...=> 0279-Use-Vanilla-Minecart-Speeds.patch} |   0
 ...0280-Fix-SpongeAbsortEvent-handling.patch} |   0
 ...-allow-digging-into-unloaded-chunks.patch} |   4 +-
 ...ult-permission-message-configurable.patch} |   6 +-
 ...revent-rayTrace-from-loading-chunks.patch} |   0
 ...-Large-Packets-disconnecting-client.patch} |   4 +-
 ...ntity-dismount-during-teleportation.patch} |  10 +-
 ...I.patch => 0286-Add-more-Zombie-API.patch} |   0
 ...mits.patch => 0287-Book-Size-Limits.patch} |   4 +-
 ...0288-Add-PlayerConnectionCloseEvent.patch} |   4 +-
 ...revent-Enderman-from-loading-chunks.patch} |   0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  12 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |   4 +-
 ...remove-from-being-called-on-Players.patch} |   4 +-
 ...ent.patch => 0293-BlockDestroyEvent.patch} |   4 +-
 ... => 0294-Async-command-map-building.patch} |   4 +-
 ...0295-Implement-Brigadier-Mojang-API.patch} |   6 +-
 ...ove-exact-choice-recipe-ingredients.patch} |   0
 ... 0297-Limit-Client-Sign-length-more.patch} |   4 +-
 ...e-Oversized-Tile-Entities-in-chunks.patch} |   0
 ...ggleEvent-when-whitelist-is-toggled.patch} |   2 +-
 ...=> 0300-Entity-getEntitySpawnReason.patch} |  12 +-
 ...tch => 0301-Fire-event-on-GS4-query.patch} |   0
 ...02-Implement-PlayerPostRespawnEvent.patch} |   2 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |   0
 ...ts.patch => 0304-Server-Tick-Events.patch} |   6 +-
 ...305-PlayerDeathEvent-getItemsToKeep.patch} |   6 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |   6 +-
 ...API.patch => 0307-Add-Heightmap-API.patch} |   2 +-
 ...> 0308-Mob-Spawner-API-Enhancements.patch} |   0
 ...-to-changed-postToMainThread-method.patch} |   0
 ...-item-frames-are-modified-MC-123450.patch} |   0
 ...0311-Implement-CraftBlockSoundGroup.patch} |   0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  10 +-
 ...13-Allow-Saving-of-Oversized-Chunks.patch} |  27 +-
 ...14-Expose-the-internal-current-tick.patch} |   2 +-
 ...15-Fix-World-isChunkGenerated-calls.patch} |  28 +-
 ...te-location-if-we-failed-to-read-it.patch} |   0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |   0
 ...urable-projectile-relative-velocity.patch} |   0
 ...h => 0319-offset-item-frame-ticking.patch} |   0
 ...-158900.patch => 0320-Fix-MC-158900.patch} |   2 +-
 ...event-consuming-the-wrong-itemstack.patch} |   0
 ...2-Dont-send-unnecessary-sign-update.patch} |   0
 ...-option-to-disable-pillager-patrols.patch} |   0
 ...324-Flat-bedrock-generator-settings.patch} |   2 +-
 ...k-loads-when-villagers-try-to-find-.patch} |   0
 ...656-Fix-Follow-Range-Initial-Target.patch} |   0
 ... 0327-Duplicate-UUID-Resolve-Option.patch} |  18 +-
 ...ayerDeathEvent-shouldDropExperience.patch} |   4 +-
 ...ading-chunks-checking-hive-position.patch} |   0
 ...hunks-from-Hoppers-and-other-things.patch} |   0
 ...timise-EntityGetter-getPlayerByUUID.patch} |   6 +-
 ...332-Fix-items-not-falling-correctly.patch} |   4 +-
 ...ize-call-to-getFluid-for-explosions.patch} |   0
 ...-in-stack-not-having-effects-when-d.patch} |   0
 ...=> 0335-Entity-Activation-Range-2.0.patch} |  42 +-
 ...ement-alternative-item-despawn-rate.patch} |   0
 ...patch => 0337-Lag-compensate-eating.patch} |   0
 ...=> 0338-Tracking-Range-Improvements.patch} |   4 +-
 ...-items-vanishing-through-end-portal.patch} |   4 +-
 ...ment-optional-per-player-mob-spawns.patch} |  26 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |   0
 ...42-Improve-Block-breakNaturally-API.patch} |   0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |   8 +-
 ...0344-Add-debug-for-sync-chunk-loads.patch} |  32 +-
 ... => 0345-Improve-java-version-check.patch} |   0
 ...tch => 0346-Add-ThrownEggHatchEvent.patch} |   0
 ...p-API.patch => 0347-Entity-Jump-API.patch} |   0
 ...-to-nerf-pigmen-from-nether-portals.patch} |   6 +-
 ... => 0349-Make-the-GUI-graph-fancier.patch} |   0
 ...50-add-hand-to-BlockMultiPlaceEvent.patch} |   0
 ...ipwire-hook-placement-before-update.patch} |   0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |   0
 ...chance-of-villager-zombie-infection.patch} |   0
 ...tch => 0354-Optimise-Chunk-getFluid.patch} |   2 +-
 ...rbose-world-setting-to-false-by-def.patch} |   0
 ...Add-tick-times-API-and-mspt-command.patch} |   8 +-
 ...57-Expose-MinecraftServer-isRunning.patch} |   2 +-
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |   0
 ...pawn-settings-and-per-player-option.patch} |   2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |   2 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |   0
 ...PlayerChunkMap-adds-crashing-server.patch} |  10 +-
 ...tch => 0363-Don-t-tick-dead-players.patch} |   4 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   0
 ...timize-Collision-to-not-load-chunks.patch} |   4 +-
 ...ove-existing-players-to-world-spawn.patch} |   8 +-
 ...alSelector-Goal.Flag-Set-operations.patch} |   0
 ...h => 0368-Improved-Watchdog-Support.patch} |  56 +-
 ....patch => 0369-Optimize-Pathfinding.patch} |   0
 ...0-Reduce-Either-Optional-allocation.patch} |   0
 ...-memory-footprint-of-NBTTagCompound.patch} |   0
 ...ent-opening-inventories-when-frozen.patch} |   6 +-
 ...entity-collision-code-if-not-needed.patch} |   0
 ...Implement-Player-Client-Options-API.patch} |   8 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |   6 +-
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |   8 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   4 +-
 ...layerAttackEntityCooldownResetEvent.patch} |   0
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   0
 ...-duplication-issues-and-teleport-is.patch} |  12 +-
 ...patch => 0382-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   4 +-
 ...n.patch => 0384-Expose-game-version.patch} |   2 +-
 ...> 0385-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   0
 ....patch => 0387-misc-debugging-dumps.patch} |  10 +-
 ...8-Prevent-teleporting-dead-entities.patch} |   4 +-
 ...traces-in-log-messages-crash-report.patch} |  18 +-
 ...atch => 0390-Implement-Mob-Goal-API.patch} |   2 +-
 ...=> 0391-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   0
 ...tch => 0393-ExperienceOrbMergeEvent.patch} |   0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   0
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0396-Potential-bed-API.patch} |   0
 ...ait-for-Async-Tasks-during-shutdown.patch} |   6 +-
 ...er-respects-game-and-entity-rules-f.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   2 +-
 ...> 0400-Ensure-safe-gateway-teleport.patch} |   0
 ...-for-console-having-all-permissions.patch} |   0
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0403-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |   0
 ...ton-physics-inconsistency-MC-188840.patch} |   0
 ...uping.patch => 0407-Fix-sand-duping.patch} |   0
 ...sing-chunks-due-to-integer-overflow.patch} |   0
 ...desync-in-playerconnection-causing-.patch} |   4 +-
 ...older-method-without-block-snapshot.patch} |   0
 ...API.patch => 0411-Improve-Arrow-API.patch} |   0
 ...mplement-PlayerRecipeBookClickEvent.patch} |   4 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |   0
 ...4-Add-permission-for-command-blocks.patch} |   6 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  14 +-
 ...d-Difficulty-Remembering-Difficulty.patch} |  22 +-
 ...atch => 0417-Paper-dumpitem-command.patch} |   6 +-
 ...Legacy-Component-serialization-size.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  12 +-
 ...incremental-chunk-and-player-saving.patch} |  22 +-
 ...422-Support-old-UUID-format-for-NBT.patch} |   0
 ...vert-legacy-attributes-in-Item-Meta.patch} |   0
 ...Remove-some-streams-from-structures.patch} |   0
 ...rom-classes-related-villager-gossip.patch} |   0
 ...0426-Support-components-in-ItemMeta.patch} |   0
 ...e-fix-EntityTargetLivingEntityEvent.patch} |   0
 ...patch => 0428-Add-entity-liquid-API.patch} |   0
 ...date-itemstack-legacy-name-and-lore.patch} |   0
 ...wn-player-in-correct-world-on-login.patch} |   2 +-
 ...atch => 0431-Add-PrepareResultEvent.patch} |   0
 ...-for-portal-on-world-gen-entity-add.patch} |   0
 ...x-arrows-never-despawning-MC-125757.patch} |   0
 ...Vanilla-Command-permission-checking.patch} |   0
 ...-5989.patch => 0435-Fix-SPIGOT-5989.patch} |   2 +-
 ...-Bukkit-world-container-is-not-used.patch} |   2 +-
 ...5885-Unable-to-disable-advancements.patch} |   2 +-
 ...taPlayer-leak-due-from-quitting-ear.patch} |   0
 ...ix-some-rails-connecting-improperly.patch} |   0
 ...stake-in-CB-NBT-int-deserialization.patch} |   0
 ...support.patch => 0441-Brand-support.patch} |   4 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |   0
 ...h => 0443-Don-t-require-FACING-data.patch} |   0
 ...eEvent-not-firing-for-all-use-cases.patch} |   6 +-
 ...PI.patch => 0445-Add-moon-phase-API.patch} |   0
 ...headless-pistons-from-being-created.patch} |   0
 ...ent.patch => 0447-Add-BellRingEvent.patch} |   0
 ...dd-zombie-targets-turtle-egg-config.patch} |   0
 ...patch => 0449-Buffer-joins-to-world.patch} |   6 +-
 ...-Eigencraft-redstone-implementation.patch} |   0
 ...s-not-working-in-some-kick-messages.patch} |   0
 ...reateEvent-needs-to-know-its-entity.patch} |   0
 ...I.patch => 0453-Add-more-Evoker-API.patch} |   0
 ...Add-methods-to-get-translation-keys.patch} |   0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |   0
 ...ch => 0456-Cache-block-data-strings.patch} |   4 +-
 ...rtation-and-cancel-velocity-if-tele.patch} |   8 +-
 ...l-open-container-api-to-HumanEntity.patch} |   0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |   0
 ...-capture-to-capture-all-items-added.patch} |   4 +-
 ...-Counter-to-allow-plugins-to-use-va.patch} |   4 +-
 ...track-plugin-scoreboards-by-default.patch} |   0
 ...king.patch => 0463-Entity-isTicking.patch} |   4 +-
 ...non-whitelisted-player-when-white-l.patch} |   4 +-
 ...-Concurrency-issue-in-ShufflingList.patch} |   0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |   0
 ...-large-move-vectors-crashing-server.patch} |   6 +-
 ...atch => 0468-Optimise-getType-calls.patch} |   0
 ....patch => 0469-Villager-resetOffers.patch} |   0
 ...ce-order-when-capturing-blockstates.patch} |   2 +-
 ...lockpos-allocation-from-pathfinding.patch} |   0
 ...em-locations-dropped-from-campfires.patch} |   0
 ...tch => 0473-Player-elytra-boost-API.patch} |   4 +-
 ...74-Fixed-TileEntityBell-memory-leak.patch} |   0
 ...ing-up-when-item-stack-is-empty-in-.patch} |   0
 ...Add-getOfflinePlayerIfCached-String.patch} |   2 +-
 ...ch => 0477-Add-ignore-discounts-API.patch} |   0
 ...Toggle-for-removing-existing-dragon.patch} |   0
 ...x-client-lag-on-advancement-loading.patch} |   0
 ...> 0480-Item-no-age-no-player-pickup.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...482-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0483-Add-API-for-quit-reason.patch} |  12 +-
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...ch => 0485-Expose-world-spawn-angle.patch} |   2 +-
 ...patch => 0486-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   4 +-
 ...88-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0489-Add-PlayerItemCooldownEvent.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...PI.patch => 0491-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   4 +-
 ...-missing-default-perms-for-commands.patch} |   0
 ...h => 0494-Add-PlayerShearBlockEvent.patch} |   0
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0496-Limit-recipe-packets.patch} |   4 +-
 ...-CraftSound-backwards-compatibility.patch} |   0
 ...0497-Player-Chunk-Load-Unload-Events.patch |  34 -
 ...0498-Player-Chunk-Load-Unload-Events.patch |  34 +
 ...9-Optimize-Dynamic-get-Missing-Keys.patch} |   0
 ...-Expose-LivingEntity-hurt-direction.patch} |   0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |   0
 ...-invalid-ingredient-lists-in-Villag.patch} |   0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |   0
 ...ch => 0504-Implement-TargetHitEvent.patch} |   0
 ... 0505-MC-4-Fix-item-position-desync.patch} |  10 +-
 ...506-Additional-Block-Material-API-s.patch} |   0
 ...tch => 0507-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0509-Cache-burn-durations.patch} |   0
 ...ob-spawner-spawn-egg-transformation.patch} |   0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |   0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |   0
 ...ct-event-not-being-called-sometimes.patch} |   6 +-
 ...h => 0514-Zombie-API-breaking-doors.patch} |   0
 ...515-Fix-nerfed-slime-when-splitting.patch} |   0
 ...=> 0516-Add-EntityLoadCrossbowEvent.patch} |   0
 ...0517-Added-WorldGameRuleChangeEvent.patch} |   6 +-
 ...-Added-ServerResourcesReloadedEvent.patch} |   6 +-
 ...d-settings-for-mobs-picking-up-loot.patch} |   0
 ...mplemented-BlockFailedDispenseEvent.patch} |   0
 ...-Added-PlayerLecternPageChangeEvent.patch} |   0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |   0
 ...nfigurable-door-breaking-difficulty.patch} |   0
 ...ty-commands-shall-not-be-dispatched.patch} |   0
 ...OIs.patch => 0525-Remove-stale-POIs.patch} |   4 +-
 ...h => 0526-Fix-villager-boat-exploit.patch} |   2 +-
 ...I.patch => 0527-Add-sendOpLevel-API.patch} |   6 +-
 ...0528-TODO-Registry-Modification-API.patch} |   0
 ...h => 0529-Add-StructuresLocateEvent.patch} |   2 +-
 ...-for-requiring-a-player-participant.patch} |   4 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...533-Make-schedule-command-per-world.patch} |   0
 ...534-Configurable-max-leash-distance.patch} |   0
 ...535-Implement-BlockPreDispenseEvent.patch} |   0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |   0
 ...e-for-always-placing-the-dragon-egg.patch} |   0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |   0
 ...eash-variable-to-EntityUnleashEvent.patch} |   0
 ...shield-blocking-on-dimension-change.patch} |   4 +-
 ...atch => 0541-add-DragonEggFormEvent.patch} |   0
 ...Event.patch => 0542-EntityMoveEvent.patch} |   6 +-
 ...isable-pathfinding-updates-on-block.patch} |   6 +-
 ... 0544-Inline-shift-direction-fields.patch} |   0
 ...-adding-items-to-BlockDropItemEvent.patch} |   0
 ...inThreadExecutor-to-BukkitScheduler.patch} |   0
 ...entity-allow-attribute-registration.patch} |   0
 ...ix-dead-slime-setSize-invincibility.patch} |   0
 ...pes-should-return-an-immutable-list.patch} |   0
 ...atch => 0550-Expose-Tracked-Players.patch} |   0
 ...1-Remove-streams-from-SensorNearest.patch} |   0
 ...GUI.patch => 0552-Improve-ServerGUI.patch} |   0
 ...553-fix-converting-txt-to-json-file.patch} |   4 +-
 ...atch => 0554-Add-worldborder-events.patch} |   0
 ...=> 0555-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0557-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0558-Add-Block-isValidTool.patch} |   0
 ...using-signs-inside-spawn-protection.patch} |   4 +-
 ....patch => 0560-Expand-world-key-API.patch} |   2 +-
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0562-Item-Rarity-API.patch} |   0
 ...d-item-when-player-has-disconnected.patch} |   2 +-
 ...elist-use-configurable-kick-message.patch} |   4 +-
 ...gnore-result-of-PlayerEditBookEvent.patch} |   4 +-
 ...tch => 0566-Expose-protocol-version.patch} |   0
 ...ab-completions-for-brigadier-comman.patch} |   2 +-
 ...temConsumeEvent-cancelling-properly.patch} |   0
 ...patch => 0569-Add-bypass-host-check.patch} |   0
 ...0570-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   4 +-
 ... => 0576-Added-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0577-More-World-API.patch} |   4 +-
 ... 0578-Added-PlayerBedFailEnterEvent.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   2 +-
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   2 +-
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |   6 +-
 ...dd-Channel-initialization-listeners.patch} |   6 +-
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0585-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...close.patch => 0589-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...=> 0591-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0592-Add-basic-Datapack-API.patch} |   2 +-
 ...ment-variable-to-disable-server-gui.patch} |   4 +-
 ...itions-to-PlayerGameModeChangeEvent.patch} |  16 +-
 ... => 0595-ItemStack-repair-check-API.patch} |   0
 ....patch => 0596-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   4 +-
 ...-and-optimise-world-force-upgrading.patch} |  26 +-
 ...PI.patch => 0599-Add-Mob-lookAt-API.patch} |   0
 ...0600-Add-Unix-domain-socket-support.patch} |   6 +-
 ... => 0601-Add-EntityInsideBlockEvent.patch} |   0
 ...02-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  14 +-
 ...patch => 0604-More-Lidded-Block-API.patch} |   0
 ...05-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0606-Add-PlayerKickEvent-causes.patch} |  56 +-
 ...0607-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ThreadingDe.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0611-Add-BellRevealRaiderEvent.patch} |   0
 ... 0612-Fix-invulnerable-end-crystals.patch} |   0
 ...13-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0614-Fix-dangerous-end-portal-logic.patch} |  13 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...patch => 0617-Line-Of-Sight-Changes.patch} |   0
 ... => 0618-add-per-world-spawn-limits.patch} |   2 +-
 ...h => 0619-Fix-potions-splash-events.patch} |   0
 ... => 0620-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   4 +-
 ...PI.patch => 0622-Missing-Entity-API.patch} |   0
 ...ect-for-book-edit-is-called-on-main.patch} |   4 +-
 ...of-Block-applyBoneMeal-always-being.patch} |   0
 ...tChunkIfLoadedImmediately-in-places.patch} |   4 +-
 ...rom-signs-not-firing-command-events.patch} |   0
 ...ch => 0627-Adds-PlayerArmSwingEvent.patch} |   4 +-
 ...-event-leave-message-not-being-sent.patch} |  12 +-
 ...-for-mobs-immune-to-default-effects.patch} |   0
 ...correct-message-for-outdated-client.patch} |   0
 ...-t-apply-cramming-damage-to-players.patch} |   4 +-
 ...d-timings-for-sensors-and-behaviors.patch} |   0
 ...-bunch-of-missing-forceDrop-toggles.patch} |   0
 ...inger-API.patch => 0634-Stinger-API.patch} |   0
 ...cy-issue-with-empty-map-items-in-CB.patch} |   0
 ... => 0636-Add-System.out-err-catcher.patch} |   2 +-
 ...-to-contain-the-source-jars-in-stac.patch} |   0
 ...-Improve-boat-collision-performance.patch} |   0
 ...AFK-kick-while-watching-end-credits.patch} |   2 +-
 ...iting-of-comments-to-server.propert.patch} |   0
 ...tch => 0641-Add-PlayerSetSpawnEvent.patch} |  14 +-
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...=> 0645-Added-EntityDamageItemEvent.patch} |   0
 ...timize-indirect-passenger-iteration.patch} |   7 +-
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...649-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0651-Add-BlockBreakBlockEvent.patch} |   0
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0653-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0655-Add-back-EntityPortalExitEvent.patch} |   6 +-
 ...-find-targets-for-lightning-strikes.patch} |  10 +-
 ... 0657-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0658-Left-handed-API.patch} |   0
 ...ch => 0659-Add-more-advancement-API.patch} |   0
 ...660-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0661-Add-critical-damage-API.patch} |   0
 ...0662-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   0
 ...-ram-API.patch => 0664-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...6-Add-Raw-Byte-Entity-Serialization.patch} |   4 +-
 ...67-Vanilla-command-permission-fixes.patch} |   0
 ...logic-for-inventories-on-chunk-unlo.patch} |   8 +-
 ...69-Fix-GameProfileCache-concurrency.patch} |   0
 ...670-Improve-and-expand-AsyncCatcher.patch} |   8 +-
 ...per-mobcaps-and-paper-playermobcaps.patch} |  12 +-
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...=> 0673-Optimise-general-POI-access.patch} |  12 +-
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   2 +-
 ...our-chunk-data-off-disk-when-conver.patch} |   6 +-
 ...-lookup-fluid-state-when-raytracing.patch} |   0
 ...atch => 0680-Time-scoreboard-search.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...2-Do-not-run-raytrace-logic-for-AIR.patch} |   0
 ...rimise-map-impl-for-tracked-players.patch} |   4 +-
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ... 0685-Optimise-random-block-ticking.patch} |  14 +-
 ...0686-Remove-streams-for-villager-AI.patch} |   0
 ...city-compression-and-cipher-natives.patch} |   6 +-
 ...hread-worker-count-for-low-core-cou.patch} |   0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   4 +-
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   6 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0694-Ensure-valid-vehicle-status.patch} |   4 +-
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0699-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   6 +-
 ...unintended-light-block-manipulation.patch} |   0
 ...0702-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ... => 0704-Configurable-feature-seeds.patch} |   6 +-
 ... 0705-Add-root-admin-user-detection.patch} |   2 +-
 ...ays-allow-item-changing-in-Fireball.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   4 +-
 ...ive-velocity-through-repeated-crits.patch} |   0
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...emoving-recipes-from-RecipeIterator.patch} |   0
 ...versized-item-data-in-equipment-and.patch} |   0
 ...e-unnecessary-itemmeta-from-clients.patch} |   4 +-
 ...=> 0713-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0715-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...tch => 0716-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   2 +-
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  22 +-
 ...n-checking-in-player-move-packet-ha.patch} |  12 +-
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   6 +-
 ...patch => 0721-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |  14 +-
 ...23-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   6 +-
 ... => 0725-Improve-scoreboard-entries.patch} |   0
 ...ch => 0726-Entity-powdered-snow-API.patch} |   0
 ...0727-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...plifiers-greater-than-127-correctly.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...=> 0733-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0734-Bucketable-API.patch} |   0
 ...es.patch => 0735-Validate-usernames.patch} |   2 +-
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   6 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...load-to-PersistentDataContainer-has.patch} |   0
 ...0-Multiple-Entries-with-Scoreboards.patch} |   0
 ...741-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...0744-Fix-xp-reward-for-baby-zombies.patch} |   0
 ... 0745-Kick-on-main-for-illegal-chat.patch} |   8 +-
 ...lti-Block-Change-API-Implementation.patch} |   4 +-
 ...ent.patch => 0747-Fix-NotePlayEvent.patch} |   0
 ....patch => 0748-Freeze-Tick-Lock-API.patch} |   8 +-
 ...lphin-API.patch => 0749-Dolphin-API.patch} |   0
 ...h => 0750-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   2 +-
 ...-missing-structure-set-seed-configs.patch} |   2 +-
 ...h => 0754-Implement-regenerateChunk.patch} |   2 +-
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   2 +-
 ...gs.patch => 0757-Add-GameEvent-tags.patch} |   2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |   6 +-
 ...tch => 0759-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   2 +-
 ...-worldlist-before-initing-the-world.patch} |   6 +-
 ... => 0764-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0765-Custom-Potion-Mixes.patch} |   6 +-
 ...66-Force-close-world-loading-screen.patch} |   2 +-
 ...767-Fix-falling-block-spawn-methods.patch} |   6 +-
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0770-More-Projectile-API.patch} |   0
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   2 +-
 ...0773-Implement-getComputedBiome-API.patch} |   0
 ...> 0774-Make-some-itemstacks-nonnull.patch} |   0
 ...775-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0776-Fix-saving-in-unloadWorld.patch} |   2 +-
 ...h => 0777-Buffer-OOB-setBlock-calls.patch} |   2 +-
 ... 0778-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   4 +-
 ...ssenger-world-matches-ridden-entity.patch} |   4 +-
 ...rd-against-invalid-entity-positions.patch} |   8 +-
 ...s.patch => 0783-cache-resource-keys.patch} |   0
 ...ange-the-podium-for-the-EnderDragon.patch} |   0
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   4 +-
 ...ead-of-display-name-in-PlayerList-g.patch} |   2 +-
 ...s-not-spawning-outside-slime-chunks.patch} |   0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  12 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0792-WorldCreator-keepSpawnLoaded.patch} |   4 +-
 ...-in-CraftPersistentDataTypeRegistry.patch} |   0
 ...destroyed-trigger-in-the-correct-pl.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0798-Add-PlayerStopUsingItemEvent.patch} |   0
 ...99-FallingBlock-auto-expire-setting.patch} |   0
 ...rs.patch => 0800-Don-t-tick-markers.patch} |  28 +-
 ...-not-accept-invalid-client-settings.patch} |   4 +-
 ...0802-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0805-Sanitize-Sent-BlockEntity-NBT.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   4 +-
 ...-on-world-create-while-being-ticked.patch} |  10 +-
 ...ate-Current-redstone-implementation.patch} |  15 +-
 ...10-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0811-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   4 +-
 ...tant-BlockStateListPopulator-method.patch} |  25 +-
 ...I.patch => 0814-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   2 +-
 ...pty-items-from-being-added-to-world.patch} |   4 +-
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...atch => 0818-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   4 +-
 ...debug-information-to-chat-packet-er.patch} |   4 +-
 ...PE.patch => 0822-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   4 +-
 ...API.patch => 0824-More-Teleport-API.patch} |  14 +-
 ... => 0825-Add-EntityPortalReadyEvent.patch} |   6 +-
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   4 +-
 ...on-plugins-accessing-faraway-chunks.patch} |  14 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |   4 +-
 ...Add-and-fix-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0831-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...API.patch => 0833-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   4 +-
 ...andom-in-ServerLoginPacketListenerI.patch} |   0
 ...836-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   6 +-
 ...ok-changes-from-crashing-the-server.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   2 +-
 ...> 0840-Missing-eating-regain-reason.patch} |   0
 ....patch => 0841-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...4-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0845-Configurable-chat-thread-limit.patch} |   4 +-
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ... 0847-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ... => 0849-Add-getDrops-to-BlockState.patch} |   0
 ...=> 0850-Fix-a-bunch-of-vanilla-bugs.patch} |   8 +-
 ...y-onTrackingStart-during-navigation.patch} |   6 +-
 ... 0852-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0853-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   4 +-
 ... 0856-Elder-Guardian-appearance-API.patch} |   4 +-
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0858-Add-entity-knockback-API.patch} |   0
 ....patch => 0859-Detect-headless-JREs.patch} |   2 +-
 ...-vehicle-collision-event-not-called.patch} |   0
 ...1-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0862-Added-EntityToggleSitEvent.patch} |   0
 ... => 0863-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0864-Add-Moving-Piston-API.patch} |   0
 ...> 0865-Ignore-impossible-spawn-tick.patch} |   0
 ...source-for-fireworks-from-dispenser.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   4 +-
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0870-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0873-Add-Player-Warden-Warning-API.patch} |   4 +-
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...875-Add-paper-dumplisteners-command.patch} |   4 +-
 ...lobal-player-list-where-appropriate.patch} |   8 +-
 ...sync-entity-add-due-to-fungus-trees.patch} |   2 +-
 ....patch => 0878-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0879-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0881-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0882-Sync-offhand-slot-in-menus.patch} |   4 +-
 ... 0883-Player-Entity-Tracking-Events.patch} |   4 +-
 ...tch => 0884-Limit-pet-look-distance.patch} |   0
 ...ch => 0885-Properly-resend-entities.patch} |   6 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0887-fix-Instruments.patch} |   4 +-
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ...tch => 0890-Add-BlockLockCheckEvent.patch} |   0
 ... 0891-Add-Sneaking-API-for-Entities.patch} |   0
 ... => 0892-Improve-logging-and-errors.patch} |   4 +-
 ....patch => 0893-Improve-PortalEvents.patch} |   4 +-
 ...ion-for-spider-worldborder-climbing.patch} |   4 +-
 ...sing-SpigotConfig-logCommands-check.patch} |   4 +-
 ...Allay-stopDancing-while-not-dancing.patch} |   0
 ...ge.patch => 0897-Flying-Fall-Damage.patch} |   4 +-
 ...k-state-to-BlockExplodeEvent-and-En.patch} |   0
 ...ion-moving-velocity-to-VehicleBlock.patch} |   4 +-
 ...onfig-for-disabling-entity-tag-tags.patch} |   0
 ...e-player-info-update-packet-on-join.patch} |   6 +-
 ...k-items-during-EntityResurrectEvent.patch} |   0
 ...en-API.patch => 0903-Win-Screen-API.patch} |   4 +-
 ...ItemStack-setAmount-null-assignment.patch} |   0
 ...ix-force-opening-enchantment-tables.patch} |   0
 ...tch => 0906-Add-Entity-Body-Yaw-API.patch} |   0
 ...vent-sleeping-villagers-moving-towa.patch} |   0
 ...hen-a-captured-block-state-is-outda.patch} |   2 +-
 ...=> 0909-Add-EntityFertilizeEggEvent.patch} |   0
 ...ty-drop-not-updating-the-client-inv.patch} |   0
 ...temEvent-and-EntityCompostItemEvent.patch} |   0
 ...ctly-handle-ArmorStand-invisibility.patch} |   0
 ...ancement-triggers-for-entity-damage.patch} |   0
 ...914-Fix-text-display-error-on-spawn.patch} |   0
 ...nventories-returning-null-Locations.patch} |   0
 ...API.patch => 0916-Add-Shearable-API.patch} |   0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |   0
 ...kshelf-and-jukebox-setItem-with-air.patch} |   0
 ...pers.patch => 0919-Optimize-Hoppers.patch} |   4 +-
 ...ives-generating-from-using-bonemeal.patch} |   0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |   0
 ...ence-violations-like-they-should-be.patch} |   4 +-
 ...uplicate-animate-packet-for-records.patch} |   0
 ...xpired-keys-from-impacting-new-join.patch} |   4 +-
 ...ts-being-fired-from-unloaded-chunks.patch} |   4 +-
 ...0926-Use-array-for-gamerule-storage.patch} |   0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |   0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |   4 +-
 ... 0929-Add-Mob-Experience-reward-API.patch} |   0
 ...redstone-on-top-of-trap-doors-early.patch} |   0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |   0
 ...Lazy-Initialization-for-Enum-Fields.patch} |   0
 ...33-More-accurate-isInOpenWater-impl.patch} |   0
 ...ccess-to-lookups-field-in-RegistryO.patch} |   0
 ...ecalcBlockCounts-for-empty-sections.patch} |   0
 ... => 0936-Expand-PlayerItemMendEvent.patch} |   4 +-
 ...sh-ProjectileSource-for-projectiles.patch} |   2 +-
 ... => 0938-Add-transient-modifier-API.patch} |   0
 ...patch => 0939-Fix-block-place-logic.patch} |   4 +-
 ...nd-playing-for-BlockItem-ItemStacks.patch} |   0
 ...efinitions-of-trim-material-pattern.patch} |   0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |   0
 ...nhasbukkit-default-if-alias-block-e.patch} |   2 +-
 ...pLike-spam-for-missing-key-selector.patch} |   0
 ...-Fix-sniffer-removeExploredLocation.patch} |   0
 ...to-remove-all-active-potion-effects.patch} |   0
 ...yerChunkLoaderData-in-order-to-prep.patch} |   0
 ...rafting-result-amount-for-fireworks.patch} |   0
 ...> 0949-Properly-Cancel-Usable-Items.patch} |   4 +-
 ...0-Add-event-for-player-editing-sign.patch} |   0
 ...k-item-frames-if-players-can-see-it.patch} |   0
 ...-command-function-perm-level-checks.patch} |   0
 ...Add-option-to-disable-block-updates.patch} |   0
 ...954-Call-missing-BlockDispenseEvent.patch} |   0
 ...-chunks-for-supporting-block-checks.patch} |   4 +-
 ...Optimize-player-lookups-for-beacons.patch} |   0
 ...957-Add-Sign-getInteractableSideFor.patch} |   0
 ...58-Array-backed-synched-entity-data.patch} |   0
 ...9-fix-item-meta-for-tadpole-buckets.patch} |   0
 ...uppress-Item-Meta-Validation-Checks.patch} |   0
 ...t-API.patch => 0961-Fix-BanList-API.patch} |   6 +-
 ...d-water-fluid-explosion-resistance-.patch} |   0
 ...x-possible-NPE-on-painting-creation.patch} |   0
 ...imer-for-Wandering-Traders-spawned-.patch} |   0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |   0
 ...igns.patch => 0966-Don-t-tick-signs.patch} |   0
 ...t-throw-both-Spread-and-Grow-Events.patch} |   0
 ....patch => 0968-Add-whitelist-events.patch} |   0
 ... 0969-Implement-PlayerFailMoveEvent.patch} |  14 +-
 ...se-allay-memory-on-non-item-targets.patch} |   0
 ...API-for-updating-recipes-on-clients.patch} |   4 +-
 ...tion-when-spawning-display-entities.patch} |   0
 ...973-Only-capture-actual-tree-growth.patch} |  11 +-
 ...rce-for-mushroom-block-spread-event.patch} |   0
 ...Data-on-more-entities-when-spawning.patch} |   0
 ...-Use-correct-seed-on-api-world-load.patch} |   2 +-
 ...ta-neighbour-ticks-outside-of-range.patch} |   0
 ...> 0978-Cache-map-ids-on-item-frames.patch} |   0
 ...-custom-statistic-criteria-creation.patch} |   0
 ...atch => 0980-Bandaid-fix-for-Effect.patch} |   8 +-
 ...tch => 0981-SculkCatalyst-bloom-API.patch} |   0
 ...API-for-an-entity-s-scoreboard-name.patch} |   0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |  10 +-
 ...lace-methods-with-old-StructureType.patch} |   2 +-
 ...e-namespaced-commands-if-send-names.patch} |   4 +-
 ...-handle-BlockBreakEvent-isDropItems.patch} |   0
 ...entity-death-event-for-ender-dragon.patch} |   0
 ...tity-tracking-range-by-Y-coordinate.patch} |   4 +-
 ... => 0989-Add-Listing-API-for-Player.patch} |   8 +-
 ...d-BlockFace-during-BlockDamageEvent.patch} |   0
 ...h => 0991-Fix-NPE-on-Boat-getStatus.patch} |   0
 ...e-API.patch => 0992-Expand-Pose-API.patch} |   4 +-
 ...patch => 0993-More-DragonBattle-API.patch} |   0
 ... 0994-Deep-clone-unhandled-nbt-tags.patch} |   0
 ...tch => 0995-Add-PlayerPickItemEvent.patch} |   4 +-
 ...-Improve-performance-of-mass-crafts.patch} |   0
 ...=> 0997-Allow-trident-custom-damage.patch} |   0
 ...pose-hand-during-BlockCanBuildEvent.patch} |   0
 ...-nearest-structure-border-iteration.patch} |   2 +-
 ...Implement-OfflinePlayer-isConnected.patch} |   4 +-
 ....patch => 1001-Fix-inventory-desync.patch} |   0
 ...titleOverride-to-InventoryOpenEvent.patch} |   6 +-
 ...03-Configure-sniffer-egg-hatch-time.patch} |   0
 ...-proximity-check-before-entity-look.patch} |   0
 ...kip-POI-finding-if-stuck-in-vehicle.patch} |   0
 ...t-sanity-checks-in-container-clicks.patch} |   0
 ...ll-BlockRedstoneEvents-for-lecterns.patch} |   0
 ...roper-checking-of-empty-item-stacks.patch} |   0
 ...ix-silent-equipment-change-for-mobs.patch} |   8 +-
 ...h => 1010-Fix-spigot-s-Forced-Stats.patch} |   0
 ...ing-InventoryHolders-to-inventories.patch} |   0
 ...-entities-in-chunks-that-are-positio.patch |  50 ++
 996 files changed, 1780 insertions(+), 1525 deletions(-)
 rename patches/{unapplied/server/0019-Rewrite-chunk-system.patch => server/0018-Rewrite-chunk-system.patch} (97%)
 rename patches/server/{0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (97%)
 rename patches/server/{0019-Configurable-cactus-bamboo-and-reed-growth-heights.patch => 0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch} (100%)
 rename patches/server/{0020-Configurable-baby-zombie-movement-speed.patch => 0021-Configurable-baby-zombie-movement-speed.patch} (100%)
 rename patches/server/{0021-Configurable-fishing-time-ranges.patch => 0022-Configurable-fishing-time-ranges.patch} (100%)
 rename patches/server/{0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch => 0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch} (100%)
 rename patches/server/{0023-Add-configurable-despawn-distances-for-living-entiti.patch => 0024-Add-configurable-despawn-distances-for-living-entiti.patch} (100%)
 rename patches/server/{0024-Allow-for-toggling-of-spawn-chunks.patch => 0025-Allow-for-toggling-of-spawn-chunks.patch} (91%)
 rename patches/server/{0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch => 0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch} (100%)
 rename patches/server/{0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch => 0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch} (88%)
 rename patches/server/{0027-Implement-Paper-VersionChecker.patch => 0028-Implement-Paper-VersionChecker.patch} (100%)
 rename patches/server/{0028-Add-version-history-to-version-command.patch => 0029-Add-version-history-to-version-command.patch} (98%)
 rename patches/server/{0029-Player-affects-spawning-API.patch => 0030-Player-affects-spawning-API.patch} (96%)
 rename patches/server/{0030-Further-improve-server-tick-loop.patch => 0031-Further-improve-server-tick-loop.patch} (92%)
 rename patches/server/{0031-Only-refresh-abilities-if-needed.patch => 0032-Only-refresh-abilities-if-needed.patch} (87%)
 rename patches/server/{0032-Entity-Origin-API.patch => 0033-Entity-Origin-API.patch} (94%)
 rename patches/server/{0033-Prevent-tile-entity-and-entity-crashes.patch => 0034-Prevent-tile-entity-and-entity-crashes.patch} (92%)
 rename patches/server/{0034-Configurable-top-of-nether-void-damage.patch => 0035-Configurable-top-of-nether-void-damage.patch} (95%)
 rename patches/server/{0035-Check-online-mode-before-converting-and-renaming-pla.patch => 0036-Check-online-mode-before-converting-and-renaming-pla.patch} (100%)
 rename patches/server/{0036-Always-tick-falling-blocks.patch => 0037-Always-tick-falling-blocks.patch} (90%)
 rename patches/server/{0037-Configurable-end-credits.patch => 0038-Configurable-end-credits.patch} (86%)
 rename patches/server/{0038-Fix-lag-from-explosions-processing-dead-entities.patch => 0039-Fix-lag-from-explosions-processing-dead-entities.patch} (100%)
 rename patches/server/{0039-Optimize-explosions.patch => 0040-Optimize-explosions.patch} (95%)
 rename patches/server/{0040-Disable-explosion-knockback.patch => 0041-Disable-explosion-knockback.patch} (100%)
 rename patches/server/{0041-Disable-thunder.patch => 0042-Disable-thunder.patch} (87%)
 rename patches/server/{0042-Disable-ice-and-snow.patch => 0043-Disable-ice-and-snow.patch} (85%)
 rename patches/server/{0043-Configurable-mob-spawner-tick-rate.patch => 0044-Configurable-mob-spawner-tick-rate.patch} (100%)
 rename patches/server/{0044-Implement-PlayerLocaleChangeEvent.patch => 0045-Implement-PlayerLocaleChangeEvent.patch} (88%)
 rename patches/server/{0045-Add-BeaconEffectEvent.patch => 0046-Add-BeaconEffectEvent.patch} (100%)
 rename patches/server/{0046-Configurable-container-update-tick-rate.patch => 0047-Configurable-container-update-tick-rate.patch} (89%)
 rename patches/server/{0047-Use-UserCache-for-player-heads.patch => 0048-Use-UserCache-for-player-heads.patch} (100%)
 rename patches/server/{0048-Disable-spigot-tick-limiters.patch => 0049-Disable-spigot-tick-limiters.patch} (88%)
 rename patches/server/{0049-Add-PlayerInitialSpawnEvent.patch => 0050-Add-PlayerInitialSpawnEvent.patch} (95%)
 rename patches/server/{0050-Configurable-Disabling-Cat-Chest-Detection.patch => 0051-Configurable-Disabling-Cat-Chest-Detection.patch} (100%)
 rename patches/server/{0051-Improve-Player-chat-API-handling.patch => 0052-Improve-Player-chat-API-handling.patch} (89%)
 rename patches/server/{0052-All-chunks-are-slime-spawn-chunks-toggle.patch => 0053-All-chunks-are-slime-spawn-chunks-toggle.patch} (93%)
 rename patches/server/{0053-Expose-server-CommandMap.patch => 0054-Expose-server-CommandMap.patch} (87%)
 rename patches/server/{0054-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0055-Be-a-bit-more-informative-in-maxHealth-exception.patch} (100%)
 rename patches/server/{0055-Player-Tab-List-and-Title-APIs.patch => 0056-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename patches/server/{0056-Add-configurable-portal-search-radius.patch => 0057-Add-configurable-portal-search-radius.patch} (94%)
 rename patches/server/{0057-Add-velocity-warnings.patch => 0058-Add-velocity-warnings.patch} (91%)
 rename patches/server/{0058-Configurable-inter-world-teleportation-safety.patch => 0059-Configurable-inter-world-teleportation-safety.patch} (91%)
 rename patches/server/{0059-Add-exception-reporting-event.patch => 0060-Add-exception-reporting-event.patch} (95%)
 rename patches/server/{0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (100%)
 rename patches/server/{0061-Disable-Scoreboards-for-non-players-by-default.patch => 0062-Disable-Scoreboards-for-non-players-by-default.patch} (92%)
 rename patches/server/{0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (100%)
 rename patches/server/{0063-Chunk-Save-Reattempt.patch => 0064-Chunk-Save-Reattempt.patch} (77%)
 rename patches/server/{0064-Complete-resource-pack-API.patch => 0065-Complete-resource-pack-API.patch} (96%)
 rename patches/server/{0065-Default-loading-permissions.yml-before-plugins.patch => 0066-Default-loading-permissions.yml-before-plugins.patch} (95%)
 rename patches/server/{0066-Allow-Reloading-of-Custom-Permissions.patch => 0067-Allow-Reloading-of-Custom-Permissions.patch} (94%)
 rename patches/server/{0067-Remove-Metadata-on-reload.patch => 0068-Remove-Metadata-on-reload.patch} (93%)
 rename patches/server/{0068-Handle-Item-Meta-Inconsistencies.patch => 0069-Handle-Item-Meta-Inconsistencies.patch} (100%)
 rename patches/server/{0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (100%)
 rename patches/server/{0070-Add-World-Util-Methods.patch => 0071-Add-World-Util-Methods.patch} (92%)
 rename patches/server/{0071-Custom-replacement-for-eaten-items.patch => 0072-Custom-replacement-for-eaten-items.patch} (100%)
 rename patches/server/{0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (98%)
 rename patches/server/{0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (94%)
 rename patches/server/{0074-Use-a-Shared-Random-for-Entities.patch => 0075-Use-a-Shared-Random-for-Entities.patch} (96%)
 rename patches/server/{0075-Configurable-spawn-chances-for-skeleton-horses.patch => 0076-Configurable-spawn-chances-for-skeleton-horses.patch} (89%)
 rename patches/server/{0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (97%)
 rename patches/server/{0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (91%)
 rename patches/server/{0078-Entity-AddTo-RemoveFrom-World-Events.patch => 0079-Entity-AddTo-RemoveFrom-World-Events.patch} (83%)
 rename patches/server/{0079-Configurable-Chunk-Inhabited-Time.patch => 0080-Configurable-Chunk-Inhabited-Time.patch} (92%)
 rename patches/server/{0080-EntityPathfindEvent.patch => 0081-EntityPathfindEvent.patch} (100%)
 rename patches/server/{0081-Sanitise-RegionFileCache-and-make-configurable.patch => 0082-Sanitise-RegionFileCache-and-make-configurable.patch} (81%)
 rename patches/server/{0082-Do-not-load-chunks-for-Pathfinding.patch => 0083-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename patches/server/{0083-Add-PlayerUseUnknownEntityEvent.patch => 0084-Add-PlayerUseUnknownEntityEvent.patch} (95%)
 rename patches/server/{0084-Configurable-Grass-Spread-Tick-Rate.patch => 0085-Configurable-Grass-Spread-Tick-Rate.patch} (100%)
 rename patches/server/{0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (82%)
 rename patches/server/{0086-Optimize-DataBits.patch => 0087-Optimize-DataBits.patch} (100%)
 rename patches/server/{0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename patches/server/{0088-Configurable-Player-Collision.patch => 0089-Configurable-Player-Collision.patch} (97%)
 rename patches/server/{0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/server/{0090-Configurable-RCON-IP-address.patch => 0091-Configurable-RCON-IP-address.patch} (100%)
 rename patches/server/{0091-EntityRegainHealthEvent-isFastRegen-API.patch => 0092-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename patches/server/{0092-Add-ability-to-configure-frosted_ice-properties.patch => 0093-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename patches/server/{0093-remove-null-possibility-for-getServer-singleton.patch => 0094-remove-null-possibility-for-getServer-singleton.patch} (92%)
 rename patches/server/{0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (97%)
 rename patches/server/{0095-LootTable-API-Replenishable-Lootables-Feature.patch => 0096-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename patches/server/{0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename patches/server/{0097-System-property-for-disabling-watchdoge.patch => 0098-System-property-for-disabling-watchdoge.patch} (83%)
 rename patches/server/{0098-Async-GameProfileCache-saving.patch => 0099-Async-GameProfileCache-saving.patch} (90%)
 rename patches/server/{0099-Optional-TNT-doesn-t-move-in-water.patch => 0100-Optional-TNT-doesn-t-move-in-water.patch} (100%)
 rename patches/server/{0100-Faster-redstone-torch-rapid-clock-removal.patch => 0101-Faster-redstone-torch-rapid-clock-removal.patch} (97%)
 rename patches/server/{0101-Add-server-name-parameter.patch => 0102-Add-server-name-parameter.patch} (100%)
 rename patches/server/{0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch => 0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch} (100%)
 rename patches/server/{0103-Avoid-blocking-on-Network-Manager-creation.patch => 0104-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename patches/server/{0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (100%)
 rename patches/server/{0105-Add-setting-for-proxy-online-mode-status.patch => 0106-Add-setting-for-proxy-online-mode-status.patch} (97%)
 rename patches/server/{0106-Optimise-BlockState-s-hashCode-equals.patch => 0107-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0107-Configurable-packet-in-spam-threshold.patch => 0108-Configurable-packet-in-spam-threshold.patch} (90%)
 rename patches/server/{0108-Configurable-flying-kick-messages.patch => 0109-Configurable-flying-kick-messages.patch} (95%)
 rename patches/server/{0109-Add-EntityZapEvent.patch => 0110-Add-EntityZapEvent.patch} (100%)
 rename patches/server/{0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch => 0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch} (100%)
 rename patches/server/{0111-Cache-user-authenticator-threads.patch => 0112-Cache-user-authenticator-threads.patch} (100%)
 rename patches/server/{0112-Allow-Reloading-of-Command-Aliases.patch => 0113-Allow-Reloading-of-Command-Aliases.patch} (94%)
 rename patches/server/{0113-Add-source-to-PlayerExpChangeEvent.patch => 0114-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename patches/server/{0114-Add-ProjectileCollideEvent.patch => 0115-Add-ProjectileCollideEvent.patch} (100%)
 rename patches/server/{0115-Prevent-Pathfinding-out-of-World-Border.patch => 0116-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename patches/server/{0116-Optimize-World.isLoaded-BlockPosition-Z.patch => 0117-Optimize-World.isLoaded-BlockPosition-Z.patch} (91%)
 rename patches/server/{0117-Bound-Treasure-Maps-to-World-Border.patch => 0118-Bound-Treasure-Maps-to-World-Border.patch} (96%)
 rename patches/server/{0118-Configurable-Cartographer-Treasure-Maps.patch => 0119-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename patches/server/{0119-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0120-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename patches/server/{0120-String-based-Action-Bar-API.patch => 0121-String-based-Action-Bar-API.patch} (94%)
 rename patches/server/{0121-Properly-fix-item-duplication-bug.patch => 0122-Properly-fix-item-duplication-bug.patch} (90%)
 rename patches/server/{0122-Firework-API-s.patch => 0123-Firework-API-s.patch} (100%)
 rename patches/server/{0123-PlayerTeleportEndGatewayEvent.patch => 0124-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0124-Provide-E-TE-Chunk-count-stat-methods.patch => 0125-Provide-E-TE-Chunk-count-stat-methods.patch} (94%)
 rename patches/server/{0125-Enforce-Sync-Player-Saves.patch => 0126-Enforce-Sync-Player-Saves.patch} (92%)
 rename patches/server/{0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename patches/server/{0127-Cap-Entity-Collisions.patch => 0128-Cap-Entity-Collisions.patch} (95%)
 rename patches/server/{0128-Remove-CraftScheduler-Async-Task-Debugger.patch => 0129-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0129-Do-not-let-armorstands-drown.patch => 0130-Do-not-let-armorstands-drown.patch} (100%)
 rename patches/server/{0130-Properly-handle-async-calls-to-restart-the-server.patch => 0131-Properly-handle-async-calls-to-restart-the-server.patch} (97%)
 rename patches/server/{0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (93%)
 rename patches/server/{0132-Add-configuration-option-to-prevent-player-names-fro.patch => 0133-Add-configuration-option-to-prevent-player-names-fro.patch} (89%)
 rename patches/server/{0133-Use-TerminalConsoleAppender-for-console-improvements.patch => 0134-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename patches/server/{0134-provide-a-configurable-option-to-disable-creeper-lin.patch => 0135-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename patches/server/{0135-Item-canEntityPickup.patch => 0136-Item-canEntityPickup.patch} (100%)
 rename patches/server/{0136-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0137-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0137-PlayerAttemptPickupItemEvent.patch => 0138-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch => 0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch} (100%)
 rename patches/server/{0139-Add-UnknownCommandEvent.patch => 0140-Add-UnknownCommandEvent.patch} (98%)
 rename patches/server/{0140-Basic-PlayerProfile-API.patch => 0141-Basic-PlayerProfile-API.patch} (98%)
 rename patches/server/{0141-Shoulder-Entities-Release-API.patch => 0142-Shoulder-Entities-Release-API.patch} (100%)
 rename patches/server/{0142-Profile-Lookup-Events.patch => 0143-Profile-Lookup-Events.patch} (100%)
 rename patches/server/{0143-Block-player-logins-during-server-shutdown.patch => 0144-Block-player-logins-during-server-shutdown.patch} (100%)
 rename patches/server/{0144-Entity-fromMobSpawner.patch => 0145-Entity-fromMobSpawner.patch} (93%)
 rename patches/server/{0145-Improve-the-Saddle-API-for-Horses.patch => 0146-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/server/{0146-Implement-ensureServerConversions-API.patch => 0147-Implement-ensureServerConversions-API.patch} (100%)
 rename patches/server/{0147-Implement-getI18NDisplayName.patch => 0148-Implement-getI18NDisplayName.patch} (100%)
 rename patches/server/{0148-ProfileWhitelistVerifyEvent.patch => 0149-ProfileWhitelistVerifyEvent.patch} (97%)
 rename patches/server/{0149-Fix-this-stupid-bullshit.patch => 0150-Fix-this-stupid-bullshit.patch} (100%)
 rename patches/server/{0150-LivingEntity-setKiller.patch => 0151-LivingEntity-setKiller.patch} (100%)
 rename patches/server/{0151-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0152-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename patches/server/{0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename patches/server/{0153-Allow-specifying-a-custom-authentication-servers-dow.patch => 0154-Allow-specifying-a-custom-authentication-servers-dow.patch} (100%)
 rename patches/server/{0154-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0155-Handle-plugin-prefixes-using-Log4J-configuration.patch} (100%)
 rename patches/server/{0155-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0156-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename patches/server/{0156-Add-PlayerJumpEvent.patch => 0157-Add-PlayerJumpEvent.patch} (94%)
 rename patches/server/{0157-handle-ServerboundKeepAlivePacket-async.patch => 0158-handle-ServerboundKeepAlivePacket-async.patch} (100%)
 rename patches/server/{0158-Expose-client-protocol-version-and-virtual-host.patch => 0159-Expose-client-protocol-version-and-virtual-host.patch} (90%)
 rename patches/server/{0159-revert-serverside-behavior-of-keepalives.patch => 0160-revert-serverside-behavior-of-keepalives.patch} (100%)
 rename patches/server/{0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename patches/server/{0161-Add-PlayerArmorChangeEvent.patch => 0162-Add-PlayerArmorChangeEvent.patch} (100%)
 rename patches/server/{0162-Prevent-logins-from-being-processed-when-the-player-.patch => 0163-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename patches/server/{0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (88%)
 rename patches/server/{0164-use-CB-BlockState-implementations-for-captured-block.patch => 0165-use-CB-BlockState-implementations-for-captured-block.patch} (95%)
 rename patches/server/{0165-API-to-get-a-BlockState-without-a-snapshot.patch => 0166-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename patches/server/{0166-AsyncTabCompleteEvent.patch => 0167-AsyncTabCompleteEvent.patch} (96%)
 rename patches/server/{0167-PlayerPickupExperienceEvent.patch => 0168-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/server/{0168-Ability-to-apply-mending-to-XP-API.patch => 0169-Ability-to-apply-mending-to-XP-API.patch} (94%)
 rename patches/server/{0169-PlayerNaturallySpawnCreaturesEvent.patch => 0170-PlayerNaturallySpawnCreaturesEvent.patch} (82%)
 rename patches/server/{0170-Add-setPlayerProfile-API-for-Skulls.patch => 0171-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0171-PreCreatureSpawnEvent.patch => 0172-PreCreatureSpawnEvent.patch} (100%)
 rename patches/server/{0172-Fill-Profile-Property-Events.patch => 0173-Fill-Profile-Property-Events.patch} (100%)
 rename patches/server/{0173-PlayerAdvancementCriterionGrantEvent.patch => 0174-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/server/{0174-Add-ArmorStand-Item-Meta.patch => 0175-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0175-Extend-Player-Interact-cancellation.patch => 0176-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0176-Tameable-getOwnerUniqueId-API.patch => 0177-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/server/{0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename patches/server/{0178-Disable-Explicit-Network-Manager-Flushing.patch => 0179-Disable-Explicit-Network-Manager-Flushing.patch} (86%)
 rename patches/server/{0179-Implement-extended-PaperServerListPingEvent.patch => 0180-Implement-extended-PaperServerListPingEvent.patch} (98%)
 rename patches/server/{0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename patches/server/{0181-Player.setPlayerProfile-API.patch => 0182-Player.setPlayerProfile-API.patch} (94%)
 rename patches/server/{0182-getPlayerUniqueId-API.patch => 0183-getPlayerUniqueId-API.patch} (94%)
 rename patches/server/{0183-Improved-Async-Task-Scheduler.patch => 0184-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0184-Make-legacy-ping-handler-more-reliable.patch => 0185-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0185-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0186-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0186-Flag-to-disable-the-channel-limit.patch => 0187-Flag-to-disable-the-channel-limit.patch} (91%)
 rename patches/server/{0187-Add-openSign-method-to-HumanEntity.patch => 0188-Add-openSign-method-to-HumanEntity.patch} (100%)
 rename patches/server/{0188-Configurable-sprint-interruption-on-attack.patch => 0189-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename patches/server/{0189-EndermanEscapeEvent.patch => 0190-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0190-Enderman.teleportRandomly.patch => 0191-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0191-Block-Enderpearl-Travel-Exploit.patch => 0192-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename patches/server/{0192-Expand-World.spawnParticle-API-and-add-Builder.patch => 0193-Expand-World.spawnParticle-API-and-add-Builder.patch} (92%)
 rename patches/server/{0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename patches/server/{0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0195-EndermanAttackPlayerEvent.patch => 0196-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0196-WitchConsumePotionEvent.patch => 0197-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0197-WitchThrowPotionEvent.patch => 0198-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0199-WitchReadyPotionEvent.patch => 0200-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0200-ItemStack-getMaxItemUseDuration.patch => 0201-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0201-Implement-EntityTeleportEndGatewayEvent.patch => 0202-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename patches/server/{0203-Fix-CraftEntity-hashCode.patch => 0204-Fix-CraftEntity-hashCode.patch} (100%)
 rename patches/server/{0204-Configurable-Alternative-LootPool-Luck-Formula.patch => 0205-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename patches/server/{0205-Print-Error-details-when-failing-to-save-player-data.patch => 0206-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0206-Make-shield-blocking-delay-configurable.patch => 0207-Make-shield-blocking-delay-configurable.patch} (100%)
 rename patches/server/{0207-Improve-EntityShootBowEvent.patch => 0208-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0208-PlayerReadyArrowEvent.patch => 0209-PlayerReadyArrowEvent.patch} (100%)
 rename patches/server/{0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch => 0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch} (98%)
 rename patches/server/{0210-Expand-Explosions-API.patch => 0211-Expand-Explosions-API.patch} (90%)
 rename patches/server/{0211-LivingEntity-Hand-Raised-Item-Use-API.patch => 0212-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0212-RangedEntity-API.patch => 0213-RangedEntity-API.patch} (100%)
 rename patches/server/{0213-Add-config-to-disable-ender-dragon-legacy-check.patch => 0214-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename patches/server/{0214-Implement-World.getEntity-UUID-API.patch => 0215-Implement-World.getEntity-UUID-API.patch} (85%)
 rename patches/server/{0215-InventoryCloseEvent-Reason-API.patch => 0216-InventoryCloseEvent-Reason-API.patch} (92%)
 rename patches/server/{0216-Vex-get-setSummoner-API.patch => 0217-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (90%)
 rename patches/server/{0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch => 0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch} (100%)
 rename patches/server/{0219-add-more-information-to-Entity.toString.patch => 0220-add-more-information-to-Entity.toString.patch} (91%)
 rename patches/server/{0220-EnderDragon-Events.patch => 0221-EnderDragon-Events.patch} (100%)
 rename patches/server/{0221-PlayerElytraBoostEvent.patch => 0222-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0222-PlayerLaunchProjectileEvent.patch => 0223-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0223-Improve-BlockPosition-inlining.patch => 0224-Improve-BlockPosition-inlining.patch} (100%)
 rename patches/server/{0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (91%)
 rename patches/server/{0225-Vanished-players-don-t-have-rights.patch => 0226-Vanished-players-don-t-have-rights.patch} (98%)
 rename patches/server/{0226-Allow-disabling-armour-stand-ticking.patch => 0227-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename patches/server/{0227-SkeletonHorse-Additions.patch => 0228-SkeletonHorse-Additions.patch} (96%)
 rename patches/server/{0228-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0229-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0229-Implement-Expanded-ArmorStand-API.patch => 0230-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0230-AnvilDamageEvent.patch => 0231-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0231-Add-TNTPrimeEvent.patch => 0232-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0232-Break-up-and-make-tab-spam-limits-configurable.patch => 0233-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename patches/server/{0233-Fix-NBT-type-issues.patch => 0234-Fix-NBT-type-issues.patch} (100%)
 rename patches/server/{0234-Remove-unnecessary-itemmeta-handling.patch => 0235-Remove-unnecessary-itemmeta-handling.patch} (100%)
 rename patches/server/{0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (91%)
 rename patches/server/{0236-Add-Early-Warning-Feature-to-WatchDog.patch => 0237-Add-Early-Warning-Feature-to-WatchDog.patch} (90%)
 rename patches/server/{0237-Use-ConcurrentHashMap-in-JsonList.patch => 0238-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename patches/server/{0238-Use-a-Queue-for-Queueing-Commands.patch => 0239-Use-a-Queue-for-Queueing-Commands.patch} (88%)
 rename patches/server/{0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (90%)
 rename patches/server/{0240-Optimize-BlockPosition-helper-methods.patch => 0241-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch => 0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch} (100%)
 rename patches/server/{0242-Slime-Pathfinder-Events.patch => 0243-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0243-Configurable-speed-for-water-flowing-over-lava.patch => 0244-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0244-Optimize-CraftBlockData-Creation.patch => 0245-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0245-Optimize-MappedRegistry.patch => 0246-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0246-Add-PhantomPreSpawnEvent.patch => 0247-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0247-Add-More-Creeper-API.patch => 0248-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0248-Inventory-removeItemAnySlot.patch => 0249-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (87%)
 rename patches/server/{0250-Add-ray-tracing-methods-to-LivingEntity.patch => 0251-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0251-Expose-attack-cooldown-methods-for-Player.patch => 0252-Expose-attack-cooldown-methods-for-Player.patch} (86%)
 rename patches/server/{0252-Improve-death-events.patch => 0253-Improve-death-events.patch} (98%)
 rename patches/server/{0253-Allow-chests-to-be-placed-with-NBT-data.patch => 0254-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0254-Mob-Pathfinding-API.patch => 0255-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0257-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0258-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0258-Implement-furnace-cook-speed-multiplier-API.patch => 0259-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0259-Honor-EntityAgeable.ageLock.patch => 0260-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0260-Configurable-connection-throttle-kick-message.patch => 0261-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0261-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0262-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0262-Hook-into-CB-plugin-rewrites.patch => 0263-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0263-PreSpawnerSpawnEvent.patch => 0264-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0264-Add-LivingEntity-getTargetEntity.patch => 0265-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/server/{0265-Add-sun-related-API.patch => 0266-Add-sun-related-API.patch} (90%)
 rename patches/server/{0266-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0267-Catch-JsonParseException-in-Entity-and-TE-names.patch} (97%)
 rename patches/server/{0267-Turtle-API.patch => 0268-Turtle-API.patch} (100%)
 rename patches/server/{0268-Call-player-spectator-target-events-and-improve-impl.patch => 0269-Call-player-spectator-target-events-and-improve-impl.patch} (91%)
 rename patches/server/{0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0270-Add-more-Witch-API.patch => 0271-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0271-Check-Drowned-for-Villager-Aggression-Config.patch => 0272-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0272-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0273-Add-option-to-prevent-players-from-moving-into-unloa.patch} (95%)
 rename patches/server/{0273-Reset-players-airTicks-on-respawn.patch => 0274-Reset-players-airTicks-on-respawn.patch} (83%)
 rename patches/server/{0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (98%)
 rename patches/server/{0276-Optimize-World-Time-Updates.patch => 0277-Optimize-World-Time-Updates.patch} (94%)
 rename patches/server/{0277-Restore-custom-InventoryHolder-support.patch => 0278-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0278-Use-Vanilla-Minecart-Speeds.patch => 0279-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0279-Fix-SpongeAbsortEvent-handling.patch => 0280-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0280-Don-t-allow-digging-into-unloaded-chunks.patch => 0281-Don-t-allow-digging-into-unloaded-chunks.patch} (96%)
 rename patches/server/{0281-Make-the-default-permission-message-configurable.patch => 0282-Make-the-default-permission-message-configurable.patch} (88%)
 rename patches/server/{0282-Prevent-rayTrace-from-loading-chunks.patch => 0283-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0283-Handle-Large-Packets-disconnecting-client.patch => 0284-Handle-Large-Packets-disconnecting-client.patch} (97%)
 rename patches/server/{0284-force-entity-dismount-during-teleportation.patch => 0285-force-entity-dismount-during-teleportation.patch} (93%)
 rename patches/server/{0285-Add-more-Zombie-API.patch => 0286-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0286-Book-Size-Limits.patch => 0287-Book-Size-Limits.patch} (94%)
 rename patches/server/{0287-Add-PlayerConnectionCloseEvent.patch => 0288-Add-PlayerConnectionCloseEvent.patch} (96%)
 rename patches/server/{0288-Prevent-Enderman-from-loading-chunks.patch => 0289-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (93%)
 rename patches/server/{0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (85%)
 rename patches/server/{0291-Block-Entity-remove-from-being-called-on-Players.patch => 0292-Block-Entity-remove-from-being-called-on-Players.patch} (90%)
 rename patches/server/{0292-BlockDestroyEvent.patch => 0293-BlockDestroyEvent.patch} (93%)
 rename patches/server/{0293-Async-command-map-building.patch => 0294-Async-command-map-building.patch} (95%)
 rename patches/server/{0294-Implement-Brigadier-Mojang-API.patch => 0295-Implement-Brigadier-Mojang-API.patch} (98%)
 rename patches/server/{0295-Improve-exact-choice-recipe-ingredients.patch => 0296-Improve-exact-choice-recipe-ingredients.patch} (100%)
 rename patches/server/{0296-Limit-Client-Sign-length-more.patch => 0297-Limit-Client-Sign-length-more.patch} (94%)
 rename patches/server/{0297-Handle-Oversized-Tile-Entities-in-chunks.patch => 0298-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (88%)
 rename patches/server/{0299-Entity-getEntitySpawnReason.patch => 0300-Entity-getEntitySpawnReason.patch} (93%)
 rename patches/server/{0300-Fire-event-on-GS4-query.patch => 0301-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0301-Implement-PlayerPostRespawnEvent.patch => 0302-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename patches/server/{0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0303-Server-Tick-Events.patch => 0304-Server-Tick-Events.patch} (85%)
 rename patches/server/{0304-PlayerDeathEvent-getItemsToKeep.patch => 0305-PlayerDeathEvent-getItemsToKeep.patch} (92%)
 rename patches/server/{0305-Optimize-Captured-TileEntity-Lookup.patch => 0306-Optimize-Captured-TileEntity-Lookup.patch} (78%)
 rename patches/server/{0306-Add-Heightmap-API.patch => 0307-Add-Heightmap-API.patch} (95%)
 rename patches/server/{0307-Mob-Spawner-API-Enhancements.patch => 0308-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0308-Fix-CB-call-to-changed-postToMainThread-method.patch => 0309-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename patches/server/{0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0310-Implement-CraftBlockSoundGroup.patch => 0311-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (96%)
 rename patches/server/{0312-Allow-Saving-of-Oversized-Chunks.patch => 0313-Allow-Saving-of-Oversized-Chunks.patch} (91%)
 rename patches/server/{0313-Expose-the-internal-current-tick.patch => 0314-Expose-the-internal-current-tick.patch} (90%)
 rename patches/server/{0314-Fix-World-isChunkGenerated-calls.patch => 0315-Fix-World-isChunkGenerated-calls.patch} (91%)
 rename patches/server/{0315-Show-blockstate-location-if-we-failed-to-read-it.patch => 0316-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0317-Configurable-projectile-relative-velocity.patch => 0318-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0318-offset-item-frame-ticking.patch => 0319-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0319-Fix-MC-158900.patch => 0320-Fix-MC-158900.patch} (94%)
 rename patches/server/{0320-Prevent-consuming-the-wrong-itemstack.patch => 0321-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0321-Dont-send-unnecessary-sign-update.patch => 0322-Dont-send-unnecessary-sign-update.patch} (100%)
 rename patches/server/{0322-Add-option-to-disable-pillager-patrols.patch => 0323-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0323-Flat-bedrock-generator-settings.patch => 0324-Flat-bedrock-generator-settings.patch} (99%)
 rename patches/server/{0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0325-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0326-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0326-Duplicate-UUID-Resolve-Option.patch => 0327-Duplicate-UUID-Resolve-Option.patch} (91%)
 rename patches/server/{0327-PlayerDeathEvent-shouldDropExperience.patch => 0328-PlayerDeathEvent-shouldDropExperience.patch} (85%)
 rename patches/server/{0328-Prevent-bees-loading-chunks-checking-hive-position.patch => 0329-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0330-Optimise-EntityGetter-getPlayerByUUID.patch => 0331-Optimise-EntityGetter-getPlayerByUUID.patch} (90%)
 rename patches/server/{0331-Fix-items-not-falling-correctly.patch => 0332-Fix-items-not-falling-correctly.patch} (94%)
 rename patches/server/{0332-Optimize-call-to-getFluid-for-explosions.patch => 0333-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0334-Entity-Activation-Range-2.0.patch => 0335-Entity-Activation-Range-2.0.patch} (97%)
 rename patches/server/{0335-Implement-alternative-item-despawn-rate.patch => 0336-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0336-Lag-compensate-eating.patch => 0337-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0337-Tracking-Range-Improvements.patch => 0338-Tracking-Range-Improvements.patch} (95%)
 rename patches/server/{0338-Fix-items-vanishing-through-end-portal.patch => 0339-Fix-items-vanishing-through-end-portal.patch} (89%)
 rename patches/server/{0339-implement-optional-per-player-mob-spawns.patch => 0340-implement-optional-per-player-mob-spawns.patch} (96%)
 rename patches/server/{0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0341-Improve-Block-breakNaturally-API.patch => 0342-Improve-Block-breakNaturally-API.patch} (100%)
 rename patches/server/{0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (89%)
 rename patches/server/{0343-Add-debug-for-sync-chunk-loads.patch => 0344-Add-debug-for-sync-chunk-loads.patch} (90%)
 rename patches/server/{0344-Improve-java-version-check.patch => 0345-Improve-java-version-check.patch} (100%)
 rename patches/server/{0345-Add-ThrownEggHatchEvent.patch => 0346-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0346-Entity-Jump-API.patch => 0347-Entity-Jump-API.patch} (100%)
 rename patches/server/{0347-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0348-Add-option-to-nerf-pigmen-from-nether-portals.patch} (91%)
 rename patches/server/{0348-Make-the-GUI-graph-fancier.patch => 0349-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0349-add-hand-to-BlockMultiPlaceEvent.patch => 0350-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0350-Validate-tripwire-hook-placement-before-update.patch => 0351-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0352-Configurable-chance-of-villager-zombie-infection.patch => 0353-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0353-Optimise-Chunk-getFluid.patch => 0354-Optimise-Chunk-getFluid.patch} (96%)
 rename patches/server/{0354-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0355-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0355-Add-tick-times-API-and-mspt-command.patch => 0356-Add-tick-times-API-and-mspt-command.patch} (96%)
 rename patches/server/{0356-Expose-MinecraftServer-isRunning.patch => 0357-Expose-MinecraftServer-isRunning.patch} (90%)
 rename patches/server/{0357-Add-Raw-Byte-ItemStack-Serialization.patch => 0358-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0358-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0359-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename patches/server/{0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (95%)
 rename patches/server/{0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (87%)
 rename patches/server/{0362-Don-t-tick-dead-players.patch => 0363-Don-t-tick-dead-players.patch} (85%)
 rename patches/server/{0363-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0364-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0364-Optimize-Collision-to-not-load-chunks.patch => 0365-Optimize-Collision-to-not-load-chunks.patch} (97%)
 rename patches/server/{0365-Don-t-move-existing-players-to-world-spawn.patch => 0366-Don-t-move-existing-players-to-world-spawn.patch} (88%)
 rename patches/server/{0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0367-Improved-Watchdog-Support.patch => 0368-Improved-Watchdog-Support.patch} (92%)
 rename patches/server/{0368-Optimize-Pathfinding.patch => 0369-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0369-Reduce-Either-Optional-allocation.patch => 0370-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0370-Reduce-memory-footprint-of-NBTTagCompound.patch => 0371-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0371-Prevent-opening-inventories-when-frozen.patch => 0372-Prevent-opening-inventories-when-frozen.patch} (94%)
 rename patches/server/{0372-Don-t-run-entity-collision-code-if-not-needed.patch => 0373-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0373-Implement-Player-Client-Options-API.patch => 0374-Implement-Player-Client-Options-API.patch} (96%)
 rename patches/server/{0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (81%)
 rename patches/server/{0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (94%)
 rename patches/server/{0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (89%)
 rename patches/server/{0377-Add-PlayerAttackEntityCooldownResetEvent.patch => 0378-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0378-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0379-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0379-Add-phantom-creative-and-insomniac-controls.patch => 0380-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (96%)
 rename patches/server/{0381-Villager-Restocks-API.patch => 0382-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0382-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0383-Validate-PickItem-Packet-and-kick-for-invalid.patch} (91%)
 rename patches/server/{0383-Expose-game-version.patch => 0384-Expose-game-version.patch} (89%)
 rename patches/server/{0384-Optimize-Voxel-Shape-Merging.patch => 0385-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0386-misc-debugging-dumps.patch => 0387-misc-debugging-dumps.patch} (91%)
 rename patches/server/{0387-Prevent-teleporting-dead-entities.patch => 0388-Prevent-teleporting-dead-entities.patch} (87%)
 rename patches/server/{0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (97%)
 rename patches/server/{0389-Implement-Mob-Goal-API.patch => 0390-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0390-Add-villager-reputation-API.patch => 0391-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0391-Option-for-maximum-exp-value-when-merging-orbs.patch => 0392-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0392-ExperienceOrbMergeEvent.patch => 0393-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0393-Fix-PotionEffect-ignores-icon-flag.patch => 0394-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0394-Optimize-brigadier-child-sorting-performance.patch => 0395-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0395-Potential-bed-API.patch => 0396-Potential-bed-API.patch} (100%)
 rename patches/server/{0396-Wait-for-Async-Tasks-during-shutdown.patch => 0397-Wait-for-Async-Tasks-during-shutdown.patch} (90%)
 rename patches/server/{0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (99%)
 rename patches/server/{0399-Ensure-safe-gateway-teleport.patch => 0400-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0400-Add-option-for-console-having-all-permissions.patch => 0401-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0401-Fix-villager-trading-demand-MC-163962.patch => 0402-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0402-Maps-shouldn-t-load-chunks.patch => 0403-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0403-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0404-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0405-Fix-piston-physics-inconsistency-MC-188840.patch => 0406-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0406-Fix-sand-duping.patch => 0407-Fix-sand-duping.patch} (100%)
 rename patches/server/{0407-Fix-missing-chunks-due-to-integer-overflow.patch => 0408-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0408-Prevent-position-desync-in-playerconnection-causing-.patch => 0409-Prevent-position-desync-in-playerconnection-causing-.patch} (91%)
 rename patches/server/{0409-Inventory-getHolder-method-without-block-snapshot.patch => 0410-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0410-Improve-Arrow-API.patch => 0411-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0411-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0412-Add-and-implement-PlayerRecipeBookClickEvent.patch} (95%)
 rename patches/server/{0412-Hide-sync-chunk-writes-behind-flag.patch => 0413-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0413-Add-permission-for-command-blocks.patch => 0414-Add-permission-for-command-blocks.patch} (96%)
 rename patches/server/{0414-Ensure-Entity-AABB-s-are-never-invalid.patch => 0415-Ensure-Entity-AABB-s-are-never-invalid.patch} (74%)
 rename patches/server/{0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (90%)
 rename patches/server/{0416-Paper-dumpitem-command.patch => 0417-Paper-dumpitem-command.patch} (94%)
 rename patches/server/{0417-Improve-Legacy-Component-serialization-size.patch => 0418-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0418-Optimize-Bit-Operations-by-inlining.patch => 0419-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (94%)
 rename patches/server/{0420-incremental-chunk-and-player-saving.patch => 0421-incremental-chunk-and-player-saving.patch} (89%)
 rename patches/server/{0421-Support-old-UUID-format-for-NBT.patch => 0422-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0422-Convert-legacy-attributes-in-Item-Meta.patch => 0423-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0423-Remove-some-streams-from-structures.patch => 0424-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0424-Remove-streams-from-classes-related-villager-gossip.patch => 0425-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0425-Support-components-in-ItemMeta.patch => 0426-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0426-Improve-fix-EntityTargetLivingEntityEvent.patch => 0427-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0427-Add-entity-liquid-API.patch => 0428-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0428-Update-itemstack-legacy-name-and-lore.patch => 0429-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0429-Spawn-player-in-correct-world-on-login.patch => 0430-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename patches/server/{0430-Add-PrepareResultEvent.patch => 0431-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0432-Fix-arrows-never-despawning-MC-125757.patch => 0433-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0433-Thread-Safe-Vanilla-Command-permission-checking.patch => 0434-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0434-Fix-SPIGOT-5989.patch => 0435-Fix-SPIGOT-5989.patch} (97%)
 rename patches/server/{0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (97%)
 rename patches/server/{0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (89%)
 rename patches/server/{0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0438-Fix-some-rails-connecting-improperly.patch => 0439-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0440-Brand-support.patch => 0441-Brand-support.patch} (95%)
 rename patches/server/{0441-Add-playPickupItemAnimation-to-LivingEntity.patch => 0442-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0442-Don-t-require-FACING-data.patch => 0443-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (90%)
 rename patches/server/{0444-Add-moon-phase-API.patch => 0445-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0445-Prevent-headless-pistons-from-being-created.patch => 0446-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0446-Add-BellRingEvent.patch => 0447-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0447-Add-zombie-targets-turtle-egg-config.patch => 0448-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0448-Buffer-joins-to-world.patch => 0449-Buffer-joins-to-world.patch} (90%)
 rename patches/server/{0449-Eigencraft-redstone-implementation.patch => 0450-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0450-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0451-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0451-PortalCreateEvent-needs-to-know-its-entity.patch => 0452-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0452-Add-more-Evoker-API.patch => 0453-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0453-Add-methods-to-get-translation-keys.patch => 0454-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0454-Create-HoverEvent-from-ItemStack-Entity.patch => 0455-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0455-Cache-block-data-strings.patch => 0456-Cache-block-data-strings.patch} (95%)
 rename patches/server/{0456-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (93%)
 rename patches/server/{0457-Add-additional-open-container-api-to-HumanEntity.patch => 0458-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0458-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0459-Extend-block-drop-capture-to-capture-all-items-added.patch => 0460-Extend-block-drop-capture-to-capture-all-items-added.patch} (94%)
 rename patches/server/{0460-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (90%)
 rename patches/server/{0461-Lazily-track-plugin-scoreboards-by-default.patch => 0462-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0462-Entity-isTicking.patch => 0463-Entity-isTicking.patch} (89%)
 rename patches/server/{0463-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (90%)
 rename patches/server/{0464-Fix-Concurrency-issue-in-ShufflingList.patch => 0465-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0465-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0466-Fix-for-large-move-vectors-crashing-server.patch => 0467-Fix-for-large-move-vectors-crashing-server.patch} (96%)
 rename patches/server/{0467-Optimise-getType-calls.patch => 0468-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0468-Villager-resetOffers.patch => 0469-Villager-resetOffers.patch} (100%)
 rename patches/server/{0469-Retain-block-place-order-when-capturing-blockstates.patch => 0470-Retain-block-place-order-when-capturing-blockstates.patch} (93%)
 rename patches/server/{0470-Reduce-blockpos-allocation-from-pathfinding.patch => 0471-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0471-Fix-item-locations-dropped-from-campfires.patch => 0472-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0472-Player-elytra-boost-API.patch => 0473-Player-elytra-boost-API.patch} (90%)
 rename patches/server/{0473-Fixed-TileEntityBell-memory-leak.patch => 0474-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0475-Add-getOfflinePlayerIfCached-String.patch => 0476-Add-getOfflinePlayerIfCached-String.patch} (93%)
 rename patches/server/{0476-Add-ignore-discounts-API.patch => 0477-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0477-Toggle-for-removing-existing-dragon.patch => 0478-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0478-Fix-client-lag-on-advancement-loading.patch => 0479-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0479-Item-no-age-no-player-pickup.patch => 0480-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0481-Beacon-API-custom-effect-ranges.patch => 0482-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0482-Add-API-for-quit-reason.patch => 0483-Add-API-for-quit-reason.patch} (87%)
 rename patches/server/{0483-Add-Wandering-Trader-spawn-rate-config-options.patch => 0484-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0484-Expose-world-spawn-angle.patch => 0485-Expose-world-spawn-angle.patch} (91%)
 rename patches/server/{0485-Add-Destroy-Speed-API.patch => 0486-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (89%)
 rename patches/server/{0487-Add-LivingEntity-clearActiveItem.patch => 0488-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0488-Add-PlayerItemCooldownEvent.patch => 0489-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0489-Significantly-improve-performance-of-the-end-generat.patch => 0490-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0490-More-lightning-API.patch => 0491-More-lightning-API.patch} (100%)
 rename patches/server/{0491-Climbing-should-not-bypass-cramming-gamerule.patch => 0492-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0492-Added-missing-default-perms-for-commands.patch => 0493-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0493-Add-PlayerShearBlockEvent.patch => 0494-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0494-Fix-curing-zombie-villager-discount-exploit.patch => 0495-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0495-Limit-recipe-packets.patch => 0496-Limit-recipe-packets.patch} (94%)
 rename patches/server/{0496-Fix-CraftSound-backwards-compatibility.patch => 0497-Fix-CraftSound-backwards-compatibility.patch} (100%)
 delete mode 100644 patches/server/0497-Player-Chunk-Load-Unload-Events.patch
 create mode 100644 patches/server/0498-Player-Chunk-Load-Unload-Events.patch
 rename patches/server/{0498-Optimize-Dynamic-get-Missing-Keys.patch => 0499-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0499-Expose-LivingEntity-hurt-direction.patch => 0500-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0501-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0502-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0503-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0503-Implement-TargetHitEvent.patch => 0504-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0504-MC-4-Fix-item-position-desync.patch => 0505-MC-4-Fix-item-position-desync.patch} (88%)
 rename patches/server/{0505-Additional-Block-Material-API-s.patch => 0506-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0506-Fix-harming-potion-dupe.patch => 0507-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0508-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0508-Cache-burn-durations.patch => 0509-Cache-burn-durations.patch} (100%)
 rename patches/server/{0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0510-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0510-Fix-Not-a-string-Map-Conversion-spam.patch => 0511-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0511-Implement-PlayerFlowerPotManipulateEvent.patch => 0512-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0512-Fix-interact-event-not-being-called-sometimes.patch => 0513-Fix-interact-event-not-being-called-sometimes.patch} (94%)
 rename patches/server/{0513-Zombie-API-breaking-doors.patch => 0514-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0514-Fix-nerfed-slime-when-splitting.patch => 0515-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0515-Add-EntityLoadCrossbowEvent.patch => 0516-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0516-Added-WorldGameRuleChangeEvent.patch => 0517-Added-WorldGameRuleChangeEvent.patch} (96%)
 rename patches/server/{0517-Added-ServerResourcesReloadedEvent.patch => 0518-Added-ServerResourcesReloadedEvent.patch} (93%)
 rename patches/server/{0518-Added-world-settings-for-mobs-picking-up-loot.patch => 0519-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0519-Implemented-BlockFailedDispenseEvent.patch => 0520-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0520-Added-PlayerLecternPageChangeEvent.patch => 0521-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0521-Added-PlayerLoomPatternSelectEvent.patch => 0522-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0522-Configurable-door-breaking-difficulty.patch => 0523-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0523-Empty-commands-shall-not-be-dispatched.patch => 0524-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0524-Remove-stale-POIs.patch => 0525-Remove-stale-POIs.patch} (86%)
 rename patches/server/{0525-Fix-villager-boat-exploit.patch => 0526-Fix-villager-boat-exploit.patch} (93%)
 rename patches/server/{0526-Add-sendOpLevel-API.patch => 0527-Add-sendOpLevel-API.patch} (89%)
 rename patches/server/{0527-TODO-Registry-Modification-API.patch => 0528-TODO-Registry-Modification-API.patch} (100%)
 rename patches/server/{0528-Add-StructuresLocateEvent.patch => 0529-Add-StructuresLocateEvent.patch} (99%)
 rename patches/server/{0529-Collision-option-for-requiring-a-player-participant.patch => 0530-Collision-option-for-requiring-a-player-participant.patch} (94%)
 rename patches/server/{0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0531-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0531-Return-chat-component-with-empty-text-instead-of-thr.patch => 0532-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0532-Make-schedule-command-per-world.patch => 0533-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0533-Configurable-max-leash-distance.patch => 0534-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0534-Implement-BlockPreDispenseEvent.patch => 0535-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0536-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0536-Add-toggle-for-always-placing-the-dragon-egg.patch => 0537-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0537-Added-PlayerStonecutterRecipeSelectEvent.patch => 0538-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0539-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0539-Reset-shield-blocking-on-dimension-change.patch => 0540-Reset-shield-blocking-on-dimension-change.patch} (83%)
 rename patches/server/{0540-add-DragonEggFormEvent.patch => 0541-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0541-EntityMoveEvent.patch => 0542-EntityMoveEvent.patch} (93%)
 rename patches/server/{0542-added-option-to-disable-pathfinding-updates-on-block.patch => 0543-added-option-to-disable-pathfinding-updates-on-block.patch} (80%)
 rename patches/server/{0543-Inline-shift-direction-fields.patch => 0544-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0544-Allow-adding-items-to-BlockDropItemEvent.patch => 0545-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0546-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0546-living-entity-allow-attribute-registration.patch => 0547-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0547-fix-dead-slime-setSize-invincibility.patch => 0548-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0548-Merchant-getRecipes-should-return-an-immutable-list.patch => 0549-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0549-Expose-Tracked-Players.patch => 0550-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0550-Remove-streams-from-SensorNearest.patch => 0551-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0551-Improve-ServerGUI.patch => 0552-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0552-fix-converting-txt-to-json-file.patch => 0553-fix-converting-txt-to-json-file.patch} (94%)
 rename patches/server/{0553-Add-worldborder-events.patch => 0554-Add-worldborder-events.patch} (100%)
 rename patches/server/{0554-added-PlayerNameEntityEvent.patch => 0555-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0555-Prevent-grindstones-from-overstacking-items.patch => 0556-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0556-Add-recipe-to-cook-events.patch => 0557-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0557-Add-Block-isValidTool.patch => 0558-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0558-Allow-using-signs-inside-spawn-protection.patch => 0559-Allow-using-signs-inside-spawn-protection.patch} (91%)
 rename patches/server/{0559-Expand-world-key-API.patch => 0560-Expand-world-key-API.patch} (97%)
 rename patches/server/{0560-Add-fast-alternative-constructor-for-Rotations.patch => 0561-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0561-Item-Rarity-API.patch => 0562-Item-Rarity-API.patch} (100%)
 rename patches/server/{0562-Drop-carried-item-when-player-has-disconnected.patch => 0563-Drop-carried-item-when-player-has-disconnected.patch} (92%)
 rename patches/server/{0563-forced-whitelist-use-configurable-kick-message.patch => 0564-forced-whitelist-use-configurable-kick-message.patch} (87%)
 rename patches/server/{0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0565-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (86%)
 rename patches/server/{0565-Expose-protocol-version.patch => 0566-Expose-protocol-version.patch} (100%)
 rename patches/server/{0566-Enhance-console-tab-completions-for-brigadier-comman.patch => 0567-Enhance-console-tab-completions-for-brigadier-comman.patch} (99%)
 rename patches/server/{0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0568-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0568-Add-bypass-host-check.patch => 0569-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0569-Set-area-affect-cloud-rotation.patch => 0570-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0570-add-isDeeplySleeping-to-HumanEntity.patch => 0571-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0571-add-consumeFuel-to-FurnaceBurnEvent.patch => 0572-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0572-add-get-set-drop-chance-to-EntityEquipment.patch => 0573-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0573-fix-PigZombieAngerEvent-cancellation.patch => 0574-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0574-fix-PlayerItemHeldEvent-firing-twice.patch => 0575-fix-PlayerItemHeldEvent-firing-twice.patch} (88%)
 rename patches/server/{0575-Added-PlayerDeepSleepEvent.patch => 0576-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0576-More-World-API.patch => 0577-More-World-API.patch} (96%)
 rename patches/server/{0577-Added-PlayerBedFailEnterEvent.patch => 0578-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0578-Implement-methods-to-convert-between-Component-and-B.patch => 0579-Implement-methods-to-convert-between-Component-and-B.patch} (96%)
 rename patches/server/{0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0580-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (95%)
 rename patches/server/{0580-Introduce-beacon-activation-deactivation-events.patch => 0581-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0581-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0582-add-RespawnFlags-to-PlayerRespawnEvent.patch} (92%)
 rename patches/server/{0582-Add-Channel-initialization-listeners.patch => 0583-Add-Channel-initialization-listeners.patch} (96%)
 rename patches/server/{0583-Send-empty-commands-if-tab-completion-is-disabled.patch => 0584-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0584-Add-more-WanderingTrader-API.patch => 0585-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0585-Add-EntityBlockStorage-clearEntities.patch => 0586-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0588-Inventory-close.patch => 0589-Inventory-close.patch} (100%)
 rename patches/server/{0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0590-Fix-CraftPotionBrewer-cache.patch => 0591-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0591-Add-basic-Datapack-API.patch => 0592-Add-basic-Datapack-API.patch} (98%)
 rename patches/server/{0592-Add-environment-variable-to-disable-server-gui.patch => 0593-Add-environment-variable-to-disable-server-gui.patch} (85%)
 rename patches/server/{0593-additions-to-PlayerGameModeChangeEvent.patch => 0594-additions-to-PlayerGameModeChangeEvent.patch} (93%)
 rename patches/server/{0594-ItemStack-repair-check-API.patch => 0595-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0595-More-Enchantment-API.patch => 0596-More-Enchantment-API.patch} (100%)
 rename patches/server/{0596-Move-range-check-for-block-placing-up.patch => 0597-Move-range-check-for-block-placing-up.patch} (87%)
 rename patches/server/{0597-Fix-and-optimise-world-force-upgrading.patch => 0598-Fix-and-optimise-world-force-upgrading.patch} (95%)
 rename patches/server/{0598-Add-Mob-lookAt-API.patch => 0599-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0599-Add-Unix-domain-socket-support.patch => 0600-Add-Unix-domain-socket-support.patch} (97%)
 rename patches/server/{0600-Add-EntityInsideBlockEvent.patch => 0601-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0601-Attributes-API-for-item-defaults.patch => 0602-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0602-Add-cause-to-Weather-ThunderChangeEvents.patch => 0603-Add-cause-to-Weather-ThunderChangeEvents.patch} (92%)
 rename patches/server/{0603-More-Lidded-Block-API.patch => 0604-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0604-Limit-item-frame-cursors-on-maps.patch => 0605-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0605-Add-PlayerKickEvent-causes.patch => 0606-Add-PlayerKickEvent-causes.patch} (95%)
 rename patches/server/{0606-Add-PufferFishStateChangeEvent.patch => 0607-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0608-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0609-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0609-Add-option-to-fix-items-merging-through-walls.patch => 0610-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0610-Add-BellRevealRaiderEvent.patch => 0611-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0611-Fix-invulnerable-end-crystals.patch => 0612-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0612-Add-ElderGuardianAppearanceEvent.patch => 0613-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0613-Fix-dangerous-end-portal-logic.patch => 0614-Fix-dangerous-end-portal-logic.patch} (93%)
 rename patches/server/{0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0615-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0615-Make-item-validations-configurable.patch => 0616-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0616-Line-Of-Sight-Changes.patch => 0617-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0617-add-per-world-spawn-limits.patch => 0618-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0618-Fix-potions-splash-events.patch => 0619-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0619-Add-more-LimitedRegion-API.patch => 0620-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0620-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0621-Fix-PlayerDropItemEvent-using-wrong-item.patch} (91%)
 rename patches/server/{0621-Missing-Entity-API.patch => 0622-Missing-Entity-API.patch} (100%)
 rename patches/server/{0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0623-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (88%)
 rename patches/server/{0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0624-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0624-Use-getChunkIfLoadedImmediately-in-places.patch => 0625-Use-getChunkIfLoadedImmediately-in-places.patch} (94%)
 rename patches/server/{0625-Fix-commands-from-signs-not-firing-command-events.patch => 0626-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0626-Adds-PlayerArmSwingEvent.patch => 0627-Adds-PlayerArmSwingEvent.patch} (88%)
 rename patches/server/{0627-Fixes-kick-event-leave-message-not-being-sent.patch => 0628-Fixes-kick-event-leave-message-not-being-sent.patch} (94%)
 rename patches/server/{0628-Add-config-for-mobs-immune-to-default-effects.patch => 0629-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0629-Fix-incorrect-message-for-outdated-client.patch => 0630-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0630-Don-t-apply-cramming-damage-to-players.patch => 0631-Don-t-apply-cramming-damage-to-players.patch} (90%)
 rename patches/server/{0631-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0632-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0632-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0633-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0633-Stinger-API.patch => 0634-Stinger-API.patch} (100%)
 rename patches/server/{0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0635-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0635-Add-System.out-err-catcher.patch => 0636-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0637-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0637-Improve-boat-collision-performance.patch => 0638-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0638-Prevent-AFK-kick-while-watching-end-credits.patch => 0639-Prevent-AFK-kick-while-watching-end-credits.patch} (93%)
 rename patches/server/{0639-Allow-skipping-writing-of-comments-to-server.propert.patch => 0640-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0640-Add-PlayerSetSpawnEvent.patch => 0641-Add-PlayerSetSpawnEvent.patch} (95%)
 rename patches/server/{0641-Make-hoppers-respect-inventory-max-stack-size.patch => 0642-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0642-Optimize-entity-tracker-passenger-checks.patch => 0643-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0643-Config-option-for-Piglins-guarding-chests.patch => 0644-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0644-Added-EntityDamageItemEvent.patch => 0645-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0645-Optimize-indirect-passenger-iteration.patch => 0646-Optimize-indirect-passenger-iteration.patch} (87%)
 rename patches/server/{0646-Configurable-item-frame-map-cursor-update-interval.patch => 0647-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0647-Make-EntityUnleashEvent-cancellable.patch => 0648-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0648-Clear-bucket-NBT-after-dispense.patch => 0649-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0649-Change-EnderEye-target-without-changing-other-things.patch => 0650-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0650-Add-BlockBreakBlockEvent.patch => 0651-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0652-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0652-More-CommandBlock-API.patch => 0653-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0653-Add-missing-team-sidebar-display-slots.patch => 0654-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0654-Add-back-EntityPortalExitEvent.patch => 0655-Add-back-EntityPortalExitEvent.patch} (93%)
 rename patches/server/{0655-Add-methods-to-find-targets-for-lightning-strikes.patch => 0656-Add-methods-to-find-targets-for-lightning-strikes.patch} (87%)
 rename patches/server/{0656-Get-entity-default-attributes.patch => 0657-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0657-Left-handed-API.patch => 0658-Left-handed-API.patch} (100%)
 rename patches/server/{0658-Add-more-advancement-API.patch => 0659-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0659-Add-ItemFactory-getSpawnEgg-API.patch => 0660-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0660-Add-critical-damage-API.patch => 0661-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0661-Fix-issues-with-mob-conversion.patch => 0662-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0662-Add-isCollidable-methods-to-various-places.patch => 0663-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0663-Goat-ram-API.patch => 0664-Goat-ram-API.patch} (100%)
 rename patches/server/{0664-Add-API-for-resetting-a-single-score.patch => 0665-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0665-Add-Raw-Byte-Entity-Serialization.patch => 0666-Add-Raw-Byte-Entity-Serialization.patch} (96%)
 rename patches/server/{0666-Vanilla-command-permission-fixes.patch => 0667-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0668-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (92%)
 rename patches/server/{0668-Fix-GameProfileCache-concurrency.patch => 0669-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0669-Improve-and-expand-AsyncCatcher.patch => 0670-Improve-and-expand-AsyncCatcher.patch} (95%)
 rename patches/server/{0670-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0671-Add-paper-mobcaps-and-paper-playermobcaps.patch} (96%)
 rename patches/server/{0671-Sanitize-ResourceLocation-error-logging.patch => 0672-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0672-Optimise-general-POI-access.patch => 0673-Optimise-general-POI-access.patch} (99%)
 rename patches/server/{0673-Custom-table-implementation-for-blockstate-state-loo.patch => 0674-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0674-Manually-inline-methods-in-BlockPosition.patch => 0675-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0675-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0676-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0677-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (94%)
 rename patches/server/{0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0678-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (77%)
 rename patches/server/{0678-Don-t-lookup-fluid-state-when-raytracing.patch => 0679-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0679-Time-scoreboard-search.patch => 0680-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0680-Send-full-pos-packets-for-hard-colliding-entities.patch => 0681-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0681-Do-not-run-raytrace-logic-for-AIR.patch => 0682-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0682-Oprimise-map-impl-for-tracked-players.patch => 0683-Oprimise-map-impl-for-tracked-players.patch} (87%)
 rename patches/server/{0683-Optimise-BlockSoil-nearby-water-lookup.patch => 0684-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0684-Optimise-random-block-ticking.patch => 0685-Optimise-random-block-ticking.patch} (97%)
 rename patches/server/{0685-Remove-streams-for-villager-AI.patch => 0686-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0686-Use-Velocity-compression-and-cipher-natives.patch => 0687-Use-Velocity-compression-and-cipher-natives.patch} (98%)
 rename patches/server/{0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0688-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0689-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0690-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (90%)
 rename patches/server/{0690-Check-requirement-before-suggesting-root-nodes.patch => 0691-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0692-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (85%)
 rename patches/server/{0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0693-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0693-Ensure-valid-vehicle-status.patch => 0694-Ensure-valid-vehicle-status.patch} (84%)
 rename patches/server/{0694-Prevent-softlocked-end-exit-portal-generation.patch => 0695-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0696-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0696-Don-t-log-debug-logging-being-disabled.patch => 0697-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0697-fix-various-menus-with-empty-level-accesses.patch => 0698-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0698-Preserve-overstacked-loot.patch => 0699-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0699-Update-head-rotation-in-missing-places.patch => 0700-Update-head-rotation-in-missing-places.patch} (84%)
 rename patches/server/{0700-prevent-unintended-light-block-manipulation.patch => 0701-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0701-Fix-CraftCriteria-defaults-map.patch => 0702-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0702-Fix-upstreams-block-state-factories.patch => 0703-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0703-Configurable-feature-seeds.patch => 0704-Configurable-feature-seeds.patch} (91%)
 rename patches/server/{0704-Add-root-admin-user-detection.patch => 0705-Add-root-admin-user-detection.patch} (97%)
 rename patches/server/{0705-Always-allow-item-changing-in-Fireball.patch => 0706-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0706-don-t-attempt-to-teleport-dead-entities.patch => 0707-don-t-attempt-to-teleport-dead-entities.patch} (85%)
 rename patches/server/{0707-Prevent-excessive-velocity-through-repeated-crits.patch => 0708-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0708-Remove-client-side-code-using-deprecated-for-removal.patch => 0709-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0709-Fix-removing-recipes-from-RecipeIterator.patch => 0710-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0710-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0711-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0711-Hide-unnecessary-itemmeta-from-clients.patch => 0712-Hide-unnecessary-itemmeta-from-clients.patch} (97%)
 rename patches/server/{0712-Fix-Spigot-growth-modifiers.patch => 0713-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0713-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0714-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0714-Add-PlayerItemFrameChangeEvent.patch => 0715-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0715-Optimize-HashMapPalette.patch => 0716-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0716-Allow-delegation-to-vanilla-chunk-gen.patch => 0717-Allow-delegation-to-vanilla-chunk-gen.patch} (98%)
 rename patches/server/{0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0718-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0718-Optimise-collision-checking-in-player-move-packet-ha.patch => 0719-Optimise-collision-checking-in-player-move-packet-ha.patch} (96%)
 rename patches/server/{0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0720-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (92%)
 rename patches/server/{0720-Add-more-Campfire-API.patch => 0721-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0722-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (88%)
 rename patches/server/{0722-Fix-tripwire-state-inconsistency.patch => 0723-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0723-Forward-CraftEntity-in-teleport-command.patch => 0724-Forward-CraftEntity-in-teleport-command.patch} (88%)
 rename patches/server/{0724-Improve-scoreboard-entries.patch => 0725-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0725-Entity-powdered-snow-API.patch => 0726-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0726-Add-API-for-item-entity-health.patch => 0727-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0727-Fix-entity-type-tags-suggestions-in-selectors.patch => 0728-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0728-Configurable-max-block-light-for-monster-spawning.patch => 0729-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0729-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0730-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0730-Load-effect-amplifiers-greater-than-127-correctly.patch => 0731-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0731-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0732-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0732-Fix-bees-aging-inside-hives.patch => 0733-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0733-Bucketable-API.patch => 0734-Bucketable-API.patch} (100%)
 rename patches/server/{0734-Validate-usernames.patch => 0735-Validate-usernames.patch} (97%)
 rename patches/server/{0735-Make-water-animal-spawn-height-configurable.patch => 0736-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0737-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (96%)
 rename patches/server/{0737-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0738-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0738-Add-new-overload-to-PersistentDataContainer-has.patch => 0739-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0739-Multiple-Entries-with-Scoreboards.patch => 0740-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0740-Reset-placed-block-on-exception.patch => 0741-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0741-Add-configurable-height-for-slime-spawn.patch => 0742-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0743-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0743-Fix-xp-reward-for-baby-zombies.patch => 0744-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0744-Kick-on-main-for-illegal-chat.patch => 0745-Kick-on-main-for-illegal-chat.patch} (90%)
 rename patches/server/{0745-Multi-Block-Change-API-Implementation.patch => 0746-Multi-Block-Change-API-Implementation.patch} (95%)
 rename patches/server/{0746-Fix-NotePlayEvent.patch => 0747-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0747-Freeze-Tick-Lock-API.patch => 0748-Freeze-Tick-Lock-API.patch} (92%)
 rename patches/server/{0748-Dolphin-API.patch => 0749-Dolphin-API.patch} (100%)
 rename patches/server/{0749-More-PotionEffectType-API.patch => 0750-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0750-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0751-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0751-API-for-creating-command-sender-which-forwards-feedb.patch => 0752-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0752-Add-missing-structure-set-seed-configs.patch => 0753-Add-missing-structure-set-seed-configs.patch} (99%)
 rename patches/server/{0753-Implement-regenerateChunk.patch => 0754-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0754-Fix-cancelled-powdered-snow-bucket-placement.patch => 0755-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0755-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0756-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (92%)
 rename patches/server/{0756-Add-GameEvent-tags.patch => 0757-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0757-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0758-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (87%)
 rename patches/server/{0758-Furnace-RecipesUsed-API.patch => 0759-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0759-Configurable-sculk-sensor-listener-range.patch => 0760-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0760-Add-missing-block-data-mins-and-maxes.patch => 0761-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0761-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0762-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (96%)
 rename patches/server/{0762-Put-world-into-worldlist-before-initing-the-world.patch => 0763-Put-world-into-worldlist-before-initing-the-world.patch} (84%)
 rename patches/server/{0763-Fix-Entity-Position-Desync.patch => 0764-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0764-Custom-Potion-Mixes.patch => 0765-Custom-Potion-Mixes.patch} (97%)
 rename patches/server/{0765-Force-close-world-loading-screen.patch => 0766-Force-close-world-loading-screen.patch} (95%)
 rename patches/server/{0766-Fix-falling-block-spawn-methods.patch => 0767-Fix-falling-block-spawn-methods.patch} (93%)
 rename patches/server/{0767-Expose-furnace-minecart-push-values.patch => 0768-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0768-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0769-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0769-More-Projectile-API.patch => 0770-More-Projectile-API.patch} (100%)
 rename patches/server/{0770-Fix-swamp-hut-cat-generation-deadlock.patch => 0771-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0771-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0772-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0772-Implement-getComputedBiome-API.patch => 0773-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0773-Make-some-itemstacks-nonnull.patch => 0774-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0774-Implement-enchantWithLevels-API.patch => 0775-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0775-Fix-saving-in-unloadWorld.patch => 0776-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0776-Buffer-OOB-setBlock-calls.patch => 0777-Buffer-OOB-setBlock-calls.patch} (95%)
 rename patches/server/{0777-Add-TameableDeathMessageEvent.patch => 0778-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0778-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0779-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0779-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0780-fix-player-loottables-running-when-mob-loot-gamerule.patch} (87%)
 rename patches/server/{0780-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0781-Ensure-entity-passenger-world-matches-ridden-entity.patch} (84%)
 rename patches/server/{0781-Guard-against-invalid-entity-positions.patch => 0782-Guard-against-invalid-entity-positions.patch} (88%)
 rename patches/server/{0782-cache-resource-keys.patch => 0783-cache-resource-keys.patch} (100%)
 rename patches/server/{0783-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0784-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0784-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0785-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0785-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0786-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0786-Prevent-tile-entity-copies-loading-chunks.patch => 0787-Prevent-tile-entity-copies-loading-chunks.patch} (89%)
 rename patches/server/{0787-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0788-Use-username-instead-of-display-name-in-PlayerList-g.patch} (92%)
 rename patches/server/{0788-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0789-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0789-Pass-ServerLevel-for-gamerule-callbacks.patch => 0790-Pass-ServerLevel-for-gamerule-callbacks.patch} (96%)
 rename patches/server/{0790-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0791-WorldCreator-keepSpawnLoaded.patch => 0792-WorldCreator-keepSpawnLoaded.patch} (77%)
 rename patches/server/{0792-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0793-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0794-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0795-Fire-CauldronLevelChange-on-initial-fill.patch => 0796-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0796-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0797-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0797-Add-PlayerStopUsingItemEvent.patch => 0798-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0798-FallingBlock-auto-expire-setting.patch => 0799-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0799-Don-t-tick-markers.patch => 0800-Don-t-tick-markers.patch} (71%)
 rename patches/server/{0800-Do-not-accept-invalid-client-settings.patch => 0801-Do-not-accept-invalid-client-settings.patch} (89%)
 rename patches/server/{0801-Add-support-for-Proxy-Protocol.patch => 0802-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0802-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0803-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0803-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0804-Sanitize-Sent-BlockEntity-NBT.patch => 0805-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0805-Disable-component-selector-resolving-in-books-by-def.patch => 0806-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0806-Prevent-entity-loading-causing-async-lookups.patch => 0807-Prevent-entity-loading-causing-async-lookups.patch} (95%)
 rename patches/server/{0807-Throw-exception-on-world-create-while-being-ticked.patch => 0808-Throw-exception-on-world-create-while-being-ticked.patch} (90%)
 rename patches/server/{0808-Add-Alternate-Current-redstone-implementation.patch => 0809-Add-Alternate-Current-redstone-implementation.patch} (99%)
 rename patches/server/{0809-Dont-resent-entity-on-art-update.patch => 0810-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0810-Add-WardenAngerChangeEvent.patch => 0811-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0811-Add-option-for-strict-advancement-dimension-checks.patch => 0812-Add-option-for-strict-advancement-dimension-checks.patch} (94%)
 rename patches/server/{0812-Add-missing-important-BlockStateListPopulator-method.patch => 0813-Add-missing-important-BlockStateListPopulator-method.patch} (84%)
 rename patches/server/{0813-Nameable-Banner-API.patch => 0814-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0814-Don-t-broadcast-messages-to-command-blocks.patch => 0815-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0815-Prevent-empty-items-from-being-added-to-world.patch => 0816-Prevent-empty-items-from-being-added-to-world.patch} (94%)
 rename patches/server/{0816-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0817-Add-Player-getFishHook.patch => 0818-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0819-Add-various-missing-EntityDropItemEvent-calls.patch => 0820-Add-various-missing-EntityDropItemEvent-calls.patch} (96%)
 rename patches/server/{0820-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0821-Add-some-minimal-debug-information-to-chat-packet-er.patch} (90%)
 rename patches/server/{0821-Fix-Bee-flower-NPE.patch => 0822-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (87%)
 rename patches/server/{0823-More-Teleport-API.patch => 0824-More-Teleport-API.patch} (95%)
 rename patches/server/{0824-Add-EntityPortalReadyEvent.patch => 0825-Add-EntityPortalReadyEvent.patch} (88%)
 rename patches/server/{0825-Don-t-use-level-random-in-entity-constructors.patch => 0826-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0826-Send-block-entities-after-destroy-prediction.patch => 0827-Send-block-entities-after-destroy-prediction.patch} (97%)
 rename patches/server/{0827-Warn-on-plugins-accessing-faraway-chunks.patch => 0828-Warn-on-plugins-accessing-faraway-chunks.patch} (90%)
 rename patches/server/{0828-Custom-Chat-Completion-Suggestions-API.patch => 0829-Custom-Chat-Completion-Suggestions-API.patch} (90%)
 rename patches/server/{0829-Add-and-fix-missing-BlockFadeEvents.patch => 0830-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0830-Collision-API.patch => 0831-Collision-API.patch} (100%)
 rename patches/server/{0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0832-Block-Ticking-API.patch => 0833-Block-Ticking-API.patch} (100%)
 rename patches/server/{0833-Add-Velocity-IP-Forwarding-Support.patch => 0834-Add-Velocity-IP-Forwarding-Support.patch} (98%)
 rename patches/server/{0834-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0835-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0835-Add-NamespacedKey-biome-methods.patch => 0836-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0836-Fix-plugin-loggers-on-server-shutdown.patch => 0837-Fix-plugin-loggers-on-server-shutdown.patch} (92%)
 rename patches/server/{0837-Stop-large-look-changes-from-crashing-the-server.patch => 0838-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0838-Fire-EntityChangeBlockEvent-in-more-places.patch => 0839-Fire-EntityChangeBlockEvent-in-more-places.patch} (99%)
 rename patches/server/{0839-Missing-eating-regain-reason.patch => 0840-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0840-Missing-effect-cause.patch => 0841-Missing-effect-cause.patch} (100%)
 rename patches/server/{0841-Added-byte-array-serialization-deserialization-for-P.patch => 0842-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0843-Call-BlockPhysicsEvent-more-often.patch => 0844-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0844-Configurable-chat-thread-limit.patch => 0845-Configurable-chat-thread-limit.patch} (95%)
 rename patches/server/{0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0846-fix-Jigsaw-block-kicking-user.patch => 0847-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0847-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0848-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0848-Add-getDrops-to-BlockState.patch => 0849-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0849-Fix-a-bunch-of-vanilla-bugs.patch => 0850-Fix-a-bunch-of-vanilla-bugs.patch} (98%)
 rename patches/server/{0850-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0851-Remove-unnecessary-onTrackingStart-during-navigation.patch} (87%)
 rename patches/server/{0851-Fix-custom-piglin-loved-items.patch => 0852-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0852-EntityPickupItemEvent-fixes.patch => 0853-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0853-Correctly-handle-interactions-with-items-on-cooldown.patch => 0854-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0854-Add-PlayerInventorySlotChangeEvent.patch => 0855-Add-PlayerInventorySlotChangeEvent.patch} (95%)
 rename patches/server/{0855-Elder-Guardian-appearance-API.patch => 0856-Elder-Guardian-appearance-API.patch} (84%)
 rename patches/server/{0856-Allow-changing-bed-s-occupied-property.patch => 0857-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0857-Add-entity-knockback-API.patch => 0858-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0858-Detect-headless-JREs.patch => 0859-Detect-headless-JREs.patch} (96%)
 rename patches/server/{0859-fixed-entity-vehicle-collision-event-not-called.patch => 0860-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0860-optimized-dirt-and-snow-spreading.patch => 0861-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0861-Added-EntityToggleSitEvent.patch => 0862-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0862-Add-fire-tick-delay-option.patch => 0863-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0863-Add-Moving-Piston-API.patch => 0864-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0864-Ignore-impossible-spawn-tick.patch => 0865-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0865-Track-projectile-source-for-fireworks-from-dispenser.patch => 0866-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (91%)
 rename patches/server/{0868-Prevent-compass-from-loading-chunks.patch => 0869-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0869-Add-PrePlayerAttackEntityEvent.patch => 0870-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0870-ensure-reset-EnderDragon-boss-event-name.patch => 0871-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0871-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0872-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0872-Add-Player-Warden-Warning-API.patch => 0873-Add-Player-Warden-Warning-API.patch} (93%)
 rename patches/server/{0873-More-vanilla-friendly-methods-to-update-trades.patch => 0874-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0874-Add-paper-dumplisteners-command.patch => 0875-Add-paper-dumplisteners-command.patch} (98%)
 rename patches/server/{0875-check-global-player-list-where-appropriate.patch => 0876-check-global-player-list-where-appropriate.patch} (93%)
 rename patches/server/{0876-Fix-async-entity-add-due-to-fungus-trees.patch => 0877-Fix-async-entity-add-due-to-fungus-trees.patch} (95%)
 rename patches/server/{0877-ItemStack-damage-API.patch => 0878-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0878-Friction-API.patch => 0879-Friction-API.patch} (100%)
 rename patches/server/{0879-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0880-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0880-Fix-player-kick-on-shutdown.patch => 0881-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0881-Sync-offhand-slot-in-menus.patch => 0882-Sync-offhand-slot-in-menus.patch} (95%)
 rename patches/server/{0882-Player-Entity-Tracking-Events.patch => 0883-Player-Entity-Tracking-Events.patch} (91%)
 rename patches/server/{0883-Limit-pet-look-distance.patch => 0884-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0884-Properly-resend-entities.patch => 0885-Properly-resend-entities.patch} (96%)
 rename patches/server/{0885-Fixes-and-additions-to-the-SpawnReason-API.patch => 0886-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0886-fix-Instruments.patch => 0887-fix-Instruments.patch} (93%)
 rename patches/server/{0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0889-Add-BlockLockCheckEvent.patch => 0890-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0890-Add-Sneaking-API-for-Entities.patch => 0891-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0891-Improve-logging-and-errors.patch => 0892-Improve-logging-and-errors.patch} (95%)
 rename patches/server/{0892-Improve-PortalEvents.patch => 0893-Improve-PortalEvents.patch} (89%)
 rename patches/server/{0893-Add-config-option-for-spider-worldborder-climbing.patch => 0894-Add-config-option-for-spider-worldborder-climbing.patch} (93%)
 rename patches/server/{0894-Add-missing-SpigotConfig-logCommands-check.patch => 0895-Add-missing-SpigotConfig-logCommands-check.patch} (88%)
 rename patches/server/{0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0896-Flying-Fall-Damage.patch => 0897-Flying-Fall-Damage.patch} (93%)
 rename patches/server/{0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (86%)
 rename patches/server/{0899-config-for-disabling-entity-tag-tags.patch => 0900-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0900-Use-single-player-info-update-packet-on-join.patch => 0901-Use-single-player-info-update-packet-on-join.patch} (92%)
 rename patches/server/{0901-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0902-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0902-Win-Screen-API.patch => 0903-Win-Screen-API.patch} (88%)
 rename patches/server/{0903-Remove-CraftItemStack-setAmount-null-assignment.patch => 0904-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0904-Fix-force-opening-enchantment-tables.patch => 0905-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0905-Add-Entity-Body-Yaw-API.patch => 0906-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0907-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0908-Update-the-flag-when-a-captured-block-state-is-outda.patch} (90%)
 rename patches/server/{0908-Add-EntityFertilizeEggEvent.patch => 0909-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0911-Correctly-handle-ArmorStand-invisibility.patch => 0912-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0912-Fix-advancement-triggers-for-entity-damage.patch => 0913-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0913-Fix-text-display-error-on-spawn.patch => 0914-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0914-Fix-certain-inventories-returning-null-Locations.patch => 0915-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0915-Add-Shearable-API.patch => 0916-Add-Shearable-API.patch} (100%)
 rename patches/server/{0916-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0917-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0917-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch => 0918-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch} (100%)
 rename patches/server/{0918-Optimize-Hoppers.patch => 0919-Optimize-Hoppers.patch} (99%)
 rename patches/server/{0919-Fix-beehives-generating-from-using-bonemeal.patch => 0920-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0921-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0921-Treat-sequence-violations-like-they-should-be.patch => 0922-Treat-sequence-violations-like-they-should-be.patch} (86%)
 rename patches/server/{0922-remove-duplicate-animate-packet-for-records.patch => 0923-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0923-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0924-Prevent-causing-expired-keys-from-impacting-new-join.patch} (95%)
 rename patches/server/{0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0925-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (84%)
 rename patches/server/{0925-Use-array-for-gamerule-storage.patch => 0926-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0926-Fix-a-couple-of-upstream-bed-issues.patch => 0927-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0927-Fix-demo-flag-not-enabling-demo-mode.patch => 0928-Fix-demo-flag-not-enabling-demo-mode.patch} (88%)
 rename patches/server/{0928-Add-Mob-Experience-reward-API.patch => 0929-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0929-Break-redstone-on-top-of-trap-doors-early.patch => 0930-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0930-Fix-DamageCause-for-Falling-Blocks.patch => 0931-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0932-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0932-More-accurate-isInOpenWater-impl.patch => 0933-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0934-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0934-Optimise-recalcBlockCounts-for-empty-sections.patch => 0935-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0935-Expand-PlayerItemMendEvent.patch => 0936-Expand-PlayerItemMendEvent.patch} (96%)
 rename patches/server/{0936-Refresh-ProjectileSource-for-projectiles.patch => 0937-Refresh-ProjectileSource-for-projectiles.patch} (97%)
 rename patches/server/{0937-Add-transient-modifier-API.patch => 0938-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0938-Fix-block-place-logic.patch => 0939-Fix-block-place-logic.patch} (96%)
 rename patches/server/{0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0940-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0940-Ignore-inline-definitions-of-trim-material-pattern.patch => 0941-Ignore-inline-definitions-of-trim-material-pattern.patch} (100%)
 rename patches/server/{0941-Call-BlockGrowEvent-for-missing-blocks.patch => 0942-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0943-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (94%)
 rename patches/server/{0943-fix-MapLike-spam-for-missing-key-selector.patch => 0944-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0944-Fix-sniffer-removeExploredLocation.patch => 0945-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0945-Add-method-to-remove-all-active-potion-effects.patch => 0946-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0947-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0948-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0948-Properly-Cancel-Usable-Items.patch => 0949-Properly-Cancel-Usable-Items.patch} (95%)
 rename patches/server/{0949-Add-event-for-player-editing-sign.patch => 0950-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0950-Only-tick-item-frames-if-players-can-see-it.patch => 0951-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0951-Improve-command-function-perm-level-checks.patch => 0952-Improve-command-function-perm-level-checks.patch} (100%)
 rename patches/server/{0952-Add-option-to-disable-block-updates.patch => 0953-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0953-Call-missing-BlockDispenseEvent.patch => 0954-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0954-Don-t-load-chunks-for-supporting-block-checks.patch => 0955-Don-t-load-chunks-for-supporting-block-checks.patch} (84%)
 rename patches/server/{0955-Optimize-player-lookups-for-beacons.patch => 0956-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0956-Add-Sign-getInteractableSideFor.patch => 0957-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0957-Array-backed-synched-entity-data.patch => 0958-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0958-fix-item-meta-for-tadpole-buckets.patch => 0959-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0959-Suppress-Item-Meta-Validation-Checks.patch => 0960-Suppress-Item-Meta-Validation-Checks.patch} (100%)
 rename patches/server/{0960-Fix-BanList-API.patch => 0961-Fix-BanList-API.patch} (98%)
 rename patches/server/{0961-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0962-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0962-Fix-possible-NPE-on-painting-creation.patch => 0963-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0964-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0964-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0965-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0965-Don-t-tick-signs.patch => 0966-Don-t-tick-signs.patch} (100%)
 rename patches/server/{0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0967-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0967-Add-whitelist-events.patch => 0968-Add-whitelist-events.patch} (100%)
 rename patches/server/{0968-Implement-PlayerFailMoveEvent.patch => 0969-Implement-PlayerFailMoveEvent.patch} (94%)
 rename patches/server/{0969-Only-erase-allay-memory-on-non-item-targets.patch => 0970-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0970-API-for-updating-recipes-on-clients.patch => 0971-API-for-updating-recipes-on-clients.patch} (95%)
 rename patches/server/{0971-Fix-rotation-when-spawning-display-entities.patch => 0972-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0972-Only-capture-actual-tree-growth.patch => 0973-Only-capture-actual-tree-growth.patch} (93%)
 rename patches/server/{0973-Use-correct-source-for-mushroom-block-spread-event.patch => 0974-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0974-Respect-randomizeData-on-more-entities-when-spawning.patch => 0975-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0975-Use-correct-seed-on-api-world-load.patch => 0976-Use-correct-seed-on-api-world-load.patch} (90%)
 rename patches/server/{0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0977-Cache-map-ids-on-item-frames.patch => 0978-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0978-Fix-custom-statistic-criteria-creation.patch => 0979-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0979-Bandaid-fix-for-Effect.patch => 0980-Bandaid-fix-for-Effect.patch} (95%)
 rename patches/server/{0980-SculkCatalyst-bloom-API.patch => 0981-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0981-API-for-an-entity-s-scoreboard-name.patch => 0982-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (92%)
 rename patches/server/{0983-Deprecate-and-replace-methods-with-old-StructureType.patch => 0984-Deprecate-and-replace-methods-with-old-StructureType.patch} (96%)
 rename patches/server/{0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (92%)
 rename patches/server/{0985-Properly-handle-BlockBreakEvent-isDropItems.patch => 0986-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0986-Fire-entity-death-event-for-ender-dragon.patch => 0987-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0987-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0988-Configurable-entity-tracking-range-by-Y-coordinate.patch} (90%)
 rename patches/server/{0988-Add-Listing-API-for-Player.patch => 0989-Add-Listing-API-for-Player.patch} (97%)
 rename patches/server/{0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/server/{0990-Fix-NPE-on-Boat-getStatus.patch => 0991-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0991-Expand-Pose-API.patch => 0992-Expand-Pose-API.patch} (93%)
 rename patches/server/{0992-More-DragonBattle-API.patch => 0993-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0993-Deep-clone-unhandled-nbt-tags.patch => 0994-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{0994-Add-PlayerPickItemEvent.patch => 0995-Add-PlayerPickItemEvent.patch} (94%)
 rename patches/server/{0995-Improve-performance-of-mass-crafts.patch => 0996-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{0996-Allow-trident-custom-damage.patch => 0997-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0997-Expose-hand-during-BlockCanBuildEvent.patch => 0998-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0998-Optimize-nearest-structure-border-iteration.patch => 0999-Optimize-nearest-structure-border-iteration.patch} (95%)
 rename patches/server/{0999-Implement-OfflinePlayer-isConnected.patch => 1000-Implement-OfflinePlayer-isConnected.patch} (90%)
 rename patches/server/{1000-Fix-inventory-desync.patch => 1001-Fix-inventory-desync.patch} (100%)
 rename patches/server/{1001-Add-titleOverride-to-InventoryOpenEvent.patch => 1002-Add-titleOverride-to-InventoryOpenEvent.patch} (97%)
 rename patches/server/{1002-Configure-sniffer-egg-hatch-time.patch => 1003-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{1003-Do-crystal-portal-proximity-check-before-entity-look.patch => 1004-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{1004-Skip-POI-finding-if-stuck-in-vehicle.patch => 1005-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{1005-Add-slot-sanity-checks-in-container-clicks.patch => 1006-Add-slot-sanity-checks-in-container-clicks.patch} (100%)
 rename patches/server/{1006-Call-BlockRedstoneEvents-for-lecterns.patch => 1007-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{1007-Allow-proper-checking-of-empty-item-stacks.patch => 1008-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{1008-Fix-silent-equipment-change-for-mobs.patch => 1009-Fix-silent-equipment-change-for-mobs.patch} (95%)
 rename patches/server/{1009-Fix-spigot-s-Forced-Stats.patch => 1010-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{1010-Add-missing-InventoryHolders-to-inventories.patch => 1011-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 create mode 100644 patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch

diff --git a/patches/unapplied/server/0019-Rewrite-chunk-system.patch b/patches/server/0018-Rewrite-chunk-system.patch
similarity index 97%
rename from patches/unapplied/server/0019-Rewrite-chunk-system.patch
rename to patches/server/0018-Rewrite-chunk-system.patch
index 4d601f411c..b6178cd634 100644
--- a/patches/unapplied/server/0019-Rewrite-chunk-system.patch
+++ b/patches/server/0018-Rewrite-chunk-system.patch
@@ -2095,7 +2095,7 @@ index 0000000000000000000000000000000000000000..99f49b5625cf51d6c97640553cf5c420
 +    }
 +}
 diff --git a/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java b/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java
-index 95eac2e12a16938d81ab512b00e90c5234b42834..8f7bf1f0400aeab8b7801d113d244d0716c5eb84 100644
+index 87ae7d64e67ebae5ab53cc239cdf6580dca31652..56c35149fd142af6ffe31434fec0064cf6ea3be5 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java
 @@ -32,191 +32,41 @@ public final class ChunkSystem {
@@ -2328,10 +2328,10 @@ index 95eac2e12a16938d81ab512b00e90c5234b42834..8f7bf1f0400aeab8b7801d113d244d07
      private ChunkSystem() {
 diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6ff277c8b
+index 0000000000000000000000000000000000000000..842848872b86e5335863d309af956fee74110d52
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-@@ -0,0 +1,1426 @@
+@@ -0,0 +1,1440 @@
 +package io.papermc.paper.chunk.system;
 +
 +import ca.spottedleaf.concurrentutil.collection.SRSWLinkedQueue;
@@ -2354,9 +2354,11 @@ index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6
 +import net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket;
 +import net.minecraft.network.protocol.game.ClientboundSetSimulationDistancePacket;
 +import net.minecraft.server.level.ChunkMap;
++import net.minecraft.server.level.ChunkTrackingView;
 +import net.minecraft.server.level.ServerLevel;
 +import net.minecraft.server.level.ServerPlayer;
 +import net.minecraft.server.level.TicketType;
++import net.minecraft.server.network.PlayerChunkSender;
 +import net.minecraft.world.level.ChunkPos;
 +import net.minecraft.world.level.GameRules;
 +import net.minecraft.world.level.chunk.ChunkAccess;
@@ -2815,8 +2817,7 @@ index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6
 +
 +        private void sendChunk(final int chunkX, final int chunkZ) {
 +            if (this.sentChunks.add(CoordinateUtils.getChunkKey(chunkX, chunkZ))) {
-+                this.world.getChunkSource().chunkMap.updateChunkTracking(this.player,
-+                    new ChunkPos(chunkX, chunkZ), new MutableObject<>(), false, true); // unloaded, loaded
++                PlayerChunkSender.sendChunk(this.player.connection, this.world, this.world.getChunkIfLoaded(chunkX, chunkZ));
 +                return;
 +            }
 +            throw new IllegalStateException();
@@ -2830,8 +2831,7 @@ index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6
 +        }
 +
 +        private void sendUnloadChunkRaw(final int chunkX, final int chunkZ) {
-+            this.player.serverLevel().getChunkSource().chunkMap.updateChunkTracking(this.player,
-+                new ChunkPos(chunkX, chunkZ), null, true, false); // unloaded, loaded
++            PlayerChunkSender.dropChunkStatic(this.player, new ChunkPos(chunkX, chunkZ));
 +        }
 +
 +        private final SingleUserAreaMap<PlayerChunkLoaderData> broadcastMap = new SingleUserAreaMap<>(this) {
@@ -2900,11 +2900,11 @@ index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6
 +        private static boolean wantChunkLoaded(final int centerX, final int centerZ, final int chunkX, final int chunkZ,
 +                                               final int sendRadius) {
 +            // expect sendRadius to be = 1 + target viewable radius
-+            return ChunkMap.isChunkInRange(chunkX, chunkZ, centerX, centerZ, sendRadius);
++            return ChunkTrackingView.isWithinDistance(centerX, centerZ, sendRadius, chunkX, chunkZ, true);
 +        }
 +
 +        private static int getClientViewDistance(final ServerPlayer player) {
-+            final Integer vd = player.clientViewDistance;
++            final Integer vd = player.requestedViewDistance();
 +            return vd == null ? -1 : Math.max(0, vd.intValue());
 +        }
 +
@@ -3122,20 +3122,34 @@ index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6
 +            // try to push more chunk generations
 +            final long maxGens = Math.max(0L, Math.min(MAX_RATE, Math.min(this.genQueue.size(), this.getMaxChunkGenerates())));
 +            final int maxGensThisTick = (int)this.chunkGenerateTicketLimiter.takeAllocation(time, genRate, maxGens);
-+            for (int i = 0; i < maxGensThisTick; ++i) {
-+                final long chunk = this.genQueue.dequeueLong();
-+                final byte prev = this.chunkTicketStage.put(chunk, CHUNK_TICKET_STAGE_GENERATING);
++            int ratedGensThisTick = 0;
++            while (!this.genQueue.isEmpty()) {
++                final long chunkKey = this.genQueue.firstLong();
++                final int chunkX = CoordinateUtils.getChunkX(chunkKey);
++                final int chunkZ = CoordinateUtils.getChunkZ(chunkKey);
++                final ChunkAccess chunk = this.world.chunkSource.getChunkAtImmediately(chunkX, chunkZ);
++                if (chunk.getStatus() != ChunkStatus.FULL) {
++                    // only rate limit actual generations
++                    if ((ratedGensThisTick + 1) > maxGensThisTick) {
++                        break;
++                    }
++                    ++ratedGensThisTick;
++                }
++
++                this.genQueue.dequeueLong();
++
++                final byte prev = this.chunkTicketStage.put(chunkKey, CHUNK_TICKET_STAGE_GENERATING);
 +                if (prev != CHUNK_TICKET_STAGE_LOADED) {
 +                    throw new IllegalStateException("Previous state should be " + CHUNK_TICKET_STAGE_LOADED + ", not " + prev);
 +                }
 +                this.pushDelayedTicketOp(
 +                    ChunkHolderManager.TicketOperation.addAndRemove(
-+                        chunk,
++                        chunkKey,
 +                        REGION_PLAYER_TICKET, GENERATED_TICKET_LEVEL, this.idBoxed,
 +                        REGION_PLAYER_TICKET, LOADED_TICKET_LEVEL, this.idBoxed
 +                    )
 +                );
-+                this.generatingQueue.enqueue(chunk);
++                this.generatingQueue.enqueue(chunkKey);
 +            }
 +
 +            // try to pull ticking chunks
@@ -3760,10 +3774,10 @@ index 0000000000000000000000000000000000000000..924539d4ac50c70178ba220424ffacd6
 +}
 diff --git a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ff7198a03ab0da79c98513f4a1507e854484f4c2
+index 0000000000000000000000000000000000000000..c4d1dbbd39ba0cdc9176ffa6d350d2aa50380211
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
-@@ -0,0 +1,859 @@
+@@ -0,0 +1,894 @@
 +package io.papermc.paper.chunk.system.entity;
 +
 +import com.destroystokyo.paper.util.maplist.EntityList;
@@ -3783,6 +3797,7 @@ index 0000000000000000000000000000000000000000..ff7198a03ab0da79c98513f4a1507e85
 +import net.minecraft.util.Mth;
 +import net.minecraft.world.entity.Entity;
 +import net.minecraft.world.entity.EntityType;
++import net.minecraft.world.level.ChunkPos;
 +import net.minecraft.world.level.entity.EntityInLevelCallback;
 +import net.minecraft.world.level.entity.EntityTypeTest;
 +import net.minecraft.world.level.entity.LevelCallback;
@@ -3790,6 +3805,7 @@ index 0000000000000000000000000000000000000000..ff7198a03ab0da79c98513f4a1507e85
 +import net.minecraft.world.level.entity.LevelEntityGetter;
 +import net.minecraft.world.level.entity.Visibility;
 +import net.minecraft.world.phys.AABB;
++import net.minecraft.world.phys.Vec3;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +import org.slf4j.Logger;
@@ -4076,22 +4092,55 @@ index 0000000000000000000000000000000000000000..ff7198a03ab0da79c98513f4a1507e85
 +        this.getChunk(x, z).updateStatus(newStatus, this);
 +    }
 +
-+    public void addLegacyChunkEntities(final List<Entity> entities) {
-+        for (int i = 0, len = entities.size(); i < len; ++i) {
-+            this.addEntity(entities.get(i), true);
++    public void addLegacyChunkEntities(final List<Entity> entities, final ChunkPos forChunk) {
++        this.addEntityChunk(entities, forChunk, true);
++    }
++
++    public void addEntityChunkEntities(final List<Entity> entities, final ChunkPos forChunk) {
++        this.addEntityChunk(entities, forChunk, true);
++    }
++
++    public void addWorldGenChunkEntities(final List<Entity> entities, final ChunkPos forChunk) {
++        this.addEntityChunk(entities, forChunk, false);
++    }
++
++    private void addRecursivelySafe(final Entity root, final boolean fromDisk) {
++        if (!this.addEntity(root, fromDisk)) {
++            // possible we are a passenger, and so should dismount from any valid entity in the world
++            root.stopRiding(true);
++            return;
++        }
++        for (final Entity passenger : root.getPassengers()) {
++            this.addRecursivelySafe(passenger, fromDisk);
 +        }
 +    }
 +
-+    public void addEntityChunkEntities(final List<Entity> entities) {
++    private void addEntityChunk(final List<Entity> entities, final ChunkPos forChunk, final boolean fromDisk) {
 +        for (int i = 0, len = entities.size(); i < len; ++i) {
-+            this.addEntity(entities.get(i), true);
-+        }
-+    }
++            final Entity entity = entities.get(i);
++            if (entity.isPassenger()) {
++                continue;
++            }
 +
-+    public void addWorldGenChunkEntities(final List<Entity> entities) {
-+        for (int i = 0, len = entities.size(); i < len; ++i) {
-+            this.addEntity(entities.get(i), false);
-+        }
++            if (!entity.chunkPosition().equals(forChunk)) {
++                LOGGER.warn("Root entity " + entity + " is outside of serialized chunk " + forChunk);
++                // can't set removed here, as we may not own the chunk position
++                // skip the entity
++                continue;
++            }
++
++            final Vec3 rootPosition = entity.position();
++
++            // always adjust positions before adding passengers in case plugins access the entity, and so that
++            // they are added to the right entity chunk
++            for (final Entity passenger : entity.getIndirectPassengers()) {
++                if (!passenger.chunkPosition().equals(forChunk)) {
++                    passenger.setPosRaw(rootPosition.x, rootPosition.y, rootPosition.z, true);
++                }
++            }
++
++            this.addRecursivelySafe(entity, fromDisk);
++         }
 +    }
 +
 +    public boolean addNewEntity(final Entity entity) {
@@ -6477,7 +6526,7 @@ index 0000000000000000000000000000000000000000..d72041aa814ff179e6e29a45dcd359a9
 +}
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkFullTask.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkFullTask.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..300700477ee34bc22b31315825c0e40f61070cd5
+index 0000000000000000000000000000000000000000..679ed4d53269e1113035b462cf74ab16a231e22e
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkFullTask.java
 @@ -0,0 +1,135 @@
@@ -6538,7 +6587,7 @@ index 0000000000000000000000000000000000000000..300700477ee34bc22b31315825c0e40f
 +                final ServerLevel world = this.world;
 +                final ProtoChunk protoChunk = (ProtoChunk)this.fromChunk;
 +                chunk = new LevelChunk(this.world, protoChunk, (final LevelChunk unused) -> {
-+                    ChunkMap.postLoadProtoChunk(world, protoChunk.getEntities());
++                    ChunkMap.postLoadProtoChunk(world, protoChunk.getEntities(), protoChunk.getPos()); // Paper - rewrite chunk system
 +                });
 +            }
 +
@@ -10933,7 +10982,7 @@ index 0000000000000000000000000000000000000000..396d72c00e47cf1669ae20dc839c1c96
 +}
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..51304c5cf4b0ac7646693ef97ef4a3847d3342b5
+index 0000000000000000000000000000000000000000..b66a7d4aab887309579154815a0d4abf9de506b0
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
 @@ -0,0 +1,2106 @@
@@ -11054,7 +11103,7 @@ index 0000000000000000000000000000000000000000..51304c5cf4b0ac7646693ef97ef4a384
 +            if (entityChunk != null) {
 +                final List<Entity> entities = EntityStorage.readEntities(this.world, entityChunk);
 +
-+                this.world.getEntityLookup().addEntityChunkEntities(entities);
++                this.world.getEntityLookup().addEntityChunkEntities(entities, new ChunkPos(this.chunkX, this.chunkZ));
 +            }
 +        }
 +
@@ -16770,12 +16819,12 @@ index 0000000000000000000000000000000000000000..7e8dc9e8f381abfdcce2746edc93122d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 047b07c7443c0d6a403506b869d63806ec2a85f7..18092ddfd000ef36f0e182ac064c2f667b1e611b 100644
+index e7a124403f2b07c96caaaf97d1c9023f9ec2f9d9..b097bb4855ab724b2c435a9a9db450ff3ce840fe 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -94,6 +94,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -111,6 +111,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      @Nullable
-     private volatile Component delayedDisconnect;
+     BandwidthDebugMonitor bandwidthDebugMonitor;
      public String hostname = ""; // CraftBukkit - add field
 +    // Paper start - add pending task queue
 +    private final Queue<Runnable> pendingTasks = new java.util.concurrent.ConcurrentLinkedQueue<>();
@@ -16802,15 +16851,15 @@ index 047b07c7443c0d6a403506b869d63806ec2a85f7..18092ddfd000ef36f0e182ac064c2f66
  
      public Connection(PacketFlow side) {
          this.receiving = side;
-@@ -261,6 +283,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -368,6 +390,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
  
      private void flushQueue() {
 +        try { // Paper - add pending task queue
          if (this.channel != null && this.channel.isOpen()) {
-             Queue queue = this.queue;
+             Queue queue = this.pendingActions;
  
-@@ -273,6 +296,12 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -380,6 +403,12 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              }
          }
@@ -16837,10 +16886,10 @@ index a5e438a834826161c52ca9db57d234d9ff80a591..b8bc1b9b8e8a33df90a963f9f9769292
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index af8afd53b5d3b34be4a5207316ce35abbcdf202d..017395b49d4cc0d12246332cc7d4d0113dcd5c5e 100644
+index ae0b713870976d4b1e469a90cef9b2e282dbcaab..646cd39c46d86899f23c8179c0790e32d03f954f 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -282,6 +282,7 @@ public class Main {
+@@ -279,6 +279,7 @@ public class Main {
  
              convertable_conversionsession.saveDataTag(iregistrycustom_dimension, savedata);
              */
@@ -16849,10 +16898,10 @@ index af8afd53b5d3b34be4a5207316ce35abbcdf202d..017395b49d4cc0d12246332cc7d4d011
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, worldLoader.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::new);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8504b749f 100644
+index 0eb3a55cbf2ed2c3f5e809ee60aba3767f7aa01b..151259cc254d4e796e6af810e37eaa30b832daa3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -299,7 +299,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -294,7 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
@@ -16861,7 +16910,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
              ((MinecraftServer) atomicreference.get()).runServer();
          }, "Server thread");
  
-@@ -582,7 +582,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -571,7 +571,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
              this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
@@ -16870,7 +16919,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
-@@ -782,6 +782,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -767,6 +767,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean shouldRconBroadcast();
  
      public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -16883,7 +16932,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
          boolean flag3 = false;
  
          for (Iterator iterator = this.getAllLevels().iterator(); iterator.hasNext(); flag3 = true) {
-@@ -790,8 +796,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -775,8 +781,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (!suppressLogs) {
                  MinecraftServer.LOGGER.info("Saving chunks for level '{}'/{}", worldserver, worldserver.dimension().location());
              }
@@ -16898,7 +16947,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
          }
  
          // CraftBukkit start - moved to WorldServer.save
-@@ -810,7 +820,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -795,7 +805,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              while (iterator1.hasNext()) {
                  ServerLevel worldserver2 = (ServerLevel) iterator1.next();
  
@@ -16907,7 +16956,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
              }
  
              MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
-@@ -890,36 +900,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -872,36 +882,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
  
@@ -16945,7 +16994,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
  
          this.isSaving = false;
          this.resources.close();
-@@ -938,7 +919,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -920,7 +901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getProfileCache().save();
          }
          // Spigot end
@@ -16954,7 +17003,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
      }
  
      public String getLocalIp() {
-@@ -972,6 +953,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -954,6 +935,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // Spigot End
  
@@ -16963,7 +17012,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
      protected void runServer() {
          try {
              if (!this.initServer()) {
-@@ -986,6 +969,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -968,6 +951,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              Arrays.fill( recentTps, 20 );
              long curTime, tickSection = Util.getMillis(), tickCount = 1;
              while (this.running) {
@@ -16976,7 +17025,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
                  long i = (curTime = Util.getMillis()) - this.nextTickTime;
  
                  if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
-@@ -1098,6 +1087,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1080,6 +1069,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private boolean haveTime() {
@@ -16988,7 +17037,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
          // CraftBukkit start
          if (isOversleep) return canOversleep();// Paper - because of our changes, this logic is broken
          return this.forceTicks || this.runningTask() || Util.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
-@@ -2247,7 +2241,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2243,7 +2237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      @Override
      public boolean isSameThread() {
@@ -16998,7 +17047,7 @@ index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8
  
      public boolean isDebugging() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 14101c77fd9814a5d1e8e1bf0d8584f42086b051..fea6b32015f9e2654c40ad90301d7aaeb0dabf72 100644
+index 5aa21689e308842fe5b64689265ba45a299f7ad5..71da1294cf3b09e53e3e846d59b3bf27a8dca618 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -399,7 +399,34 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -17037,7 +17086,7 @@ index 14101c77fd9814a5d1e8e1bf0d8584f42086b051..fea6b32015f9e2654c40ad90301d7aae
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e229694fbd2 100644
+index 807a6bb1026dac2c4cd0a50afe06fd62ce23558b..2b998bdbe49bf8211b755e0eb7c1bf13ac280eab 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -48,17 +48,12 @@ public class ChunkHolder {
@@ -17061,12 +17110,13 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
      public final ChunkPos pos;
      private boolean hasChangedSections;
      private final ShortSet[] changedBlocksPerSection;
-@@ -67,10 +62,20 @@ public class ChunkHolder {
+@@ -67,11 +62,20 @@ public class ChunkHolder {
      private final LevelLightEngine lightEngine;
      private final ChunkHolder.LevelChangeListener onLevelChange;
      public final ChunkHolder.PlayerProvider playerProvider;
 -    private boolean wasAccessibleSinceLastSave;
 -    private CompletableFuture<Void> pendingFullStateConfirmation;
+-    private CompletableFuture<?> sendSync;
 +    // Paper - rewrite chunk system
  
      private final ChunkMap chunkMap; // Paper
@@ -17084,7 +17134,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
  
      // Paper start
      public void onChunkAdd() {
-@@ -82,148 +87,130 @@ public class ChunkHolder {
+@@ -83,158 +87,143 @@ public class ChunkHolder {
      }
      // Paper end
  
@@ -17114,6 +17164,10 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
 +    public boolean hasChunkBeenSent() {
 +        return this.playersSentChunkTo.size() != 0;
 +    }
++
++    public boolean hasBeenSent(ServerPlayer to) {
++        return this.playersSentChunkTo.contains(to);
++    }
 +    // Paper end - replace player chunk loader
 +    public ChunkHolder(ChunkPos pos, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.PlayerProvider playersWatchingChunkProvider, io.papermc.paper.chunk.system.scheduling.NewChunkHolder newChunkHolder) { // Paper - rewrite chunk system
 +        this.newChunkHolder = newChunkHolder; // Paper - rewrite chunk system
@@ -17121,6 +17175,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
          this.blockChangedLightSectionFilter = new BitSet();
          this.skyChangedLightSectionFilter = new BitSet();
 -        this.pendingFullStateConfirmation = CompletableFuture.completedFuture(null); // CraftBukkit - decompile error
+-        this.sendSync = CompletableFuture.completedFuture(null); // CraftBukkit - decompile error
 +        // Paper - rewrite chunk system
          this.pos = pos;
          this.levelHeightAccessor = world;
@@ -17216,6 +17271,17 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
 +        // Paper end - rewrite chunk system
      }
  
+     public CompletableFuture<?> getChunkSendSyncFuture() {
+-        return this.sendSync;
++        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
+     }
+ 
+     @Nullable
+     public LevelChunk getChunkToSend() {
+-        return !this.sendSync.isDone() ? null : this.getTickingChunk();
++        return this.getSendingChunk(); // Paper - rewrite chunk system
+     }
+ 
      @Nullable
      public final LevelChunk getFullChunk() { // Paper - final for inline
 -        CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getFullChunkFuture();
@@ -17296,7 +17362,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
  
          if (chunk != null) {
              int i = this.levelHeightAccessor.getSectionIndex(pos.getY());
-@@ -239,16 +226,17 @@ public class ChunkHolder {
+@@ -250,16 +239,17 @@ public class ChunkHolder {
      }
  
      public void sectionLightChanged(LightLayer lightType, int y) {
@@ -17319,7 +17385,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
                      int j = this.lightEngine.getMinLightSection();
                      int k = this.lightEngine.getMaxLightSection();
  
-@@ -273,7 +261,7 @@ public class ChunkHolder {
+@@ -284,7 +274,7 @@ public class ChunkHolder {
              List list;
  
              if (!this.skyChangedLightSectionFilter.isEmpty() || !this.blockChangedLightSectionFilter.isEmpty()) {
@@ -17328,7 +17394,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
                  if (!list.isEmpty()) {
                      ClientboundLightUpdatePacket packetplayoutlightupdate = new ClientboundLightUpdatePacket(chunk.getPos(), this.lightEngine, this.skyChangedLightSectionFilter, this.blockChangedLightSectionFilter);
  
-@@ -285,7 +273,7 @@ public class ChunkHolder {
+@@ -296,7 +286,7 @@ public class ChunkHolder {
              }
  
              if (this.hasChangedSections) {
@@ -17337,7 +17403,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
  
                  for (int i = 0; i < this.changedBlocksPerSection.length; ++i) {
                      ShortSet shortset = this.changedBlocksPerSection[i];
-@@ -343,67 +331,35 @@ public class ChunkHolder {
+@@ -354,78 +344,35 @@ public class ChunkHolder {
  
      }
  
@@ -17415,15 +17481,25 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
          });
      }
  
+-    public void addSendDependency(CompletableFuture<?> postProcessingFuture) {
+-        if (this.sendSync.isDone()) {
+-            this.sendSync = postProcessingFuture;
+-        } else {
+-            this.sendSync = this.sendSync.thenCombine(postProcessingFuture, (object, object1) -> {
+-                return null;
+-            });
+-        }
+-
+-    }
 +    // Paper - rewrite chunk system
-+
+ 
      public FullChunkStatus getFullStatus() {
 -        return ChunkLevel.fullStatus(this.ticketLevel);
 +        return this.newChunkHolder.getChunkStatus(); // Paper - rewrite chunk system) {
      }
  
      public final ChunkPos getPos() { // Paper - final for inline
-@@ -411,240 +367,17 @@ public class ChunkHolder {
+@@ -433,240 +380,17 @@ public class ChunkHolder {
      }
  
      public final int getTicketLevel() { // Paper - final for inline
@@ -17668,7 +17744,7 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
      }
  
      @FunctionalInterface
-@@ -682,15 +415,15 @@ public class ChunkHolder {
+@@ -704,15 +428,15 @@ public class ChunkHolder {
  
      // Paper start
      public final boolean isEntityTickingReady() {
@@ -17688,11 +17764,11 @@ index 4620e64d8eb81520b75fbfbc64603e5887c7b016..c5389e7f3665c06e487dfde3200b7e22
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0ee9c1113 100644
+index 8c84461a5711cb408b0ead397417c31cb2f4d336..ea0b82165e452b7b82d1d9a58eef6059cba30552 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -127,10 +127,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     private static final int MIN_VIEW_DISTANCE = 2;
+@@ -118,10 +118,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     public static final int MIN_VIEW_DISTANCE = 2;
      public static final int MAX_VIEW_DISTANCE = 32;
      public static final int FORCED_TICKET_LEVEL = ChunkLevel.byStatus(FullChunkStatus.ENTITY_TICKING);
 -    public final Long2ObjectLinkedOpenHashMap<ChunkHolder> updatingChunkMap = new Long2ObjectLinkedOpenHashMap();
@@ -17703,7 +17779,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      public final ServerLevel level;
      private final ThreadedLevelLightEngine lightEngine;
      public final BlockableEventLoop<Runnable> mainThreadExecutor; // Paper - public
-@@ -139,16 +136,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -130,16 +127,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      private final ChunkGeneratorStructureState chunkGeneratorState;
      public final Supplier<DimensionDataStorage> overworldDataStorage;
      private final PoiManager poiManager;
@@ -17723,9 +17799,9 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      private final String storageName;
      private final PlayerMap playerMap;
      public final Int2ObjectMap<ChunkMap.TrackedEntity> entityMap;
-@@ -157,37 +152,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -148,37 +143,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      private final Queue<Runnable> unloadQueue;
-     int viewDistance;
+     private int serverViewDistance;
  
 -    // CraftBukkit start - recursion-safe executor for Chunk loadCallback() and unloadCallback()
 -    public final CallbackExecutor callbackExecutor = new CallbackExecutor();
@@ -17754,8 +17830,8 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
  
      void addPlayerToDistanceMaps(ServerPlayer player) {
 +        this.level.playerChunkLoader.addPlayer(player); // Paper - replace chunk loader
-         int chunkX = MCUtil.getChunkCoordinate(player.getX());
-         int chunkZ = MCUtil.getChunkCoordinate(player.getZ());
+         int chunkX = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getX());
+         int chunkZ = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getZ());
          // Note: players need to be explicitly added to distance maps before they can be updated
      }
  
@@ -17764,15 +17840,15 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
  
      }
  
-@@ -195,6 +173,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         int chunkX = MCUtil.getChunkCoordinate(player.getX());
-         int chunkZ = MCUtil.getChunkCoordinate(player.getZ());
+@@ -186,6 +164,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         int chunkX = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getX());
+         int chunkZ = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getZ());
          // Note: players need to be explicitly added to distance maps before they can be updated
 +        this.level.playerChunkLoader.updatePlayer(player); // Paper - replace chunk loader
      }
      // Paper end
      // Paper start
-@@ -224,16 +203,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -215,16 +194,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public final ChunkHolder getUnloadingChunkHolder(int chunkX, int chunkZ) {
@@ -17791,7 +17867,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
          this.tickingGenerated = new AtomicInteger();
          this.playerMap = new PlayerMap();
          this.entityMap = new Int2ObjectOpenHashMap();
-@@ -264,19 +240,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -255,19 +231,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
          this.chunkGeneratorState = chunkGenerator.createState(iregistrycustom.lookupOrThrow(Registries.STRUCTURE_SET), this.randomState, j, world.spigotConfig); // Spigot
          this.mainThreadExecutor = mainThreadExecutor;
@@ -17816,7 +17892,37 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
          this.distanceManager = new ChunkMap.ChunkDistanceManager(executor, mainThreadExecutor);
          this.overworldDataStorage = persistentStateManagerFactory;
          this.poiManager = new PoiManager(path.resolve("poi"), dataFixer, dsync, iregistrycustom, world);
-@@ -340,20 +314,22 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -311,23 +285,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+ 
+     boolean isChunkTracked(ServerPlayer player, int chunkX, int chunkZ) {
+-        return player.getChunkTrackingView().contains(chunkX, chunkZ) && !player.connection.chunkSender.isPending(ChunkPos.asLong(chunkX, chunkZ));
++        // Paper start - rewrite player chunk loader
++        return this.level.playerChunkLoader.isChunkSent(player, chunkX, chunkZ);
++        // Paper end - rewrite player chunk loader
+     }
+ 
+     private boolean isChunkOnTrackedBorder(ServerPlayer player, int chunkX, int chunkZ) {
+-        if (!this.isChunkTracked(player, chunkX, chunkZ)) {
+-            return false;
+-        } else {
+-            for (int k = -1; k <= 1; ++k) {
+-                for (int l = -1; l <= 1; ++l) {
+-                    if ((k != 0 || l != 0) && !this.isChunkTracked(player, chunkX + k, chunkZ + l)) {
+-                        return true;
+-                    }
+-                }
+-            }
+-
+-            return false;
+-        }
++        // Paper start - rewrite player chunk loader
++        return this.level.playerChunkLoader.isChunkSent(player, chunkX, chunkZ, true);
++        // Paper end - rewrite player chunk loader
+     }
+ 
+     protected ThreadedLevelLightEngine getLightEngine() {
+@@ -336,20 +302,22 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      @Nullable
      protected ChunkHolder getUpdatingChunkIfPresent(long pos) {
@@ -17846,7 +17952,16 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      }
  
      public String getChunkDebugData(ChunkPos chunkPos) {
-@@ -391,84 +367,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -379,92 +347,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ 
+     // Paper start
+     public final int getEffectiveViewDistance() {
+-        // TODO this needs to be checked on update
+-        // Mojang currently sets it to +1 of the configured view distance. So subtract one to get the one we really want.
+-        //TODO check if +0 is correct now
+-        return this.viewDistance;
++        return this.serverViewDistance;
+     }
      // Paper end
  
      private CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkHolder centerChunk, int margin, IntFunction<ChunkStatus> distanceToStatus) {
@@ -17903,7 +18018,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
 -
 -                    Optional<ChunkAccess> optional = either.left();
 -
--                    if (!optional.isPresent()) {
+-                    if (optional.isEmpty()) {
 -                        return Either.right(new ChunkHolder.ChunkLoadingFailure() {
 -                            public String toString() {
 -                                ChunkPos chunkcoordintpair2 = new ChunkPos(j + l1 % (margin * 2 + 1), k + l1 / (margin * 2 + 1));
@@ -17932,7 +18047,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      }
  
      public ReportedException debugFuturesAndCreateReportedException(IllegalStateException exception, String details) {
-@@ -498,263 +397,72 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -494,263 +382,72 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> prepareEntityTickingChunk(ChunkHolder chunk) {
@@ -18005,7 +18120,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
  
      protected void saveAllChunks(boolean flush) {
 -        if (flush) {
--            List<ChunkHolder> list = (List) io.papermc.paper.chunk.system.ChunkSystem.getVisibleChunkHolders(this.level).stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList()); // Paper
+-            List<ChunkHolder> list = io.papermc.paper.chunk.system.ChunkSystem.getVisibleChunkHolders(this.level).stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).toList(); // Paper
 -            MutableBoolean mutableboolean = new MutableBoolean();
 -
 -            do {
@@ -18216,7 +18331,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
          return nbt.contains("Status", 8);
      }
  
-@@ -790,54 +498,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -786,54 +483,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      private CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> scheduleChunkGeneration(ChunkHolder holder, ChunkStatus requiredStatus) {
@@ -18272,7 +18387,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      }
  
      protected void releaseLightTicket(ChunkPos pos) {
-@@ -848,7 +509,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -844,7 +494,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }));
      }
  
@@ -18281,16 +18396,24 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
          ChunkStatus chunkstatus1;
  
          if (distance == 0) {
-@@ -860,7 +521,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -856,7 +506,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return chunkstatus1;
      }
  
 -    private static void postLoadProtoChunk(ServerLevel world, List<CompoundTag> nbt) {
-+    public static void postLoadProtoChunk(ServerLevel world, List<CompoundTag> nbt) { // Paper - public
++    public static void postLoadProtoChunk(ServerLevel world, List<CompoundTag> nbt, ChunkPos position) { // Paper - public and add chunk position parameter
          if (!nbt.isEmpty()) {
              // CraftBukkit start - these are spawned serialized (DefinedStructure) and we don't call an add event below at the moment due to ordering complexities
              world.addWorldGenChunkEntities(EntityType.loadEntitiesRecursive(nbt, world).filter((entity) -> {
-@@ -882,93 +543,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -871,111 +521,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                     needsRemoval = true;
+                 }
+                 return !needsRemoval;
+-            }));
++            }), position); // Paper - rewrite chunk system
+             // CraftBukkit end
+         }
+ 
      }
  
      private CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> protoChunkToFullChunk(ChunkHolder chunkHolder) {
@@ -18351,6 +18474,16 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
 -            return either.ifLeft((chunk) -> {
 -                chunk.postProcessGeneration();
 -                this.level.startTickingChunk(chunk);
+-                CompletableFuture<?> completablefuture2 = holder.getChunkSendSyncFuture();
+-
+-                if (completablefuture2.isDone()) {
+-                    this.onChunkReadyToSend(chunk);
+-                } else {
+-                    completablefuture2.thenAcceptAsync((object) -> {
+-                        this.onChunkReadyToSend(chunk);
+-                    }, this.mainThreadExecutor);
+-                }
+-
 -            });
 -        }, this.mainThreadExecutor);
 -
@@ -18358,27 +18491,29 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
 -            this.tickingGenerated.getAndIncrement();
 -            return null;
 -        });
--        completablefuture1.thenAcceptAsync((either) -> {
--            either.ifLeft((chunk) -> {
--                MutableObject<ClientboundLevelChunkWithLightPacket> mutableobject = new MutableObject();
--
--                this.getPlayers(holder.getPos(), false).forEach((entityplayer) -> {
--                    this.playerLoadedChunk(entityplayer, mutableobject, chunk);
--                });
--            });
--        }, (runnable) -> {
--            this.mainThreadMailbox.tell(ChunkTaskPriorityQueueSorter.message(holder, runnable));
--        });
 -        return completablefuture1;
 +        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
      }
  
+     private void onChunkReadyToSend(LevelChunk chunk) {
+-        ChunkPos chunkcoordintpair = chunk.getPos();
+-        Iterator iterator = this.playerMap.getAllPlayers().iterator();
+-
+-        while (iterator.hasNext()) {
+-            ServerPlayer entityplayer = (ServerPlayer) iterator.next();
+-
+-            if (entityplayer.getChunkTrackingView().contains(chunkcoordintpair)) {
+-                ChunkMap.markChunkPendingToSend(entityplayer, chunk);
+-            }
+-        }
++        throw new UnsupportedOperationException(); // Paper - rewrite player chunk loader
+ 
+     }
+ 
      public CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> prepareAccessibleChunk(ChunkHolder holder) {
 -        return this.getChunkRangeFuture(holder, 1, ChunkStatus::getStatusAroundFullChunk).thenApplyAsync((either) -> {
 -            return either.mapLeft((list) -> {
--                LevelChunk chunk = (LevelChunk) list.get(list.size() / 2);
--
--                return chunk;
+-                return (LevelChunk) list.get(list.size() / 2);
 -            });
 -        }, (runnable) -> {
 -            this.mainThreadMailbox.tell(ChunkTaskPriorityQueueSorter.message(holder, runnable));
@@ -18387,7 +18522,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      }
  
      public int getTickingGenerated() {
-@@ -976,94 +559,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -983,130 +549,52 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      private boolean saveChunkIfNeeded(ChunkHolder chunkHolder) {
@@ -18474,89 +18609,68 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
 -                this.markPositionReplaceable(pos);
 -                return false;
 -            }
--
--            ChunkStatus.ChunkType chunkstatus_type = ChunkSerializer.getChunkTypeFromTag(nbttagcompound);
 +        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
 +    }
  
+-            ChunkStatus.ChunkType chunkstatus_type = ChunkSerializer.getChunkTypeFromTag(nbttagcompound);
++    // Paper start - replace player loader system
++    public void setTickViewDistance(int distance) {
++        this.level.playerChunkLoader.setTickDistance(distance);
++    }
+ 
 -            return this.markPosition(pos, chunkstatus_type) == 1;
 -        }
-+    // Paper start - replace player loader system
-+    public void setTickViewDistance(int distance) {
-+        this.level.playerChunkLoader.setTickDistance(distance);
-     }
- 
 +    public void setSendViewDistance(int distance) {
 +        this.level.playerChunkLoader.setSendDistance(distance);
-+    }
+     }
 +    // Paper end - replace player loader system
-     public void setViewDistance(int watchDistance) {
+ 
+-    protected void setServerViewDistance(int watchDistance) {
++    public void setServerViewDistance(int watchDistance) { // Paper - replace player loader system
          int j = Mth.clamp(watchDistance, 2, 32);
  
-@@ -1071,35 +586,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             int k = this.viewDistance;
- 
-             this.viewDistance = j;
--            this.distanceManager.updatePlayerTickets(this.viewDistance);
--            Iterator objectiterator = io.papermc.paper.chunk.system.ChunkSystem.getUpdatingChunkHolders(this.level).iterator(); // Paper
+         if (j != this.serverViewDistance) {
+             this.serverViewDistance = j;
+-            this.distanceManager.updatePlayerTickets(this.serverViewDistance);
+-            Iterator iterator = this.playerMap.getAllPlayers().iterator();
 -
--            while (objectiterator.hasNext()) {
--                ChunkHolder playerchunk = (ChunkHolder) objectiterator.next();
--                ChunkPos chunkcoordintpair = playerchunk.getPos();
--                MutableObject<ClientboundLevelChunkWithLightPacket> mutableobject = new MutableObject();
+-            while (iterator.hasNext()) {
+-                ServerPlayer entityplayer = (ServerPlayer) iterator.next();
 -
--                this.getPlayers(chunkcoordintpair, false).forEach((entityplayer) -> {
--                    SectionPos sectionposition = entityplayer.getLastSectionPos();
--                    boolean flag = ChunkMap.isChunkInRange(chunkcoordintpair.x, chunkcoordintpair.z, sectionposition.x(), sectionposition.z(), k);
--                    boolean flag1 = ChunkMap.isChunkInRange(chunkcoordintpair.x, chunkcoordintpair.z, sectionposition.x(), sectionposition.z(), this.viewDistance);
--
--                    this.updateChunkTracking(entityplayer, chunkcoordintpair, mutableobject, flag, flag1);
--                });
+-                this.updateChunkTracking(entityplayer);
 -            }
-+            this.level.playerChunkLoader.setLoadDistance(this.viewDistance + 1); // Paper - replace player loader system
++            this.level.playerChunkLoader.setLoadDistance(this.serverViewDistance + 1); // Paper - replace player loader system
          }
  
      }
  
--    protected void updateChunkTracking(ServerPlayer player, ChunkPos pos, MutableObject<ClientboundLevelChunkWithLightPacket> packet, boolean oldWithinViewDistance, boolean newWithinViewDistance) {
-+    public void updateChunkTracking(ServerPlayer player, ChunkPos pos, MutableObject<ClientboundLevelChunkWithLightPacket> packet, boolean oldWithinViewDistance, boolean newWithinViewDistance) { // Paper - public
-+        io.papermc.paper.util.TickThread.ensureTickThread(this.level, pos, "May not update chunk tracking for chunk async"); // Paper - replace chunk loader system
-+        io.papermc.paper.util.TickThread.ensureTickThread(player, "May not update chunk tracking for player async"); // Paper - replace chunk loader system
-         if (player.level() == this.level) {
-+            ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos.toLong()); // Paper - replace chunk loader system - move up
-             if (newWithinViewDistance && !oldWithinViewDistance) {
--                ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos.toLong());
-+                // Paper - replace chunk loader system - move up
- 
-                 if (playerchunk != null) {
--                    LevelChunk chunk = playerchunk.getTickingChunk();
-+                    LevelChunk chunk = playerchunk.getSendingChunk(); // Paper - replace chunk loader system
- 
-                     if (chunk != null) {
-+                        playerchunk.addPlayer(player); // Paper - replace chunk loader system
-                         this.playerLoadedChunk(player, packet, chunk);
-                     }
- 
-@@ -1108,10 +612,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             }
- 
-             if (!newWithinViewDistance && oldWithinViewDistance) {
-+                // Paper start - replace chunk loader system
-+                if (playerchunk != null) {
-+                    playerchunk.removePlayer(player);
-+                } else {
-+                    LOGGER.warn("ChunkHolder at " + pos + " in world '" + this.level.getWorld().getName() + "' does not exist to untrack chunk for " + player, new Throwable());
-+                }
-+                // Paper end - replace chunk loader system
-                 player.untrackChunk(pos);
-             }
- 
--        }
-+        } else { LOGGER.warn("Mismatch in world for chunk " + pos + " in world '" + this.level.getWorld().getName() + "' for player " + player, new Throwable()); } // Paper - replace chunk loader system
+     int getPlayerViewDistance(ServerPlayer player) {
+-        return Mth.clamp(player.requestedViewDistance(), 2, this.serverViewDistance);
++        return io.papermc.paper.chunk.system.ChunkSystem.getSendViewDistance(player); // Paper - per player view distance
      }
  
-     public int size() {
-@@ -1127,30 +638,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     private void markChunkPendingToSend(ServerPlayer player, ChunkPos pos) {
+-        LevelChunk chunk = this.getChunkToSend(pos.toLong());
+-
+-        if (chunk != null) {
+-            ChunkMap.markChunkPendingToSend(player, chunk);
+-        }
++        throw new UnsupportedOperationException(); // Paper - per player view distance
+ 
+     }
+ 
+     private static void markChunkPendingToSend(ServerPlayer player, LevelChunk chunk) {
+-        player.connection.chunkSender.markChunkPendingToSend(chunk);
++        throw new UnsupportedOperationException(); // Paper - rewrite player chunk loader
+     }
+ 
+     private static void dropChunk(ServerPlayer player, ChunkPos pos) {
+-        player.connection.chunkSender.dropChunk(player, pos);
++        // Paper - rewrite player chunk loader
+     }
+ 
+     @Nullable
+@@ -1129,30 +617,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      void dumpChunks(Writer writer) throws IOException {
@@ -18588,7 +18702,7 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      }
  
      private static String printFuture(CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> future) {
-@@ -1169,6 +657,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1171,6 +636,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
@@ -18624,91 +18738,94 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      private CompletableFuture<Optional<CompoundTag>> readChunk(ChunkPos chunkPos) {
          return this.read(chunkPos).thenApplyAsync((optional) -> {
              return optional.map((nbttagcompound) -> this.upgradeChunkTag(nbttagcompound, chunkPos)); // CraftBukkit
-@@ -1272,15 +789,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1260,8 +754,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                 this.distanceManager.addPlayer(SectionPos.of((EntityAccess) player), player);
+             }
+ 
+-            player.setChunkTrackingView(ChunkTrackingView.EMPTY);
+-            this.updateChunkTracking(player);
++            // Paper - handled by player chunk loader
+             this.addPlayerToDistanceMaps(player); // Paper - distance maps
+         } else {
+             SectionPos sectionposition = player.getLastSectionPos();
+@@ -1272,7 +765,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             }
+ 
              this.removePlayerFromDistanceMaps(player); // Paper - distance maps
+-            this.applyChunkTrackingView(player, ChunkTrackingView.EMPTY);
++            // Paper - handled by player chunk loader
          }
  
--        for (int k = i - this.viewDistance - 1; k <= i + this.viewDistance + 1; ++k) {
--            for (int l = j - this.viewDistance - 1; l <= j + this.viewDistance + 1; ++l) {
--                if (ChunkMap.isChunkInRange(k, l, i, j, this.viewDistance)) {
--                    ChunkPos chunkcoordintpair = new ChunkPos(k, l);
--
--                    this.updateChunkTracking(player, chunkcoordintpair, new MutableObject(), !added, added);
--                }
--            }
--        }
-+        // Paper - handled by player chunk loader
- 
      }
+@@ -1320,73 +813,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                 this.playerMap.unIgnorePlayer(player);
+             }
  
-@@ -1288,7 +797,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         SectionPos sectionposition = SectionPos.of((EntityAccess) player);
- 
-         player.setLastSectionPos(sectionposition);
--        player.connection.send(new ClientboundSetChunkCacheCenterPacket(sectionposition.x(), sectionposition.z()));
-+        //player.connection.send(new ClientboundSetChunkCacheCenterPacket(sectionposition.x(), sectionposition.z())); // Paper - handled by player chunk loader
-         return sectionposition;
-     }
- 
-@@ -1344,44 +853,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         int l1;
-         int i2;
- 
--        if (Math.abs(i1 - i) <= k1 * 2 && Math.abs(j1 - j) <= k1 * 2) {
--            l1 = Math.min(i, i1) - k1;
--            i2 = Math.min(j, j1) - k1;
--            int j2 = Math.max(i, i1) + k1;
--            int k2 = Math.max(j, j1) + k1;
--
--            for (int l2 = l1; l2 <= j2; ++l2) {
--                for (int i3 = i2; i3 <= k2; ++i3) {
--                    boolean flag3 = ChunkMap.isChunkInRange(l2, i3, i1, j1, this.viewDistance);
--                    boolean flag4 = ChunkMap.isChunkInRange(l2, i3, i, j, this.viewDistance);
--
--                    this.updateChunkTracking(player, new ChunkPos(l2, i3), new MutableObject(), flag3, flag4);
--                }
--            }
--        } else {
--            boolean flag5;
--            boolean flag6;
--
--            for (l1 = i1 - k1; l1 <= i1 + k1; ++l1) {
--                for (i2 = j1 - k1; i2 <= j1 + k1; ++i2) {
--                    if (ChunkMap.isChunkInRange(l1, i2, i1, j1, this.viewDistance)) {
--                        flag5 = true;
--                        flag6 = false;
--                        this.updateChunkTracking(player, new ChunkPos(l1, i2), new MutableObject(), true, false);
--                    }
--                }
--            }
--
--            for (l1 = i - k1; l1 <= i + k1; ++l1) {
--                for (i2 = j - k1; i2 <= j + k1; ++i2) {
--                    if (ChunkMap.isChunkInRange(l1, i2, i, j, this.viewDistance)) {
--                        flag5 = false;
--                        flag6 = true;
--                        this.updateChunkTracking(player, new ChunkPos(l1, i2), new MutableObject(), false, true);
--                    }
--                }
--            }
--        }
-+        // Paper - replaced by PlayerChunkLoader
+-            this.updateChunkTracking(player);
++            // Paper - replaced by PlayerChunkLoader
+         }
  
          this.updateMaps(player); // Paper - distance maps
+     }
  
-@@ -1389,20 +861,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     private void updateChunkTracking(ServerPlayer player) {
+-        ChunkPos chunkcoordintpair = player.chunkPosition();
+-        int i = this.getPlayerViewDistance(player);
+-        ChunkTrackingView chunktrackingview = player.getChunkTrackingView();
+-
+-        if (chunktrackingview instanceof ChunkTrackingView.Positioned) {
+-            ChunkTrackingView.Positioned chunktrackingview_a = (ChunkTrackingView.Positioned) chunktrackingview;
+-
+-            if (chunktrackingview_a.center().equals(chunkcoordintpair) && chunktrackingview_a.viewDistance() == i) {
+-                return;
+-            }
+-        }
+-
+-        this.applyChunkTrackingView(player, ChunkTrackingView.of(chunkcoordintpair, i));
++        throw new UnsupportedOperationException(); // Paper - replaced by PlayerChunkLoader
+     }
+ 
+     private void applyChunkTrackingView(ServerPlayer player, ChunkTrackingView chunkFilter) {
+-        if (player.level() == this.level) {
+-            ChunkTrackingView chunktrackingview1 = player.getChunkTrackingView();
+-
+-            if (chunkFilter instanceof ChunkTrackingView.Positioned) {
+-                label15:
+-                {
+-                    ChunkTrackingView.Positioned chunktrackingview_a = (ChunkTrackingView.Positioned) chunkFilter;
+-
+-                    if (chunktrackingview1 instanceof ChunkTrackingView.Positioned) {
+-                        ChunkTrackingView.Positioned chunktrackingview_a1 = (ChunkTrackingView.Positioned) chunktrackingview1;
+-
+-                        if (chunktrackingview_a1.center().equals(chunktrackingview_a.center())) {
+-                            break label15;
+-                        }
+-                    }
+-
+-                    player.connection.send(new ClientboundSetChunkCacheCenterPacket(chunktrackingview_a.center().x, chunktrackingview_a.center().z));
+-                }
+-            }
+-
+-            ChunkTrackingView.difference(chunktrackingview1, chunkFilter, (chunkcoordintpair) -> {
+-                this.markChunkPendingToSend(player, chunkcoordintpair);
+-            }, (chunkcoordintpair) -> {
+-                ChunkMap.dropChunk(player, chunkcoordintpair);
+-            });
+-            player.setChunkTrackingView(chunkFilter);
+-        }
++        throw new UnsupportedOperationException(); // Paper - replaced by PlayerChunkLoader
+     }
  
      @Override
      public List<ServerPlayer> getPlayers(ChunkPos chunkPos, boolean onlyOnWatchDistanceEdge) {
--        Set<ServerPlayer> set = this.playerMap.getPlayers(chunkPos.toLong());
+-        Set<ServerPlayer> set = this.playerMap.getAllPlayers();
 -        Builder<ServerPlayer> builder = ImmutableList.builder();
 -        Iterator iterator = set.iterator();
 -
 -        while (iterator.hasNext()) {
 -            ServerPlayer entityplayer = (ServerPlayer) iterator.next();
--            SectionPos sectionposition = entityplayer.getLastSectionPos();
 -
--            if (onlyOnWatchDistanceEdge && ChunkMap.isChunkOnRangeBorder(chunkPos.x, chunkPos.z, sectionposition.x(), sectionposition.z(), this.viewDistance) || !onlyOnWatchDistanceEdge && ChunkMap.isChunkInRange(chunkPos.x, chunkPos.z, sectionposition.x(), sectionposition.z(), this.viewDistance)) {
+-            if (onlyOnWatchDistanceEdge && this.isChunkOnTrackedBorder(entityplayer, chunkPos.x, chunkPos.z) || !onlyOnWatchDistanceEdge && this.isChunkTracked(entityplayer, chunkPos.x, chunkPos.z)) {
 -                builder.add(entityplayer);
 -            }
 +        // Paper start - per player view distance
@@ -18724,7 +18841,40 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
      }
  
      public void addEntity(Entity entity) {
-@@ -1630,7 +1096,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1450,13 +900,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+ 
+     protected void tick() {
+-        Iterator iterator = this.playerMap.getAllPlayers().iterator();
+-
+-        while (iterator.hasNext()) {
+-            ServerPlayer entityplayer = (ServerPlayer) iterator.next();
+-
+-            this.updateChunkTracking(entityplayer);
+-        }
++        // Paper - replaced by PlayerChunkLoader
+ 
+         List<ServerPlayer> list = Lists.newArrayList();
+         List<ServerPlayer> list1 = this.level.players();
+@@ -1565,16 +1009,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+ 
+     public void waitForLightBeforeSending(ChunkPos centerPos, int radius) {
+-        int j = radius + 1;
+-
+-        ChunkPos.rangeClosed(centerPos, j).forEach((chunkcoordintpair1) -> {
+-            ChunkHolder playerchunk = this.getVisibleChunkIfPresent(chunkcoordintpair1.toLong());
+-
+-            if (playerchunk != null) {
+-                playerchunk.addSendDependency(this.lightEngine.waitForPendingTasks(chunkcoordintpair1.x, chunkcoordintpair1.z));
+-            }
+-
+-        });
++        // Paper - rewrite player chunk loader
+     }
+ 
+     private class ChunkDistanceManager extends DistanceManager {
+@@ -1585,7 +1020,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
          @Override
          protected boolean isChunkToRemove(long pos) {
@@ -18733,17 +18883,8 @@ index 19bd6f9aee3ccb1af1b010ee51a54aa2d0bf9c84..6f30a16595e352e32375530a0482d8c0
          }
  
          @Nullable
-@@ -1711,7 +1177,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             org.spigotmc.AsyncCatcher.catchOp("player tracker update"); // Spigot
-             if (player != this.entity) {
-                 Vec3 vec3d = player.position().subtract(this.entity.position());
--                double d0 = (double) Math.min(this.getEffectiveRange(), ChunkMap.this.viewDistance * 16);
-+                double d0 = (double) Math.min(this.getEffectiveRange(), io.papermc.paper.chunk.system.ChunkSystem.getSendViewDistance(player) * 16); // Paper - per player view distance
-                 double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z;
-                 double d2 = d0 * d0;
-                 boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player);
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..c716047fefb51a77ce18df243c517d80c78b6853 100644
+index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..942042863f0105769c15b865d4d98a09a7053a68 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -39,65 +39,28 @@ import org.slf4j.Logger;
@@ -19048,7 +19189,7 @@ index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..c716047fefb51a77ce18df243c517d80
  
      protected void updatePlayerTickets(int viewDistance) {
 -        this.playerTicketManager.updateViewDistance(viewDistance);
-+        this.chunkMap.setViewDistance(viewDistance);// Paper - route to player chunk manager
++        this.chunkMap.setServerViewDistance(viewDistance);// Paper - route to player chunk manager
      }
  
      // Paper start
@@ -19202,7 +19343,7 @@ index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..c716047fefb51a77ce18df243c517d80
 +    */ // Paper - rewrite chunk system
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 6d5a160a9fdaa04bb930afae8a0765910f631d23..b0687dcf8af84af627b67e7fbb68170a2fd28da0 100644
+index b1fd6118132ba38f60d2a2b15c09231fa29be8fa..65d447df49d8c4a27de9ae7f9e298bf705c688bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -141,108 +141,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -19633,7 +19774,7 @@ index 6d5a160a9fdaa04bb930afae8a0765910f631d23..b0687dcf8af84af627b67e7fbb68170a
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e653da43d 100644
+index 988a17cd0b960a07795d999dd125eae3a63d4227..0261baddef54c47f7b32f4e2a31ba0172e676d38 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -194,7 +194,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -19645,7 +19786,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
      private final GameEventDispatcher gameEventDispatcher;
      public boolean noSave;
      private final SleepStatus sleepStatus;
-@@ -260,50 +260,63 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -260,50 +260,65 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return true;
      }
  
@@ -19721,8 +19862,10 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
          java.util.function.Consumer<net.minecraft.world.level.chunk.ChunkAccess> consumer = (net.minecraft.world.level.chunk.ChunkAccess chunk) -> {
              if (chunk != null) {
 -                int ticketLevel = Math.max(33, chunkProvider.chunkMap.getUpdatingChunkIfPresent(chunk.getPos().toLong()).getTicketLevel());
++                synchronized (ret) { // Folia - region threading - make callback thread-safe TODO rebase
                  ret.add(chunk);
 -                ticketLevels.add(ticketLevel);
++                } // Folia - region threading - make callback thread-safe TODO rebase
                  chunkProvider.addTicketAtLevel(TicketType.FUTURE_AWAIT, chunk.getPos(), ticketLevel, holderIdentifier);
              }
 -            if (++loadedChunks[0] == requiredChunks) {
@@ -19736,7 +19879,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
  
                          chunkProvider.addTicketAtLevel(TicketType.UNKNOWN, chunkPos, ticketLevel, chunkPos);
                          chunkProvider.removeTicketAtLevel(TicketType.FUTURE_AWAIT, chunkPos, ticketLevel, holderIdentifier);
-@@ -315,12 +328,223 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -315,12 +330,223 @@ public class ServerLevel extends Level implements WorldGenLevel {
          for (int cx = minChunkX; cx <= maxChunkX; ++cx) {
              for (int cz = minChunkZ; cz <= maxChunkZ; ++cz) {
                  io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(
@@ -19962,7 +20105,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
  
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
-@@ -364,16 +588,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -364,16 +590,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // CraftBukkit end
          boolean flag2 = minecraftserver.forceSynchronousWrites();
          DataFixer datafixer = minecraftserver.getFixerUpper();
@@ -19984,8 +20127,8 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
              return minecraftserver.overworld().getDataStorage();
          });
          this.chunkSource.getGeneratorState().ensureStructuresGenerated();
-@@ -410,6 +634,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             }, "random_sequences");
+@@ -402,6 +628,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             return (RandomSequences) this.getDataStorage().computeIfAbsent(RandomSequences.factory(l), "random_sequences");
          });
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
 +
@@ -19994,7 +20137,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
      }
  
      /** @deprecated */
-@@ -520,7 +747,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -512,7 +741,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                          gameprofilerfiller.push("checkDespawn");
                          entity.checkDespawn();
                          gameprofilerfiller.pop();
@@ -20003,7 +20146,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
                              Entity entity1 = entity.getVehicle();
  
                              if (entity1 != null) {
-@@ -545,13 +772,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -537,13 +766,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          gameprofilerfiller.push("entityManagement");
@@ -20022,7 +20165,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
      }
  
      protected void tickTime() {
-@@ -1012,6 +1242,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1010,6 +1242,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
@@ -20034,7 +20177,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
          ServerChunkCache chunkproviderserver = this.getChunkSource();
  
          if (!savingDisabled) {
-@@ -1027,16 +1262,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1025,16 +1262,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
                  timings.worldSaveChunks.startTiming(); // Paper
@@ -20055,7 +20198,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
          ServerLevel worldserver1 = this;
-@@ -1172,7 +1404,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1170,7 +1404,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED);
          }
  
@@ -20064,7 +20207,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
      }
  
      // CraftBukkit start
-@@ -1188,7 +1420,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1186,7 +1420,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
              // CraftBukkit end
  
@@ -20073,7 +20216,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
          }
      }
  
-@@ -1200,10 +1432,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1198,10 +1432,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
          // CraftBukkit end
          Stream<UUID> stream = entity.getSelfAndPassengers().map(Entity::getUUID); // CraftBukkit - decompile error
@@ -20087,7 +20230,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
              return false;
          } else {
              this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit
-@@ -1723,7 +1955,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1712,7 +1946,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
@@ -20096,7 +20239,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
              bufferedwriter.write(String.format(Locale.ROOT, "block_entity_tickers: %d\n", this.blockEntityTickers.size()));
              bufferedwriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count()));
              bufferedwriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count()));
-@@ -1772,7 +2004,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1761,7 +1995,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter2 = Files.newBufferedWriter(path1);
  
          try {
@@ -20105,7 +20248,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
          } catch (Throwable throwable4) {
              if (bufferedwriter2 != null) {
                  try {
-@@ -1793,7 +2025,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1782,7 +2016,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter3 = Files.newBufferedWriter(path2);
  
          try {
@@ -20114,7 +20257,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
          } catch (Throwable throwable6) {
              if (bufferedwriter3 != null) {
                  try {
-@@ -1935,7 +2167,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1924,7 +2158,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public String getWatchdogStats() {
@@ -20123,7 +20266,7 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          }), this.blockEntityTickers.size(), ServerLevel.getTypeCount(this.blockEntityTickers, TickingBlockEntity::getType), this.getBlockTicks().count(), this.getFluidTicks().count(), this.gatherChunkSourceStats());
      }
-@@ -1995,15 +2227,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1984,15 +2218,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public LevelEntityGetter<Entity> getEntities() {
          org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot
@@ -20131,18 +20274,20 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
 +        return this.entityLookup; // Paper - rewrite chunk system
      }
  
-     public void addLegacyChunkEntities(Stream<Entity> entities) {
+-    public void addLegacyChunkEntities(Stream<Entity> entities) {
 -        this.entityManager.addLegacyChunkEntities(entities);
-+        this.entityLookup.addLegacyChunkEntities(entities.toList()); // Paper - rewrite chunk system
++    public void addLegacyChunkEntities(Stream<Entity> entities, ChunkPos forChunk) { // Paper - rewrite chunk system
++        this.entityLookup.addLegacyChunkEntities(entities.toList(), forChunk); // Paper - rewrite chunk system
      }
  
-     public void addWorldGenChunkEntities(Stream<Entity> entities) {
+-    public void addWorldGenChunkEntities(Stream<Entity> entities) {
 -        this.entityManager.addWorldGenChunkEntities(entities);
-+        this.entityLookup.addWorldGenChunkEntities(entities.toList()); // Paper - rewrite chunk system
++    public void addWorldGenChunkEntities(Stream<Entity> entities, ChunkPos forChunk) { // Paper - rewrite chunk system
++        this.entityLookup.addWorldGenChunkEntities(entities.toList(), forChunk); // Paper - rewrite chunk system
      }
  
      public void startTickingChunk(LevelChunk chunk) {
-@@ -2019,34 +2251,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2008,34 +2242,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public void close() throws IOException {
          super.close();
@@ -20200,13 +20345,14 @@ index 7cb5abfa89f842194325d26c6e95b49460c5968f..995be2fd84ce343d7430d9658f91868e
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a0856fc649c50309258f015e623502dd46aeeab4..5a18f4649b64d47f429eb6c1dbb6238aab3eacd2 100644
+index b944cda955c5660d3a9b84e9c92c2b19337a027a..32d79663a30dbbf54b0edf0460193182008f003b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -260,6 +260,48 @@ public class ServerPlayer extends Player {
+@@ -257,6 +257,50 @@ public class ServerPlayer extends Player {
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
  
++    // Paper start - replace player chunk loader
 +    private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 +    public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 +
@@ -20248,12 +20394,13 @@ index a0856fc649c50309258f015e623502dd46aeeab4..5a18f4649b64d47f429eb6c1dbb6238a
 +            return input.setSendViewDistance(distance);
 +        });
 +    }
++    // Paper end - replace player chunk loader
 +
-     public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
+     public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
 diff --git a/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java b/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java
-index 6716d9acc8b31f3fc3642b47fa52ce32c5195a3e..76bd323f25d7c2f4e12dd13baa53995fa4f8b27a 100644
+index 97662f8c8c125cb964d46b9095509a0da9796dba..f382d138959b34bfc3a114bc9d96e056cccbfc89 100644
 --- a/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java
 +++ b/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java
 @@ -37,15 +37,12 @@ import net.minecraft.world.level.chunk.ChunkStatus;
@@ -20425,7 +20572,7 @@ index 6716d9acc8b31f3fc3642b47fa52ce32c5195a3e..76bd323f25d7c2f4e12dd13baa53995f
 +        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
      }
  
-     static enum TaskType {
+     public CompletableFuture<?> waitForPendingTasks(int x, int z) {
 diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java
 index b346fa94b23d81da7da073f71dd12e672e0f079c..0edb97617f0c0da8dda901a26891b33c324715c7 100644
 --- a/src/main/java/net/minecraft/server/level/Ticket.java
@@ -20522,11 +20669,55 @@ index e96a0ca47e4701ba187555bd92c968345bc85677..73b96f804079288e9c5fcc11da54e61e
 +    public <T> void getEntitiesByClass(Class<? extends T> clazz, Entity except, AABB box, List<? super T> into, Predicate<? super T> predicate) {}
 +    // Paper end
  }
+diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
+index c509a1318bcef38fd4927e38b6ee9846853e2d15..0f7ee2eea68a5c910bdf4d6263ed09cbed592516 100644
+--- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
++++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
+@@ -42,14 +42,21 @@ public class PlayerChunkSender {
+         this.pendingChunks.add(chunk.getPos().toLong());
+     }
+ 
++    // Paper start - rewrite player chunk loader
++    public static void dropChunkStatic(ServerPlayer player, ChunkPos pos) {
++        player.connection.send(new ClientboundForgetLevelChunkPacket(pos));
++    }
++    // Paper end - rewrite player chunk loader
++
+     public void dropChunk(ServerPlayer player, ChunkPos pos) {
+         if (!this.pendingChunks.remove(pos.toLong()) && player.isAlive()) {
+-            player.connection.send(new ClientboundForgetLevelChunkPacket(pos));
++           dropChunkStatic(player, pos); // Paper - rewrite player chunk loader - move into own method
+         }
+ 
+     }
+ 
+     public void sendNextChunks(ServerPlayer player) {
++        if (true) return; // Paper - rewrite player chunk loader
+         if (this.unacknowledgedBatches < this.maxUnacknowledgedBatches) {
+             float f = Math.max(1.0F, this.desiredChunksPerTick);
+             this.batchQuota = Math.min(this.batchQuota + this.desiredChunksPerTick, f);
+@@ -75,7 +82,7 @@ public class PlayerChunkSender {
+         }
+     }
+ 
+-    private static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) {
++    public static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) { // Paper - rewrite chunk loader - public
+         handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null));
+         ChunkPos chunkPos = chunk.getPos();
+         DebugPackets.sendPoiPacketsForChunk(world, chunkPos);
+@@ -100,6 +107,7 @@ public class PlayerChunkSender {
+     }
+ 
+     public void onChunkBatchReceivedByClient(float desiredBatchSize) {
++        if (true) return; // Paper - rewrite player chunk loader
+         --this.unacknowledgedBatches;
+         this.desiredChunksPerTick = Double.isNaN((double)desiredBatchSize) ? 0.01F : Mth.clamp(desiredBatchSize, 0.01F, 64.0F);
+         if (this.unacknowledgedBatches == 0) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1fa9b13831638ea2bfd5d3073dc31018083c8b6a..2c922afde237ca0e56ee6dc067f2989434d4d08c 100644
+index e85268e4c20371d4264effb70ae9fa8e435f8766..3b11d395bd2c8ca8ec9a2ddb62b57c167a45ba2d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -790,6 +790,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -695,6 +695,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.disconnect(Component.translatable("disconnect.spam"));
              return;
          }
@@ -20541,30 +20732,30 @@ index 1fa9b13831638ea2bfd5d3073dc31018083c8b6a..2c922afde237ca0e56ee6dc067f29894
          StringReader stringreader = new StringReader(packet.getCommand());
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b922654c0b0b1b0d03beb20bb1944b817907f929..b40ddd8fb3e2d2bafaa2ece46714815d0d6d5f75 100644
+index b30128b77d2fe8a8c1db9b5746aab537a9a25430..5ae47b3449df7a83a5c22a266f7b9e4ea681a492 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -262,7 +262,7 @@ public abstract class PlayerList {
-         boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
+@@ -251,7 +251,7 @@ public abstract class PlayerList {
+         boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
  
          // Spigot - view distance
--        playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), player.gameMode.getGameModeForPlayer(), player.gameMode.getPreviousGameModeForPlayer(), this.server.levelKeys(), this.synchronizedRegistries, worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), this.getMaxPlayers(), worldserver1.spigotConfig.viewDistance, worldserver1.spigotConfig.simulationDistance, flag1, !flag, worldserver1.isDebug(), worldserver1.isFlat(), player.getLastDeathLocation(), player.getPortalCooldown()));
-+        playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), player.gameMode.getGameModeForPlayer(), player.gameMode.getPreviousGameModeForPlayer(), this.server.levelKeys(), this.synchronizedRegistries, worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), this.getMaxPlayers(), worldserver1.getWorld().getSendViewDistance(), worldserver1.getWorld().getSimulationDistance(), flag1, !flag, worldserver1.isDebug(), worldserver1.isFlat(), player.getLastDeathLocation(), player.getPortalCooldown())); // Paper - replace old player chunk management
+-        playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), this.server.levelKeys(), this.getMaxPlayers(), worldserver1.spigotConfig.viewDistance, worldserver1.spigotConfig.simulationDistance, flag1, !flag, flag2, player.createCommonSpawnInfo(worldserver1)));
++        playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), this.server.levelKeys(), this.getMaxPlayers(), worldserver1.getWorld().getSendViewDistance(), worldserver1.getWorld().getSimulationDistance(), flag1, !flag, flag2, player.createCommonSpawnInfo(worldserver1))); // Paper - replace old player chunk management
          player.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
-         playerconnection.send(new ClientboundUpdateEnabledFeaturesPacket(FeatureFlags.REGISTRY.toNames(worldserver1.enabledFeatures())));
-         playerconnection.send(new ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.BRAND, (new FriendlyByteBuf(Unpooled.buffer())).writeUtf(this.getServer().getServerModName())));
-@@ -800,8 +800,8 @@ public abstract class PlayerList {
-         // CraftBukkit start
-         LevelData worlddata = worldserver1.getLevelData();
-         entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), (byte) i, entityplayer1.getLastDeathLocation(), entityplayer1.getPortalCooldown()));
+         playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+         playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
+@@ -799,8 +799,8 @@ public abstract class PlayerList {
+         LevelData worlddata = worldserver2.getLevelData();
+ 
+         entityplayer1.connection.send(new ClientboundRespawnPacket(entityplayer1.createCommonSpawnInfo(worldserver2), (byte) i));
 -        entityplayer1.connection.send(new ClientboundSetChunkCacheRadiusPacket(worldserver1.spigotConfig.viewDistance)); // Spigot
 -        entityplayer1.connection.send(new ClientboundSetSimulationDistancePacket(worldserver1.spigotConfig.simulationDistance)); // Spigot
 +        entityplayer1.connection.send(new ClientboundSetChunkCacheRadiusPacket(worldserver1.getWorld().getSendViewDistance())); // Spigot // Paper - replace old player chunk management
 +        entityplayer1.connection.send(new ClientboundSetSimulationDistancePacket(worldserver1.getWorld().getSimulationDistance())); // Spigot // Paper - replace old player chunk management
-         entityplayer1.spawnIn(worldserver1);
-         entityplayer1.unsetRemoved();
-         entityplayer1.connection.teleport(CraftLocation.toBukkit(entityplayer1.position(), worldserver1.getWorld(), entityplayer1.getYRot(), entityplayer1.getXRot()));
-@@ -1297,7 +1297,7 @@ public abstract class PlayerList {
+         entityplayer1.connection.teleport(CraftLocation.toBukkit(entityplayer1.position(), worldserver2.getWorld(), entityplayer1.getYRot(), entityplayer1.getXRot())); // CraftBukkit
+         entityplayer1.connection.send(new ClientboundSetDefaultSpawnPositionPacket(worldserver1.getSharedSpawnPos(), worldserver1.getSharedSpawnAngle()));
+         entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+@@ -1291,7 +1291,7 @@ public abstract class PlayerList {
  
      public void setViewDistance(int viewDistance) {
          this.viewDistance = viewDistance;
@@ -20573,7 +20764,7 @@ index b922654c0b0b1b0d03beb20bb1944b817907f929..b40ddd8fb3e2d2bafaa2ece46714815d
          Iterator iterator = this.server.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1312,7 +1312,7 @@ public abstract class PlayerList {
+@@ -1306,7 +1306,7 @@ public abstract class PlayerList {
  
      public void setSimulationDistance(int simulationDistance) {
          this.simulationDistance = simulationDistance;
@@ -20692,7 +20883,7 @@ index 495b52bfab14478f8285cc5471335a41244c199e..e16ef1b7c0bfe6d6194c09f6787a50fd
                          if (flag1) {
                              ++this.converted;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1c13e674b 100644
+index 8b3763ba7f5648c41c5bf8a72e5c801d5483e6e0..0e79e92014dd56fc2ba98ce6050463627a0cde9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -327,6 +327,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -20754,7 +20945,7 @@ index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
          this.passengers = ImmutableList.of();
-@@ -2256,11 +2308,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2264,11 +2316,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return InteractionResult.PASS;
      }
  
@@ -20768,7 +20959,7 @@ index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1
          return false;
      }
  
-@@ -3561,6 +3613,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3588,6 +3640,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          };
      }
  
@@ -20785,7 +20976,7 @@ index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1
      public boolean hasExactlyOnePlayerPassenger() {
          return this.getIndirectPassengersStream().filter((entity) -> {
              return entity instanceof Player;
-@@ -3892,6 +3954,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3919,6 +3981,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -20798,7 +20989,7 @@ index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
              this.position = new Vec3(x, y, z);
              int i = Mth.floor(x);
-@@ -3999,6 +4067,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4026,6 +4094,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      @Override
      public final void setRemoved(Entity.RemovalReason reason) {
@@ -20812,7 +21003,7 @@ index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4007,7 +4082,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4034,7 +4109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.stopRiding();
          }
  
@@ -20821,7 +21012,7 @@ index 8fdac0e7bb0b9374ebdb82673d0579fff22af5e3..48ac0559e32a1b6b26a00978cf9ef6a1
          this.levelCallback.onRemove(reason);
      }
  
-@@ -4022,7 +4097,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4049,7 +4124,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      @Override
      public boolean shouldBeSaved() {
@@ -21082,7 +21273,7 @@ index 795a02941d7cecb58ec45b5e79c8d510ff21163a..3fc17817906876e83f040f908b8b1ba6
          this.setDirty = updateListener;
          this.isValid = valid;
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 127c4ebedb94631ceac92dbdcd465e904217d715..be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42 100644
+index b6a3c75b84d9f768afee33aa0f226207b307c1c0..2ec2b1d9d987c7f31c685aec3d3c87f42758c94b 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
 @@ -18,6 +18,18 @@ import net.minecraft.world.phys.shapes.Shapes;
@@ -21362,7 +21553,7 @@ index 846ae3fd184a1d63b743aa25e045604576697c96..a907b79fd8291a0e92db138f37239d17
  
      public int getIndex() {
 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 09999a3f523ce6d652799215d3418284a69042c1..a0c88a15be577d552e61bfa923a6e566b1cfcc49 100644
+index bcdaa86cfd31c2ce4aadad900c348aee0a9e3fc8..a8b2ce0debe54afeb937a4f1215d6b8955037d3d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -661,9 +661,26 @@ public class LevelChunk extends ChunkAccess {
@@ -21541,7 +21732,7 @@ index 09999a3f523ce6d652799215d3418284a69042c1..a0c88a15be577d552e61bfa923a6e566
  
      public void setFullStatus(Supplier<FullChunkStatus> levelTypeProvider) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 24892ae367e19038625e243bcdf1bb694632ede5..a7ee469bb2880a78540b79ae691ea449dfe22ce4 100644
+index 24892ae367e19038625e243bcdf1bb694632ede5..97cdd8cd7749185230471f34f7d1ce3abcd0fd11 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -94,7 +94,27 @@ public class ChunkSerializer {
@@ -21689,6 +21880,15 @@ index 24892ae367e19038625e243bcdf1bb694632ede5..a7ee469bb2880a78540b79ae691ea449
          nbttagcompound.put("PostProcessing", ChunkSerializer.packOffsets(chunk.getPostProcessing()));
          CompoundTag nbttagcompound3 = new CompoundTag();
          Iterator iterator1 = chunk.getHeightmaps().iterator();
+@@ -558,7 +631,7 @@ public class ChunkSerializer {
+ 
+         return nbttaglist == null && nbttaglist1 == null ? null : (chunk) -> {
+             if (nbttaglist != null) {
+-                world.addLegacyChunkEntities(EntityType.loadEntitiesRecursive(nbttaglist, world));
++                world.addLegacyChunkEntities(EntityType.loadEntitiesRecursive(nbttaglist, world), chunk.getPos()); // Paper - rewrite chunk system
+             }
+ 
+             if (nbttaglist1 != null) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 index 6c0f87535ffa95cf82ab4b03bb7bf8f2132d275f..b4e7c9b317d532d4915932f8f79dfebf2b63ff16 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
@@ -22019,10 +22219,10 @@ index d9daf07132c46548964a75588b69d7a74680e917..e68205fe7169c7c5b7c6fdada2ee97d8
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3a1f397f2 100644
+index 1988063a0cac0350ae3b3388b8f2a0c95b8b259f..2b6ba2e30c9a4682d6deb2ab750d6923ad8469e4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -24,30 +24,98 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -25,30 +25,98 @@ public class RegionFileStorage implements AutoCloseable {
      private final Path folder;
      private final boolean sync;
  
@@ -22126,7 +22326,7 @@ index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3
              return regionfile1;
          }
      }
-@@ -55,11 +123,12 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -56,11 +124,12 @@ public class RegionFileStorage implements AutoCloseable {
      @Nullable
      public CompoundTag read(ChunkPos pos) throws IOException {
          // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
@@ -22140,7 +22340,7 @@ index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3
          DataInputStream datainputstream = regionfile.getChunkDataInputStream(pos);
  
          CompoundTag nbttagcompound;
-@@ -96,6 +165,9 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -97,6 +166,9 @@ public class RegionFileStorage implements AutoCloseable {
          }
  
          return nbttagcompound;
@@ -22150,7 +22350,7 @@ index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3
      }
  
      public void scanChunk(ChunkPos chunkPos, StreamTagVisitor scanner) throws IOException {
-@@ -130,7 +202,12 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -131,7 +203,12 @@ public class RegionFileStorage implements AutoCloseable {
      }
  
      protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException {
@@ -22164,7 +22364,7 @@ index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3
  
          if (nbt == null) {
              regionfile.clear(pos);
-@@ -156,9 +233,12 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -157,9 +234,12 @@ public class RegionFileStorage implements AutoCloseable {
              }
          }
  
@@ -22178,7 +22378,7 @@ index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3
          ExceptionCollector<IOException> exceptionsuppressor = new ExceptionCollector<>();
          ObjectIterator objectiterator = this.regionCache.values().iterator();
  
-@@ -175,7 +255,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -176,7 +256,7 @@ public class RegionFileStorage implements AutoCloseable {
          exceptionsuppressor.throwIfPresent();
      }
  
@@ -22188,7 +22388,7 @@ index b9b50c56e79297bb824a92355f437a5d4d7e6760..fe8bb0037bb7f317fc32ac34461f4eb3
  
          while (objectiterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index b0c8a0e64c7a5d41c1b4cc1e39c4399c142b56af..0887cba39bfc4279abec21c6c316abab28beb0a3 100644
+index 56f0e217276b01aed2f20a71f6849826285fc15b..54db563d80bbabd87a2be6f5ead92b482ac07b10 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -34,27 +34,28 @@ import net.minecraft.world.level.ChunkPos;
@@ -22684,10 +22884,10 @@ index bf4b2f89d3a7133155c6272379c742318b2c1514..33677ec811ceab939c419bf7d31b9958
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42e74be803ad80b78e0db1c8cdd2dd9e45a40985..3704952279358e0a047ce1dccf2d3ef259b33ff1 100644
+index 71a0bad7402ec1ba48dcecb875fcad294af0f70e..e0b8aa7f17d98d7b686faf5422db4b4def12ee90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1187,7 +1187,7 @@ public final class CraftServer implements Server {
+@@ -1161,7 +1161,7 @@ public final class CraftServer implements Server {
          this.console.addLevel(internal);
  
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
@@ -22696,7 +22896,7 @@ index 42e74be803ad80b78e0db1c8cdd2dd9e45a40985..3704952279358e0a047ce1dccf2d3ef2
  
          this.pluginManager.callEvent(new WorldLoadEvent(internal.getWorld()));
          return internal.getWorld();
-@@ -1231,7 +1231,7 @@ public final class CraftServer implements Server {
+@@ -1205,7 +1205,7 @@ public final class CraftServer implements Server {
              }
  
              handle.getChunkSource().close(save);
@@ -22705,7 +22905,7 @@ index 42e74be803ad80b78e0db1c8cdd2dd9e45a40985..3704952279358e0a047ce1dccf2d3ef2
              handle.convertable.close();
          } catch (Exception ex) {
              this.getLogger().log(Level.SEVERE, null, ex);
-@@ -2062,7 +2062,7 @@ public final class CraftServer implements Server {
+@@ -2036,7 +2036,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -22715,7 +22915,7 @@ index 42e74be803ad80b78e0db1c8cdd2dd9e45a40985..3704952279358e0a047ce1dccf2d3ef2
  
      // Paper start - Adventure
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d01388bbadf3069357cf52463f4104a1be4d2b56..b3dfa35bc41191883814c78693a0d958ff3bf19b 100644
+index d01388bbadf3069357cf52463f4104a1be4d2b56..f4f94185cf699582737aecee1d3623c7857fbbb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -322,10 +322,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -22798,7 +22998,7 @@ index d01388bbadf3069357cf52463f4104a1be4d2b56..b3dfa35bc41191883814c78693a0d958
 +            throw new IllegalArgumentException("View distance " + viewDistance + " is out of range of [2, 32]");
 +        }
 +        net.minecraft.server.level.ChunkMap chunkMap = getHandle().getChunkSource().chunkMap;
-+        chunkMap.setViewDistance(viewDistance);
++        chunkMap.setServerViewDistance(viewDistance);
 +    }
 +
 +    @Override
@@ -22834,10 +23034,10 @@ index d01388bbadf3069357cf52463f4104a1be4d2b56..b3dfa35bc41191883814c78693a0d958
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f76db40188007b6ab475d259b4cbe0c7ef804677..49ca3592012cca981b96434c9807440672a8c165 100644
+index aa8ec0a92c8bca78088a2b30f571587823dd79bb..0c716967f19783e8e02c777835b63ed8126a80d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -195,6 +195,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -197,6 +197,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = System.currentTimeMillis();
      }
  
diff --git a/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 97%
rename from patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index b2c45575c1..e546480117 100644
--- a/patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 71a0bad7402ec1ba48dcecb875fcad294af0f70e..b841302b22d5be19e2ed84a0e9ae34cc4f4ce3ae 100644
+index e0b8aa7f17d98d7b686faf5422db4b4def12ee90..c3d5a05d847ee7d32cfb227b3445a92762df31d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -431,6 +431,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0019-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
similarity index 100%
rename from patches/server/0019-Configurable-cactus-bamboo-and-reed-growth-heights.patch
rename to patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0020-Configurable-baby-zombie-movement-speed.patch b/patches/server/0021-Configurable-baby-zombie-movement-speed.patch
similarity index 100%
rename from patches/server/0020-Configurable-baby-zombie-movement-speed.patch
rename to patches/server/0021-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0021-Configurable-fishing-time-ranges.patch b/patches/server/0022-Configurable-fishing-time-ranges.patch
similarity index 100%
rename from patches/server/0021-Configurable-fishing-time-ranges.patch
rename to patches/server/0022-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
similarity index 100%
rename from patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
rename to patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0023-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 100%
rename from patches/server/0023-Add-configurable-despawn-distances-for-living-entiti.patch
rename to patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch
similarity index 91%
rename from patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch
rename to patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch
index 905a52fbd1..042396c575 100644
--- a/patches/server/0024-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow for toggling of spawn chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d87f02c748fe2e5b4ea251f6691e8907a152cb6d..f21ba175538436e59c45d5350ef7b2605ed96775 100644
+index 5988c0847af4e8f0094328e91f736f25d567db60..fb78a91d1ab77f909823422c6d4e2ef7ed10c9c3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -261,6 +261,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 100%
rename from patches/server/0025-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 88%
rename from patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 136eba3acb..bf3d04ec74 100644
--- a/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0eb3a55cbf2ed2c3f5e809ee60aba3767f7aa01b..38896d1beb8adce59d62c6aeefb86ef8fb69ce40 100644
+index 151259cc254d4e796e6af810e37eaa30b832daa3..ce626187e7ffda51a54225fa6e43b817c6c19db8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1463,7 +1463,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1457,7 +1457,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -19,7 +19,7 @@ index 0eb3a55cbf2ed2c3f5e809ee60aba3767f7aa01b..38896d1beb8adce59d62c6aeefb86ef8
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b841302b22d5be19e2ed84a0e9ae34cc4f4ce3ae..eb3bf7f9f9d577fb31b51426dded196e7b5eb3c2 100644
+index c3d5a05d847ee7d32cfb227b3445a92762df31d0..30c0dd03f56a627e1c2516edf538193f4a0df588 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,7 +266,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -63,10 +63,10 @@ index e469180a85e68fbcdab88e8b567aefbb072f87d3..c4a7da71046a4669eb98d7260d3e00b4
                  net.minecraft.server.Main.main(options);
              } catch (Throwable t) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 335120afc88a8fc1543c2e6df516fd728e3ab032..d5863b0b06384b25eaa33572fa02649795463ed8 100644
+index f1194eb6fdfba60959e00080d0562f2820d13b27..11d7ede26b46d0bf9cced65e8c3bcc41c8b66dbf 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
+@@ -19,7 +19,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
  
      private WatchdogThread(long timeoutTime, boolean restart)
      {
@@ -75,7 +75,7 @@ index 335120afc88a8fc1543c2e6df516fd728e3ab032..d5863b0b06384b25eaa33572fa026497
          this.timeoutTime = timeoutTime;
          this.restart = restart;
      }
-@@ -65,14 +65,14 @@ public class WatchdogThread extends Thread
+@@ -65,14 +65,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
              {
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "------------------------------" );
@@ -93,12 +93,12 @@ index 335120afc88a8fc1543c2e6df516fd728e3ab032..d5863b0b06384b25eaa33572fa026497
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -82,7 +82,7 @@ public class WatchdogThread extends Thread
+@@ -82,7 +82,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                  }
                  //
                  log.log( Level.SEVERE, "------------------------------" );
 -                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
 +                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
                  log.log( Level.SEVERE, "------------------------------" );
-                 //
diff --git a/patches/server/0027-Implement-Paper-VersionChecker.patch b/patches/server/0028-Implement-Paper-VersionChecker.patch
similarity index 100%
rename from patches/server/0027-Implement-Paper-VersionChecker.patch
rename to patches/server/0028-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0028-Add-version-history-to-version-command.patch b/patches/server/0029-Add-version-history-to-version-command.patch
similarity index 98%
rename from patches/server/0028-Add-version-history-to-version-command.patch
rename to patches/server/0029-Add-version-history-to-version-command.patch
index d3a1973666..163d03a670 100644
--- a/patches/server/0028-Add-version-history-to-version-command.patch
+++ b/patches/server/0029-Add-version-history-to-version-command.patch
@@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 5aa21689e308842fe5b64689265ba45a299f7ad5..8d4fadc9c65636259bdbdba28bb8a3f8f4e25768 100644
+index 71da1294cf3b09e53e3e846d59b3bf27a8dca618..b77cbdd926cd54a4bae89e0d5a21e7d139bc0c63 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -189,6 +189,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0029-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch
similarity index 96%
rename from patches/server/0029-Player-affects-spawning-API.patch
rename to patches/server/0030-Player-affects-spawning-API.patch
index 76122bbe7e..a7faf3c124 100644
--- a/patches/server/0029-Player-affects-spawning-API.patch
+++ b/patches/server/0030-Player-affects-spawning-API.patch
@@ -100,10 +100,10 @@ index ad5d8db9fb44f8e47edc82f9ba62872802bfa380..124703a7c043b6c3b651fa1a81c5ba3e
  
      public void clientTick(Level world, BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index b6a3c75b84d9f768afee33aa0f226207b307c1c0..a583599e3b49d5ded871252646904a80825a01ff 100644
+index 2ec2b1d9d987c7f31c685aec3d3c87f42758c94b..36d793b492d9776ee36f8285b5bab09e6463cdce 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -70,6 +70,11 @@ public interface EntityGetter {
+@@ -82,6 +82,11 @@ public interface EntityGetter {
          }
      }
  
@@ -115,7 +115,7 @@ index b6a3c75b84d9f768afee33aa0f226207b307c1c0..a583599e3b49d5ded871252646904a80
      @Nullable
      default Player getNearestPlayer(double x, double y, double z, double maxDistance, @Nullable Predicate<Entity> targetPredicate) {
          double d = -1.0D;
-@@ -99,6 +104,20 @@ public interface EntityGetter {
+@@ -111,6 +116,20 @@ public interface EntityGetter {
          return this.getNearestPlayer(x, y, z, maxDistance, predicate);
      }
  
@@ -137,10 +137,10 @@ index b6a3c75b84d9f768afee33aa0f226207b307c1c0..a583599e3b49d5ded871252646904a80
          for(Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa8ec0a92c8bca78088a2b30f571587823dd79bb..19688fa3049603f63a306e5c48c45c80b0030f69 100644
+index 0c716967f19783e8e02c777835b63ed8126a80d9..ce81d9c7e5acea4c045321e82d190aa7be87848b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2205,6 +2205,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2247,6 +2247,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().language;
      }
  
diff --git a/patches/server/0030-Further-improve-server-tick-loop.patch b/patches/server/0031-Further-improve-server-tick-loop.patch
similarity index 92%
rename from patches/server/0030-Further-improve-server-tick-loop.patch
rename to patches/server/0031-Further-improve-server-tick-loop.patch
index 7d21f2f470..eb08edc741 100644
--- a/patches/server/0030-Further-improve-server-tick-loop.patch
+++ b/patches/server/0031-Further-improve-server-tick-loop.patch
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 38896d1beb8adce59d62c6aeefb86ef8fb69ce40..c8f952998cfa35e043796a88acf555a34ba979c3 100644
+index ce626187e7ffda51a54225fa6e43b817c6c19db8..086be61bfc8a43076b502bbf00e9f2d2785495d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -277,7 +277,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -33,7 +33,7 @@ index 38896d1beb8adce59d62c6aeefb86ef8fb69ce40..c8f952998cfa35e043796a88acf555a3
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-@@ -952,6 +952,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -933,6 +933,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      {
          return ( avg * exp ) + ( tps * ( 1 - exp ) );
      }
@@ -90,8 +90,8 @@ index 38896d1beb8adce59d62c6aeefb86ef8fb69ce40..c8f952998cfa35e043796a88acf555a3
 +    // Paper End
      // Spigot End
  
-     protected void runServer() {
-@@ -966,9 +1017,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public static volatile RuntimeException chunkSystemCrash; // Paper - rewrite chunk system
+@@ -949,7 +1000,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              // Spigot start
              Arrays.fill( recentTps, 20 );
@@ -99,12 +99,18 @@ index 38896d1beb8adce59d62c6aeefb86ef8fb69ce40..c8f952998cfa35e043796a88acf555a3
 +            long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
 +            lastTick = start - TICK_TIME; // Paper
              while (this.running) {
+                 // Paper start - rewrite chunk system
+                 // guarantee that nothing can stop the server from halting if it can at least still tick
+@@ -957,7 +1009,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     throw this.chunkSystemCrash;
+                 }
+                 // Paper end - rewrite chunk system
 -                long i = (curTime = Util.getMillis()) - this.nextTickTime;
 +                long i = ((curTime = System.nanoTime()) / (1000L * 1000L)) - this.nextTickTime; // Paper
  
                  if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
                      long j = i / 50L;
-@@ -980,12 +1032,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -969,12 +1021,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
  
                  ++MinecraftServer.currentTickLong; // Paper
@@ -128,7 +134,7 @@ index 38896d1beb8adce59d62c6aeefb86ef8fb69ce40..c8f952998cfa35e043796a88acf555a3
                      tickSection = curTime;
                  }
                  // Spigot end
-@@ -995,7 +1053,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -984,7 +1042,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.debugCommandProfiler = new MinecraftServer.TimeProfiler(Util.getNanos(), this.tickCount);
                  }
  
@@ -139,7 +145,7 @@ index 38896d1beb8adce59d62c6aeefb86ef8fb69ce40..c8f952998cfa35e043796a88acf555a3
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb3bf7f9f9d577fb31b51426dded196e7b5eb3c2..c2289c8ef49c73d662a67eab7a2b8c0cf9bb31a9 100644
+index 30c0dd03f56a627e1c2516edf538193f4a0df588..9d70513d05515f6ff3f03b5580bd48f127d73ca1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2478,6 +2478,17 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0031-Only-refresh-abilities-if-needed.patch b/patches/server/0032-Only-refresh-abilities-if-needed.patch
similarity index 87%
rename from patches/server/0031-Only-refresh-abilities-if-needed.patch
rename to patches/server/0032-Only-refresh-abilities-if-needed.patch
index 42da1f2bc0..8418c55511 100644
--- a/patches/server/0031-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0032-Only-refresh-abilities-if-needed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 19688fa3049603f63a306e5c48c45c80b0030f69..14667b660e756da2ae838efe979e4c96146625db 100644
+index ce81d9c7e5acea4c045321e82d190aa7be87848b..248b424939740e1d9208398c2c649efce0c99cf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1878,12 +1878,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1920,12 +1920,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/patches/server/0032-Entity-Origin-API.patch b/patches/server/0033-Entity-Origin-API.patch
similarity index 94%
rename from patches/server/0032-Entity-Origin-API.patch
rename to patches/server/0033-Entity-Origin-API.patch
index 6a5465e9b6..bcc8c0f7ae 100644
--- a/patches/server/0032-Entity-Origin-API.patch
+++ b/patches/server/0033-Entity-Origin-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 988a17cd0b960a07795d999dd125eae3a63d4227..1ba20de63a5c6a8c3dc1977a6a48154fd83ef0a2 100644
+index 0261baddef54c47f7b32f4e2a31ba0172e676d38..c4490354ec7c6d66a0879e7f2c2eb4edd301d045 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2105,6 +2105,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2354,6 +2354,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.valid = true; // CraftBukkit
@@ -25,7 +25,7 @@ index 988a17cd0b960a07795d999dd125eae3a63d4227..1ba20de63a5c6a8c3dc1977a6a48154f
  
          public void onTrackingEnd(Entity entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8b3763ba7f5648c41c5bf8a72e5c801d5483e6e0..706af1c9ec5c115e727753bf75d1fda01accaeca 100644
+index 0e79e92014dd56fc2ba98ce6050463627a0cde9f..f496c3d95d1cc47cada8f86a99b055f44eb6cd5e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -312,7 +312,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -56,7 +56,7 @@ index 8b3763ba7f5648c41c5bf8a72e5c801d5483e6e0..706af1c9ec5c115e727753bf75d1fda0
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -2018,6 +2038,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2070,6 +2090,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.bukkitEntity.storeBukkitValues(nbt);
              }
              // CraftBukkit end
@@ -72,7 +72,7 @@ index 8b3763ba7f5648c41c5bf8a72e5c801d5483e6e0..706af1c9ec5c115e727753bf75d1fda0
              return nbt;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2145,6 +2174,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2197,6 +2226,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
              // CraftBukkit end
  
diff --git a/patches/server/0033-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch
similarity index 92%
rename from patches/server/0033-Prevent-tile-entity-and-entity-crashes.patch
rename to patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch
index f8f65b9314..3e7cc84d14 100644
--- a/patches/server/0033-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f21ba175538436e59c45d5350ef7b2605ed96775..627f80e726f306edc765be5e6ac59ca73aade10b 100644
+index fb78a91d1ab77f909823422c6d4e2ef7ed10c9c3..a022d009b72e366ed69d05087457b712970c0b84 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -723,11 +723,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -728,11 +728,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
@@ -44,10 +44,10 @@ index b300d12e9e00519028b53aca9c3fb01f589eaa91..63acd109a79ed752a05df3d4f1b99309
          }
      }
 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 bcdaa86cfd31c2ce4aadad900c348aee0a9e3fc8..28ae0792c6b83580369937673f475f79b1c19576 100644
+index a8b2ce0debe54afeb937a4f1215d6b8955037d3d..515aedcf9969b818dfdc02a16a7f7178b5bb5593 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1057,11 +1057,11 @@ public class LevelChunk extends ChunkAccess {
+@@ -1146,11 +1146,11 @@ public class LevelChunk extends ChunkAccess {
  
                          gameprofilerfiller.pop();
                      } catch (Throwable throwable) {
diff --git a/patches/server/0034-Configurable-top-of-nether-void-damage.patch b/patches/server/0035-Configurable-top-of-nether-void-damage.patch
similarity index 95%
rename from patches/server/0034-Configurable-top-of-nether-void-damage.patch
rename to patches/server/0035-Configurable-top-of-nether-void-damage.patch
index c765fde675..370b46a4a6 100644
--- a/patches/server/0034-Configurable-top-of-nether-void-damage.patch
+++ b/patches/server/0035-Configurable-top-of-nether-void-damage.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable top of nether void damage
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 706af1c9ec5c115e727753bf75d1fda01accaeca..06e8a82d2001e2a8dd381f3be20ee7442e1d1178 100644
+index f496c3d95d1cc47cada8f86a99b055f44eb6cd5e..a9584072854fe3f8e946a271504fda70ebab9d2c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -663,7 +663,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -715,7 +715,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void checkBelowWorld() {
diff --git a/patches/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 100%
rename from patches/server/0035-Check-online-mode-before-converting-and-renaming-pla.patch
rename to patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0036-Always-tick-falling-blocks.patch b/patches/server/0037-Always-tick-falling-blocks.patch
similarity index 90%
rename from patches/server/0036-Always-tick-falling-blocks.patch
rename to patches/server/0037-Always-tick-falling-blocks.patch
index 694e377a2c..2e80c8ca6a 100644
--- a/patches/server/0036-Always-tick-falling-blocks.patch
+++ b/patches/server/0037-Always-tick-falling-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index ebd48f9977553174b14bdc7429c07d8352f5a297..d9149580408094784794bc0575a00bebe2e7b4d4 100644
+index 6606a118e7bff01aa51440aea7540ec9feec6cc5..1d9ce6dae17ff572d4528971c69c63d0f85b313c 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -89,6 +89,7 @@ public class ActivationRange
diff --git a/patches/server/0037-Configurable-end-credits.patch b/patches/server/0038-Configurable-end-credits.patch
similarity index 86%
rename from patches/server/0037-Configurable-end-credits.patch
rename to patches/server/0038-Configurable-end-credits.patch
index 84af64e3f6..4b685e3509 100644
--- a/patches/server/0037-Configurable-end-credits.patch
+++ b/patches/server/0038-Configurable-end-credits.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b944cda955c5660d3a9b84e9c92c2b19337a027a..e978a91636192cd00ef8bab9b8411fda39aebbb7 100644
+index 32d79663a30dbbf54b0edf0460193182008f003b..d0cab48a8743a97c8be6bb84dd1c1a490cf5221c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1025,6 +1025,7 @@ public class ServerPlayer extends Player {
+@@ -1069,6 +1069,7 @@ public class ServerPlayer extends Player {
              this.unRide();
              this.serverLevel().removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
              if (!this.wonGame) {
diff --git a/patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 100%
rename from patches/server/0038-Fix-lag-from-explosions-processing-dead-entities.patch
rename to patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0039-Optimize-explosions.patch b/patches/server/0040-Optimize-explosions.patch
similarity index 95%
rename from patches/server/0039-Optimize-explosions.patch
rename to patches/server/0040-Optimize-explosions.patch
index 3c7e3649b7..0bb6b1001b 100644
--- a/patches/server/0039-Optimize-explosions.patch
+++ b/patches/server/0040-Optimize-explosions.patch
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8f952998cfa35e043796a88acf555a34ba979c3..4eb9d3a3de91a7af2930f7e014256eeeafcb4ac7 100644
+index 086be61bfc8a43076b502bbf00e9f2d2785495d3..0e5661716d72ecf57d76443d8c7627e90966ee4d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1396,6 +1396,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1390,6 +1390,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.profiler.pop();
              this.profiler.pop();
@@ -120,7 +120,7 @@ index 4f2e06dab92085edd8f98415272cf77952e4888f..03151b8042912882ebb969dda16cc378
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 627f80e726f306edc765be5e6ac59ca73aade10b..0a7a354c085655c243fdf94c7dc82cdc95b3987a 100644
+index a022d009b72e366ed69d05087457b712970c0b84..da553430864689c426ad2c1dd74ad7d1134ffbae 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0040-Disable-explosion-knockback.patch b/patches/server/0041-Disable-explosion-knockback.patch
similarity index 100%
rename from patches/server/0040-Disable-explosion-knockback.patch
rename to patches/server/0041-Disable-explosion-knockback.patch
diff --git a/patches/server/0041-Disable-thunder.patch b/patches/server/0042-Disable-thunder.patch
similarity index 87%
rename from patches/server/0041-Disable-thunder.patch
rename to patches/server/0042-Disable-thunder.patch
index 83d57d717e..2cec26a5e0 100644
--- a/patches/server/0041-Disable-thunder.patch
+++ b/patches/server/0042-Disable-thunder.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1ba20de63a5c6a8c3dc1977a6a48154fd83ef0a2..521da94115387efb389569fce0765dacd86e95c6 100644
+index c4490354ec7c6d66a0879e7f2c2eb4edd301d045..03e05ddb51f9695079fccca9f7119f7adedd75ba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -593,7 +593,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -825,7 +825,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
diff --git a/patches/server/0042-Disable-ice-and-snow.patch b/patches/server/0043-Disable-ice-and-snow.patch
similarity index 85%
rename from patches/server/0042-Disable-ice-and-snow.patch
rename to patches/server/0043-Disable-ice-and-snow.patch
index 06ba40fcce..add551b9f1 100644
--- a/patches/server/0042-Disable-ice-and-snow.patch
+++ b/patches/server/0043-Disable-ice-and-snow.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 521da94115387efb389569fce0765dacd86e95c6..511f27358cad1fa067497914c61855ee6ea3846a 100644
+index 03e05ddb51f9695079fccca9f7119f7adedd75ba..35c401b41750748738c8f8aa2b8988377f4e679f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -623,11 +623,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -855,11 +855,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          gameprofilerfiller.popPush("iceandsnow");
  
diff --git a/patches/server/0043-Configurable-mob-spawner-tick-rate.patch b/patches/server/0044-Configurable-mob-spawner-tick-rate.patch
similarity index 100%
rename from patches/server/0043-Configurable-mob-spawner-tick-rate.patch
rename to patches/server/0044-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0044-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
similarity index 88%
rename from patches/server/0044-Implement-PlayerLocaleChangeEvent.patch
rename to patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
index 48b0a31eda..60a09515b4 100644
--- a/patches/server/0044-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e978a91636192cd00ef8bab9b8411fda39aebbb7..32ecdb19c377952b553297548c7f3ff32054ee2a 100644
+index d0cab48a8743a97c8be6bb84dd1c1a490cf5221c..263c1be59c62e2e5b6e40ecc7c36085e9e48827e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -214,7 +214,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index e978a91636192cd00ef8bab9b8411fda39aebbb7..32ecdb19c377952b553297548c7f3ff3
      public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
      @Nullable
      private Vec3 startingToFallPosition;
-@@ -264,7 +264,7 @@ public class ServerPlayer extends Player {
+@@ -308,7 +308,7 @@ public class ServerPlayer extends Player {
          this.lastActionTime = Util.getMillis();
          this.recipeBook = new ServerRecipeBook();
          this.requestedViewDistance = 2;
@@ -26,7 +26,7 @@ index e978a91636192cd00ef8bab9b8411fda39aebbb7..32ecdb19c377952b553297548c7f3ff3
          this.lastSectionPos = SectionPos.of(0, 0, 0);
          this.chunkTrackingView = ChunkTrackingView.EMPTY;
          this.respawnDimension = Level.OVERWORLD;
-@@ -1818,9 +1818,10 @@ public class ServerPlayer extends Player {
+@@ -1862,9 +1862,10 @@ public class ServerPlayer extends Player {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -39,10 +39,10 @@ index e978a91636192cd00ef8bab9b8411fda39aebbb7..32ecdb19c377952b553297548c7f3ff3
          // CraftBukkit end
          this.language = clientOptions.language();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 14667b660e756da2ae838efe979e4c96146625db..5ded753f030cad268f8aaeaf242985c67da2ca8d 100644
+index 248b424939740e1d9208398c2c649efce0c99cf9..b8fc211d72e860c85ca39b03574db3a7b18e369f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2203,7 +2203,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2245,7 +2245,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
diff --git a/patches/server/0045-Add-BeaconEffectEvent.patch b/patches/server/0046-Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0045-Add-BeaconEffectEvent.patch
rename to patches/server/0046-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0046-Configurable-container-update-tick-rate.patch b/patches/server/0047-Configurable-container-update-tick-rate.patch
similarity index 89%
rename from patches/server/0046-Configurable-container-update-tick-rate.patch
rename to patches/server/0047-Configurable-container-update-tick-rate.patch
index 3106a4b62e..cd597d48d3 100644
--- a/patches/server/0046-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0047-Configurable-container-update-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 32ecdb19c377952b553297548c7f3ff32054ee2a..d90748aab21adf9c7f463e31e7d7eb5f9bc0bbbd 100644
+index 263c1be59c62e2e5b6e40ecc7c36085e9e48827e..56566c9f74d1ba2539f9d35f61038489650b0792 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -239,6 +239,7 @@ public class ServerPlayer extends Player {
@@ -16,7 +16,7 @@ index 32ecdb19c377952b553297548c7f3ff32054ee2a..d90748aab21adf9c7f463e31e7d7eb5f
  
      // CraftBukkit start
      public String displayName;
-@@ -631,7 +632,12 @@ public class ServerPlayer extends Player {
+@@ -675,7 +676,12 @@ public class ServerPlayer extends Player {
              --this.invulnerableTime;
          }
  
diff --git a/patches/server/0047-Use-UserCache-for-player-heads.patch b/patches/server/0048-Use-UserCache-for-player-heads.patch
similarity index 100%
rename from patches/server/0047-Use-UserCache-for-player-heads.patch
rename to patches/server/0048-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0048-Disable-spigot-tick-limiters.patch b/patches/server/0049-Disable-spigot-tick-limiters.patch
similarity index 88%
rename from patches/server/0048-Disable-spigot-tick-limiters.patch
rename to patches/server/0049-Disable-spigot-tick-limiters.patch
index 0920c8b50e..f40564a8ea 100644
--- a/patches/server/0048-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0049-Disable-spigot-tick-limiters.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0a7a354c085655c243fdf94c7dc82cdc95b3987a..42e81640354c2679570823347b28ee1155e7a00e 100644
+index da553430864689c426ad2c1dd74ad7d1134ffbae..78041052d7ab2e6b60405ce7e02468458650db22 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -689,9 +689,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -694,9 +694,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          // Spigot start
          // Iterator iterator = this.blockEntityTickers.iterator();
          int tilesThisCycle = 0;
diff --git a/patches/server/0049-Add-PlayerInitialSpawnEvent.patch b/patches/server/0050-Add-PlayerInitialSpawnEvent.patch
similarity index 95%
rename from patches/server/0049-Add-PlayerInitialSpawnEvent.patch
rename to patches/server/0050-Add-PlayerInitialSpawnEvent.patch
index 10cdd4b026..7c18e2e07b 100644
--- a/patches/server/0049-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0050-Add-PlayerInitialSpawnEvent.patch
@@ -12,7 +12,7 @@ improve setPosition to use raw
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b30128b77d2fe8a8c1db9b5746aab537a9a25430..fe200718aedcd71c6dc9b9cea10a844551a78324 100644
+index 5ae47b3449df7a83a5c22a266f7b9e4ea681a492..fa7aad589275598eaf3cae86a4e1e47d40b52f05 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -228,7 +228,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 100%
rename from patches/server/0050-Configurable-Disabling-Cat-Chest-Detection.patch
rename to patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0051-Improve-Player-chat-API-handling.patch b/patches/server/0052-Improve-Player-chat-API-handling.patch
similarity index 89%
rename from patches/server/0051-Improve-Player-chat-API-handling.patch
rename to patches/server/0052-Improve-Player-chat-API-handling.patch
index a5567f463d..7db60a49c4 100644
--- a/patches/server/0051-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0052-Improve-Player-chat-API-handling.patch
@@ -17,10 +17,10 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e85268e4c20371d4264effb70ae9fa8e435f8766..98266c0349d21fc1ebf0d34a3d898825d477d6e5 100644
+index 3b11d395bd2c8ca8ec9a2ddb62b57c167a45ba2d..a3fb406ca9fda0ca6909e2e4f4f486c7de0e5ae3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1918,7 +1918,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1925,7 +1925,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          OutgoingChatMessage outgoing = OutgoingChatMessage.create(original);
  
@@ -29,7 +29,7 @@ index e85268e4c20371d4264effb70ae9fa8e435f8766..98266c0349d21fc1ebf0d34a3d898825
              this.handleCommand(s);
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
-@@ -2002,7 +2002,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2009,7 +2009,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
      }
  
@@ -40,7 +40,7 @@ index e85268e4c20371d4264effb70ae9fa8e435f8766..98266c0349d21fc1ebf0d34a3d898825
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c2289c8ef49c73d662a67eab7a2b8c0cf9bb31a9..3e3c3db4a9a4474af79d2470da2ab133eef7cf4c 100644
+index 9d70513d05515f6ff3f03b5580bd48f127d73ca1..81d2d940fef25a9fb5caccbf4e2c0c9d4ece71c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -889,7 +889,7 @@ public final class CraftServer implements Server {
@@ -53,10 +53,10 @@ index c2289c8ef49c73d662a67eab7a2b8c0cf9bb31a9..3e3c3db4a9a4474af79d2470da2ab133
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5ded753f030cad268f8aaeaf242985c67da2ca8d..965f40d5acb8cfe401e22c4c15efa84b36ac3ace 100644
+index b8fc211d72e860c85ca39b03574db3a7b18e369f..530fba6fa83c3e87ec2501e6aa6997c108dae6d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -452,7 +452,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -494,7 +494,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 93%
rename from patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
index c9b81f3b84..673744942c 100644
--- a/patches/server/0052-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -18,10 +18,10 @@ index 2e343d108714bd136ab8e7b20acbf241166177de..382cdfd7d7dceeeffed1cdc34b9e475a
              if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
                  return checkMobSpawnRules(type, world, spawnReason, pos, random);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index bf4b2f89d3a7133155c6272379c742318b2c1514..f07a6b1d782426581c84ffa19447c1375c4cbc07 100644
+index 33677ec811ceab939c419bf7d31b99585e9a1ef1..8ae78690748b2cb5d5186d8859871c1630e10130 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -213,7 +213,7 @@ public class CraftChunk implements Chunk {
+@@ -169,7 +169,7 @@ public class CraftChunk implements Chunk {
      @Override
      public boolean isSlimeChunk() {
          // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
diff --git a/patches/server/0053-Expose-server-CommandMap.patch b/patches/server/0054-Expose-server-CommandMap.patch
similarity index 87%
rename from patches/server/0053-Expose-server-CommandMap.patch
rename to patches/server/0054-Expose-server-CommandMap.patch
index 09165b75bc..ffe646ca1b 100644
--- a/patches/server/0053-Expose-server-CommandMap.patch
+++ b/patches/server/0054-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3e3c3db4a9a4474af79d2470da2ab133eef7cf4c..5f87d8882cec191c6fe1cc194531ff4a24c85987 100644
+index 81d2d940fef25a9fb5caccbf4e2c0c9d4ece71c9..bfcb1e2959e33e4e0cce78e0756cd13253662790 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2018,6 +2018,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 100%
rename from patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from patches/server/0055-Player-Tab-List-and-Title-APIs.patch
rename to patches/server/0056-Player-Tab-List-and-Title-APIs.patch
index 3a003cd429..6db44193b4 100644
--- a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 965f40d5acb8cfe401e22c4c15efa84b36ac3ace..93b38758645a52f2da7d8e2baba576dc0284a132 100644
+index 530fba6fa83c3e87ec2501e6aa6997c108dae6d1..9c66e4b6f36f634a7fe25b630b9f2e65a7b50153 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -73,7 +73,7 @@ index 965f40d5acb8cfe401e22c4c15efa84b36ac3ace..93b38758645a52f2da7d8e2baba576dc
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -294,6 +295,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -336,6 +337,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0056-Add-configurable-portal-search-radius.patch b/patches/server/0057-Add-configurable-portal-search-radius.patch
similarity index 94%
rename from patches/server/0056-Add-configurable-portal-search-radius.patch
rename to patches/server/0057-Add-configurable-portal-search-radius.patch
index 0c14267615..d93ecc093d 100644
--- a/patches/server/0056-Add-configurable-portal-search-radius.patch
+++ b/patches/server/0057-Add-configurable-portal-search-radius.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 06e8a82d2001e2a8dd381f3be20ee7442e1d1178..3f627611fe372ab87701fb01e16486b434f77585 100644
+index a9584072854fe3f8e946a271504fda70ebab9d2c..1b301b9b577b632470a1e6d23f34288875c5ffb8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3148,7 +3148,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3200,7 +3200,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  double d0 = DimensionType.getTeleportationScale(this.level().dimensionType(), destination.dimensionType());
                  BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
                  // CraftBukkit start
diff --git a/patches/server/0057-Add-velocity-warnings.patch b/patches/server/0058-Add-velocity-warnings.patch
similarity index 91%
rename from patches/server/0057-Add-velocity-warnings.patch
rename to patches/server/0058-Add-velocity-warnings.patch
index b2e63affe1..1eb5e79e8d 100644
--- a/patches/server/0057-Add-velocity-warnings.patch
+++ b/patches/server/0058-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5f87d8882cec191c6fe1cc194531ff4a24c85987..4390e4ded8a88a0dcd57d161f74a276852de4800 100644
+index bfcb1e2959e33e4e0cce78e0756cd13253662790..7ae7ad27e8e6731a81a4bcb3e4dd0ed20d0373de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -302,6 +302,7 @@ public final class CraftServer implements Server {
@@ -62,10 +62,10 @@ index 9b4e28353892240debc2d2d48876c5640d479ae9..5767eefb09d9e0e3a3d5a006242220b8
      public double getHeight() {
          return this.getHandle().getBbHeight();
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index d5863b0b06384b25eaa33572fa02649795463ed8..2693cc933d746e40d8a47d96c6cb6799f0a2472f 100644
+index 11d7ede26b46d0bf9cced65e8c3bcc41c8b66dbf..3ad14bf0697e682a2e777baa8faeb323d127fb13 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -80,7 +80,19 @@ public class WatchdogThread extends Thread
+@@ -80,7 +80,19 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      log.log( Level.SEVERE, "During the run of the server, a physics stackoverflow was supressed" );
                      log.log( Level.SEVERE, "near " + net.minecraft.world.level.Level.lastPhysicsProblem );
                  }
@@ -85,4 +85,4 @@ index d5863b0b06384b25eaa33572fa02649795463ed8..2693cc933d746e40d8a47d96c6cb6799
 +                // Paper end
                  log.log( Level.SEVERE, "------------------------------" );
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
diff --git a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
similarity index 91%
rename from patches/server/0058-Configurable-inter-world-teleportation-safety.patch
rename to patches/server/0059-Configurable-inter-world-teleportation-safety.patch
index a141e85e9f..d6403829a6 100644
--- a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 93b38758645a52f2da7d8e2baba576dc0284a132..c30d2987f4afce8737c5c67b193d9ee3b6e230be 100644
+index 9c66e4b6f36f634a7fe25b630b9f2e65a7b50153..26ca5b2c4216f95c1f7a74245c271bdddd111c4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1120,7 +1120,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entity.connection.teleport(to);
          } else {
              // The respawn reason should never be used if the passed location is non null.
diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/server/0060-Add-exception-reporting-event.patch
similarity index 95%
rename from patches/server/0059-Add-exception-reporting-event.patch
rename to patches/server/0060-Add-exception-reporting-event.patch
index 68114b68e1..0e8fa03642 100644
--- a/patches/server/0059-Add-exception-reporting-event.patch
+++ b/patches/server/0060-Add-exception-reporting-event.patch
@@ -88,7 +88,7 @@ index c6fb4c33d7ea52b88d8fc0d90748cbab7387c565..fed09b886f4fa0006d160e5f2abb00df
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 42e81640354c2679570823347b28ee1155e7a00e..a7fb12648c2e655e191d8c805753ae0c05421d17 100644
+index 78041052d7ab2e6b60405ce7e02468458650db22..8149286827d9b609be47a4ded0413ca11f7858de 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1,5 +1,10 @@
@@ -102,7 +102,7 @@ index 42e81640354c2679570823347b28ee1155e7a00e..a7fb12648c2e655e191d8c805753ae0c
  import com.google.common.collect.Lists;
  import com.mojang.serialization.Codec;
  import java.io.IOException;
-@@ -725,6 +730,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -730,6 +735,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper start - Prevent tile entity and entity crashes
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
@@ -131,7 +131,7 @@ index 5d65baba605dd83e5f74d526aeda36d8ede8c014..92e76dd39dc3575e9466031dd799080a
                                  }
  
 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 28ae0792c6b83580369937673f475f79b1c19576..0b246935d0ad3f8a78e86f0e60f53a05efda8355 100644
+index 515aedcf9969b818dfdc02a16a7f7178b5bb5593..56900156d79781f15357a3d25906d32b615366ce 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1,6 +1,7 @@
@@ -163,7 +163,7 @@ index 28ae0792c6b83580369937673f475f79b1c19576..0b246935d0ad3f8a78e86f0e60f53a05
              // CraftBukkit end
          }
      }
-@@ -1060,6 +1067,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -1149,6 +1156,7 @@ public class LevelChunk extends ChunkAccess {
                          // Paper start - Prevent tile entity and entity crashes
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
@@ -172,10 +172,10 @@ index 28ae0792c6b83580369937673f475f79b1c19576..0b246935d0ad3f8a78e86f0e60f53a05
                          // Paper end
                          // Spigot start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index d9daf07132c46548964a75588b69d7a74680e917..67a2f3c02aa4983b3ec2df073821190ddb36543c 100644
+index e68205fe7169c7c5b7c6fdada2ee97d86107ca97..aa8972fd1a1fade05d60ab69efb8ff24f344508a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -274,6 +274,7 @@ public class RegionFile implements AutoCloseable {
+@@ -275,6 +275,7 @@ public class RegionFile implements AutoCloseable {
                      return true;
                  }
              } catch (IOException ioexception) {
@@ -183,7 +183,7 @@ index d9daf07132c46548964a75588b69d7a74680e917..67a2f3c02aa4983b3ec2df073821190d
                  return false;
              }
          }
-@@ -355,6 +356,7 @@ public class RegionFile implements AutoCloseable {
+@@ -356,6 +357,7 @@ public class RegionFile implements AutoCloseable {
              ((java.nio.Buffer) buf).position(5); // CraftBukkit - decompile error
              filechannel.write(buf);
          } catch (Throwable throwable) {
diff --git a/patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 100%
rename from patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 92%
rename from patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
rename to patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
index 5834906cde..1df1030bc9 100644
--- a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
@@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3f627611fe372ab87701fb01e16486b434f77585..9c17aef67d011f485129aee781aae3bd18eb6c1c 100644
+index 1b301b9b577b632470a1e6d23f34288875c5ffb8..a8608e7b3dae15a54185d720c01a49d3a7e59994 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2779,6 +2779,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2831,6 +2831,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      @Nullable
      public Team getTeam() {
diff --git a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0063-Chunk-Save-Reattempt.patch b/patches/server/0064-Chunk-Save-Reattempt.patch
similarity index 77%
rename from patches/server/0063-Chunk-Save-Reattempt.patch
rename to patches/server/0064-Chunk-Save-Reattempt.patch
index cae796dce7..d82deaae7c 100644
--- a/patches/server/0063-Chunk-Save-Reattempt.patch
+++ b/patches/server/0064-Chunk-Save-Reattempt.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 67a2f3c02aa4983b3ec2df073821190ddb36543c..9e65b56fd2d5af6be305efa08e7c569e6598343a 100644
+index aa8972fd1a1fade05d60ab69efb8ff24f344508a..ddcc212ba83d9365adb842b3d3ced64e3d7dd155 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -274,7 +274,7 @@ public class RegionFile implements AutoCloseable {
+@@ -275,7 +275,7 @@ public class RegionFile implements AutoCloseable {
                      return true;
                  }
              } catch (IOException ioexception) {
@@ -19,18 +19,18 @@ index 67a2f3c02aa4983b3ec2df073821190ddb36543c..9e65b56fd2d5af6be305efa08e7c569e
              }
          }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 1988063a0cac0350ae3b3388b8f2a0c95b8b259f..ab3145064f0ea3d71e85f3f02cf73d13f548a425 100644
+index 2b6ba2e30c9a4682d6deb2ab750d6923ad8469e4..2d00333f25828ef5912c925d1213a56c564d85c9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -132,6 +132,7 @@ public class RegionFileStorage implements AutoCloseable {
- 
-     protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException {
-         RegionFile regionfile = this.getRegionFile(pos, false); // CraftBukkit
+@@ -209,6 +209,7 @@ public class RegionFileStorage implements AutoCloseable {
+         }
+         // Paper end - rewrite chunk system
+         try { // Paper
 +        int attempts = 0; Exception laste = null; while (attempts++ < 5) { try { // Paper
  
          if (nbt == null) {
              regionfile.clear(pos);
-@@ -156,7 +157,18 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -233,7 +234,18 @@ public class RegionFileStorage implements AutoCloseable {
                  dataoutputstream.close();
              }
          }
@@ -46,6 +46,6 @@ index 1988063a0cac0350ae3b3388b8f2a0c95b8b259f..ab3145064f0ea3d71e85f3f02cf73d13
 +            net.minecraft.server.MinecraftServer.LOGGER.error("Failed to save chunk " + pos, laste);
 +        }
 +        // Paper end
-     }
- 
-     public void close() throws IOException {
+         } finally { // Paper start
+             regionfile.fileLock.unlock();
+         } // Paper end
diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch
similarity index 96%
rename from patches/server/0064-Complete-resource-pack-API.patch
rename to patches/server/0065-Complete-resource-pack-API.patch
index 696eb450f8..31ea6c68d9 100644
--- a/patches/server/0064-Complete-resource-pack-API.patch
+++ b/patches/server/0065-Complete-resource-pack-API.patch
@@ -22,7 +22,7 @@ index b9062fe651de34d5b3f9d5f146ae0b4fe29cbfee..e8b12a8ae009023afa2818ecbf398a14
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c30d2987f4afce8737c5c67b193d9ee3b6e230be..de5d17be3d7dcd9ae1f10918c3d6a3caffe7ef23 100644
+index 26ca5b2c4216f95c1f7a74245c271bdddd111c4d..4a784d3c8454549ddeaba18d36a7182059401c91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -191,6 +191,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index c30d2987f4afce8737c5c67b193d9ee3b6e230be..de5d17be3d7dcd9ae1f10918c3d6a3ca
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2326,6 +2330,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2368,6 +2372,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
diff --git a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
similarity index 95%
rename from patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
rename to patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
index 66ad35180b..9cd9a40b36 100644
--- a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4390e4ded8a88a0dcd57d161f74a276852de4800..068cde0c7061b4969e095a4a93cd8a1662079211 100644
+index 7ae7ad27e8e6731a81a4bcb3e4dd0ed20d0373de..311226bce4d6103ae9e8c6e4b49ccb90afcfb64d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -465,6 +465,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
similarity index 94%
rename from patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
rename to patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
index d282533aa3..f3a5dc7766 100644
--- a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 068cde0c7061b4969e095a4a93cd8a1662079211..d0dea86da026827163e36b9fc970bd9ab630b0b8 100644
+index 311226bce4d6103ae9e8c6e4b49ccb90afcfb64d..f101155cf3ae72c0c810714cc4ad319d1116b4e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2622,5 +2622,23 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0067-Remove-Metadata-on-reload.patch b/patches/server/0068-Remove-Metadata-on-reload.patch
similarity index 93%
rename from patches/server/0067-Remove-Metadata-on-reload.patch
rename to patches/server/0068-Remove-Metadata-on-reload.patch
index 4bae83c9fb..ddc5f1b1d3 100644
--- a/patches/server/0067-Remove-Metadata-on-reload.patch
+++ b/patches/server/0068-Remove-Metadata-on-reload.patch
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d0dea86da026827163e36b9fc970bd9ab630b0b8..6797239634ba90768e55fcfb37cb2c14141b7d28 100644
+index f101155cf3ae72c0c810714cc4ad319d1116b4e0..0476ae7a485c2ac74b39965f0727fbfd372c3be2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -956,8 +956,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
rename to patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 100%
rename from patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/server/0071-Add-World-Util-Methods.patch
similarity index 92%
rename from patches/server/0070-Add-World-Util-Methods.patch
rename to patches/server/0071-Add-World-Util-Methods.patch
index 8d92d3ac71..624da03d47 100644
--- a/patches/server/0070-Add-World-Util-Methods.patch
+++ b/patches/server/0071-Add-World-Util-Methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 511f27358cad1fa067497914c61855ee6ea3846a..c5974d23eb2c0f0a71a5c438f387762516f7a1d9 100644
+index 35c401b41750748738c8f8aa2b8988377f4e679f..b9d93d802e981139b79ecba91968f56f842acc48 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,7 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -19,7 +19,7 @@ index 511f27358cad1fa067497914c61855ee6ea3846a..c5974d23eb2c0f0a71a5c438f3877625
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a7fb12648c2e655e191d8c805753ae0c05421d17..5e4b102e747a053280871879c3c18fc3d3d2d18a 100644
+index 8149286827d9b609be47a4ded0413ca11f7858de..809f7db469583ea90fbb165cf180dc87055c6105 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -342,6 +342,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/server/0072-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/server/0071-Custom-replacement-for-eaten-items.patch
rename to patches/server/0072-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 98%
rename from patches/server/0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 7a6e79726e..6d81cc3915 100644
--- a/patches/server/0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -63,7 +63,7 @@ index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..3b31a1927aaed7fffc1b4f4bcefc1212
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
              BlockState iblockdata = this.getBlockState(blockposition);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5e4b102e747a053280871879c3c18fc3d3d2d18a..a64b4eb9bc6437cc143ed6816060b223ce6542e6 100644
+index 809f7db469583ea90fbb165cf180dc87055c6105..37d5abf5a18b90695d1cea9e365c764e93b918bf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -283,6 +283,90 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 94%
rename from patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 33db07fbca..dd675859bd 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,10 +44,10 @@ index c5d4f36dda7c977b3a7563f4d2d74ebcf7dc61ef..fa03c3a9debe419dd4e60764de4d9544
  
      protected void internalSetAbsorptionAmount(float absorptionAmount) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index de5d17be3d7dcd9ae1f10918c3d6a3caffe7ef23..dc436397256cecfb51ed82b0cc654307a8d2e0f6 100644
+index 4a784d3c8454549ddeaba18d36a7182059401c91..bedeae40c7a88b7c13babb9ef8c94983a2ac4fef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2123,6 +2123,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2165,6 +2165,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/server/0075-Use-a-Shared-Random-for-Entities.patch
similarity index 96%
rename from patches/server/0074-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0075-Use-a-Shared-Random-for-Entities.patch
index d53f5a439c..2658f7646d 100644
--- a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0075-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9c17aef67d011f485129aee781aae3bd18eb6c1c..6dc250da442ae15a69c40e10af7ea71d9aaf0055 100644
+index a8608e7b3dae15a54185d720c01a49d3a7e59994..fc39c3742e852bc9f4131b1ade62c32b318bdb02 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -89,7 +89,7 @@ index 9c17aef67d011f485129aee781aae3bd18eb6c1c..6dc250da442ae15a69c40e10af7ea71d
      private CraftEntity bukkitEntity;
  
      public CraftEntity getBukkitEntity() {
-@@ -354,7 +427,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -406,7 +479,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.bb = Entity.INITIAL_AABB;
          this.stuckSpeedMultiplier = Vec3.ZERO;
          this.nextStep = 1.0F;
diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 89%
rename from patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
index 5210f274c0..af6fe09b5c 100644
--- a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c5974d23eb2c0f0a71a5c438f387762516f7a1d9..3310ad37178c6397e00291186a518bffce876570 100644
+index b9d93d802e981139b79ecba91968f56f842acc48..d419ff842d1df822e14994e4f1d5b91352579cf1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -598,7 +598,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -830,7 +830,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
diff --git a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 97%
rename from patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 0a545c8f02..a4c9a41195 100644
--- a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -29,7 +29,7 @@ index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c8624935
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a64b4eb9bc6437cc143ed6816060b223ce6542e6..f96154f86a260ecd8dbd485a1c72703bc5949de2 100644
+index 37d5abf5a18b90695d1cea9e365c764e93b918bf..5502d037279ba876f5e4c6728cc678f128bce9d4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -368,7 +368,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -88,7 +88,7 @@ index 60e760b42dd6471a229dfd45490dcf8c51979d35..4a3ac7dedf5cb1e76f16ec4f18e82afc
      @Override
      public FluidState getFluidState(BlockPos pos) {
 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 0b246935d0ad3f8a78e86f0e60f53a05efda8355..d84b4051ee5177e9916199ec11445fc6c9a18936 100644
+index 56900156d79781f15357a3d25906d32b615366ce..0eedaf7df86b7bdd22623231f9a49da8e798f204 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -295,12 +295,29 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 91%
rename from patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 1ae76f59e7..9b81d2ddcd 100644
--- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4eb9d3a3de91a7af2930f7e014256eeeafcb4ac7..19cb043e5c501b664d101b11717b759be9dd4cfd 100644
+index 0e5661716d72ecf57d76443d8c7627e90966ee4d..281884fedf6607581a24fef4b3326dfb81012124 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1357,6 +1357,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1351,6 +1351,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
@@ -18,7 +18,7 @@ index 4eb9d3a3de91a7af2930f7e014256eeeafcb4ac7..19cb043e5c501b664d101b11717b759b
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3310ad37178c6397e00291186a518bffce876570..db86df427b604e4a0959181eb2ee161bdda6bfad 100644
+index d419ff842d1df822e14994e4f1d5b91352579cf1..9ee06d9b6eceb5df90275177ea855272fc61b016 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,10 +30,10 @@ index 3310ad37178c6397e00291186a518bffce876570..db86df427b604e4a0959181eb2ee161b
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f96154f86a260ecd8dbd485a1c72703bc5949de2..c771ec0e5ebd4a45130b3481fa9d3ba00b95f2ae 100644
+index 5502d037279ba876f5e4c6728cc678f128bce9d4..ba7760b0b478c6f24dcbaa64919a4766e107a720 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -575,7 +575,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -580,7 +580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 83%
rename from patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
index 96eebd1121..cc876dd9b6 100644
--- a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index db86df427b604e4a0959181eb2ee161bdda6bfad..71e448a44b1d85bba4481fd02612d687aa9df4a1 100644
+index 9ee06d9b6eceb5df90275177ea855272fc61b016..949404f3ac0e853cfc45e28453136dd166ac9563 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2117,6 +2117,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2366,6 +2366,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
              }
              // Paper end
@@ -16,7 +16,7 @@ index db86df427b604e4a0959181eb2ee161bdda6bfad..71e448a44b1d85bba4481fd02612d687
          }
  
          public void onTrackingEnd(Entity entity) {
-@@ -2192,6 +2193,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2441,6 +2442,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
              // CraftBukkit end
diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0080-Configurable-Chunk-Inhabited-Time.patch
similarity index 92%
rename from patches/server/0079-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0080-Configurable-Chunk-Inhabited-Time.patch
index 15d5627a38..c046cafc1f 100644
--- a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0080-Configurable-Chunk-Inhabited-Time.patch
@@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 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 d84b4051ee5177e9916199ec11445fc6c9a18936..fdb8c2346cb2e444b75f863a8a8199da84f25193 100644
+index 0eedaf7df86b7bdd22623231f9a49da8e798f204..cf910b466a4b75c0b9219abef5c9bff30793d7bf 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -280,6 +280,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/server/0081-EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/0080-EntityPathfindEvent.patch
rename to patches/server/0081-EntityPathfindEvent.patch
diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 81%
rename from patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
index 5c3c1d34d2..87c1dfbbb9 100644
--- a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -11,13 +11,13 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index ab3145064f0ea3d71e85f3f02cf73d13f548a425..32880df5c96e77c8db8198c91a0a3efe8968199e 100644
+index 2d00333f25828ef5912c925d1213a56c564d85c9..465ad0bae446a20e941e8f2dbf2d85f2627482b9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -37,7 +37,7 @@ public class RegionFileStorage implements AutoCloseable {
-         if (regionfile != null) {
-             return regionfile;
-         } else {
+@@ -92,7 +92,7 @@ public class RegionFileStorage implements AutoCloseable {
+                 return null;
+             }
+             // Paper end - cache regionfile does not exist state
 -            if (this.regionCache.size() >= 256) {
 +            if (this.regionCache.size() >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.regionFileCacheSize) { // Paper - configurable
                  ((RegionFile) this.regionCache.removeLast()).close();
diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
similarity index 95%
rename from patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
index 532519ab03..f2da1fdee9 100644
--- a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
@@ -28,10 +28,10 @@ index 644a0fdea6576647539b96528717dbaeab498d93..221e64a66ff12a8de5c75992fc26a54a
 +    // Paper end - PlayerUseUnknownEntityEvent
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 98266c0349d21fc1ebf0d34a3d898825d477d6e5..a4e010b9195d0afeb4724dc64c85964a843eb59a 100644
+index a3fb406ca9fda0ca6909e2e4f4f486c7de0e5ae3..d8a78412d2cfa6aff023ecc8e5cc2121767a9097 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2385,8 +2385,38 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2392,8 +2392,38 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  });
              }
          }
diff --git a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0085-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch
rename to patches/server/0085-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 82%
rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index ad60a4eac0..46e1468576 100644
--- a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 71e448a44b1d85bba4481fd02612d687aa9df4a1..f0820ab21ff17601c896099d664d18283c759384 100644
+index 949404f3ac0e853cfc45e28453136dd166ac9563..f13e39082638310532a0fd1dab41e809c45287c0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1366,6 +1366,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1600,6 +1600,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void updateNeighborsAt(BlockPos pos, Block sourceBlock) {
diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/server/0087-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0086-Optimize-DataBits.patch
rename to patches/server/0087-Optimize-DataBits.patch
diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0089-Configurable-Player-Collision.patch
similarity index 97%
rename from patches/server/0088-Configurable-Player-Collision.patch
rename to patches/server/0089-Configurable-Player-Collision.patch
index d295cfdc50..8de27b08b0 100644
--- a/patches/server/0088-Configurable-Player-Collision.patch
+++ b/patches/server/0089-Configurable-Player-Collision.patch
@@ -18,7 +18,7 @@ index 1294b38262505b0d54089e428df9b363219de1f0..ee37ec0de1ca969144824427ae42b0c8
              buf.writeComponent(this.playerPrefix);
              buf.writeComponent(this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 19cb043e5c501b664d101b11717b759be9dd4cfd..c667cf1564011a922f208e671ff293485324b5cd 100644
+index 281884fedf6607581a24fef4b3326dfb81012124..1356d61428a50b4fc09c6c4d4c02e02056b6b38b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -575,6 +575,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -43,7 +43,7 @@ index 19cb043e5c501b664d101b11717b759be9dd4cfd..c667cf1564011a922f208e671ff29348
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fe200718aedcd71c6dc9b9cea10a844551a78324..5406ac93eaf9b9f9e810bfbbcf4a35e2f38f680c 100644
+index fa7aad589275598eaf3cae86a4e1e47d40b52f05..441c187b45bfa20d929fe3c5e8dc25db22c4aad1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -100,6 +100,7 @@ import net.minecraft.world.phys.Vec3;
diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/server/0091-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0090-Configurable-RCON-IP-address.patch
rename to patches/server/0091-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0094-remove-null-possibility-for-getServer-singleton.patch
similarity index 92%
rename from patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0094-remove-null-possibility-for-getServer-singleton.patch
index 95a252454d..cb1512a183 100644
--- a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0094-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c667cf1564011a922f208e671ff293485324b5cd..c6802d54fcd594f2fc7bd8615f8a95e5cfe9e1c0 100644
+index 1356d61428a50b4fc09c6c4d4c02e02056b6b38b..1766cd6d83aee31800364402dbe4a439c56e63d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -189,6 +189,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -25,7 +25,7 @@ index c667cf1564011a922f208e671ff293485324b5cd..c6802d54fcd594f2fc7bd8615f8a95e5
          this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
          this.profiler = this.metricsRecorder.getProfiler();
          this.onMetricsRecordingStopped = (methodprofilerresults) -> {
-@@ -2325,9 +2327,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2319,9 +2321,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return false;
      }
  
diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 97%
rename from patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index b49fbf9bf3..19f0aa51b6 100644
--- a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f0820ab21ff17601c896099d664d18283c759384..303ce1ef47ae9aad137ee29f23b9084d08717cbb 100644
+index f13e39082638310532a0fd1dab41e809c45287c0..10c492e57958335a0f054f17c985209238df8b63 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2138,6 +2138,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2387,6 +2387,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              {
                                  if ( iter.next().player == entity )
                                  {
diff --git a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
rename to patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
index 74d29659e8..f143c3f8ec 100644
--- a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -504,7 +504,7 @@ index 0000000000000000000000000000000000000000..9cfa5d36a6991067a3866e0d437749fa
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6dc250da442ae15a69c40e10af7ea71d9aaf0055..468111bb80e7756371d22eb831596c187538f0c1 100644
+index fc39c3742e852bc9f4131b1ade62c32b318bdb02..f3db63ddb175f82b6eafee48686065050437fc92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -235,6 +235,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0097-System-property-for-disabling-watchdoge.patch b/patches/server/0098-System-property-for-disabling-watchdoge.patch
similarity index 83%
rename from patches/server/0097-System-property-for-disabling-watchdoge.patch
rename to patches/server/0098-System-property-for-disabling-watchdoge.patch
index 8d880e6928..65be04b57b 100644
--- a/patches/server/0097-System-property-for-disabling-watchdoge.patch
+++ b/patches/server/0098-System-property-for-disabling-watchdoge.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 2693cc933d746e40d8a47d96c6cb6799f0a2472f..6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529 100644
+index 3ad14bf0697e682a2e777baa8faeb323d127fb13..a9897c494b3dc56d900356d74030359832febbaa 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -61,7 +61,7 @@ public class WatchdogThread extends Thread
+@@ -61,7 +61,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
          while ( !this.stopping )
          {
              //
diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/server/0099-Async-GameProfileCache-saving.patch
similarity index 90%
rename from patches/server/0098-Async-GameProfileCache-saving.patch
rename to patches/server/0099-Async-GameProfileCache-saving.patch
index 441d547b12..6b0d1609c1 100644
--- a/patches/server/0098-Async-GameProfileCache-saving.patch
+++ b/patches/server/0099-Async-GameProfileCache-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Async GameProfileCache saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c6802d54fcd594f2fc7bd8615f8a95e5cfe9e1c0..8ef6e39e4711d2147e5ad97e9f8028e005588ac5 100644
+index 1766cd6d83aee31800364402dbe4a439c56e63d0..b46cffe141921e499a47dac08318f167f21a5509 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -933,7 +933,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -914,7 +914,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } catch (java.lang.InterruptedException ignored) {} // Paper
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
@@ -16,9 +16,9 @@ index c6802d54fcd594f2fc7bd8615f8a95e5cfe9e1c0..8ef6e39e4711d2147e5ad97e9f8028e0
 +            this.getProfileCache().save(false); // Paper
          }
          // Spigot end
- 
+         io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8d4fadc9c65636259bdbdba28bb8a3f8f4e25768..6cc085cf212994cd00dbabd4dd363fc5b3c97281 100644
+index b77cbdd926cd54a4bae89e0d5a21e7d139bc0c63..f17e1621b498e70c8787dfe96dd819dc6e4b621f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 97%
rename from patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
index abd75dabf7..6402112739 100644
--- a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c771ec0e5ebd4a45130b3481fa9d3ba00b95f2ae..efb2c0f5f7b3acd127f9a570d00c5826c9e9bb6f 100644
+index ba7760b0b478c6f24dcbaa64919a4766e107a720..0c6384c6332babf8e517503c2e9b21a9d6e2ed88 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0101-Add-server-name-parameter.patch b/patches/server/0102-Add-server-name-parameter.patch
similarity index 100%
rename from patches/server/0101-Add-server-name-parameter.patch
rename to patches/server/0102-Add-server-name-parameter.patch
diff --git a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
similarity index 100%
rename from patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
rename to patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
diff --git a/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
similarity index 97%
rename from patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
index 32c7b4ad99..3e700955a0 100644
--- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
@@ -43,7 +43,7 @@ index 0214830d9bc98b8d435ff11f40df65596980cf77..5db27d7bcaaa2eeaeeb08401513d8d23
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6797239634ba90768e55fcfb37cb2c14141b7d28..e9c908750f40429108ce21cd2e01630d1416435b 100644
+index 0476ae7a485c2ac74b39965f0727fbfd372c3be2..649f9a5604da73f332ad6c9725bddab5e85f1ae7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1727,7 +1727,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0107-Configurable-packet-in-spam-threshold.patch b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
similarity index 90%
rename from patches/server/0107-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0108-Configurable-packet-in-spam-threshold.patch
index 60ec35618b..4f514d88d1 100644
--- a/patches/server/0107-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a4e010b9195d0afeb4724dc64c85964a843eb59a..2233a21dfe7a745a95886784dcbcbf1d95a93f7a 100644
+index d8a78412d2cfa6aff023ecc8e5cc2121767a9097..24bb821dce6e70cf3e8f9c8f757f2967672a8896 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1498,13 +1498,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1505,13 +1505,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/patches/server/0108-Configurable-flying-kick-messages.patch b/patches/server/0109-Configurable-flying-kick-messages.patch
similarity index 95%
rename from patches/server/0108-Configurable-flying-kick-messages.patch
rename to patches/server/0109-Configurable-flying-kick-messages.patch
index 9cb4f579da..269687e30e 100644
--- a/patches/server/0108-Configurable-flying-kick-messages.patch
+++ b/patches/server/0109-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2233a21dfe7a745a95886784dcbcbf1d95a93f7a..855bb02f3879bc2ab74ceb7e837b562496aca30e 100644
+index 24bb821dce6e70cf3e8f9c8f757f2967672a8896..75f454263d0933d2e5b3869c83ddc6eb43947c2c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -336,7 +336,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0110-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0109-Add-EntityZapEvent.patch
rename to patches/server/0110-Add-EntityZapEvent.patch
diff --git a/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
similarity index 100%
rename from patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
rename to patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/server/0112-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0111-Cache-user-authenticator-threads.patch
rename to patches/server/0112-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
similarity index 94%
rename from patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
index 4e806b23dd..26dff29483 100644
--- a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e9c908750f40429108ce21cd2e01630d1416435b..c23e5dc08bbcbdc5787c730f0a2857aacff2e69e 100644
+index 649f9a5604da73f332ad6c9725bddab5e85f1ae7..9e198a0547c17c2f913ff9fc35bfb22b335a0b95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2648,5 +2648,24 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/0114-Add-ProjectileCollideEvent.patch
rename to patches/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 91%
rename from patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
index c975fad3dc..94ecd47c94 100644
--- a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index efb2c0f5f7b3acd127f9a570d00c5826c9e9bb6f..936f21b61589a6bcd9bf19c7466b9b1b9a14f280 100644
+index 0c6384c6332babf8e517503c2e9b21a9d6e2ed88..7b681914b7f9e7fb6d2ea607e0d63ca7024a7ec3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -427,6 +427,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
similarity index 96%
rename from patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
index 35bf6917df..a546d2ee4a 100644
--- a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
@@ -34,7 +34,7 @@ index 52325a99ea38530ad69a39ac0215233139f35268..dd74e8a034022fe72a1652f92712182b
          return (double) pos.getMaxBlockX() > this.getMinX() && (double) pos.getMinBlockX() < this.getMaxX() && (double) pos.getMaxBlockZ() > this.getMinZ() && (double) pos.getMinBlockZ() < this.getMaxZ();
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index f739a175e26f250c652c73b8985158fe37c2823a..d70317d0306a7b55ba88b0d2360c9b190454e049 100644
+index 5f4fa76fe3a1a0a4fc11064fcf57bfab20bd9729..4da303d7e15496f04f0e27bfb613176bc2a72b76 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -217,6 +217,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0121-String-based-Action-Bar-API.patch
similarity index 94%
rename from patches/server/0120-String-based-Action-Bar-API.patch
rename to patches/server/0121-String-based-Action-Bar-API.patch
index 4809ccb8de..f597ed3118 100644
--- a/patches/server/0120-String-based-Action-Bar-API.patch
+++ b/patches/server/0121-String-based-Action-Bar-API.patch
@@ -26,10 +26,10 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dc436397256cecfb51ed82b0cc654307a8d2e0f6..75e82bec61c9e20d6ae589664f87cb1f26b0deb5 100644
+index bedeae40c7a88b7c13babb9ef8c94983a2ac4fef..18db64ff86517c7ceb98590c0c91e0c21855db72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -300,6 +300,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -342,6 +342,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0122-Properly-fix-item-duplication-bug.patch
similarity index 90%
rename from patches/server/0121-Properly-fix-item-duplication-bug.patch
rename to patches/server/0122-Properly-fix-item-duplication-bug.patch
index 5c9d66dc2b..6b92612404 100644
--- a/patches/server/0121-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0122-Properly-fix-item-duplication-bug.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d90748aab21adf9c7f463e31e7d7eb5f9bc0bbbd..40efa19ffe9275748a62e0546c3fd42bbcb0883d 100644
+index 56566c9f74d1ba2539f9d35f61038489650b0792..aee79a46d8fce5e5e80010e0e34f04fc8495d602 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2352,7 +2352,7 @@ public class ServerPlayer extends Player {
+@@ -2396,7 +2396,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
diff --git a/patches/server/0122-Firework-API-s.patch b/patches/server/0123-Firework-API-s.patch
similarity index 100%
rename from patches/server/0122-Firework-API-s.patch
rename to patches/server/0123-Firework-API-s.patch
diff --git a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch b/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0123-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0124-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 94%
rename from patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
index 4fa211b968..6324b36515 100644
--- a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 936f21b61589a6bcd9bf19c7466b9b1b9a14f280..776a5a9947c56eb63df7ac9797166be456282af1 100644
+index 7b681914b7f9e7fb6d2ea607e0d63ca7024a7ec3..7cfcbc1e38f5e9145c827dfe26299277a3f14cee 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -116,7 +116,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -20,7 +20,7 @@ index 936f21b61589a6bcd9bf19c7466b9b1b9a14f280..776a5a9947c56eb63df7ac9797166be4
      private final List<TickingBlockEntity> pendingBlockEntityTickers = Lists.newArrayList();
      private boolean tickingBlockEntities;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d01388bbadf3069357cf52463f4104a1be4d2b56..9d79b31baea99d25218e9d3f27ab895d4f73ef8a 100644
+index f4f94185cf699582737aecee1d3623c7857fbbb5..6b0dba6f7211500ba5950a76d2b2252a09f65103 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -154,6 +154,56 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0125-Enforce-Sync-Player-Saves.patch b/patches/server/0126-Enforce-Sync-Player-Saves.patch
similarity index 92%
rename from patches/server/0125-Enforce-Sync-Player-Saves.patch
rename to patches/server/0126-Enforce-Sync-Player-Saves.patch
index bfd5092167..4bdce0e792 100644
--- a/patches/server/0125-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0126-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5406ac93eaf9b9f9e810bfbbcf4a35e2f38f680c..a2b4e5fc6b3174705f2232abb2df7bf869dc3926 100644
+index 441c187b45bfa20d929fe3c5e8dc25db22c4aad1..bba11f3ad244bf9f3b7e6006128ce5e4228ab531 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1063,11 +1063,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0127-Cap-Entity-Collisions.patch b/patches/server/0128-Cap-Entity-Collisions.patch
similarity index 95%
rename from patches/server/0127-Cap-Entity-Collisions.patch
rename to patches/server/0128-Cap-Entity-Collisions.patch
index 60f4af0a25..0b9b7754b2 100644
--- a/patches/server/0127-Cap-Entity-Collisions.patch
+++ b/patches/server/0128-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 468111bb80e7756371d22eb831596c187538f0c1..b4c91cb985d3772c5b105b8d2267b51d7483e005 100644
+index f3db63ddb175f82b6eafee48686065050437fc92..4e71fb3fcbd89c21e5132cfb76dcbf8cec7785dd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -387,6 +387,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0129-Do-not-let-armorstands-drown.patch b/patches/server/0130-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/0129-Do-not-let-armorstands-drown.patch
rename to patches/server/0130-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 97%
rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
index 5e4cfcbaa0..a12364d7ee 100644
--- a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ef6e39e4711d2147e5ad97e9f8028e005588ac5..8a3a8b8ccbf3b5e3b41f33c8b5c6a0834e547131 100644
+index b46cffe141921e499a47dac08318f167f21a5509..092f76d1d248e04c3fa5fa346373ec1f2600ee5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -233,6 +233,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index 8ef6e39e4711d2147e5ad97e9f8028e005588ac5..8a3a8b8ccbf3b5e3b41f33c8b5c6a083
      private boolean stopped;
      private int tickCount;
      protected final Proxy proxy;
-@@ -872,7 +873,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -882,7 +883,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.playerList != null) {
              MinecraftServer.LOGGER.info("Saving players");
              this.playerList.saveAll();
@@ -50,7 +50,7 @@ index 8ef6e39e4711d2147e5ad97e9f8028e005588ac5..8a3a8b8ccbf3b5e3b41f33c8b5c6a083
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -952,6 +953,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -933,6 +934,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void halt(boolean waitForShutdown) {
@@ -64,7 +64,7 @@ index 8ef6e39e4711d2147e5ad97e9f8028e005588ac5..8a3a8b8ccbf3b5e3b41f33c8b5c6a083
          if (waitForShutdown) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a2b4e5fc6b3174705f2232abb2df7bf869dc3926..9d700d27d05c6f276b3ca159735fece0a75ca9b1 100644
+index bba11f3ad244bf9f3b7e6006128ce5e4228ab531..845a90426545b554aaf5c278723c107ba9791270 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1175,8 +1175,15 @@ public abstract class PlayerList {
diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 93%
rename from patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 5727c9be30..251ed4472a 100644
--- a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -14,10 +14,10 @@ To be converted into a Paper-API event at some point in the future?
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 855bb02f3879bc2ab74ceb7e837b562496aca30e..4f420687d7afc6cdb8175d510c54a0d8dd3847b6 100644
+index 75f454263d0933d2e5b3869c83ddc6eb43947c2c..bebe7cee0a0a94c1e11b7ac8c79c7496fb6b8edc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2162,6 +2162,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2169,6 +2169,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          switch (packet.getAction()) {
              case PRESS_SHIFT_KEY:
                  this.player.setShiftKeyDown(true);
diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 89%
rename from patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
index 7aeabc3c10..fb87a15c0a 100644
--- a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c23e5dc08bbcbdc5787c730f0a2857aacff2e69e..a51ab0eddb94263642b0015967cd2e6987ed2619 100644
+index 9e198a0547c17c2f913ff9fc35bfb22b335a0b95..d3a9b47ab78844e5cb6a04a790e079fe22bf153c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2667,5 +2667,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
index 4307dc001d..f62590803e 100644
--- a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -252,7 +252,7 @@ index c3631efda9c7fa531a8a9f18fbee7b5f8655382b..769f6489632302627fa1730cc08e77f5
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8a3a8b8ccbf3b5e3b41f33c8b5c6a0834e547131..a654f345f55493816c239f296864c9f75ee5247a 100644
+index 092f76d1d248e04c3fa5fa346373ec1f2600ee5c..ee27251b9decc00a0094611cf79644bd83bce5c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -164,7 +164,7 @@ import com.mojang.datafixers.util.Pair;
@@ -292,7 +292,7 @@ index 8a3a8b8ccbf3b5e3b41f33c8b5c6a0834e547131..a654f345f55493816c239f296864c9f7
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper
-@@ -1125,7 +1129,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1114,7 +1118,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  org.spigotmc.WatchdogThread.doStop(); // Spigot
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -301,7 +301,7 @@ index 8a3a8b8ccbf3b5e3b41f33c8b5c6a0834e547131..a654f345f55493816c239f296864c9f7
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -1592,7 +1596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1586,7 +1590,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public void sendSystemMessage(Component message) {
@@ -311,7 +311,7 @@ index 8a3a8b8ccbf3b5e3b41f33c8b5c6a0834e547131..a654f345f55493816c239f296864c9f7
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6cc085cf212994cd00dbabd4dd363fc5b3c97281..e11aee38009a6a37dceaf42232e295b71e0b7d40 100644
+index f17e1621b498e70c8787dfe96dd819dc6e4b621f..5a3f0a6e3f663718993cf3679ffc96c4af140e4d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -98,6 +98,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -375,7 +375,7 @@ index 75083eeb9b413e6dd5375007360dce6857a08fff..d292fdb165436f0b9b46b32110f5e09a
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9d700d27d05c6f276b3ca159735fece0a75ca9b1..0fb1fda1aba730e54d9e922e18de3bd048a78a62 100644
+index 845a90426545b554aaf5c278723c107ba9791270..a3c150e9552fbc9b9244c70508c27f03a3834fa2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -162,8 +162,7 @@ public abstract class PlayerList {
@@ -389,7 +389,7 @@ index 9d700d27d05c6f276b3ca159735fece0a75ca9b1..0fb1fda1aba730e54d9e922e18de3bd0
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a51ab0eddb94263642b0015967cd2e6987ed2619..15d881193f40dda74996932854283e4551742185 100644
+index d3a9b47ab78844e5cb6a04a790e079fe22bf153c..7b019dcb70b430c36112e68c837b2b4aeb1aacc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -44,7 +44,6 @@ import java.util.logging.Level;
diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/server/0136-Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/0135-Item-canEntityPickup.patch
rename to patches/server/0136-Item-canEntityPickup.patch
diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/server/0138-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0137-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0138-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0139-Add-UnknownCommandEvent.patch b/patches/server/0140-Add-UnknownCommandEvent.patch
similarity index 98%
rename from patches/server/0139-Add-UnknownCommandEvent.patch
rename to patches/server/0140-Add-UnknownCommandEvent.patch
index c347eb344a..98800873f2 100644
--- a/patches/server/0139-Add-UnknownCommandEvent.patch
+++ b/patches/server/0140-Add-UnknownCommandEvent.patch
@@ -83,7 +83,7 @@ index d1ecf61ffecb8669214ad85334374a4569811de8..e63632f09d608371aaeaf09a6dac57c1
  
                  b1 = 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 15d881193f40dda74996932854283e4551742185..c37793f660c0b2a28e4478dfee0582a61a8faf3c 100644
+index 7b019dcb70b430c36112e68c837b2b4aeb1aacc7..66f241411af172e2f44edfc4e8f1b9bda86844e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -531,6 +531,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0140-Basic-PlayerProfile-API.patch b/patches/server/0141-Basic-PlayerProfile-API.patch
similarity index 98%
rename from patches/server/0140-Basic-PlayerProfile-API.patch
rename to patches/server/0141-Basic-PlayerProfile-API.patch
index b482ebaaf4..24f2b83526 100644
--- a/patches/server/0140-Basic-PlayerProfile-API.patch
+++ b/patches/server/0141-Basic-PlayerProfile-API.patch
@@ -548,7 +548,7 @@ index 0000000000000000000000000000000000000000..7ac27392a8647ef7d0dc78efe78703e9
 +    @NotNull GameProfile buildGameProfile();
 +}
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 9572294a50110f2452090da1f32e0a73edc3db05..ff8876b7e7cc2172a2cb5e12d6836b9875cc9aa1 100644
+index dc2ab968ed010289125ac08f0a9ea85af6f6e8bb..82a1a87822e3fc323b92e1aa30ddb0cdb351d89c 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -1,5 +1,7 @@
@@ -559,15 +559,15 @@ index 9572294a50110f2452090da1f32e0a73edc3db05..ff8876b7e7cc2172a2cb5e12d6836b98
  import com.google.common.util.concurrent.ThreadFactoryBuilder;
  import io.papermc.paper.math.BlockPosition;
  import io.papermc.paper.math.FinePosition;
-@@ -17,6 +19,7 @@ import net.minecraft.world.level.ClipContext;
- import net.minecraft.world.level.Level;
+@@ -30,6 +32,7 @@ import net.minecraft.world.level.chunk.ChunkAccess;
+ import net.minecraft.world.level.chunk.ChunkStatus;
  import net.minecraft.world.phys.Vec3;
  import org.apache.commons.lang.exception.ExceptionUtils;
 +import com.mojang.authlib.GameProfile;
  import org.bukkit.Location;
  import org.bukkit.block.BlockFace;
  import org.bukkit.craftbukkit.CraftWorld;
-@@ -362,6 +365,10 @@ public final class MCUtil {
+@@ -378,6 +381,10 @@ public final class MCUtil {
          return run.get();
      }
  
@@ -579,7 +579,7 @@ index 9572294a50110f2452090da1f32e0a73edc3db05..ff8876b7e7cc2172a2cb5e12d6836b98
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index ae0b713870976d4b1e469a90cef9b2e282dbcaab..6c3e0540dce5f810a7822cefe59228ef77528132 100644
+index 646cd39c46d86899f23c8179c0790e32d03f954f..1b97195394161e067312b71c81ddd448b92c5e44 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -178,7 +178,7 @@ public class Main {
@@ -614,7 +614,7 @@ index c70cd016e1978931d115cfca94664897f0158196..eac9658fa4cab7a651e10e4e18c679e0
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c37793f660c0b2a28e4478dfee0582a61a8faf3c..35dc09187b0bed916c9a10f3cf3a900052926a72 100644
+index 66f241411af172e2f44edfc4e8f1b9bda86844e2..e42555a01a581a094bc4bd41bf4cd8a9a45bf7c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -264,6 +264,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/patches/server/0141-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/0141-Shoulder-Entities-Release-API.patch
rename to patches/server/0142-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0142-Profile-Lookup-Events.patch b/patches/server/0143-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0142-Profile-Lookup-Events.patch
rename to patches/server/0143-Profile-Lookup-Events.patch
diff --git a/patches/server/0143-Block-player-logins-during-server-shutdown.patch b/patches/server/0144-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0143-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0144-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch
similarity index 93%
rename from patches/server/0144-Entity-fromMobSpawner.patch
rename to patches/server/0145-Entity-fromMobSpawner.patch
index 393eb7cd61..bae3882cc4 100644
--- a/patches/server/0144-Entity-fromMobSpawner.patch
+++ b/patches/server/0145-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b4c91cb985d3772c5b105b8d2267b51d7483e005..3fc715e7ceb35e2309ba3ffeb19ae58cfd25fde6 100644
+index 4e71fb3fcbd89c21e5132cfb76dcbf8cec7785dd..1d21c5d5ea84f76d4cafe9d2d22226cf50232ee1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -388,6 +388,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -16,7 +16,7 @@ index b4c91cb985d3772c5b105b8d2267b51d7483e005..3fc715e7ceb35e2309ba3ffeb19ae58c
      @javax.annotation.Nullable
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
-@@ -2125,6 +2126,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2177,6 +2178,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
                  nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index b4c91cb985d3772c5b105b8d2267b51d7483e005..3fc715e7ceb35e2309ba3ffeb19ae58c
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2265,6 +2270,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2317,6 +2322,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.originWorld = originWorld;
                  origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));
              }
diff --git a/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0146-Implement-ensureServerConversions-API.patch b/patches/server/0147-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0146-Implement-ensureServerConversions-API.patch
rename to patches/server/0147-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0147-Implement-getI18NDisplayName.patch b/patches/server/0148-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0147-Implement-getI18NDisplayName.patch
rename to patches/server/0148-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0148-ProfileWhitelistVerifyEvent.patch b/patches/server/0149-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from patches/server/0148-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0149-ProfileWhitelistVerifyEvent.patch
index 95627cc8cc..e64e46dedb 100644
--- a/patches/server/0148-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0149-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0fb1fda1aba730e54d9e922e18de3bd048a78a62..0cdab5d4f1b4d368dfee0dc50183a83ca446fc17 100644
+index a3c150e9552fbc9b9244c70508c27f03a3834fa2..e4199b1c4b297db85a99e1e6a1c61ce6d7abc909 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -633,9 +633,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0149-Fix-this-stupid-bullshit.patch b/patches/server/0150-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0149-Fix-this-stupid-bullshit.patch
rename to patches/server/0150-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0150-LivingEntity-setKiller.patch b/patches/server/0151-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0150-LivingEntity-setKiller.patch
rename to patches/server/0151-LivingEntity-setKiller.patch
diff --git a/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/server/0157-Add-PlayerJumpEvent.patch
similarity index 94%
rename from patches/server/0156-Add-PlayerJumpEvent.patch
rename to patches/server/0157-Add-PlayerJumpEvent.patch
index 62a093ea68..c718d20f84 100644
--- a/patches/server/0156-Add-PlayerJumpEvent.patch
+++ b/patches/server/0157-Add-PlayerJumpEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4f420687d7afc6cdb8175d510c54a0d8dd3847b6..875c98d4f93b3fdd93af3a1087a818f7250515b1 100644
+index bebe7cee0a0a94c1e11b7ac8c79c7496fb6b8edc..592e7d24b27fab4af32d35d0f7c7786c582d9418 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1192,7 +1192,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1199,7 +1199,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              boolean flag = d7 > 0.0D;
  
                              if (this.player.onGround() && !packet.isOnGround() && flag) {
diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
similarity index 100%
rename from patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
similarity index 90%
rename from patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
index f8a2b76a5a..a35ad62785 100644
--- a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
@@ -60,13 +60,13 @@ index 0000000000000000000000000000000000000000..a5a7624f1f372a26b982836cd31cff15
 +
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index e7a124403f2b07c96caaaf97d1c9023f9ec2f9d9..e5e4a5fb2c342a249344d207ffea4000cc998710 100644
+index b097bb4855ab724b2c435a9a9db450ff3ce840fe..2c807e8a579de5152f99c75ea272a6483a778f17 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -111,6 +111,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-     @Nullable
-     BandwidthDebugMonitor bandwidthDebugMonitor;
-     public String hostname = ""; // CraftBukkit - add field
+@@ -133,6 +133,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+         }
+     }
+     // Paper end - add pending task queue
 +    // Paper start - NetworkClient implementation
 +    public int protocolVersion;
 +    public java.net.InetSocketAddress virtualHost;
@@ -90,10 +90,10 @@ index c1eb9f999c1042da804a3560d12c14f5d67b7953..331af220601127872aff709c8f692fdc
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 75e82bec61c9e20d6ae589664f87cb1f26b0deb5..8106506803d77b88f13ca033eefa3b3f62453650 100644
+index 18db64ff86517c7ceb98590c0c91e0c21855db72..4d324d2fc5f9966a6b27391f856c4efec98692c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -246,6 +246,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -288,6 +288,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/server/0160-revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from patches/server/0159-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0160-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/server/0162-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/server/0161-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0162-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 88%
rename from patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 10951ab2ba..169d912a4b 100644
--- a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 776a5a9947c56eb63df7ac9797166be456282af1..e00e9a6ca14622c2baeba71f54710fedc838ffd7 100644
+index 7cfcbc1e38f5e9145c827dfe26299277a3f14cee..22dab285bbcea77d04a8625b025f054c625cadd4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -800,6 +800,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -805,6 +805,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          // Spigot start
          // Iterator iterator = this.blockEntityTickers.iterator();
          int tilesThisCycle = 0;
@@ -17,7 +17,7 @@ index 776a5a9947c56eb63df7ac9797166be456282af1..e00e9a6ca14622c2baeba71f54710fed
          for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
              this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
              TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
-@@ -807,7 +809,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -812,7 +814,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity == null) {
                  this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
                  tilesThisCycle--;
@@ -25,7 +25,7 @@ index 776a5a9947c56eb63df7ac9797166be456282af1..e00e9a6ca14622c2baeba71f54710fed
                  continue;
              }
              // Spigot end
-@@ -815,12 +816,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -820,12 +821,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity.isRemoved()) {
                  // Spigot start
                  tilesThisCycle--;
diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 95%
rename from patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
index f2aca08353..c5f6827d65 100644
--- a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e00e9a6ca14622c2baeba71f54710fedc838ffd7..068382daaeae03e67b2859cce7d15e290c92352e 100644
+index 22dab285bbcea77d04a8625b025f054c625cadd4..ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,7 +154,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -49,7 +49,7 @@ index e00e9a6ca14622c2baeba71f54710fedc838ffd7..068382daaeae03e67b2859cce7d15e29
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
                  captured = true;
              }
-@@ -690,7 +691,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -695,7 +696,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public BlockState getBlockState(BlockPos pos) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/server/0167-AsyncTabCompleteEvent.patch
similarity index 96%
rename from patches/server/0166-AsyncTabCompleteEvent.patch
rename to patches/server/0167-AsyncTabCompleteEvent.patch
index d1e3c29612..c3a706e77f 100644
--- a/patches/server/0166-AsyncTabCompleteEvent.patch
+++ b/patches/server/0167-AsyncTabCompleteEvent.patch
@@ -16,10 +16,10 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 875c98d4f93b3fdd93af3a1087a818f7250515b1..c14ebcc46c033834a14de5d6335a4dcc7830069d 100644
+index 592e7d24b27fab4af32d35d0f7c7786c582d9418..c425780ba9867b4ccea9841a8a7dba43f98f5073 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -687,27 +687,58 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -687,12 +687,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      }
  
@@ -37,6 +37,10 @@ index 875c98d4f93b3fdd93af3a1087a818f7250515b1..c14ebcc46c033834a14de5d6335a4dcc
 +            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper
              return;
          }
+         // Paper start
+@@ -703,18 +707,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         }
+         // Paper end
          // CraftBukkit end
 +        // Paper start - async tab completion
 +        TAB_COMPLETE_EXECUTOR.execute(() -> {
@@ -87,7 +91,7 @@ index 875c98d4f93b3fdd93af3a1087a818f7250515b1..c14ebcc46c033834a14de5d6335a4dcc
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 35dc09187b0bed916c9a10f3cf3a900052926a72..659e239a407f793706e4f133f6168a556e9de68b 100644
+index e42555a01a581a094bc4bd41bf4cd8a9a45bf7c1..2c4c8a1a4bb779de970068af5a30505f434029be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2132,7 +2132,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0168-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0167-PlayerPickupExperienceEvent.patch
rename to patches/server/0168-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
similarity index 94%
rename from patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
index be694c6135..524104d241 100644
--- a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
@@ -14,10 +14,10 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8106506803d77b88f13ca033eefa3b3f62453650..d327ce535c8750b6ee6c993b3643006e0e91a08d 100644
+index 4d324d2fc5f9966a6b27391f856c4efec98692c6..18d7e0ab3c57a3daa819cd20e8ff6cd33b4c2edc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1498,7 +1498,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1540,7 +1540,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 82%
rename from patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
index 076442dce8..2bc01a5882 100644
--- a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
@@ -9,10 +9,10 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8c84461a5711cb408b0ead397417c31cb2f4d336..db027a4291131b7f64c32853da4ca5fc71582251 100644
+index ea0b82165e452b7b82d1d9a58eef6059cba30552..cdcad9e1470a0b465ee96d1f2b4b8b31e8c3d219 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1193,7 +1193,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -687,7 +687,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          chunkRange = (chunkRange > level.spigotConfig.viewDistance) ? (byte) level.spigotConfig.viewDistance : chunkRange;
          chunkRange = (chunkRange > 8) ? 8 : chunkRange;
  
@@ -23,7 +23,7 @@ index 8c84461a5711cb408b0ead397417c31cb2f4d336..db027a4291131b7f64c32853da4ca5fc
          // Spigot end
          if (!this.distanceManager.hasPlayersNearby(chunkcoordintpair.toLong())) {
              return false;
-@@ -1208,6 +1210,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -702,6 +704,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  }
  
                  entityplayer = (ServerPlayer) iterator.next();
@@ -40,10 +40,10 @@ index 8c84461a5711cb408b0ead397417c31cb2f4d336..db027a4291131b7f64c32853da4ca5fc
  
              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 b1fd6118132ba38f60d2a2b15c09231fa29be8fa..0f38bdf2c9a29f2111c27138b8d997c230633bb8 100644
+index 65d447df49d8c4a27de9ae7f9e298bf705c688bc..4649e597b86335b33d9e9227d966dd7ad8208096 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -718,6 +718,15 @@ public class ServerChunkCache extends ChunkSource {
+@@ -565,6 +565,15 @@ public class ServerChunkCache extends ChunkSource {
              boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
  
              Collections.shuffle(list);
@@ -60,7 +60,7 @@ index b1fd6118132ba38f60d2a2b15c09231fa29be8fa..0f38bdf2c9a29f2111c27138b8d997c2
  
              while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 40efa19ffe9275748a62e0546c3fd42bbcb0883d..491dffdcbb065acf5861dc01b403d1a895c92baa 100644
+index aee79a46d8fce5e5e80010e0e34f04fc8495d602..74249488581e661dda4792348ca1407c1b1df6a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@
@@ -76,5 +76,5 @@ index 40efa19ffe9275748a62e0546c3fd42bbcb0883d..491dffdcbb065acf5861dc01b403d1a8
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 +    public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
-     public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
-         super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
+     // Paper start - replace player chunk loader
+     private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0172-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0171-PreCreatureSpawnEvent.patch
rename to patches/server/0172-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/server/0173-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0172-Fill-Profile-Property-Events.patch
rename to patches/server/0173-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/server/0175-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0174-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0175-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/server/0176-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0175-Extend-Player-Interact-cancellation.patch
rename to patches/server/0176-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/server/0177-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0176-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0177-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 86%
rename from patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
index 70cd06eab6..d269ed5ad4 100644
--- a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
@@ -12,10 +12,10 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index e5e4a5fb2c342a249344d207ffea4000cc998710..2d7f332910328cef616609dc4c89facafcbe66cc 100644
+index 2c807e8a579de5152f99c75ea272a6483a778f17..837cc21af01e691eb9e877479a67ce94d5b2bc06 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -114,6 +114,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -136,6 +136,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      // Paper start - NetworkClient implementation
      public int protocolVersion;
      public java.net.InetSocketAddress virtualHost;
@@ -23,7 +23,7 @@ index e5e4a5fb2c342a249344d207ffea4000cc998710..2d7f332910328cef616609dc4c89faca
      // Paper end
  
      public Connection(PacketFlow side) {
-@@ -401,7 +402,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -430,7 +431,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          }
  
          if (this.channel != null) {
diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
similarity index 98%
rename from patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
index eea61eada1..c91d2d9333 100644
--- a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a654f345f55493816c239f296864c9f75ee5247a..76728fd630e103e8e3431c6b54ef944cb62b33fd 100644
+index ee27251b9decc00a0094611cf79644bd83bce5c7..52f5c91d71a8fc86d14c3c4c9e258b9cf70ad57b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
@@ -194,7 +194,7 @@ index a654f345f55493816c239f296864c9f75ee5247a..76728fd630e103e8e3431c6b54ef944c
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1334,7 +1337,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1328,7 +1331,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(i, list.size(), List.of());
          } else {
diff --git a/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/server/0182-Player.setPlayerProfile-API.patch
similarity index 94%
rename from patches/server/0181-Player.setPlayerProfile-API.patch
rename to patches/server/0182-Player.setPlayerProfile-API.patch
index d67afbecce..b662586788 100644
--- a/patches/server/0181-Player.setPlayerProfile-API.patch
+++ b/patches/server/0182-Player.setPlayerProfile-API.patch
@@ -9,10 +9,10 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c14ebcc46c033834a14de5d6335a4dcc7830069d..6ad9b294aadf96465834cde1ff1cda1710441c79 100644
+index c425780ba9867b4ccea9841a8a7dba43f98f5073..eff014f2a2d81cf52e36e92af9bf371c5a80fdff 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1430,7 +1430,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1437,7 +1437,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.internalTeleport(dest.getX(), dest.getY(), dest.getZ(), dest.getYaw(), dest.getPitch(), Collections.emptySet());
      }
  
@@ -55,10 +55,10 @@ index b17fe83bcd7bde44ee8c1f872fffa8bf40707c50..aac78c13361b19efa7b43a0c95458390
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d327ce535c8750b6ee6c993b3643006e0e91a08d..160a6d5b3ec3a9bc7677f937444334c0aca8be86 100644
+index 18d7e0ab3c57a3daa819cd20e8ff6cd33b4c2edc..ec9c0fe82ae5bba9a272d8a834f3f6bcf01cf205 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -229,11 +229,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -271,11 +271,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return server.getPlayer(getUniqueId()) != null;
      }
  
@@ -70,7 +70,7 @@ index d327ce535c8750b6ee6c993b3643006e0e91a08d..160a6d5b3ec3a9bc7677f937444334c0
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1648,8 +1643,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1690,8 +1685,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      private void untrackAndHideEntity(org.bukkit.entity.Entity entity) {
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -87,7 +87,7 @@ index d327ce535c8750b6ee6c993b3643006e0e91a08d..160a6d5b3ec3a9bc7677f937444334c0
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1662,8 +1664,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1704,8 +1706,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
              }
          }
@@ -96,7 +96,7 @@ index d327ce535c8750b6ee6c993b3643006e0e91a08d..160a6d5b3ec3a9bc7677f937444334c0
      }
  
      void resetAndHideEntity(org.bukkit.entity.Entity entity) {
-@@ -1728,12 +1728,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1770,12 +1770,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      private void trackAndShowEntity(org.bukkit.entity.Entity entity) {
@@ -122,7 +122,7 @@ index d327ce535c8750b6ee6c993b3643006e0e91a08d..160a6d5b3ec3a9bc7677f937444334c0
          }
  
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
-@@ -1743,6 +1756,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1785,6 +1798,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
      }
@@ -162,7 +162,7 @@ index d327ce535c8750b6ee6c993b3643006e0e91a08d..160a6d5b3ec3a9bc7677f937444334c0
  
      void resetAndShowEntity(org.bukkit.entity.Entity entity) {
          // SPIGOT-7312: Can't show/hide self
-@@ -1754,6 +1800,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1796,6 +1842,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              this.trackAndShowEntity(entity);
          }
      }
diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/server/0183-getPlayerUniqueId-API.patch
similarity index 94%
rename from patches/server/0182-getPlayerUniqueId-API.patch
rename to patches/server/0183-getPlayerUniqueId-API.patch
index 9662a29ff4..8b6772fe45 100644
--- a/patches/server/0182-getPlayerUniqueId-API.patch
+++ b/patches/server/0183-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 659e239a407f793706e4f133f6168a556e9de68b..e6b0b567ccbe8d7e3f21ffdc336ee2b2ddfb34e9 100644
+index 2c4c8a1a4bb779de970068af5a30505f434029be..70db3c9fc868e6d87f4fc85fd1ae5ac756be7b7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1730,6 +1730,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0184-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0183-Improved-Async-Task-Scheduler.patch
rename to patches/server/0184-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0187-Flag-to-disable-the-channel-limit.patch
similarity index 91%
rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0187-Flag-to-disable-the-channel-limit.patch
index 958efeab5f..c0de29b0a2 100644
--- a/patches/server/0186-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0187-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 160a6d5b3ec3a9bc7677f937444334c0aca8be86..21e12aa4508b0079e17131b1ee7baebe4108e413 100644
+index ec9c0fe82ae5bba9a272d8a834f3f6bcf01cf205..04b3dc0c856a515f09e56cb40f9313e970f20cca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -194,6 +194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -20,7 +20,7 @@ index 160a6d5b3ec3a9bc7677f937444334c0aca8be86..21e12aa4508b0079e17131b1ee7baebe
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -2052,7 +2053,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2094,7 +2095,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper end
  
      public void addChannel(String channel) {
diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0188-Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0188-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0189-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0189-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0189-EndermanEscapeEvent.patch
rename to patches/server/0190-EndermanEscapeEvent.patch
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0190-Enderman.teleportRandomly.patch
rename to patches/server/0191-Enderman.teleportRandomly.patch
diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
index 11c7a01a3a..bac68c7c20 100644
--- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
@@ -16,10 +16,10 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile ownerUUID
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 303ce1ef47ae9aad137ee29f23b9084d08717cbb..024854ba480643b28c4334dbff0523fb3b023ba3 100644
+index 10c492e57958335a0f054f17c985209238df8b63..445b8839d2a7a5ec2debb853d606e499c2a1f20b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2071,6 +2071,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2320,6 +2320,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 92%
rename from patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
index 81fc864ce7..384e79120e 100644
--- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,10 +10,10 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 024854ba480643b28c4334dbff0523fb3b023ba3..9242f42ad622897721a86b5a443aa67619e52918 100644
+index 445b8839d2a7a5ec2debb853d606e499c2a1f20b..4c1911140197568685524721e3140739bca039c7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1485,12 +1485,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1719,12 +1719,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
@@ -34,10 +34,10 @@ index 024854ba480643b28c4334dbff0523fb3b023ba3..9242f42ad622897721a86b5a443aa676
  
              if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9d79b31baea99d25218e9d3f27ab895d4f73ef8a..69cf1142c9d40f581f4d84ebc4d58e95c9a71ddc 100644
+index 6b0dba6f7211500ba5950a76d2b2252a09f65103..262e73f5b6ff9b681b6c441df3b2e79265ade02d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1873,11 +1873,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1863,11 +1863,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0195-EndermanAttackPlayerEvent.patch b/patches/server/0196-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0195-EndermanAttackPlayerEvent.patch
rename to patches/server/0196-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0196-WitchConsumePotionEvent.patch b/patches/server/0197-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0196-WitchConsumePotionEvent.patch
rename to patches/server/0197-WitchConsumePotionEvent.patch
diff --git a/patches/server/0197-WitchThrowPotionEvent.patch b/patches/server/0198-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0197-WitchThrowPotionEvent.patch
rename to patches/server/0198-WitchThrowPotionEvent.patch
diff --git a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/server/0200-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0199-WitchReadyPotionEvent.patch
rename to patches/server/0200-WitchReadyPotionEvent.patch
diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/server/0201-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0200-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0201-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/server/0204-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0203-Fix-CraftEntity-hashCode.patch
rename to patches/server/0204-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/server/0207-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0206-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0207-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/server/0208-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0207-Improve-EntityShootBowEvent.patch
rename to patches/server/0208-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/server/0209-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0208-PlayerReadyArrowEvent.patch
rename to patches/server/0209-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
similarity index 98%
rename from patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
rename to patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
index b1ad26114d..f15d42d34c 100644
--- a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
@@ -9,10 +9,10 @@ Co-authored-by: aerulion <aerulion@gmail.com>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3fc715e7ceb35e2309ba3ffeb19ae58cfd25fde6..ff8a82764811ce19d6688723fd9a725f46fdbedc 100644
+index 1d21c5d5ea84f76d4cafe9d2d22226cf50232ee1..ca773bca9df5a313d979e97e3a5245e701353793 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1850,8 +1850,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1902,8 +1902,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void push(double deltaX, double deltaY, double deltaZ) {
diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/server/0211-Expand-Explosions-API.patch
similarity index 90%
rename from patches/server/0210-Expand-Explosions-API.patch
rename to patches/server/0211-Expand-Explosions-API.patch
index cf0d96453d..69153e513a 100644
--- a/patches/server/0210-Expand-Explosions-API.patch
+++ b/patches/server/0211-Expand-Explosions-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 69cf1142c9d40f581f4d84ebc4d58e95c9a71ddc..d2fa8e46446f2e7a8fd8bfed5901a959b27a73e0 100644
+index 262e73f5b6ff9b681b6c441df3b2e79265ade02d..3218f5409cb26fcbd74a754a50b6f5f1ec3cb4a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -726,6 +726,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -716,6 +716,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
          return !this.world.explode(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? net.minecraft.world.level.Level.ExplosionInteraction.MOB : net.minecraft.world.level.Level.ExplosionInteraction.NONE).wasCanceled;
      }
diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/server/0213-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0212-RangedEntity-API.patch
rename to patches/server/0213-RangedEntity-API.patch
diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/server/0215-Implement-World.getEntity-UUID-API.patch
similarity index 85%
rename from patches/server/0214-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0215-Implement-World.getEntity-UUID-API.patch
index 1d0a9b289b..761dbd4806 100644
--- a/patches/server/0214-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0215-Implement-World.getEntity-UUID-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d2fa8e46446f2e7a8fd8bfed5901a959b27a73e0..a9089569e063b5124c246b52b10f4a5728af49e0 100644
+index 3218f5409cb26fcbd74a754a50b6f5f1ec3cb4a7..71ac1f681fe2518d2b0f52597310e7b538a0b1d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1050,6 +1050,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1040,6 +1040,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return list;
      }
  
diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch
similarity index 92%
rename from patches/server/0215-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0216-InventoryCloseEvent-Reason-API.patch
index b3273b5727..95b9e5ec9e 100644
--- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch
@@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9242f42ad622897721a86b5a443aa67619e52918..0e60542256d8e6ded167a3b9a75cca7d0915cb2f 100644
+index 4c1911140197568685524721e3140739bca039c7..1170b2fb6396fab0aa30a097bc8957e2551f4f1c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1217,7 +1217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1451,7 +1451,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
@@ -19,7 +19,7 @@ index 9242f42ad622897721a86b5a443aa67619e52918..0e60542256d8e6ded167a3b9a75cca7d
                  }
              }
          }
-@@ -2161,7 +2161,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2410,7 +2410,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
@@ -29,10 +29,10 @@ index 9242f42ad622897721a86b5a443aa67619e52918..0e60542256d8e6ded167a3b9a75cca7d
              }
              // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 491dffdcbb065acf5861dc01b403d1a895c92baa..3a9fd9ea736d1b3dbb261158d690e218baa4df96 100644
+index 74249488581e661dda4792348ca1407c1b1df6a9..73762977727f1cbeb52f6eb683b24217e034bc90 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -641,7 +641,7 @@ public class ServerPlayer extends Player {
+@@ -685,7 +685,7 @@ public class ServerPlayer extends Player {
          }
          // Paper end
          if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
@@ -41,7 +41,7 @@ index 491dffdcbb065acf5861dc01b403d1a895c92baa..3a9fd9ea736d1b3dbb261158d690e218
              this.containerMenu = this.inventoryMenu;
          }
  
-@@ -834,7 +834,7 @@ public class ServerPlayer extends Player {
+@@ -878,7 +878,7 @@ public class ServerPlayer extends Player {
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.containerMenu != this.inventoryMenu) {
@@ -50,7 +50,7 @@ index 491dffdcbb065acf5861dc01b403d1a895c92baa..3a9fd9ea736d1b3dbb261158d690e218
          }
  
          net.kyori.adventure.text.Component deathMessage = event.deathMessage() != null ? event.deathMessage() : net.kyori.adventure.text.Component.empty(); // Paper - Adventure
-@@ -1453,7 +1453,7 @@ public class ServerPlayer extends Player {
+@@ -1497,7 +1497,7 @@ public class ServerPlayer extends Player {
          }
          // CraftBukkit end
          if (this.containerMenu != this.inventoryMenu) {
@@ -59,7 +59,7 @@ index 491dffdcbb065acf5861dc01b403d1a895c92baa..3a9fd9ea736d1b3dbb261158d690e218
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1481,7 +1481,13 @@ public class ServerPlayer extends Player {
+@@ -1525,7 +1525,13 @@ public class ServerPlayer extends Player {
  
      @Override
      public void closeContainer() {
@@ -75,7 +75,7 @@ index 491dffdcbb065acf5861dc01b403d1a895c92baa..3a9fd9ea736d1b3dbb261158d690e218
          this.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6ad9b294aadf96465834cde1ff1cda1710441c79..f32e04f1c6394769983dec0d931798e0b5fda2fe 100644
+index eff014f2a2d81cf52e36e92af9bf371c5a80fdff..248390822d7d4fbff96b184e65affad953c14c8f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -215,6 +215,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -86,7 +86,7 @@ index 6ad9b294aadf96465834cde1ff1cda1710441c79..f32e04f1c6394769983dec0d931798e0
  import org.bukkit.event.inventory.InventoryCreativeEvent;
  import org.bukkit.event.inventory.InventoryType.SlotType;
  import org.bukkit.event.inventory.SmithItemEvent;
-@@ -2516,10 +2517,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2523,10 +2524,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleContainerClose(ServerboundContainerClosePacket packet) {
@@ -104,7 +104,7 @@ index 6ad9b294aadf96465834cde1ff1cda1710441c79..f32e04f1c6394769983dec0d931798e0
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0cdab5d4f1b4d368dfee0dc50183a83ca446fc17..6e88a9e8ea63e54fd191263f105d3e9f81f27f3a 100644
+index e4199b1c4b297db85a99e1e6a1c61ce6d7abc909..49d5410341e949b51c003a0c79d9d77ba5a723f9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -520,7 +520,7 @@ public abstract class PlayerList {
@@ -173,10 +173,10 @@ index e5b2686e466a2604ebcdb6e5c3b6fb7ff7bc6eec..aa131c233ee9d7926ca77e1afedd27ba
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 21e12aa4508b0079e17131b1ee7baebe4108e413..f1c6baeafb93ae51d4a76d39399cbd99b2e1f92c 100644
+index 04b3dc0c856a515f09e56cb40f9313e970f20cca..4dc09147e29bc43c854546e18cf2af41622a8a8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1149,7 +1149,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1191,7 +1191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/server/0217-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0216-Vex-get-setSummoner-API.patch
rename to patches/server/0217-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 90%
rename from patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index faec5db369..32808b63d8 100644
--- a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f32e04f1c6394769983dec0d931798e0b5fda2fe..c63b0a3ff5fe5c03199693d8e2cbf08a25f33d70 100644
+index 248390822d7d4fbff96b184e65affad953c14c8f..108667fc42c8595d27d270e46a0e26fa3426450e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2397,6 +2397,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2404,6 +2404,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              }
  
                              if (event.isCancelled()) {
diff --git a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0219-add-more-information-to-Entity.toString.patch b/patches/server/0220-add-more-information-to-Entity.toString.patch
similarity index 91%
rename from patches/server/0219-add-more-information-to-Entity.toString.patch
rename to patches/server/0220-add-more-information-to-Entity.toString.patch
index e1ed207cf9..0e0ae2885c 100644
--- a/patches/server/0219-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0220-add-more-information-to-Entity.toString.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ff8a82764811ce19d6688723fd9a725f46fdbedc..6e3012f482df9efc21545c72cf21d1a14bd62585 100644
+index ca773bca9df5a313d979e97e3a5245e701353793..5ec7104201f4280208d8f0e0bae6b5e481c7bc56 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3121,7 +3121,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3173,7 +3173,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public String toString() {
          String s = this.level() == null ? "~NULL~" : this.level().toString();
  
diff --git a/patches/server/0220-EnderDragon-Events.patch b/patches/server/0221-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0220-EnderDragon-Events.patch
rename to patches/server/0221-EnderDragon-Events.patch
diff --git a/patches/server/0221-PlayerElytraBoostEvent.patch b/patches/server/0222-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0221-PlayerElytraBoostEvent.patch
rename to patches/server/0222-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0222-PlayerLaunchProjectileEvent.patch b/patches/server/0223-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0222-PlayerLaunchProjectileEvent.patch
rename to patches/server/0223-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0223-Improve-BlockPosition-inlining.patch b/patches/server/0224-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0223-Improve-BlockPosition-inlining.patch
rename to patches/server/0224-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 91%
rename from patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 6d193d77e9..45c55e0e80 100644
--- a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -17,10 +17,10 @@ index 37c19685049ef6b267a74a4323dc4ec33159c3d2..4859a4c78e59745ef75155bc8d6915fc
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 068382daaeae03e67b2859cce7d15e290c92352e..32a0cc8602998be451cbb4dc8a68417bdb2c911a 100644
+index ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6..0b02ba70956ea1352ea8e67957b3789408b67f6b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -844,6 +844,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -849,6 +849,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end
          }
      }
diff --git a/patches/server/0225-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from patches/server/0225-Vanished-players-don-t-have-rights.patch
rename to patches/server/0226-Vanished-players-don-t-have-rights.patch
index 02335919f5..5eec807aca 100644
--- a/patches/server/0225-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0226-Vanished-players-don-t-have-rights.patch
@@ -39,7 +39,7 @@ index a6638e626600e4304a973497a39e3fac52203b16..e68b7a1b03783e4f9de24c5ae8773fc3
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 32a0cc8602998be451cbb4dc8a68417bdb2c911a..beec98739e6be4e51e812091c0be8d98dd459c3f 100644
+index 0b02ba70956ea1352ea8e67957b3789408b67f6b..8320bece16dfa339e33801e43ff2f297bc876001 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -273,6 +273,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch b/patches/server/0227-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0226-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0227-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0228-SkeletonHorse-Additions.patch
similarity index 96%
rename from patches/server/0227-SkeletonHorse-Additions.patch
rename to patches/server/0228-SkeletonHorse-Additions.patch
index 4f87c8baa6..efb850022d 100644
--- a/patches/server/0227-SkeletonHorse-Additions.patch
+++ b/patches/server/0228-SkeletonHorse-Additions.patch
@@ -32,10 +32,10 @@ index 8f20239f3ef7ebe41fac8ee6e024c36dafec33c4..d00fb16ae3b94dfcb10fd1a7c1671595
  
          this.horse.setTrap(false);
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index a583599e3b49d5ded871252646904a80825a01ff..c41d0efb40f137d71b2a038dd362d17ddb2fac60 100644
+index 36d793b492d9776ee36f8285b5bab09e6463cdce..a25497eec004add7408a63b1a0f09e3fa443b324 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -93,6 +93,28 @@ public interface EntityGetter {
+@@ -105,6 +105,28 @@ public interface EntityGetter {
          return player;
      }
  
diff --git a/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch b/patches/server/0230-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0229-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0230-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0230-AnvilDamageEvent.patch b/patches/server/0231-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0230-AnvilDamageEvent.patch
rename to patches/server/0231-AnvilDamageEvent.patch
diff --git a/patches/server/0231-Add-TNTPrimeEvent.patch b/patches/server/0232-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0231-Add-TNTPrimeEvent.patch
rename to patches/server/0232-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
index f1e78a18b8..f072c2aa74 100644
--- a/patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c63b0a3ff5fe5c03199693d8e2cbf08a25f33d70..423390ff2508ab9af804925044142ea289068bae 100644
+index 108667fc42c8595d27d270e46a0e26fa3426450e..36cc7b95613139b0ebc0b7b3525bc56814c11949 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -253,6 +253,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0233-Fix-NBT-type-issues.patch b/patches/server/0234-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0233-Fix-NBT-type-issues.patch
rename to patches/server/0234-Fix-NBT-type-issues.patch
diff --git a/patches/server/0234-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0234-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 91%
rename from patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 6d92f8e010..8d32ee0f06 100644
--- a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -8,10 +8,10 @@ Add -Ddebug.entities=true to your JVM flags to gain more information
 1.17: Needs to be reworked for new entity storage system
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index db027a4291131b7f64c32853da4ca5fc71582251..58125d6d08cebf80e792baf809f2c8c1d8a738e5 100644
+index cdcad9e1470a0b465ee96d1f2b4b8b31e8c3d219..165daf5e4b44425974703e9f603955fa09984f1b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1415,6 +1415,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -865,6 +865,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  } else {
                      ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
  
@@ -19,7 +19,7 @@ index db027a4291131b7f64c32853da4ca5fc71582251..58125d6d08cebf80e792baf809f2c8c1
                      this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
                      playerchunkmap_entitytracker.updatePlayers(this.level.players());
                      if (entity instanceof ServerPlayer) {
-@@ -1457,7 +1458,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -907,7 +908,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          if (playerchunkmap_entitytracker1 != null) {
              playerchunkmap_entitytracker1.broadcastRemoved();
          }
@@ -29,7 +29,7 @@ index db027a4291131b7f64c32853da4ca5fc71582251..58125d6d08cebf80e792baf809f2c8c1
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0e60542256d8e6ded167a3b9a75cca7d0915cb2f..af33e4be10c9d571eb6f7ba5730b7ed4d8647761 100644
+index 1170b2fb6396fab0aa30a097bc8957e2551f4f1c..5de07950d549716e917ec3fd2f364c994007333e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -42,7 +42,7 @@ index 0e60542256d8e6ded167a3b9a75cca7d0915cb2f..af33e4be10c9d571eb6f7ba5730b7ed4
  
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
-@@ -1179,7 +1182,28 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1413,7 +1416,28 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // CraftBukkit start
      private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
@@ -72,7 +72,7 @@ index 0e60542256d8e6ded167a3b9a75cca7d0915cb2f..af33e4be10c9d571eb6f7ba5730b7ed4
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6e3012f482df9efc21545c72cf21d1a14bd62585..72c5fde2220524f66a2608ecfa96c7b56f8b198c 100644
+index 5ec7104201f4280208d8f0e0bae6b5e481c7bc56..63f9f874ef9da0d5f0c6d6df2901be27df5e30a0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -238,6 +238,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -85,7 +85,7 @@ index 6e3012f482df9efc21545c72cf21d1a14bd62585..72c5fde2220524f66a2608ecfa96c7b5
          if (this.bukkitEntity == null) {
              this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index beec98739e6be4e51e812091c0be8d98dd459c3f..e66e35b25dfce6f071173de87c452a9dd38fcf4d 100644
+index 8320bece16dfa339e33801e43ff2f297bc876001..18234d71eba7d2a2874f3e5c9628d82970acc033 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -150,6 +150,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 90%
rename from patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
index 64519da0da..d3d640afc0 100644
--- a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,10 +9,10 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 76728fd630e103e8e3431c6b54ef944cb62b33fd..715ebeb36f0620eaeafa63bf87a30e63363069a3 100644
+index 52f5c91d71a8fc86d14c3c4c9e258b9cf70ad57b..41bad67b3a6b8ccdcf9467858cb7d9c0e0a03f0e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1046,6 +1046,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1029,6 +1029,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -21,7 +21,7 @@ index 76728fd630e103e8e3431c6b54ef944cb62b33fd..715ebeb36f0620eaeafa63bf87a30e63
              long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
              lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e11aee38009a6a37dceaf42232e295b71e0b7d40..1ea037e33e50ed4f1d4bcbc294cc26cac7cc8d94 100644
+index 5a3f0a6e3f663718993cf3679ffc96c4af140e4d..cdc020e1787c258ba283d86a25ab153237b0e194 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -197,6 +197,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -33,7 +33,7 @@ index e11aee38009a6a37dceaf42232e295b71e0b7d40..1ea037e33e50ed4f1d4bcbc294cc26ca
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e6b0b567ccbe8d7e3f21ffdc336ee2b2ddfb34e9..7afc77aa2b9959689d18b0a93c9d87e663b0f034 100644
+index 70db3c9fc868e6d87f4fc85fd1ae5ac756be7b7d..145476b25f7d7d60c7bc4891e71484c74011cac2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -918,6 +918,7 @@ public final class CraftServer implements Server {
@@ -66,10 +66,10 @@ index ddc5f2d9aa7dda6aff132392927e3d7e3674dbff..3ac48dafe2300ff4cf4591569fec9ce4
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529..06efdd7aa6d35a670e81c4f303618a7ba301396a 100644
+index a9897c494b3dc56d900356d74030359832febbaa..b47d043144c499b1499f6b4be5a16a3f75c9fcb8 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -14,6 +14,10 @@ public class WatchdogThread extends Thread
+@@ -14,6 +14,10 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
      private static WatchdogThread instance;
      private long timeoutTime;
      private boolean restart;
@@ -80,7 +80,7 @@ index 6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529..06efdd7aa6d35a670e81c4f303618a7b
      private volatile long lastTick;
      private volatile boolean stopping;
  
-@@ -22,6 +26,8 @@ public class WatchdogThread extends Thread
+@@ -22,6 +26,8 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
          super( "Paper Watchdog Thread" );
          this.timeoutTime = timeoutTime;
          this.restart = restart;
@@ -89,7 +89,7 @@ index 6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529..06efdd7aa6d35a670e81c4f303618a7b
      }
  
      private static long monotonicMillis()
-@@ -61,9 +67,18 @@ public class WatchdogThread extends Thread
+@@ -61,9 +67,18 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
          while ( !this.stopping )
          {
              //
@@ -110,7 +110,7 @@ index 6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529..06efdd7aa6d35a670e81c4f303618a7b
                  log.log( Level.SEVERE, "------------------------------" );
                  log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
                  log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-@@ -93,29 +108,45 @@ public class WatchdogThread extends Thread
+@@ -93,30 +108,46 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      }
                  }
                  // Paper end
@@ -122,6 +122,7 @@ index 6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529..06efdd7aa6d35a670e81c4f303618a7b
 +                // Paper end - Different message for short timeout
                  log.log( Level.SEVERE, "------------------------------" );
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
                  log.log( Level.SEVERE, "------------------------------" );
                  //
diff --git a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
index 25679ae826..065570f504 100644
--- a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6e88a9e8ea63e54fd191263f105d3e9f81f27f3a..68b6956fc1866fc5b78544cfd348db864b3042e9 100644
+index 49d5410341e949b51c003a0c79d9d77ba5a723f9..98c4a1b8542486f5af1274f974b898a69f2684f1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -636,7 +636,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
similarity index 88%
rename from patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
index 9aa80ee13f..e270dd1d65 100644
--- a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1ea037e33e50ed4f1d4bcbc294cc26cac7cc8d94..f17116ee619338e1dc8ae1fb9d5b18ad28164ba3 100644
+index cdc020e1787c258ba283d86a25ab153237b0e194..2ae9b52d43a44b2164034d9162b644daba618d66 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,10 +18,10 @@ index 1ea037e33e50ed4f1d4bcbc294cc26cac7cc8d94..f17116ee619338e1dc8ae1fb9d5b18ad
      @Nullable
      private QueryThreadGs4 queryThreadGs4;
      // private final RemoteControlCommandListener rconConsoleSource; // CraftBukkit - remove field
-@@ -412,13 +412,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-     }
- 
-     public void handleConsoleInput(String command, CommandSourceStack commandSource) {
+@@ -439,13 +439,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+             return;
+         }
+         // Paper end - rewrite chunk system
 -        this.consoleInput.add(new ConsoleInput(command, commandSource));
 +        this.serverCommandQueue.add(new ConsoleInput(command, commandSource)); // Paper - use proper queue
      }
diff --git a/patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 90%
rename from patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index f36f1d318a..4d0160d028 100644
--- a/patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index f07a6b1d782426581c84ffa19447c1375c4cbc07..719730451635d418b3f5024c35620412add42b7f 100644
+index 8ae78690748b2cb5d5186d8859871c1630e10130..b738e1f7debac7d70910d5ac908ca9d4f60640d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -169,6 +169,13 @@ public class CraftChunk implements Chunk {
+@@ -125,6 +125,13 @@ public class CraftChunk implements Chunk {
  
      @Override
      public BlockState[] getTileEntities() {
@@ -22,7 +22,7 @@ index f07a6b1d782426581c84ffa19447c1375c4cbc07..719730451635d418b3f5024c35620412
          if (!this.isLoaded()) {
              this.getWorld().getChunkAt(x, z); // Transient load for this tick
          }
-@@ -178,7 +185,29 @@ public class CraftChunk implements Chunk {
+@@ -134,7 +141,29 @@ public class CraftChunk implements Chunk {
          BlockState[] entities = new BlockState[chunk.blockEntities.size()];
  
          for (BlockPos position : chunk.blockEntities.keySet()) {
diff --git a/patches/server/0240-Optimize-BlockPosition-helper-methods.patch b/patches/server/0241-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0240-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0241-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0242-Slime-Pathfinder-Events.patch b/patches/server/0243-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0242-Slime-Pathfinder-Events.patch
rename to patches/server/0243-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0244-Optimize-CraftBlockData-Creation.patch b/patches/server/0245-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0244-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0245-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0245-Optimize-MappedRegistry.patch b/patches/server/0246-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0245-Optimize-MappedRegistry.patch
rename to patches/server/0246-Optimize-MappedRegistry.patch
diff --git a/patches/server/0246-Add-PhantomPreSpawnEvent.patch b/patches/server/0247-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0246-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0247-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0247-Add-More-Creeper-API.patch b/patches/server/0248-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0247-Add-More-Creeper-API.patch
rename to patches/server/0248-Add-More-Creeper-API.patch
diff --git a/patches/server/0248-Inventory-removeItemAnySlot.patch b/patches/server/0249-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0248-Inventory-removeItemAnySlot.patch
rename to patches/server/0249-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 87%
rename from patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index f0b0005db7..9e08bc2db2 100644
--- a/patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a9089569e063b5124c246b52b10f4a5728af49e0..b7c5d1c9db8284e2ed51da603ebed36be1563046 100644
+index 71ac1f681fe2518d2b0f52597310e7b538a0b1d8..71e68b9cdafbacc84c317cfb2126d4da472d9f63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -397,7 +397,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -400,7 +400,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
diff --git a/patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
similarity index 86%
rename from patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
index 762e5c4dfd..20ca3168a8 100644
--- a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f1c6baeafb93ae51d4a76d39399cbd99b2e1f92c..d9ada8e35c30dcad123716bf4ca7b3fbbb5bdf4b 100644
+index 4dc09147e29bc43c854546e18cf2af41622a8a8f..d141e55f92d6c7f211a1a91bd5379144137e7b25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2801,6 +2801,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2843,6 +2843,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0252-Improve-death-events.patch b/patches/server/0253-Improve-death-events.patch
similarity index 98%
rename from patches/server/0252-Improve-death-events.patch
rename to patches/server/0253-Improve-death-events.patch
index 6539f069b3..beb38acee3 100644
--- a/patches/server/0252-Improve-death-events.patch
+++ b/patches/server/0253-Improve-death-events.patch
@@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3a9fd9ea736d1b3dbb261158d690e218baa4df96..9f36555177b98f4d66a8b45fc2b3a032c6bbce0d 100644
+index 73762977727f1cbeb52f6eb683b24217e034bc90..4b67d13665b9c52cebd3d5c3a94617f09900726d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -241,6 +241,10 @@ public class ServerPlayer extends Player {
@@ -33,7 +33,7 @@ index 3a9fd9ea736d1b3dbb261158d690e218baa4df96..9f36555177b98f4d66a8b45fc2b3a032
  
      // CraftBukkit start
      public String displayName;
-@@ -831,6 +835,15 @@ public class ServerPlayer extends Player {
+@@ -875,6 +879,15 @@ public class ServerPlayer extends Player {
          String deathmessage = defaultMessage.getString();
          this.keepLevel = keepInventory; // SPIGOT-2222: pre-set keepLevel
          org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, PaperAdventure.asAdventure(defaultMessage), defaultMessage.getString(), keepInventory); // Paper - Adventure
@@ -49,7 +49,7 @@ index 3a9fd9ea736d1b3dbb261158d690e218baa4df96..9f36555177b98f4d66a8b45fc2b3a032
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.containerMenu != this.inventoryMenu) {
-@@ -982,8 +995,17 @@ public class ServerPlayer extends Player {
+@@ -1026,8 +1039,17 @@ public class ServerPlayer extends Player {
                          }
                      }
                  }
@@ -392,10 +392,10 @@ index 6483ad071c119353267a4f13b192a50931995c2a..7eecbe85949e47b367014c04d7a37c2c
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d9ada8e35c30dcad123716bf4ca7b3fbbb5bdf4b..622cd2c42dc51353c29f85abb6ab3cbbed460bfa 100644
+index d141e55f92d6c7f211a1a91bd5379144137e7b25..c4dd9c90c12b6c8fc11a2d683ff73fdc02ff5e5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2301,7 +2301,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2343,7 +2343,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void sendHealthUpdate() {
          FoodData foodData = this.getHandle().getFoodData();
diff --git a/patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0254-Mob-Pathfinding-API.patch b/patches/server/0255-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0254-Mob-Pathfinding-API.patch
rename to patches/server/0255-Mob-Pathfinding-API.patch
diff --git a/patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0259-Honor-EntityAgeable.ageLock.patch b/patches/server/0260-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0259-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0260-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0260-Configurable-connection-throttle-kick-message.patch b/patches/server/0261-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0260-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0261-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0262-Hook-into-CB-plugin-rewrites.patch b/patches/server/0263-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0262-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0263-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0263-PreSpawnerSpawnEvent.patch b/patches/server/0264-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0263-PreSpawnerSpawnEvent.patch
rename to patches/server/0264-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0264-Add-LivingEntity-getTargetEntity.patch b/patches/server/0265-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0264-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0265-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0265-Add-sun-related-API.patch b/patches/server/0266-Add-sun-related-API.patch
similarity index 90%
rename from patches/server/0265-Add-sun-related-API.patch
rename to patches/server/0266-Add-sun-related-API.patch
index 54c247facb..9962323a27 100644
--- a/patches/server/0265-Add-sun-related-API.patch
+++ b/patches/server/0266-Add-sun-related-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add sun related API
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b7c5d1c9db8284e2ed51da603ebed36be1563046..7d9942004b52b4deae7ca09dafb43795d0d9c31d 100644
+index 71e68b9cdafbacc84c317cfb2126d4da472d9f63..08058aced4b27cf86f38b8a205dd3faeea47b007 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -702,6 +702,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -692,6 +692,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
      }
  
diff --git a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 97%
rename from patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 31dae70550..50b2539679 100644
--- a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -13,10 +13,10 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index ff8876b7e7cc2172a2cb5e12d6836b9875cc9aa1..b9949b44553a8ac91565b6e614ac7bd7cd140dd0 100644
+index 82a1a87822e3fc323b92e1aa30ddb0cdb351d89c..d02546b18cb689724887b4e85e8d32a18828a4ad 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -538,4 +538,19 @@ public final class MCUtil {
+@@ -648,4 +648,19 @@ public final class MCUtil {
      public static int getTicketLevelFor(net.minecraft.world.level.chunk.ChunkStatus status) {
          return net.minecraft.server.level.ChunkMap.MAX_VIEW_DISTANCE + net.minecraft.world.level.chunk.ChunkStatus.getDistance(status);
      }
diff --git a/patches/server/0267-Turtle-API.patch b/patches/server/0268-Turtle-API.patch
similarity index 100%
rename from patches/server/0267-Turtle-API.patch
rename to patches/server/0268-Turtle-API.patch
diff --git a/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 91%
rename from patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
index 1c9a88c431..ec64c4989b 100644
--- a/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,10 +19,10 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9f36555177b98f4d66a8b45fc2b3a032c6bbce0d..ddc3522e38b3bafb3c3b32492d842d588efd1495 100644
+index 4b67d13665b9c52cebd3d5c3a94617f09900726d..740544bddc8a6013567cd25f0456f7c9b8c44c65 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1942,6 +1942,19 @@ public class ServerPlayer extends Player {
+@@ -1986,6 +1986,19 @@ public class ServerPlayer extends Player {
  
          this.camera = (Entity) (entity == null ? this : entity);
          if (entity1 != this.camera) {
@@ -42,7 +42,7 @@ index 9f36555177b98f4d66a8b45fc2b3a032c6bbce0d..ddc3522e38b3bafb3c3b32492d842d58
              Level world = this.camera.level();
  
              if (world instanceof ServerLevel) {
-@@ -1957,7 +1970,6 @@ public class ServerPlayer extends Player {
+@@ -2001,7 +2014,6 @@ public class ServerPlayer extends Player {
              this.connection.send(new ClientboundSetCameraPacket(this.camera));
              this.connection.resetPosition();
          }
diff --git a/patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0270-Add-more-Witch-API.patch b/patches/server/0271-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0270-Add-more-Witch-API.patch
rename to patches/server/0271-Add-more-Witch-API.patch
diff --git a/patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 95%
rename from patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 5c4d6841b8..dcf7a97fc0 100644
--- a/patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 423390ff2508ab9af804925044142ea289068bae..a0e1010066b34650f5c554bfa8324ed0621f77f0 100644
+index 36cc7b95613139b0ebc0b7b3525bc56814c11949..f1e730acceb8a539238857d7005406a515833a4f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -466,9 +466,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -39,7 +39,7 @@ index 423390ff2508ab9af804925044142ea289068bae..a0e1010066b34650f5c554bfa8324ed0
                  if (d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
                  // CraftBukkit end
                      ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", new Object[]{entity.getName().getString(), this.player.getName().getString(), d6, d7, d8});
-@@ -1149,9 +1159,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1156,9 +1166,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.allowedPlayerTicks = 20; // CraftBukkit
                  } else {
                      this.awaitingTeleportTime = this.tickCount;
@@ -52,7 +52,7 @@ index 423390ff2508ab9af804925044142ea289068bae..a0e1010066b34650f5c554bfa8324ed0
                      float f = Mth.wrapDegrees(packet.getYRot(this.player.getYRot()));
                      float f1 = Mth.wrapDegrees(packet.getXRot(this.player.getXRot()));
  
-@@ -1206,6 +1216,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1213,6 +1223,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              } else {
                                  speed = this.player.getAbilities().walkingSpeed * 10f;
                              }
diff --git a/patches/server/0273-Reset-players-airTicks-on-respawn.patch b/patches/server/0274-Reset-players-airTicks-on-respawn.patch
similarity index 83%
rename from patches/server/0273-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0274-Reset-players-airTicks-on-respawn.patch
index 63d5c3d162..0b4fd916e3 100644
--- a/patches/server/0273-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0274-Reset-players-airTicks-on-respawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ddc3522e38b3bafb3c3b32492d842d588efd1495..10044e1d596665b8f8b88f0baf1c61c8d3af0c4e 100644
+index 740544bddc8a6013567cd25f0456f7c9b8c44c65..ca74bfbfe3863eb3b098252d39afa0d4b3398a5e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2414,6 +2414,7 @@ public class ServerPlayer extends Player {
+@@ -2458,6 +2458,7 @@ public class ServerPlayer extends Player {
  
          this.setHealth(this.getMaxHealth());
          this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
diff --git a/patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 98%
rename from patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index a1cd74fc4a..388cea5974 100644
--- a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -79,7 +79,7 @@ index 30237ca94a36197ce21369bdcc7bb1dfafe02680..5e9401f0c2de0743aca9237ee8c4dfba
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 715ebeb36f0620eaeafa63bf87a30e63363069a3..c2a2985362672aba907039907605b3ea3e53262c 100644
+index 41bad67b3a6b8ccdcf9467858cb7d9c0e0a03f0e..08f1a442137da542d23957b86db8ad4c62e771b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0276-Optimize-World-Time-Updates.patch b/patches/server/0277-Optimize-World-Time-Updates.patch
similarity index 94%
rename from patches/server/0276-Optimize-World-Time-Updates.patch
rename to patches/server/0277-Optimize-World-Time-Updates.patch
index 5857b16844..4f8393d3d2 100644
--- a/patches/server/0276-Optimize-World-Time-Updates.patch
+++ b/patches/server/0277-Optimize-World-Time-Updates.patch
@@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c2a2985362672aba907039907605b3ea3e53262c..0f50236866984efd7b8cb95373215b240117be0d 100644
+index 08f1a442137da542d23957b86db8ad4c62e771b4..950265d4ba677432b224bd8f2e5cb5076a9103fa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1379,12 +1379,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1373,12 +1373,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
diff --git a/patches/server/0277-Restore-custom-InventoryHolder-support.patch b/patches/server/0278-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0277-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0278-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0278-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0279-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0278-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0279-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0279-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0280-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0279-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0280-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 96%
rename from patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
index 0b18d06449..b22bcfa3ff 100644
--- a/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,10 +59,10 @@ index 7adf7d1248680e591638298f13f5ae88788f5e4c..bdf11a98614c9c12d3112f437651be81
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a0e1010066b34650f5c554bfa8324ed0621f77f0..8b26ce9c8d1003ef611cdc14aee3f5d4cfd6a6fb 100644
+index f1e730acceb8a539238857d7005406a515833a4f..54105a484ce0ad074cb2183abff322fdf49478b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1554,6 +1554,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1561,6 +1561,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              case START_DESTROY_BLOCK:
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
diff --git a/patches/server/0281-Make-the-default-permission-message-configurable.patch b/patches/server/0282-Make-the-default-permission-message-configurable.patch
similarity index 88%
rename from patches/server/0281-Make-the-default-permission-message-configurable.patch
rename to patches/server/0282-Make-the-default-permission-message-configurable.patch
index d63fb7ba22..83428ced3e 100644
--- a/patches/server/0281-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0282-Make-the-default-permission-message-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index de0e1ad2c78e5132651494f198703533847c84bd..830978f3409888302ab857161628cee5869efa8f 100644
+index 0dd48e4098191c8b6e29945d62bc473e9f3a1e77..ae51993e0de706cb62c96795ca9de7663893a5bf 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -74,7 +74,7 @@ public final class PaperCommand extends Command {
+@@ -75,7 +75,7 @@ public final class PaperCommand extends Command {
          if (sender.hasPermission(BASE_PERM + permission) || sender.hasPermission("bukkit.command.paper")) {
              return true;
          }
@@ -18,7 +18,7 @@ index de0e1ad2c78e5132651494f198703533847c84bd..830978f3409888302ab857161628cee5
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7afc77aa2b9959689d18b0a93c9d87e663b0f034..223e43758a009a9f5d97e9e89745bb12f2d72d2f 100644
+index 145476b25f7d7d60c7bc4891e71484c74011cac2..4acb515c423a55c9bb7ba87504cb5a04c58d2bf8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2708,6 +2708,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
similarity index 97%
rename from patches/server/0283-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
index 19fb8af125..f315c755c8 100644
--- a/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
@@ -7,10 +7,10 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 2d7f332910328cef616609dc4c89facafcbe66cc..ff97e47cb248ade6530e52583b0b3865d77ace15 100644
+index 837cc21af01e691eb9e877479a67ce94d5b2bc06..8af273d3aa3989e148ca93528754a13e1d1bf414 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -144,6 +144,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -166,6 +166,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
  
      public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwable throwable) {
diff --git a/patches/server/0284-force-entity-dismount-during-teleportation.patch b/patches/server/0285-force-entity-dismount-during-teleportation.patch
similarity index 93%
rename from patches/server/0284-force-entity-dismount-during-teleportation.patch
rename to patches/server/0285-force-entity-dismount-during-teleportation.patch
index 19fe847955..3370e15d3d 100644
--- a/patches/server/0284-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0285-force-entity-dismount-during-teleportation.patch
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 72c5fde2220524f66a2608ecfa96c7b56f8b198c..d0779d38c56ca1c01abd154720d2865d14479a30 100644
+index 63f9f874ef9da0d5f0c6d6df2901be27df5e30a0..72c33eaa232503c373bf8cf9a1c1c7603923e80a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2524,11 +2524,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2576,11 +2576,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void removeVehicle() {
@@ -41,7 +41,7 @@ index 72c5fde2220524f66a2608ecfa96c7b56f8b198c..d0779d38c56ca1c01abd154720d2865d
          }
  
      }
-@@ -2559,7 +2564,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2611,7 +2616,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  
@@ -53,7 +53,7 @@ index 72c5fde2220524f66a2608ecfa96c7b56f8b198c..d0779d38c56ca1c01abd154720d2865d
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2569,7 +2577,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2621,7 +2629,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) this.getBukkitEntity(),
@@ -62,7 +62,7 @@ index 72c5fde2220524f66a2608ecfa96c7b56f8b198c..d0779d38c56ca1c01abd154720d2865d
                  );
                  // Suppress during worldgen
                  if (this.valid) {
-@@ -2583,7 +2591,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2635,7 +2643,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
              // CraftBukkit end
              // Spigot start
diff --git a/patches/server/0285-Add-more-Zombie-API.patch b/patches/server/0286-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0285-Add-more-Zombie-API.patch
rename to patches/server/0286-Add-more-Zombie-API.patch
diff --git a/patches/server/0286-Book-Size-Limits.patch b/patches/server/0287-Book-Size-Limits.patch
similarity index 94%
rename from patches/server/0286-Book-Size-Limits.patch
rename to patches/server/0287-Book-Size-Limits.patch
index 7990644879..3058d5f68d 100644
--- a/patches/server/0286-Book-Size-Limits.patch
+++ b/patches/server/0287-Book-Size-Limits.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8b26ce9c8d1003ef611cdc14aee3f5d4cfd6a6fb..08af9c32f8cb40e1e94cfb5c42ee113e8765db86 100644
+index 54105a484ce0ad074cb2183abff322fdf49478b7..42aec20c6ddfdbce688aa6a11e3b4ef99efcf15d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1016,6 +1016,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1023,6 +1023,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {
diff --git a/patches/server/0287-Add-PlayerConnectionCloseEvent.patch b/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
similarity index 96%
rename from patches/server/0287-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0288-Add-PlayerConnectionCloseEvent.patch
index 932a754c2c..2c7847d36b 100644
--- a/patches/server/0287-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
@@ -39,10 +39,10 @@ public net.minecraft.server.network.ServerLoginPacketListenerImpl state
 public net.minecraft.server.network.ServerLoginPacketListenerImpl gameProfile
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index ff97e47cb248ade6530e52583b0b3865d77ace15..62df5c51fa11f85ec2fad20c0ea5aa6241294e8a 100644
+index 8af273d3aa3989e148ca93528754a13e1d1bf414..08361da4ebd301996b0aaafc58beb5ec6698ff44 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -632,6 +632,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -661,6 +661,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
                      packetlistener1.onDisconnect(ichatbasecomponent);
                  }
                  this.pendingActions.clear(); // Free up packet queue.
diff --git a/patches/server/0288-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0288-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 93%
rename from patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 055a0ad0f0..759bc012dc 100644
--- a/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 10044e1d596665b8f8b88f0baf1c61c8d3af0c4e..78405a80e16f44231c0d4ee10d283c521aead686 100644
+index ca74bfbfe3863eb3b098252d39afa0d4b3398a5e..c3e238933436bd9b8705e8d23c499b0cadfdfab5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -241,6 +241,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 10044e1d596665b8f8b88f0baf1c61c8d3af0c4e..78405a80e16f44231c0d4ee10d283c52
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 68b6956fc1866fc5b78544cfd348db864b3042e9..7b094b859fe4c865cd369108700d5b0d6573c019 100644
+index 98c4a1b8542486f5af1274f974b898a69f2684f1..45bfb32505dfd2a66d8a6ee4627ec293a88da818 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -181,6 +181,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index aac78c13361b19efa7b43a0c95458390f1ba8340..f572a74b85df36a6da76b78ec29d8072
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 622cd2c42dc51353c29f85abb6ab3cbbed460bfa..f38de4bf4f45e2069e4baaf960b6fac542b1a08e 100644
+index c4dd9c90c12b6c8fc11a2d683ff73fdc02ff5e5c..14d8c5636b6a1fe0c18086a98469ba30f1325b6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -195,6 +195,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -117,7 +117,7 @@ index 622cd2c42dc51353c29f85abb6ab3cbbed460bfa..f38de4bf4f45e2069e4baaf960b6fac5
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1910,6 +1911,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1952,6 +1953,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index 622cd2c42dc51353c29f85abb6ab3cbbed460bfa..f38de4bf4f45e2069e4baaf960b6fac5
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1932,6 +1945,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1974,6 +1987,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index 622cd2c42dc51353c29f85abb6ab3cbbed460bfa..f38de4bf4f45e2069e4baaf960b6fac5
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1946,6 +1961,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1988,6 +2003,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
diff --git a/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 85%
rename from patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 6374eec50b..e31c54b6f5 100644
--- a/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 78405a80e16f44231c0d4ee10d283c521aead686..9ad2e953a3b4a7a2f4ce375a1b209820cdef2d47 100644
+index c3e238933436bd9b8705e8d23c499b0cadfdfab5..9f32eea06954a2d695e7ebdb9f180ecb15c44f63 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1603,6 +1603,13 @@ public class ServerPlayer extends Player {
+@@ -1647,6 +1647,13 @@ public class ServerPlayer extends Player {
      public void disconnect() {
          this.disconnected = true;
          this.ejectPassengers();
diff --git a/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 90%
rename from patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
index c189c0b86e..121eb4c612 100644
--- a/patches/server/0291-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f38de4bf4f45e2069e4baaf960b6fac542b1a08e..1fecbdbc382a47aa76bd562fb3cc0625b7807bfc 100644
+index 14d8c5636b6a1fe0c18086a98469ba30f1325b6a..6ef5547264dcd557a4dcdb5392b9fd5ef22d143d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2848,6 +2848,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2890,6 +2890,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetAttackStrengthTicker();
      }
diff --git a/patches/server/0292-BlockDestroyEvent.patch b/patches/server/0293-BlockDestroyEvent.patch
similarity index 93%
rename from patches/server/0292-BlockDestroyEvent.patch
rename to patches/server/0293-BlockDestroyEvent.patch
index 0b2a57fd43..8aeb73edf5 100644
--- a/patches/server/0292-BlockDestroyEvent.patch
+++ b/patches/server/0293-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e66e35b25dfce6f071173de87c452a9dd38fcf4d..9fa7dd67ebe5d7d4125e970dbe2e3b201b01f6aa 100644
+index 18234d71eba7d2a2874f3e5c9628d82970acc033..b3a0f4dd651dda29d2064b629da67378c00a6a78 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -30,6 +30,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -22,7 +22,7 @@ index e66e35b25dfce6f071173de87c452a9dd38fcf4d..9fa7dd67ebe5d7d4125e970dbe2e3b20
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.FullChunkStatus;
  import net.minecraft.server.level.ServerLevel;
-@@ -661,8 +662,21 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -666,8 +667,21 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/server/0293-Async-command-map-building.patch b/patches/server/0294-Async-command-map-building.patch
similarity index 95%
rename from patches/server/0293-Async-command-map-building.patch
rename to patches/server/0294-Async-command-map-building.patch
index 2528f49959..09e485ed88 100644
--- a/patches/server/0293-Async-command-map-building.patch
+++ b/patches/server/0294-Async-command-map-building.patch
@@ -53,10 +53,10 @@ index e63632f09d608371aaeaf09a6dac57c1d8a719d4..bbf4db5faf4694e78e01f4e74e277b46
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0f50236866984efd7b8cb95373215b240117be0d..bace1ff9e64bd8bec334c5e1d1fd1c621a63cd92 100644
+index 950265d4ba677432b224bd8f2e5cb5076a9103fa..afc8a65c0513a394f5a6736a952afba1397cae6a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -870,6 +870,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -880,6 +880,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          MinecraftServer.LOGGER.info("Stopping server");
diff --git a/patches/server/0294-Implement-Brigadier-Mojang-API.patch b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
similarity index 98%
rename from patches/server/0294-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0295-Implement-Brigadier-Mojang-API.patch
index 8768a42347..2db9ed409a 100644
--- a/patches/server/0294-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
@@ -131,10 +131,10 @@ index bbf4db5faf4694e78e01f4e74e277b46a02f7afd..148cfe9eac43cafee016d58a1344a97a
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 08af9c32f8cb40e1e94cfb5c42ee113e8765db86..aed6d2420afeb404b5542f19d7424b6c14d0b636 100644
+index 42aec20c6ddfdbce688aa6a11e3b4ef99efcf15d..cb190a36c21a5a9002721e2951cc0dcbae44d496 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -732,8 +732,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -739,8 +739,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
  
                          this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
@@ -149,7 +149,7 @@ index 08af9c32f8cb40e1e94cfb5c42ee113e8765db86..aed6d2420afeb404b5542f19d7424b6c
                          });
                      });
                  }
-@@ -748,7 +752,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -755,7 +759,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          builder.suggest(completion.suggestion(), PaperAdventure.asVanilla(completion.tooltip()));
                      }
                  });
diff --git a/patches/server/0295-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0296-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0295-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0296-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0296-Limit-Client-Sign-length-more.patch b/patches/server/0297-Limit-Client-Sign-length-more.patch
similarity index 94%
rename from patches/server/0296-Limit-Client-Sign-length-more.patch
rename to patches/server/0297-Limit-Client-Sign-length-more.patch
index f12ff89878..1d3574a0f2 100644
--- a/patches/server/0296-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0297-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aed6d2420afeb404b5542f19d7424b6c14d0b636..717f23a92017a589e639c09e15377e30f602d8fe 100644
+index cb190a36c21a5a9002721e2951cc0dcbae44d496..467ae1d550191f7ba17b7822daaf753cae9d6fda 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -288,6 +288,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -33,7 +33,7 @@ index aed6d2420afeb404b5542f19d7424b6c14d0b636..717f23a92017a589e639c09e15377e30
  
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
          super(server, connection, clientData, player); // CraftBukkit
-@@ -3044,7 +3045,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3051,7 +3052,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
diff --git a/patches/server/0297-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0297-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from patches/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 6a698f18f9..a9e1668d8d 100644
--- a/patches/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7b094b859fe4c865cd369108700d5b0d6573c019..b97ffb7746b2be70285addd091711fef0c2b1b87 100644
+index 45bfb32505dfd2a66d8a6ee4627ec293a88da818..2e4e90223160361e21e651c9dbcffdef7b235af7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1151,6 +1151,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0299-Entity-getEntitySpawnReason.patch b/patches/server/0300-Entity-getEntitySpawnReason.patch
similarity index 93%
rename from patches/server/0299-Entity-getEntitySpawnReason.patch
rename to patches/server/0300-Entity-getEntitySpawnReason.patch
index 4db244395b..b72984e849 100644
--- a/patches/server/0299-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0300-Entity-getEntitySpawnReason.patch
@@ -22,10 +22,10 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..a7c89cdf20cb63792c76de81c1ff9f2c
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index af33e4be10c9d571eb6f7ba5730b7ed4d8647761..6978abb97da6c33099db2e4ead3f33b0ca87bed1 100644
+index 5de07950d549716e917ec3fd2f364c994007333e..440ea09a6645e0c094a9378b6fbacf335ab04d1b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1197,6 +1197,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1431,6 +1431,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return true;
          }
          // Paper end
@@ -34,7 +34,7 @@ index af33e4be10c9d571eb6f7ba5730b7ed4d8647761..6978abb97da6c33099db2e4ead3f33b0
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b97ffb7746b2be70285addd091711fef0c2b1b87..3831c724dfcdf97129c6fd8dab0c7a91fa3e7679 100644
+index 2e4e90223160361e21e651c9dbcffdef7b235af7..11e52541ea928e77c2913ff4029bde8c612ee229 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -225,6 +225,11 @@ public abstract class PlayerList {
@@ -59,7 +59,7 @@ index b97ffb7746b2be70285addd091711fef0c2b1b87..3831c724dfcdf97129c6fd8dab0c7a91
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d0779d38c56ca1c01abd154720d2865d14479a30..7c23f63fd642002cac597da2eafc5f0b4232d5a4 100644
+index 72c33eaa232503c373bf8cf9a1c1c7603923e80a..af707404bfbba0ded894b6bd29c87c07e62b7854 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -234,6 +234,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -70,7 +70,7 @@ index d0779d38c56ca1c01abd154720d2865d14479a30..7c23f63fd642002cac597da2eafc5f0b
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
      private CraftEntity bukkitEntity;
-@@ -2137,6 +2138,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2189,6 +2190,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
                  nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -80,7 +80,7 @@ index d0779d38c56ca1c01abd154720d2865d14479a30..7c23f63fd642002cac597da2eafc5f0b
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbt.putBoolean("Paper.FromMobSpawner", true);
-@@ -2283,6 +2287,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2335,6 +2339,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/server/0300-Fire-event-on-GS4-query.patch b/patches/server/0301-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0300-Fire-event-on-GS4-query.patch
rename to patches/server/0301-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0301-Implement-PlayerPostRespawnEvent.patch b/patches/server/0302-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0301-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0302-Implement-PlayerPostRespawnEvent.patch
index 349aa918ff..3a208b92c8 100644
--- a/patches/server/0301-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0302-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3831c724dfcdf97129c6fd8dab0c7a91fa3e7679..3c4224472ce59d7a2c1748d510e4fc8f58a7d5e1 100644
+index 11e52541ea928e77c2913ff4029bde8c612ee229..b9da3530f72ebb3854da7c96ee20431efb0c93bd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -753,9 +753,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0303-Server-Tick-Events.patch b/patches/server/0304-Server-Tick-Events.patch
similarity index 85%
rename from patches/server/0303-Server-Tick-Events.patch
rename to patches/server/0304-Server-Tick-Events.patch
index c08c011b0c..13e4840fa3 100644
--- a/patches/server/0303-Server-Tick-Events.patch
+++ b/patches/server/0304-Server-Tick-Events.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bace1ff9e64bd8bec334c5e1d1fd1c621a63cd92..8ce9b9444c46956eeace333206eefd3ebca1e0c0 100644
+index afc8a65c0513a394f5a6736a952afba1397cae6a..679211aed0fc5bdd630369aa9c82aa6aca9059f4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1292,6 +1292,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1286,6 +1286,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
          // Paper end
@@ -17,7 +17,7 @@ index bace1ff9e64bd8bec334c5e1d1fd1c621a63cd92..8ce9b9444c46956eeace333206eefd3e
  
          ++this.tickCount;
          this.tickChildren(shouldKeepTicking);
-@@ -1313,6 +1314,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1307,6 +1308,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.runAllTasks();
          }
          // Paper end
diff --git a/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
similarity index 92%
rename from patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
index e29f69afa3..32316e5817 100644
--- a/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,10 +11,10 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9ad2e953a3b4a7a2f4ce375a1b209820cdef2d47..e66d24174d5834cb9526fa4a238d0765bef827b2 100644
+index 9f32eea06954a2d695e7ebdb9f180ecb15c44f63..678cfedf124c30ab34843995aa86a11a7d9b1aa1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -806,6 +806,46 @@ public class ServerPlayer extends Player {
+@@ -850,6 +850,46 @@ public class ServerPlayer extends Player {
          });
      }
  
@@ -61,7 +61,7 @@ index 9ad2e953a3b4a7a2f4ce375a1b209820cdef2d47..e66d24174d5834cb9526fa4a238d0765
      @Override
      public void die(DamageSource damageSource) {
          this.gameEvent(GameEvent.ENTITY_DIE);
-@@ -889,7 +929,12 @@ public class ServerPlayer extends Player {
+@@ -933,7 +973,12 @@ public class ServerPlayer extends Player {
          this.dropExperience();
          // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
          if (!event.getKeepInventory()) {
diff --git a/patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
similarity index 78%
rename from patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
index 79bc8bc67d..b58f0b7c64 100644
--- a/patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9fa7dd67ebe5d7d4125e970dbe2e3b201b01f6aa..4968e036350631b79a8c7e70fdc32db4bcff2ade 100644
+index b3a0f4dd651dda29d2064b629da67378c00a6a78..b1111e644f860f40a944fd43ac900db4615a1c5e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -977,9 +977,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -982,9 +982,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
@@ -26,5 +26,5 @@ index 9fa7dd67ebe5d7d4125e970dbe2e3b201b01f6aa..4968e036350631b79a8c7e70fdc32db4
          }
 +        // Paper end
          // CraftBukkit end
-         return this.isOutsideBuildHeight(blockposition) ? null : (!this.isClientSide && Thread.currentThread() != this.thread ? null : this.getChunkAt(blockposition).getBlockEntity(blockposition, LevelChunk.EntityCreationType.IMMEDIATE));
+         return this.isOutsideBuildHeight(blockposition) ? null : (!this.isClientSide && !io.papermc.paper.util.TickThread.isTickThread() ? null : this.getChunkAt(blockposition).getBlockEntity(blockposition, LevelChunk.EntityCreationType.IMMEDIATE)); // Paper - rewrite chunk system
      }
diff --git a/patches/server/0306-Add-Heightmap-API.patch b/patches/server/0307-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0306-Add-Heightmap-API.patch
rename to patches/server/0307-Add-Heightmap-API.patch
index adddc3de3f..42b59f7fd6 100644
--- a/patches/server/0306-Add-Heightmap-API.patch
+++ b/patches/server/0307-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7d9942004b52b4deae7ca09dafb43795d0d9c31d..00267800750ad2a4817b39c9c19a9336aff2299d 100644
+index 08058aced4b27cf86f38b8a205dd3faeea47b007..4776242cb73213686d3e020ef36fea77ef905598 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -219,6 +219,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0307-Mob-Spawner-API-Enhancements.patch b/patches/server/0308-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0307-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0308-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0308-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0308-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0310-Implement-CraftBlockSoundGroup.patch b/patches/server/0311-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0310-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0311-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 96%
rename from patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 3fc5d96721..47d9458307 100644
--- a/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ce9b9444c46956eeace333206eefd3ebca1e0c0..5b274f766e8cf55151ac6499fa1a68b9a0816b57 100644
+index 679211aed0fc5bdd630369aa9c82aa6aca9059f4..4d3cd4a5dbf7adb482e60dc88ededdaccf558061 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -722,30 +722,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -63,10 +63,10 @@ index 8ce9b9444c46956eeace333206eefd3ebca1e0c0..5b274f766e8cf55151ac6499fa1a68b9
          // this.updateMobSpawningFlags();
          worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6978abb97da6c33099db2e4ead3f33b0ca87bed1..74bddd7f37af06355549128bb0bfc1d7eedd2bb8 100644
+index 440ea09a6645e0c094a9378b6fbacf335ab04d1b..c4ae2f4f1ec9aa39478815f46e0d1d13144acf5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1625,12 +1625,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1859,12 +1859,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return ((MapIndex) this.getServer().overworld().getDataStorage().computeIfAbsent(MapIndex.factory(), "idcounts")).getFreeAuxValueForMap();
      }
  
@@ -191,10 +191,10 @@ index 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844f
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 00267800750ad2a4817b39c9c19a9336aff2299d..d9d327326f5fbf861f7b8ab6120ca2f2e8c8b360 100644
+index 4776242cb73213686d3e020ef36fea77ef905598..f1278670dbc4ad5f879aaffb78e1df5a28734738 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1360,15 +1360,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1350,15 +1350,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setKeepSpawnInMemory(boolean keepLoaded) {
diff --git a/patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
similarity index 91%
rename from patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
index 551f5cc3d7..1f7cc7c892 100644
--- a/patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
@@ -33,31 +33,30 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 9e65b56fd2d5af6be305efa08e7c569e6598343a..bbf84e05d8c2ac5ad8e3837756421b6bda65f91c 100644
+index ddcc212ba83d9365adb842b3d3ced64e3d7dd155..b5283dae63fa669a6d53277156c4afb6c96fc489 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -18,8 +18,12 @@ import java.nio.file.LinkOption;
+@@ -18,8 +18,11 @@ import java.nio.file.LinkOption;
  import java.nio.file.Path;
  import java.nio.file.StandardCopyOption;
  import java.nio.file.StandardOpenOption;
 +import java.util.zip.InflaterInputStream; // Paper
-+
  import javax.annotation.Nullable;
  import net.minecraft.Util;
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.nbt.NbtIo;
++import net.minecraft.nbt.CompoundTag; // Paper
++import net.minecraft.nbt.NbtIo; // Paper
  import net.minecraft.world.level.ChunkPos;
  import org.slf4j.Logger;
  
-@@ -44,6 +48,7 @@ public class RegionFile implements AutoCloseable {
-     private final IntBuffer timestamps;
+@@ -45,6 +48,7 @@ public class RegionFile implements AutoCloseable {
      @VisibleForTesting
      protected final RegionBitmap usedSectors;
+     public final java.util.concurrent.locks.ReentrantLock fileLock = new java.util.concurrent.locks.ReentrantLock(true); // Paper
 +    public final Path regionFile; // Paper
  
      public RegionFile(Path file, Path directory, boolean dsync) throws IOException {
          this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync);
-@@ -51,6 +56,8 @@ public class RegionFile implements AutoCloseable {
+@@ -52,6 +56,8 @@ public class RegionFile implements AutoCloseable {
  
      public RegionFile(Path file, Path directory, RegionFileVersion outputChunkStreamVersion, boolean dsync) throws IOException {
          this.header = ByteBuffer.allocateDirect(8192);
@@ -66,7 +65,7 @@ index 9e65b56fd2d5af6be305efa08e7c569e6598343a..bbf84e05d8c2ac5ad8e3837756421b6b
          this.usedSectors = new RegionBitmap();
          this.version = outputChunkStreamVersion;
          if (!Files.isDirectory(directory, new LinkOption[0])) {
-@@ -420,6 +427,74 @@ public class RegionFile implements AutoCloseable {
+@@ -430,6 +436,74 @@ public class RegionFile implements AutoCloseable {
  
      }
  
@@ -142,10 +141,10 @@ index 9e65b56fd2d5af6be305efa08e7c569e6598343a..bbf84e05d8c2ac5ad8e3837756421b6b
  
          private final ChunkPos pos;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 32880df5c96e77c8db8198c91a0a3efe8968199e..a07aca1955f5332aea22bbcf00d0980ed5b48ae6 100644
+index 465ad0bae446a20e941e8f2dbf2d85f2627482b9..42dc999d820e62c6a222afbd9239cc671fc7de53 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -53,6 +53,71 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -121,6 +121,71 @@ public class RegionFileStorage implements AutoCloseable {
          }
      }
  
@@ -217,8 +216,8 @@ index 32880df5c96e77c8db8198c91a0a3efe8968199e..a07aca1955f5332aea22bbcf00d0980e
      @Nullable
      public CompoundTag read(ChunkPos pos) throws IOException {
          // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
-@@ -63,6 +128,12 @@ public class RegionFileStorage implements AutoCloseable {
-         // CraftBukkit end
+@@ -132,6 +197,12 @@ public class RegionFileStorage implements AutoCloseable {
+         try { // Paper
          DataInputStream datainputstream = regionfile.getChunkDataInputStream(pos);
  
 +        // Paper start
@@ -230,7 +229,7 @@ index 32880df5c96e77c8db8198c91a0a3efe8968199e..a07aca1955f5332aea22bbcf00d0980e
          CompoundTag nbttagcompound;
          label43:
          {
-@@ -141,6 +212,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -218,6 +289,7 @@ public class RegionFileStorage implements AutoCloseable {
  
              try {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
diff --git a/patches/server/0313-Expose-the-internal-current-tick.patch b/patches/server/0314-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0313-Expose-the-internal-current-tick.patch
rename to patches/server/0314-Expose-the-internal-current-tick.patch
index 989241d7b3..a7d618c0e6 100644
--- a/patches/server/0313-Expose-the-internal-current-tick.patch
+++ b/patches/server/0314-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 223e43758a009a9f5d97e9e89745bb12f2d72d2f..da2c850b1625758c0bb387930788b6e9f03555d9 100644
+index 4acb515c423a55c9bb7ba87504cb5a04c58d2bf8..fcb0f9cf49495ffbfd9acd25cd3049ca63fb33b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2749,5 +2749,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0314-Fix-World-isChunkGenerated-calls.patch b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch
similarity index 91%
rename from patches/server/0314-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0315-Fix-World-isChunkGenerated-calls.patch
index 15d945731b..27c6d0a372 100644
--- a/patches/server/0314-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch
@@ -8,11 +8,11 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 58125d6d08cebf80e792baf809f2c8c1d8a738e5..6682318c9430430af6cba4e7e6e4cd07cfca0333 100644
+index 165daf5e4b44425974703e9f603955fa09984f1b..a8533bbac77c6024cd6163149affe4f4733019b5 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1172,9 +1172,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     }
+@@ -666,9 +666,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     // Paper end
  
      private CompletableFuture<Optional<CompoundTag>> readChunk(ChunkPos chunkPos) {
 -        return this.read(chunkPos).thenApplyAsync((optional) -> {
@@ -28,7 +28,7 @@ index 58125d6d08cebf80e792baf809f2c8c1d8a738e5..6682318c9430430af6cba4e7e6e4cd07
      }
  
      // CraftBukkit start
-@@ -1183,6 +1187,63 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -677,6 +681,63 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          // CraftBukkit end
      }
  
@@ -93,11 +93,11 @@ index 58125d6d08cebf80e792baf809f2c8c1d8a738e5..6682318c9430430af6cba4e7e6e4cd07
          // Spigot start
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index bbf84e05d8c2ac5ad8e3837756421b6bda65f91c..13ab2d2d8d0d3ab0facbae8285b09267765cc97d 100644
+index b5283dae63fa669a6d53277156c4afb6c96fc489..8ef37d5f9a60f1bc62d5ef54a419ec1404659dde 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -50,6 +50,30 @@ public class RegionFile implements AutoCloseable {
-     protected final RegionBitmap usedSectors;
+     public final java.util.concurrent.locks.ReentrantLock fileLock = new java.util.concurrent.locks.ReentrantLock(true); // Paper
      public final Path regionFile; // Paper
  
 +    // Paper start - Cache chunk status
@@ -127,7 +127,7 @@ index bbf84e05d8c2ac5ad8e3837756421b6bda65f91c..13ab2d2d8d0d3ab0facbae8285b09267
      public RegionFile(Path file, Path directory, boolean dsync) throws IOException {
          this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync);
      }
-@@ -397,11 +421,13 @@ public class RegionFile implements AutoCloseable {
+@@ -397,6 +421,7 @@ public class RegionFile implements AutoCloseable {
          return this.getOffset(pos) != 0;
      }
  
@@ -135,17 +135,19 @@ index bbf84e05d8c2ac5ad8e3837756421b6bda65f91c..13ab2d2d8d0d3ab0facbae8285b09267
      private static int getOffsetIndex(ChunkPos pos) {
          return pos.getRegionLocalX() + pos.getRegionLocalZ() * 32;
      }
- 
-     public void close() throws IOException {
+@@ -407,6 +432,7 @@ public class RegionFile implements AutoCloseable {
+         synchronized (this) {
+         try {
+         // Paper end
 +        this.closed = true; // Paper
          try {
              this.padToFullSector();
          } finally {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index a07aca1955f5332aea22bbcf00d0980ed5b48ae6..37144c084bd242f9c50b972f46da5ac2671ed20d 100644
+index 42dc999d820e62c6a222afbd9239cc671fc7de53..b850dba2b0fa5bc762b170ed7083cf8904761f17 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -212,6 +212,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -289,6 +289,7 @@ public class RegionFileStorage implements AutoCloseable {
  
              try {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
@@ -154,7 +156,7 @@ index a07aca1955f5332aea22bbcf00d0980ed5b48ae6..37144c084bd242f9c50b972f46da5ac2
              } catch (Throwable throwable) {
                  if (dataoutputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d9d327326f5fbf861f7b8ab6120ca2f2e8c8b360..b266cd21fec4c48d2fc4676eb30b1bfdaa4acd98 100644
+index f1278670dbc4ad5f879aaffb78e1df5a28734738..f5e54c4adc9466ba23a665cc8d14b2ce4efd00d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -307,9 +307,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -183,7 +185,7 @@ index d9d327326f5fbf861f7b8ab6120ca2f2e8c8b360..b266cd21fec4c48d2fc4676eb30b1bfd
              throw new RuntimeException(ex);
          }
      }
-@@ -420,20 +434,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -423,20 +437,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
diff --git a/patches/server/0315-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0315-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0317-Configurable-projectile-relative-velocity.patch b/patches/server/0318-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0317-Configurable-projectile-relative-velocity.patch
rename to patches/server/0318-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0318-offset-item-frame-ticking.patch b/patches/server/0319-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0318-offset-item-frame-ticking.patch
rename to patches/server/0319-offset-item-frame-ticking.patch
diff --git a/patches/server/0319-Fix-MC-158900.patch b/patches/server/0320-Fix-MC-158900.patch
similarity index 94%
rename from patches/server/0319-Fix-MC-158900.patch
rename to patches/server/0320-Fix-MC-158900.patch
index 940a0d08ca..ef03c99b3d 100644
--- a/patches/server/0319-Fix-MC-158900.patch
+++ b/patches/server/0320-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3c4224472ce59d7a2c1748d510e4fc8f58a7d5e1..b4ded40387006821433db1de85ed1c2347757155 100644
+index b9da3530f72ebb3854da7c96ee20431efb0c93bd..cffda75eebe70e1c9b5ac7905f69929b2634aeb0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -629,8 +629,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0321-Dont-send-unnecessary-sign-update.patch b/patches/server/0322-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0321-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0322-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0322-Add-option-to-disable-pillager-patrols.patch b/patches/server/0323-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0322-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0323-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0323-Flat-bedrock-generator-settings.patch b/patches/server/0324-Flat-bedrock-generator-settings.patch
similarity index 99%
rename from patches/server/0323-Flat-bedrock-generator-settings.patch
rename to patches/server/0324-Flat-bedrock-generator-settings.patch
index 07b87e77ed..d745373918 100644
--- a/patches/server/0323-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0324-Flat-bedrock-generator-settings.patch
@@ -126,7 +126,7 @@ index c887d34171f89c731d76c4ca92c70be2b1edc1e6..df6752b5c77bc88a4fcf1ffe918b24d4
                      });
                      // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 54308f1decc3982f30bf8b7a8a9d8865bfdbb9fd..0fca35ac82a1854260980b7c2664be82033e3bad 100644
+index 902156477bdfc9917105f1229f760c26e5af302a..58609a0911c4e32b6f80f050cd3d23f70ad75b1b 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 @@ -207,7 +207,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
diff --git a/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0326-Duplicate-UUID-Resolve-Option.patch b/patches/server/0327-Duplicate-UUID-Resolve-Option.patch
similarity index 91%
rename from patches/server/0326-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0327-Duplicate-UUID-Resolve-Option.patch
index dad8a91bfc..17a74454e7 100644
--- a/patches/server/0326-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0327-Duplicate-UUID-Resolve-Option.patch
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java b/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java
-index 87ae7d64e67ebae5ab53cc239cdf6580dca31652..f27644293468efc3988bea50f5b96fd117e826f8 100644
+index 56c35149fd142af6ffe31434fec0064cf6ea3be5..14e24e3bd8695c7038e8e1f4fb92ca3fd20c6258 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/ChunkSystem.java
-@@ -224,7 +224,17 @@ public final class ChunkSystem {
+@@ -74,7 +74,17 @@ public final class ChunkSystem {
      }
  
      public static void onEntityPreAdd(final ServerLevel level, final Entity entity) {
@@ -56,19 +56,19 @@ index 87ae7d64e67ebae5ab53cc239cdf6580dca31652..f27644293468efc3988bea50f5b96fd1
  
      public static void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6682318c9430430af6cba4e7e6e4cd07cfca0333..8c0d36e8f946771c35ea9f06db3db8fc5ac3c4a2 100644
+index a8533bbac77c6024cd6163149affe4f4733019b5..de89863bae07b6e1264b0c70287c085a716862e4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -870,6 +870,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -520,6 +520,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      entity.discard();
                      needsRemoval = true;
                  }
 +                checkDupeUUID(world, entity); // Paper
                  return !needsRemoval;
-             }));
+             }), position); // Paper - rewrite chunk system
              // CraftBukkit end
-@@ -920,6 +921,49 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         });
+@@ -531,6 +532,49 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         throw new UnsupportedOperationException(); // Paper - rewrite chunk system
      }
  
 +    // Paper start
@@ -115,5 +115,5 @@ index 6682318c9430430af6cba4e7e6e4cd07cfca0333..8c0d36e8f946771c35ea9f06db3db8fc
 +    }
 +    // Paper end
      public CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> prepareTickingChunk(ChunkHolder holder) {
-         CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getChunkRangeFuture(holder, 1, (i) -> {
-             return ChunkStatus.FULL;
+         throw new UnsupportedOperationException(); // Paper - rewrite chunk system
+     }
diff --git a/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
similarity index 85%
rename from patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
index 7af94b1b12..5dd5fa4c9f 100644
--- a/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e66d24174d5834cb9526fa4a238d0765bef827b2..394f2b87010454ff2e4898f3ee5085c68d91952a 100644
+index 678cfedf124c30ab34843995aa86a11a7d9b1aa1..19aa75cce58c3e3db350c416211d0f6d89549508 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -926,7 +926,7 @@ public class ServerPlayer extends Player {
+@@ -970,7 +970,7 @@ public class ServerPlayer extends Player {
              this.tellNeutralMobsThatIDied();
          }
          // SPIGOT-5478 must be called manually now
diff --git a/patches/server/0328-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0328-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 90%
rename from patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
index ed3f293f2f..79988c201b 100644
--- a/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 74bddd7f37af06355549128bb0bfc1d7eedd2bb8..0b928a1cf86de9c83fd50472226be48443ed65a6 100644
+index c4ae2f4f1ec9aa39478815f46e0d1d13144acf5b..7c780e464faae69b74d69e40bbeeeccf4c609eab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -326,6 +326,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -552,6 +552,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         });
      }
-     // Paper end
  
 +    // Paper start - optimise getPlayerByUUID
 +    @Nullable
diff --git a/patches/server/0331-Fix-items-not-falling-correctly.patch b/patches/server/0332-Fix-items-not-falling-correctly.patch
similarity index 94%
rename from patches/server/0331-Fix-items-not-falling-correctly.patch
rename to patches/server/0332-Fix-items-not-falling-correctly.patch
index 86f295faf5..db8b4a2a96 100644
--- a/patches/server/0331-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0332-Fix-items-not-falling-correctly.patch
@@ -28,10 +28,10 @@ index fda34d93a5b75919c840d3bc0efa0651e5eb4843..cecd7bd4a6dd66cfb2d632a232ff469e
                  float f1 = 0.98F;
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d9149580408094784794bc0575a00bebe2e7b4d4..5d470b424d52ae402ec0e950263ad54cf6f7e3ef 100644
+index 1d9ce6dae17ff572d4528971c69c63d0f85b313c..305d9772f2af22e8bdf73235cdb15ea01ac2c3b3 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -251,7 +251,7 @@ public class ActivationRange
+@@ -257,7 +257,7 @@ public class ActivationRange
                  isActive = true;
              }
              // Add a little performance juice to active entities. Skip 1/4 if not immune.
diff --git a/patches/server/0332-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0332-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0334-Entity-Activation-Range-2.0.patch b/patches/server/0335-Entity-Activation-Range-2.0.patch
similarity index 97%
rename from patches/server/0334-Entity-Activation-Range-2.0.patch
rename to patches/server/0335-Entity-Activation-Range-2.0.patch
index e73b9c627b..82ddff60a2 100644
--- a/patches/server/0334-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0335-Entity-Activation-Range-2.0.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c39553bdbf1d0 100644
+index 7c780e464faae69b74d69e40bbeeeccf4c609eab..35e2688f9252fbc12b69519e5e5fbaec5ff82e42 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -29,7 +29,7 @@ index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c3955
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -956,17 +955,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1188,17 +1187,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
@@ -51,7 +51,7 @@ index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c3955
          try {
          // Paper end - timings
          entity.setOldPosAndRot();
-@@ -977,9 +976,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1209,9 +1208,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
@@ -65,7 +65,7 @@ index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c3955
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -987,13 +990,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1219,13 +1222,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              this.tickPassenger(entity, entity1);
          }
@@ -85,7 +85,7 @@ index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c3955
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
                  ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -1002,8 +1010,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1234,8 +1242,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      return BuiltInRegistries.ENTITY_TYPE.getKey(passenger.getType()).toString();
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
@@ -103,7 +103,7 @@ index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c3955
                  gameprofilerfiller.pop();
                  Iterator iterator = passenger.getPassengers().iterator();
  
-@@ -1013,6 +1030,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1245,6 +1262,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
@@ -112,7 +112,7 @@ index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c3955
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7c23f63fd642002cac597da2eafc5f0b4232d5a4..359f680c52dc44139e48673675617d97c1aa24a1 100644
+index af707404bfbba0ded894b6bd29c87c07e62b7854..cd8a75a830512014fbc694325ff860265b9b70f9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -390,6 +390,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -124,7 +124,7 @@ index 7c23f63fd642002cac597da2eafc5f0b4232d5a4..359f680c52dc44139e48673675617d97
      protected int numCollisions = 0; // Paper
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      @javax.annotation.Nullable
-@@ -910,6 +912,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -962,6 +964,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          } else {
              this.wasOnFire = this.isOnFire();
              if (movementType == MoverType.PISTON) {
@@ -133,7 +133,7 @@ index 7c23f63fd642002cac597da2eafc5f0b4232d5a4..359f680c52dc44139e48673675617d97
                  movement = this.limitPistonMovement(movement);
                  if (movement.equals(Vec3.ZERO)) {
                      return;
-@@ -922,6 +926,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -974,6 +978,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.stuckSpeedMultiplier = Vec3.ZERO;
                  this.setDeltaMovement(Vec3.ZERO);
              }
@@ -348,7 +348,7 @@ index b149e8bcac034bb3fc118a9adcb0de45e18ed5e9..fc35cfc9d045f3e5b6a50af1d0ba83b6
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4968e036350631b79a8c7e70fdc32db4bcff2ade..495ab82a3a9d47583eb7239730aa78dd51f16fc6 100644
+index b1111e644f860f40a944fd43ac900db4615a1c5e..9a6ed3aa55f988ed30669fab2a2513741eda399b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -160,6 +160,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -380,7 +380,7 @@ index 45f55c79a9d105f732054d61c4cf83eb5db49762..17a6327ab7b26dfab38881bbc0689b0b
                              }
                          }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8fd5b6e572 100644
+index 305d9772f2af22e8bdf73235cdb15ea01ac2c3b3..50ddcd7ee9c3ffe7549361f942df01b8ef078932 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -1,39 +1,52 @@
@@ -564,9 +564,9 @@ index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8f
 +            ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, worldHeight, villagerActivationRange );
 +            // Paper end
  
-             world.getEntities().get(maxBB, ActivationRange::activateEntity);
-         }
-@@ -166,60 +244,118 @@ public class ActivationRange
+             // Paper start
+             java.util.List<Entity> entities = world.getEntities((Entity)null, maxBB, null);
+@@ -172,60 +250,118 @@ public class ActivationRange
       * @param entity
       * @return
       */
@@ -628,8 +628,7 @@ index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8f
              {
 -                return true;
 +                return 20; // Paper
-             }
--            if ( entity instanceof Villager && ( (Villager) entity ).canBreed() )
++            }
 +            // Paper start
 +            if (entity instanceof Bee) {
 +                Bee bee = (Bee)entity;
@@ -657,7 +656,8 @@ index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8f
 +                        return config.villagersWorkImmunityFor;
 +                    }
 +                }
-+            }
+             }
+-            if ( entity instanceof Villager && ( (Villager) entity ).canBreed() )
 +            if ( entity instanceof Llama && ( (Llama) entity ).inCaravan() )
              {
 -                return true;
@@ -685,11 +685,11 @@ index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8f
 +            // Paper start
 +            if (entity instanceof Mob && ((Mob) entity).targetSelector.hasTasks() ) {
 +                return 0;
-+            }
+             }
 +            if (entity instanceof Pillager) {
 +                Pillager pillager = (Pillager) entity;
 +                // TODO:?
-             }
++            }
 +            // Paper end
          }
          // SPIGOT-6644: Otherwise the target refresh tick will be missed
@@ -702,7 +702,7 @@ index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8f
      }
  
      /**
-@@ -234,8 +370,19 @@ public class ActivationRange
+@@ -240,8 +376,19 @@ public class ActivationRange
          if ( entity instanceof FireworkRocketEntity ) {
              return true;
          }
@@ -723,7 +723,7 @@ index 5d470b424d52ae402ec0e950263ad54cf6f7e3ef..b1e844b1c0dafb2dfc9904d2d4ad0e8f
  
          // Should this entity tick?
          if ( !isActive )
-@@ -243,15 +390,19 @@ public class ActivationRange
+@@ -249,15 +396,19 @@ public class ActivationRange
              if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 )
              {
                  // Check immunities every 20 ticks.
diff --git a/patches/server/0335-Implement-alternative-item-despawn-rate.patch b/patches/server/0336-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0335-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0336-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0336-Lag-compensate-eating.patch b/patches/server/0337-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0336-Lag-compensate-eating.patch
rename to patches/server/0337-Lag-compensate-eating.patch
diff --git a/patches/server/0337-Tracking-Range-Improvements.patch b/patches/server/0338-Tracking-Range-Improvements.patch
similarity index 95%
rename from patches/server/0337-Tracking-Range-Improvements.patch
rename to patches/server/0338-Tracking-Range-Improvements.patch
index 882ce12ba2..621f176e28 100644
--- a/patches/server/0337-Tracking-Range-Improvements.patch
+++ b/patches/server/0338-Tracking-Range-Improvements.patch
@@ -8,10 +8,10 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8c0d36e8f946771c35ea9f06db3db8fc5ac3c4a2..d6e3bde87fd3613b3e9263bbe116fac004c27848 100644
+index de89863bae07b6e1264b0c70287c085a716862e4..ed43ade8c884f9fe7945ef20c1dd2cf5c70680d3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1816,6 +1816,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1251,6 +1251,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();
                  int j = entity.getType().clientTrackingRange() * 16;
diff --git a/patches/server/0338-Fix-items-vanishing-through-end-portal.patch b/patches/server/0339-Fix-items-vanishing-through-end-portal.patch
similarity index 89%
rename from patches/server/0338-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0339-Fix-items-vanishing-through-end-portal.patch
index 1a857a9597..c25aebab62 100644
--- a/patches/server/0338-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0339-Fix-items-vanishing-through-end-portal.patch
@@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 359f680c52dc44139e48673675617d97c1aa24a1..d9e9d363d8b0271cee42479a362f6670c5df38cb 100644
+index cd8a75a830512014fbc694325ff860265b9b70f9..29125ecad7bd1a66c46656a24d657ac175e75b5d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3326,6 +3326,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3378,6 +3378,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (flag1) {
                  blockposition1 = ServerLevel.END_SPAWN_POINT;
              } else {
diff --git a/patches/server/0339-implement-optional-per-player-mob-spawns.patch b/patches/server/0340-implement-optional-per-player-mob-spawns.patch
similarity index 96%
rename from patches/server/0339-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0340-implement-optional-per-player-mob-spawns.patch
index 5aa1b5ae6e..178eb66f2b 100644
--- a/patches/server/0339-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0340-implement-optional-per-player-mob-spawns.patch
@@ -252,18 +252,18 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc
 +    }
 +} 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9fce5944c 100644
+index ed43ade8c884f9fe7945ef20c1dd2cf5c70680d3..1f30d06781cea0855be26784c239e71ed1a2f6c3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -147,6 +147,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -142,6 +142,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      private final Long2LongMap chunkSaveCooldowns;
      private final Queue<Runnable> unloadQueue;
      private int serverViewDistance;
 +    public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobDistanceMap; // Paper
  
-     // CraftBukkit start - recursion-safe executor for Chunk loadCallback() and unloadCallback()
-     public final CallbackExecutor callbackExecutor = new CallbackExecutor();
-@@ -176,16 +177,32 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     // Paper - rewrite chunk system
+ 
+@@ -153,11 +154,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          int chunkX = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getX());
          int chunkZ = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getZ());
          // Note: players need to be explicitly added to distance maps before they can be updated
@@ -275,6 +275,7 @@ index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9
      }
  
      void removePlayerFromDistanceMaps(ServerPlayer player) {
+         this.level.playerChunkLoader.removePlayer(player); // Paper - replace chunk loader
  
 +        // Paper start - per player mob spawning
 +        if (this.playerMobDistanceMap != null) {
@@ -284,9 +285,10 @@ index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9
      }
  
      void updateMaps(ServerPlayer player) {
-         int chunkX = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getX());
+@@ -165,6 +176,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          int chunkZ = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getZ());
          // Note: players need to be explicitly added to distance maps before they can be updated
+         this.level.playerChunkLoader.updatePlayer(player); // Paper - replace chunk loader
 +
 +        // Paper start - per player mob spawning
 +        if (this.playerMobDistanceMap != null) {
@@ -296,7 +298,7 @@ index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9
      }
      // Paper end
      // Paper start
-@@ -276,6 +293,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -250,6 +267,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.dataRegionManager = new io.papermc.paper.chunk.SingleThreadChunkRegionManager(this.level, 2, (1.0 / 3.0), 1, 6, "Data", DataRegionData::new, DataRegionSectionData::new);
          this.regionManagers.add(this.dataRegionManager);
          // Paper end
@@ -304,7 +306,7 @@ index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9
      }
  
      protected ChunkGenerator generator() {
-@@ -301,6 +319,31 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -275,6 +293,31 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          });
      }
  
@@ -337,10 +339,10 @@ index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 0f38bdf2c9a29f2111c27138b8d997c230633bb8..dd9b315c169398d12c592c549693f94922961ed1 100644
+index 4649e597b86335b33d9e9227d966dd7ad8208096..e655cf837f7bd7d4271dca80b9c6764372336910 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -696,7 +696,18 @@ public class ServerChunkCache extends ChunkSource {
+@@ -543,7 +543,18 @@ public class ServerChunkCache extends ChunkSource {
              gameprofilerfiller.push("naturalSpawnCount");
              this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
              int l = this.distanceManager.getNaturalSpawnChunkCount();
@@ -361,7 +363,7 @@ index 0f38bdf2c9a29f2111c27138b8d997c230633bb8..dd9b315c169398d12c592c549693f949
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 394f2b87010454ff2e4898f3ee5085c68d91952a..8af7966008a5f06c9a33f0c4396b940ecec623e8 100644
+index 19aa75cce58c3e3db350c416211d0f6d89549508..b37cde9c222aaedc440385a04bd7118b584dd3e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -246,6 +246,11 @@ public class ServerPlayer extends Player {
@@ -376,7 +378,7 @@ index 394f2b87010454ff2e4898f3ee5085c68d91952a..8af7966008a5f06c9a33f0c4396b940e
  
      // CraftBukkit start
      public String displayName;
-@@ -339,6 +344,7 @@ public class ServerPlayer extends Player {
+@@ -383,6 +388,7 @@ public class ServerPlayer extends Player {
          this.adventure$displayName = net.kyori.adventure.text.Component.text(this.getScoreboardName()); // Paper
          this.bukkitPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
diff --git a/patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0341-Improve-Block-breakNaturally-API.patch b/patches/server/0342-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0341-Improve-Block-breakNaturally-API.patch
rename to patches/server/0342-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 89%
rename from patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 50d9094442..09cc020c8f 100644
--- a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,10 +7,10 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index dd9b315c169398d12c592c549693f94922961ed1..b6461fdd77895fbeae10e92c76e8799c7e846ac5 100644
+index e655cf837f7bd7d4271dca80b9c6764372336910..2d44b8a98216f879f2bc89fba1dad53cd5558ff9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -398,6 +398,12 @@ public class ServerChunkCache extends ChunkSource {
+@@ -270,6 +270,12 @@ public class ServerChunkCache extends ChunkSource {
                  return this.getChunk(x, z, leastStatus, create);
              }, this.mainThreadProcessor).join();
          } else {
@@ -23,8 +23,8 @@ index dd9b315c169398d12c592c549693f94922961ed1..b6461fdd77895fbeae10e92c76e8799c
              ProfilerFiller gameprofilerfiller = this.level.getProfiler();
  
              gameprofilerfiller.incrementCounter("getChunk");
-@@ -444,39 +450,7 @@ public class ServerChunkCache extends ChunkSource {
-         if (Thread.currentThread() != this.mainThread) {
+@@ -313,39 +319,7 @@ public class ServerChunkCache extends ChunkSource {
+         if (!io.papermc.paper.util.TickThread.isTickThread()) { // Paper - rewrite chunk system
              return null;
          } else {
 -            this.level.getProfiler().incrementCounter("getChunkNow");
diff --git a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch b/patches/server/0344-Add-debug-for-sync-chunk-loads.patch
similarity index 90%
rename from patches/server/0343-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0344-Add-debug-for-sync-chunk-loads.patch
index 095dfaf041..eccc8c5476 100644
--- a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0344-Add-debug-for-sync-chunk-loads.patch
@@ -194,13 +194,13 @@ index 0000000000000000000000000000000000000000..0bb4aaa546939b67a5d22865190f3047
 +    }
 +}
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index 830978f3409888302ab857161628cee5869efa8f..43573b5ef76c8bb42411c3707cb13d90d531b905 100644
+index ae51993e0de706cb62c96795ca9de7663893a5bf..5bfa245a621a0bf7ef60cd01f4c04576b770384e 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -39,6 +39,7 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("version"), new VersionCommand());
+@@ -40,6 +40,7 @@ public final class PaperCommand extends Command {
          commands.put(Set.of("dumpplugins"), new DumpPluginsCommand());
          commands.put(Set.of("fixlight"), new FixLightCommand());
+         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
 +        commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
  
          return commands.entrySet().stream()
@@ -300,31 +300,23 @@ index 0000000000000000000000000000000000000000..95d6022c9cfb2e36ec5a71be6e343540
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index b6461fdd77895fbeae10e92c76e8799c7e846ac5..7aceefc28f310e704ca8803e95c40ada13718988 100644
+index 2d44b8a98216f879f2bc89fba1dad53cd5558ff9..7881a34e01dd6c8e31b55577bb9323a0171d24bf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -393,6 +393,7 @@ public class ServerChunkCache extends ChunkSource {
-     @Nullable
-     @Override
-     public ChunkAccess getChunk(int x, int z, ChunkStatus leastStatus, boolean create) {
-+        final int x1 = x; final int z1 = z; // Paper - conflict on variable change
-         if (Thread.currentThread() != this.mainThread) {
-             return (ChunkAccess) CompletableFuture.supplyAsync(() -> {
-                 return this.getChunk(x, z, leastStatus, create);
-@@ -426,6 +427,7 @@ public class ServerChunkCache extends ChunkSource {
- 
-             Objects.requireNonNull(completablefuture);
-             if (!completablefuture.isDone()) { // Paper
+@@ -294,6 +294,7 @@ public class ServerChunkCache extends ChunkSource {
+                 // Paper start - async chunk io/loading
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.pushChunkWait(this.level, x1, z1); // Paper - rewrite chunk system
+                 // Paper end
 +                com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x1, z1); // Paper - sync load info
                  this.level.timings.syncChunkLoad.startTiming(); // Paper
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
-                 this.level.timings.syncChunkLoad.stopTiming(); // Paper
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9bcf1fee8df0186f7355bf37ba7c39553bdbf1d0..79229f3563cc642568487ea92840c8753c536240 100644
+index 35e2688f9252fbc12b69519e5e5fbaec5ff82e42..e7847e03b94fed1a76f8a57d6b61f5f01a87615b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -416,6 +416,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
+@@ -645,6 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
      }
  
 +    // Paper start
diff --git a/patches/server/0344-Improve-java-version-check.patch b/patches/server/0345-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0344-Improve-java-version-check.patch
rename to patches/server/0345-Improve-java-version-check.patch
diff --git a/patches/server/0345-Add-ThrownEggHatchEvent.patch b/patches/server/0346-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0345-Add-ThrownEggHatchEvent.patch
rename to patches/server/0346-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0346-Entity-Jump-API.patch b/patches/server/0347-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0346-Entity-Jump-API.patch
rename to patches/server/0347-Entity-Jump-API.patch
diff --git a/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 91%
rename from patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 7b34896321..5ba5da5033 100644
--- a/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0348-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/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d9e9d363d8b0271cee42479a362f6670c5df38cb..1badb25665edaeb5eb274b770ea50598ba056b22 100644
+index 29125ecad7bd1a66c46656a24d657ac175e75b5d..a3885b4a6453d4317323a97f0b4e86c377448ddc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -392,6 +392,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -16,7 +16,7 @@ index d9e9d363d8b0271cee42479a362f6670c5df38cb..1badb25665edaeb5eb274b770ea50598
      protected int numCollisions = 0; // Paper
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      @javax.annotation.Nullable
-@@ -2156,6 +2157,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2208,6 +2209,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (spawnedViaMobSpawner) {
                  nbt.putBoolean("Paper.FromMobSpawner", true);
              }
@@ -26,7 +26,7 @@ index d9e9d363d8b0271cee42479a362f6670c5df38cb..1badb25665edaeb5eb274b770ea50598
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2298,6 +2302,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2350,6 +2354,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/server/0348-Make-the-GUI-graph-fancier.patch b/patches/server/0349-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0348-Make-the-GUI-graph-fancier.patch
rename to patches/server/0349-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0350-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0351-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0350-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0351-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0353-Optimise-Chunk-getFluid.patch b/patches/server/0354-Optimise-Chunk-getFluid.patch
similarity index 96%
rename from patches/server/0353-Optimise-Chunk-getFluid.patch
rename to patches/server/0354-Optimise-Chunk-getFluid.patch
index 8f635b56f9..6411c144ec 100644
--- a/patches/server/0353-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0354-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 fdb8c2346cb2e444b75f863a8a8199da84f25193..f229838bf0566d61b2716463ff95fcc0b04d2e97 100644
+index cf910b466a4b75c0b9219abef5c9bff30793d7bf..7d85d805bdc7bb67dae2cab8bcd38368f519a85c 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -380,18 +380,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0355-Add-tick-times-API-and-mspt-command.patch b/patches/server/0356-Add-tick-times-API-and-mspt-command.patch
similarity index 96%
rename from patches/server/0355-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0356-Add-tick-times-API-and-mspt-command.patch
index 45da3a31cc..9f51624fda 100644
--- a/patches/server/0355-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0356-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b274f766e8cf55151ac6499fa1a68b9a0816b57..0fa1d9f299194ff660130a1cf33d9a405d56a842 100644
+index 4d3cd4a5dbf7adb482e60dc88ededdaccf558061..951e283d38cb7601049ac6f24385acde514df553 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -247,6 +247,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -140,7 +140,7 @@ index 5b274f766e8cf55151ac6499fa1a68b9a0816b57..0fa1d9f299194ff660130a1cf33d9a40
      @Nullable
      private KeyPair keyPair;
      @Nullable
-@@ -1328,6 +1333,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1322,6 +1327,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.averageTickTime = this.averageTickTime * 0.8F + (float) j / 1000000.0F * 0.19999999F;
          long k = Util.getNanos();
  
@@ -152,7 +152,7 @@ index 5b274f766e8cf55151ac6499fa1a68b9a0816b57..0fa1d9f299194ff660130a1cf33d9a40
          this.logTickTime(k - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
-@@ -2574,4 +2584,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2568,4 +2578,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static record ServerResourcePackInfo(String url, String hash, boolean isRequired, @Nullable Component prompt) {
  
      }
@@ -184,7 +184,7 @@ index 5b274f766e8cf55151ac6499fa1a68b9a0816b57..0fa1d9f299194ff660130a1cf33d9a40
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da2c850b1625758c0bb387930788b6e9f03555d9..7ac0cdf96740887b97616290b27eb63665294546 100644
+index fcb0f9cf49495ffbfd9acd25cd3049ca63fb33b9..93de9add395f36e3c1ba645434c858ae5e38e867 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2533,6 +2533,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0356-Expose-MinecraftServer-isRunning.patch b/patches/server/0357-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0356-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0357-Expose-MinecraftServer-isRunning.patch
index 73c892831b..1ea1387f8d 100644
--- a/patches/server/0356-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0357-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7ac0cdf96740887b97616290b27eb63665294546..712bee34303ca3ceec4520e265f4defdc27ea8ff 100644
+index 93de9add395f36e3c1ba645434c858ae5e38e867..81e8ff4c3901bb16ddfb09bda1237308b5c469e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2764,5 +2764,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch
index fad860e5b7..3d3bae66b4 100644
--- a/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0359-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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8af7966008a5f06c9a33f0c4396b940ecec623e8..b8a54046bdfd7ae0650a3758af3a56d0d06d0661 100644
+index b37cde9c222aaedc440385a04bd7118b584dd3e4..53cbb238c00e212a549b540e4c14724777387491 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -242,6 +242,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 95%
rename from patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 36b39986f0..a4a67214ec 100644
--- a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f17116ee619338e1dc8ae1fb9d5b18ad28164ba3..6d2f49204e6a8fe8057a0c83f23adae3e1dbf00c 100644
+index 2ae9b52d43a44b2164034d9162b644daba618d66..7889a55c8ddf8b1b1b27a8241875c071f6ac0eba 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 87%
rename from patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 30646fc5d0..dbfb02d9ce 100644
--- a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,10 +7,10 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 02aa2f4c7d2d4ddd2dbfcd7a90996fa9fce5944c..fdf4da153f57dea2e83ced0c4b56fdb8bd10aa74 100644
+index 1f30d06781cea0855be26784c239e71ed1a2f6c3..91373583904a22bc28c82cf3dfec9f60aebee9a3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1550,6 +1550,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1000,6 +1000,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      public void addEntity(Entity entity) {
          org.spigotmc.AsyncCatcher.catchOp("entity track"); // Spigot
@@ -25,10 +25,10 @@ index 02aa2f4c7d2d4ddd2dbfcd7a90996fa9fce5944c..fdf4da153f57dea2e83ced0c4b56fdb8
              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 79229f3563cc642568487ea92840c8753c536240..4307b72acc389ccab97b2b7f3f824ddeca5a3cda 100644
+index e7847e03b94fed1a76f8a57d6b61f5f01a87615b..282d94ab6da3cefa68a7caee88d726ffa2f73b83 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2217,7 +2217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2466,7 +2466,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -37,7 +37,7 @@ index 79229f3563cc642568487ea92840c8753c536240..4307b72acc389ccab97b2b7f3f824dde
              if (entity instanceof ServerPlayer) {
                  ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -2251,6 +2251,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2500,6 +2500,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0362-Don-t-tick-dead-players.patch b/patches/server/0363-Don-t-tick-dead-players.patch
similarity index 85%
rename from patches/server/0362-Don-t-tick-dead-players.patch
rename to patches/server/0363-Don-t-tick-dead-players.patch
index ee41d21867..16832df64e 100644
--- a/patches/server/0362-Don-t-tick-dead-players.patch
+++ b/patches/server/0363-Don-t-tick-dead-players.patch
@@ -7,10 +7,10 @@ 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 b8a54046bdfd7ae0650a3758af3a56d0d06d0661..ddfc108db57e3df813e9cef794f00b95d86f5078 100644
+index 53cbb238c00e212a549b540e4c14724777387491..0b286ea0798845d86173fa81735f2dc1d4ff8737 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -683,7 +683,7 @@ public class ServerPlayer extends Player {
+@@ -727,7 +727,7 @@ public class ServerPlayer extends Player {
  
      public void doTick() {
          try {
diff --git a/patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch
similarity index 97%
rename from patches/server/0364-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0365-Optimize-Collision-to-not-load-chunks.patch
index d23823ed80..78012d2193 100644
--- a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b4ded40387006821433db1de85ed1c2347757155..6a170e73f0ca6233a742dfa13ce496e0b770b0ac 100644
+index cffda75eebe70e1c9b5ac7905f69929b2634aeb0..7d8304497377993163f2837ee615c844f676481c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -824,6 +824,7 @@ public abstract class PlayerList {
@@ -26,7 +26,7 @@ index b4ded40387006821433db1de85ed1c2347757155..6a170e73f0ca6233a742dfa13ce496e0
              // CraftBukkit end
              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 1badb25665edaeb5eb274b770ea50598ba056b22..961213739ba810c6e39aca76a32d74bcf2a58ad3 100644
+index a3885b4a6453d4317323a97f0b4e86c377448ddc..32707ab485111e265cc34d5f09507c97067dfa09 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -237,6 +237,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch
similarity index 88%
rename from patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch
index c3b90202af..a9448a590f 100644
--- a/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,10 +13,10 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ddfc108db57e3df813e9cef794f00b95d86f5078..3ebcbda84de7817ff1aab5cdac6566f9eb05f2dd 100644
+index 0b286ea0798845d86173fa81735f2dc1d4ff8737..e3e0cd60ad735b895a57fd3b5f38087643a2809e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -335,7 +335,7 @@ public class ServerPlayer extends Player {
+@@ -379,7 +379,7 @@ public class ServerPlayer extends Player {
          this.stats = server.getPlayerList().getPlayerStats(this);
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
          this.setMaxUpStep(1.0F);
@@ -25,7 +25,7 @@ index ddfc108db57e3df813e9cef794f00b95d86f5078..3ebcbda84de7817ff1aab5cdac6566f9
          this.updateOptions(clientOptions);
  
          this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
-@@ -570,7 +570,7 @@ public class ServerPlayer extends Player {
+@@ -614,7 +614,7 @@ public class ServerPlayer extends Player {
                  position = Vec3.atCenterOf(world.getSharedSpawnPos());
              }
              this.setLevel(world);
@@ -35,7 +35,7 @@ index ddfc108db57e3df813e9cef794f00b95d86f5078..3ebcbda84de7817ff1aab5cdac6566f9
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6a170e73f0ca6233a742dfa13ce496e0b770b0ac..89310108e94f3198c5f4ecd65e414a2c7af262cb 100644
+index 7d8304497377993163f2837ee615c844f676481c..abd0acb3aa7a430888d143b58a96c7eac3ba10e3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -228,6 +228,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0367-Improved-Watchdog-Support.patch b/patches/server/0368-Improved-Watchdog-Support.patch
similarity index 92%
rename from patches/server/0367-Improved-Watchdog-Support.patch
rename to patches/server/0368-Improved-Watchdog-Support.patch
index 753ef66b52..8568213430 100644
--- a/patches/server/0367-Improved-Watchdog-Support.patch
+++ b/patches/server/0368-Improved-Watchdog-Support.patch
@@ -71,7 +71,7 @@ index d7995cadda8f48bbf642114935311180d3ebde5b..226cba0c1eeedd9e80acd603c46b802c
              cause = cause.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a32d4f1465 100644
+index 951e283d38cb7601049ac6f24385acde514df553..41106a10ca8148dae4129e2a46854d83605839b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -291,7 +291,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -92,8 +92,8 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
 +
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-         Thread thread = new Thread(() -> {
-@@ -858,6 +861,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
+@@ -868,6 +871,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      // CraftBukkit start
      private boolean hasStopped = false;
@@ -101,7 +101,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -872,6 +876,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -882,6 +886,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -121,13 +121,15 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -955,6 +972,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -935,7 +952,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             this.getProfileCache().save(false); // Paper
          }
          // Spigot end
- 
 +        // Paper start - move final shutdown items here
 +        LOGGER.info("Flushing Chunk IO");
-+        // TODO chunk system patch has a line here
++        // Paper end - move final shutdown items here
+         io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
++        // Paper start - move final shutdown items here
 +        LOGGER.info("Closing Thread Pool");
 +        Util.shutdownExecutors(); // Paper
 +        LOGGER.info("Closing Server");
@@ -136,11 +138,11 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
 +        } catch (Exception e) {
 +        }
 +        this.onServerExit();
-+        // Paper end
++        // Paper end - move final shutdown items here
      }
  
      public String getLocalIp() {
-@@ -1047,6 +1076,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1030,6 +1060,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void runServer() {
          try {
@@ -148,7 +150,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
              if (!this.initServer()) {
                  throw new IllegalStateException("Failed to initialize server");
              }
-@@ -1056,6 +1086,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1039,6 +1070,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -167,7 +169,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( recentTps, 20 );
              long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
-@@ -1110,6 +1152,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1099,6 +1142,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
              }
          } catch (Throwable throwable) {
@@ -180,7 +182,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
              // Spigot Start
              if ( throwable.getCause() != null )
-@@ -1140,14 +1188,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1129,14 +1178,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.services.profileCache().clearExecutor();
                  }
  
@@ -198,7 +200,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
              }
  
          }
-@@ -1211,6 +1259,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1205,6 +1254,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public TickTask wrapRunnable(Runnable runnable) {
@@ -211,7 +213,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
          return new TickTask(this.tickCount, runnable);
      }
  
-@@ -1451,6 +1505,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1445,6 +1500,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  try {
                      crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
                  } catch (Throwable t) {
@@ -219,7 +221,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
                      throw new RuntimeException("Error generating crash report", t);
                  }
                  // Spigot End
-@@ -1964,7 +2019,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1958,7 +2014,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
@@ -237,7 +239,7 @@ index 0fa1d9f299194ff660130a1cf33d9a405d56a842..d50878653132218dd494e0e5ed6fc3a3
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6d2f49204e6a8fe8057a0c83f23adae3e1dbf00c..f72c1a4baff6ac9a3b1df83ece3925e2b1678df9 100644
+index 7889a55c8ddf8b1b1b27a8241875c071f6ac0eba..f43e5a83b9220eb23a777fa7490b49aac440bea0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -269,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -259,7 +261,7 @@ index 6d2f49204e6a8fe8057a0c83f23adae3e1dbf00c..f72c1a4baff6ac9a3b1df83ece3925e2
      }
  
      @Override
-@@ -748,7 +749,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -775,7 +776,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      @Override
      public void stopServer() {
          super.stopServer();
@@ -269,7 +271,7 @@ index 6d2f49204e6a8fe8057a0c83f23adae3e1dbf00c..f72c1a4baff6ac9a3b1df83ece3925e2
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 89310108e94f3198c5f4ecd65e414a2c7af262cb..d1e5db7b0b260002198b1262f914d3c5a30cd2d9 100644
+index abd0acb3aa7a430888d143b58a96c7eac3ba10e3..29f9dc6771029295d9ad3a8e74e90c3abc1ab138 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -534,7 +534,7 @@ public abstract class PlayerList {
@@ -294,10 +296,10 @@ index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb89
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 495ab82a3a9d47583eb7239730aa78dd51f16fc6..8b0c85d341c75e86421fc7c72aefcce83a165075 100644
+index 9a6ed3aa55f988ed30669fab2a2513741eda399b..a9a4e27178a1d83812720f0d4d695b0d32badaf7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -896,6 +896,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -901,6 +901,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
@@ -306,10 +308,10 @@ index 495ab82a3a9d47583eb7239730aa78dd51f16fc6..8b0c85d341c75e86421fc7c72aefcce8
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
 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 f229838bf0566d61b2716463ff95fcc0b04d2e97..c9a6a56dfd25601bc0a11e5ddb349dba372c0e18 100644
+index 7d85d805bdc7bb67dae2cab8bcd38368f519a85c..793077e38a0bced4f78d41c0555487cd955f45e9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1091,6 +1091,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -1180,6 +1180,7 @@ public class LevelChunk extends ChunkAccess {
  
                          gameprofilerfiller.pop();
                      } catch (Throwable throwable) {
@@ -470,18 +472,18 @@ index 14eadb0f81dfad072d82d7793cce1a4dd3f2c5f0..29b39dff0aceaa902f701162a42d3f2f
          String[] split = restartScript.split( " " );
          if ( split.length > 0 && new File( split[0] ).isFile() )
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 06efdd7aa6d35a670e81c4f303618a7ba301396a..e71041d41eae31cce73d8817c4f95f16c8c600aa 100644
+index b47d043144c499b1499f6b4be5a16a3f75c9fcb8..a9bd33b58a6a3296b70eaaaea3adbee74724e448 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -11,6 +11,7 @@ import org.bukkit.Bukkit;
- public class WatchdogThread extends Thread
+ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - rewrite chunk system
  {
  
 +    public static final boolean DISABLE_WATCHDOG = Boolean.getBoolean("disable.watchdog"); // Paper
      private static WatchdogThread instance;
      private long timeoutTime;
      private boolean restart;
-@@ -39,6 +40,7 @@ public class WatchdogThread extends Thread
+@@ -39,6 +40,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
      {
          if ( WatchdogThread.instance == null )
          {
@@ -489,7 +491,7 @@ index 06efdd7aa6d35a670e81c4f303618a7ba301396a..e71041d41eae31cce73d8817c4f95f16
              WatchdogThread.instance = new WatchdogThread( timeoutTime * 1000L, restart );
              WatchdogThread.instance.start();
          } else
-@@ -70,12 +72,13 @@ public class WatchdogThread extends Thread
+@@ -70,12 +72,13 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
              // Paper start
              Logger log = Bukkit.getServer().getLogger();
              long currentTime = WatchdogThread.monotonicMillis();
@@ -506,7 +508,7 @@ index 06efdd7aa6d35a670e81c4f303618a7ba301396a..e71041d41eae31cce73d8817c4f95f16
                  lastEarlyWarning = currentTime;
                  if (isLongTimeout) {
                  // Paper end
-@@ -136,9 +139,24 @@ public class WatchdogThread extends Thread
+@@ -137,9 +140,24 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
  
                  if ( isLongTimeout )
                  {
diff --git a/patches/server/0368-Optimize-Pathfinding.patch b/patches/server/0369-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0368-Optimize-Pathfinding.patch
rename to patches/server/0369-Optimize-Pathfinding.patch
diff --git a/patches/server/0369-Reduce-Either-Optional-allocation.patch b/patches/server/0370-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0369-Reduce-Either-Optional-allocation.patch
rename to patches/server/0370-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0371-Prevent-opening-inventories-when-frozen.patch b/patches/server/0372-Prevent-opening-inventories-when-frozen.patch
similarity index 94%
rename from patches/server/0371-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0372-Prevent-opening-inventories-when-frozen.patch
index c5a44bb6a8..870b00d3c6 100644
--- a/patches/server/0371-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0372-Prevent-opening-inventories-when-frozen.patch
@@ -5,10 +5,10 @@ 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 3ebcbda84de7817ff1aab5cdac6566f9eb05f2dd..06d257ac2d307cdae1c3eeba50f133814c13b181 100644
+index e3e0cd60ad735b895a57fd3b5f38087643a2809e..e84b71b457ee8e7ceedf621d755d2d304d4d6f8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -652,7 +652,7 @@ public class ServerPlayer extends Player {
+@@ -696,7 +696,7 @@ public class ServerPlayer extends Player {
              containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
          }
          // Paper end
@@ -17,7 +17,7 @@ index 3ebcbda84de7817ff1aab5cdac6566f9eb05f2dd..06d257ac2d307cdae1c3eeba50f13381
              this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
              this.containerMenu = this.inventoryMenu;
          }
-@@ -1501,7 +1501,7 @@ public class ServerPlayer extends Player {
+@@ -1545,7 +1545,7 @@ public class ServerPlayer extends Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;
diff --git a/patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0373-Implement-Player-Client-Options-API.patch b/patches/server/0374-Implement-Player-Client-Options-API.patch
similarity index 96%
rename from patches/server/0373-Implement-Player-Client-Options-API.patch
rename to patches/server/0374-Implement-Player-Client-Options-API.patch
index 9d830d7721..ddc58c23b8 100644
--- a/patches/server/0373-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0374-Implement-Player-Client-Options-API.patch
@@ -87,10 +87,10 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 06d257ac2d307cdae1c3eeba50f133814c13b181..77859358366eb51282bedf61c8b0094302548e2a 100644
+index e84b71b457ee8e7ceedf621d755d2d304d4d6f8c..9c89106456ceae53dd87fe8ac6137eb86ccdcacd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1908,7 +1908,23 @@ public class ServerPlayer extends Player {
+@@ -1952,7 +1952,23 @@ public class ServerPlayer extends Player {
          }
      }
  
@@ -115,10 +115,10 @@ index 06d257ac2d307cdae1c3eeba50f133814c13b181..77859358366eb51282bedf61c8b00943
          if (getMainArm() != clientOptions.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1fecbdbc382a47aa76bd562fb3cc0625b7807bfc..e28872e0f86a0106e4ea4e06d1ea8e41128de5c7 100644
+index 6ef5547264dcd557a4dcdb5392b9fd5ef22d143d..f81ebf2e29bab66904644e106cdb2d1ca812a212 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -562,6 +562,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -604,6 +604,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
          }
      }
diff --git a/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 81%
rename from patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 9b3e447197..9c4eda5303 100644
--- a/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from
 I suspect it deals with teleporting as it uses players current x/y/z
 
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..2dbea6eef75ee90d62145ed855935bbc9996f15a 100644
+index 942042863f0105769c15b865d4d98a09a7053a68..68550d4497a5f10bf653482f79be77373df53f27 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
-@@ -285,8 +285,8 @@ public abstract class DistanceManager {
+@@ -147,8 +147,8 @@ public abstract class DistanceManager {
          ObjectSet<ServerPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
          if (objectset == null) return; // CraftBukkit - SPIGOT-6208
  
@@ -20,4 +20,4 @@ index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..2dbea6eef75ee90d62145ed855935bbc
 +        if (objectset == null || objectset.isEmpty()) { // Paper
              this.playersPerChunk.remove(i);
              this.naturalSpawnChunkCounter.update(i, Integer.MAX_VALUE, false);
-             this.playerTicketManager.update(i, Integer.MAX_VALUE, false);
+             //this.playerTicketManager.update(i, Integer.MAX_VALUE, false); // Paper - no longer used
diff --git a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 94%
rename from patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 9d66b30712..bd911e1f52 100644
--- a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -31,10 +31,10 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fdf4da153f57dea2e83ced0c4b56fdb8bd10aa74..4fa2076efd11a628e17d8124f3d89342a3299375 100644
+index 91373583904a22bc28c82cf3dfec9f60aebee9a3..463a82f08b7848a4b8a4eb89b201a6e8424c6831 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1556,6 +1556,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1006,6 +1006,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  + ": " + entity  + (this.entityMap.containsKey(entity.getId()) ? " ALREADY CONTAINED (This would have crashed your server)" : ""), new Throwable());
              return;
          }
@@ -43,7 +43,7 @@ index fdf4da153f57dea2e83ced0c4b56fdb8bd10aa74..4fa2076efd11a628e17d8124f3d89342
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 77859358366eb51282bedf61c8b0094302548e2a..fcf875c6145c2428cab7a801442f34adc098b3ce 100644
+index 9c89106456ceae53dd87fe8ac6137eb86ccdcacd..3523b35e629dc78343b891a495bbe310724595f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -265,6 +265,7 @@ public class ServerPlayer extends Player {
@@ -55,7 +55,7 @@ index 77859358366eb51282bedf61c8b0094302548e2a..fcf875c6145c2428cab7a801442f34ad
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d1e5db7b0b260002198b1262f914d3c5a30cd2d9..fdd518b5ea21ae617069fd03429712de4b44841b 100644
+index 29f9dc6771029295d9ad3a8e74e90c3abc1ab138..8b4c98ff8c411ee6f4efdf4839f9b34ea79fd599 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -297,6 +297,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 89%
rename from patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index df38135262..58d3032f44 100644
--- a/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,10 +7,10 @@ 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 961213739ba810c6e39aca76a32d74bcf2a58ad3..d8f8ca63079eed7d97488f954d989e99ec4c054e 100644
+index 32707ab485111e265cc34d5f09507c97067dfa09..eed16b541a9c39ed4697e783612e6f7b7ff23b70 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2275,9 +2275,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2327,9 +2327,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      bworld = server.getWorld(worldName);
                  }
  
diff --git a/patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 96%
rename from patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 24a34f27d2..0db5713461 100644
--- a/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,10 +16,10 @@ 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 d8f8ca63079eed7d97488f954d989e99ec4c054e..f57d9a298a6e3be63c37ed7e14c99b154d372709 100644
+index eed16b541a9c39ed4697e783612e6f7b7ff23b70..1d2dd9b8ae43f22d875cb530130118df247b87dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2405,11 +2405,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2457,11 +2457,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -34,7 +34,7 @@ index d8f8ca63079eed7d97488f954d989e99ec4c054e..f57d9a298a6e3be63c37ed7e14c99b15
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -3211,6 +3212,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3263,6 +3264,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, Vec3 location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index d8f8ca63079eed7d97488f954d989e99ec4c054e..f57d9a298a6e3be63c37ed7e14c99b15
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
              this.level().getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -3237,6 +3244,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3289,6 +3296,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  // CraftBukkit end
  
                  this.level().getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index d8f8ca63079eed7d97488f954d989e99ec4c054e..f57d9a298a6e3be63c37ed7e14c99b15
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {
-@@ -3250,10 +3262,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3302,10 +3314,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index d8f8ca63079eed7d97488f954d989e99ec4c054e..f57d9a298a6e3be63c37ed7e14c99b15
                      // CraftBukkit end
                  }
  
-@@ -3374,7 +3382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3426,7 +3434,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0381-Villager-Restocks-API.patch b/patches/server/0382-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0381-Villager-Restocks-API.patch
rename to patches/server/0382-Villager-Restocks-API.patch
diff --git a/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 91%
rename from patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 8390bc1c20..ece5627802 100644
--- a/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,10 +5,10 @@ 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 717f23a92017a589e639c09e15377e30f602d8fe..1f5d20f46ac358855f857a2c5fb348233b56bf2e 100644
+index 467ae1d550191f7ba17b7822daaf753cae9d6fda..b27e3ce52a900345556b2f6bd5985d8e368b7d0b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -859,7 +859,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -866,7 +866,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handlePickItem(ServerboundPickItemPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0383-Expose-game-version.patch b/patches/server/0384-Expose-game-version.patch
similarity index 89%
rename from patches/server/0383-Expose-game-version.patch
rename to patches/server/0384-Expose-game-version.patch
index 8c8e16d9f8..5765fe7db9 100644
--- a/patches/server/0383-Expose-game-version.patch
+++ b/patches/server/0384-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 712bee34303ca3ceec4520e265f4defdc27ea8ff..3597b4f98c73b781a3f2389e563e3dc2c2f711fe 100644
+index 81e8ff4c3901bb16ddfb09bda1237308b5c469e4..e843466c691b348b24826a9acbefa06c9098a28b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -585,6 +585,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0384-Optimize-Voxel-Shape-Merging.patch b/patches/server/0385-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0384-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0385-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0386-misc-debugging-dumps.patch b/patches/server/0387-misc-debugging-dumps.patch
similarity index 91%
rename from patches/server/0386-misc-debugging-dumps.patch
rename to patches/server/0387-misc-debugging-dumps.patch
index d85a2e4647..5229ba2681 100644
--- a/patches/server/0386-misc-debugging-dumps.patch
+++ b/patches/server/0387-misc-debugging-dumps.patch
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d50878653132218dd494e0e5ed6fc3a32d4f1465..ad7f14d78fea3e6aba9576114463907b292c45a0 100644
+index 41106a10ca8148dae4129e2a46854d83605839b4..a107751a13ccef2729068e9b9822509374d20187 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -862,6 +862,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -872,6 +872,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
      public volatile boolean hasFullyShutdown = false; // Paper
@@ -40,7 +40,7 @@ index d50878653132218dd494e0e5ed6fc3a32d4f1465..ad7f14d78fea3e6aba9576114463907b
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -876,6 +877,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -886,6 +887,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -48,7 +48,7 @@ index d50878653132218dd494e0e5ed6fc3a32d4f1465..ad7f14d78fea3e6aba9576114463907b
          // Paper start - kill main thread, and kill it hard
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
-@@ -1004,6 +1006,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -986,6 +988,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          this.isRestarting = isRestarting;
@@ -74,7 +74,7 @@ index ea26375d6f23b14a8a1cd926fe410713551de99d..496ac1d2fd43c5ddfe7fa7a8b72a7586
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3597b4f98c73b781a3f2389e563e3dc2c2f711fe..64663e74d85979f857d748f0c252c0568f5d95ae 100644
+index e843466c691b348b24826a9acbefa06c9098a28b..d58ecb5bbfe0c64a88da1b7705d6482d2722da18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1009,6 +1009,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0387-Prevent-teleporting-dead-entities.patch b/patches/server/0388-Prevent-teleporting-dead-entities.patch
similarity index 87%
rename from patches/server/0387-Prevent-teleporting-dead-entities.patch
rename to patches/server/0388-Prevent-teleporting-dead-entities.patch
index 4b805d6514..39d8eeff36 100644
--- a/patches/server/0387-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0388-Prevent-teleporting-dead-entities.patch
@@ -5,10 +5,10 @@ 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 1f5d20f46ac358855f857a2c5fb348233b56bf2e..7f4bae60e44d9624871b5b447ea2df11f95d82fe 100644
+index b27e3ce52a900345556b2f6bd5985d8e368b7d0b..f4fc0edf454722b59ac89559fb3e5bb241dac5a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1507,6 +1507,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1514,6 +1514,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<RelativeMovement> set) { // Paper
diff --git a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 97%
rename from patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index ad1f434e26..ff18006911 100644
--- a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -494,7 +494,7 @@ index 52eb3176437113f9a0ff85d10ce5c2415e1b5570..b54ddd0ba0b001fbcb1838a838ca4890
          }
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 62df5c51fa11f85ec2fad20c0ea5aa6241294e8a..81e49a770fd8a10e987f3e67a5ab99fc39d5e47f 100644
+index 08361da4ebd301996b0aaafc58beb5ec6698ff44..69722e101f537a71576fd82957cf305c5feef5fa 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -75,13 +75,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -514,7 +514,7 @@ index 62df5c51fa11f85ec2fad20c0ea5aa6241294e8a..81e49a770fd8a10e987f3e67a5ab99fc
      });
      private final PacketFlow receiving;
      private final Queue<Consumer<Connection>> pendingActions = Queues.newConcurrentLinkedQueue();
-@@ -195,7 +195,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -217,7 +217,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              }
          }
@@ -524,7 +524,7 @@ index 62df5c51fa11f85ec2fad20c0ea5aa6241294e8a..81e49a770fd8a10e987f3e67a5ab99fc
  
      protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f72c1a4baff6ac9a3b1df83ece3925e2b1678df9..967817ad15146407668361a85c89be6beb6a73f9 100644
+index f43e5a83b9220eb23a777fa7490b49aac440bea0..1f8dcc331505890ba72777b5d0cda2427e0ccfd1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -195,6 +195,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -536,7 +536,7 @@ index f72c1a4baff6ac9a3b1df83ece3925e2b1678df9..967817ad15146407668361a85c89be6b
          paperConfigurations.initializeWorldDefaultsConfiguration();
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4307b72acc389ccab97b2b7f3f824ddeca5a3cda..6bb7f2050e93f63045ea608672751da28138d3f8 100644
+index 282d94ab6da3cefa68a7caee88d726ffa2f73b83..5efd4d512f0a5ea90ff0f3131a91271310da8be0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,7 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -550,7 +550,7 @@ index 4307b72acc389ccab97b2b7f3f824ddeca5a3cda..6bb7f2050e93f63045ea608672751da2
      }
  
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-@@ -1235,7 +1237,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1469,7 +1471,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity.isRemoved()) {
              // Paper start
              if (DEBUG_ENTITIES) {
@@ -612,7 +612,7 @@ index 5db27d7bcaaa2eeaeeb08401513d8d23f6cb63c7..ce43cb0152ba07c6c21e08142d65813d
                              }
                         }
 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 c9a6a56dfd25601bc0a11e5ddb349dba372c0e18..9cb4c145a36de0fe5be148b854ebb6f2a8446f49 100644
+index 793077e38a0bced4f78d41c0555487cd955f45e9..7fccb874ca2de82cc652a440bd250d0d1295397d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -603,7 +603,7 @@ public class LevelChunk extends ChunkAccess {
@@ -641,10 +641,10 @@ index 3c1992e212a6d6f1db4d5b807b38d71913619fc0..9c1aff17aabd062640e3f451a2ef8c50
  
      CraftAsyncScheduler() {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index e71041d41eae31cce73d8817c4f95f16c8c600aa..71dbda5ae954b31ca3915de8823b552a09dfcab8 100644
+index a9bd33b58a6a3296b70eaaaea3adbee74724e448..7071327fab87d53e794374c701d7c2748c439aaa 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -105,7 +105,7 @@ public class WatchdogThread extends Thread
+@@ -105,7 +105,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      log.log( Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity" );
                      log.log( Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated" );
                      log.log( Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
@@ -653,7 +653,7 @@ index e71041d41eae31cce73d8817c4f95f16c8c600aa..71dbda5ae954b31ca3915de8823b552a
                      {
                          log.log( Level.SEVERE, "\t\t" + stack );
                      }
-@@ -191,7 +191,7 @@ public class WatchdogThread extends Thread
+@@ -192,7 +192,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
          }
          log.log( Level.SEVERE, "\tStack:" );
          //
diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0390-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0389-Implement-Mob-Goal-API.patch
rename to patches/server/0390-Implement-Mob-Goal-API.patch
index 38b645c5a7..bc48cef1c0 100644
--- a/patches/server/0389-Implement-Mob-Goal-API.patch
+++ b/patches/server/0390-Implement-Mob-Goal-API.patch
@@ -792,7 +792,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 64663e74d85979f857d748f0c252c0568f5d95ae..5918b0296cf011f562e219984e6ad12a975318fb 100644
+index d58ecb5bbfe0c64a88da1b7705d6482d2722da18..dd0b8f158718af34275589d772c64d94dfcb911d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2777,5 +2777,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0390-Add-villager-reputation-API.patch b/patches/server/0391-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0390-Add-villager-reputation-API.patch
rename to patches/server/0391-Add-villager-reputation-API.patch
diff --git a/patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0392-ExperienceOrbMergeEvent.patch b/patches/server/0393-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0392-ExperienceOrbMergeEvent.patch
rename to patches/server/0393-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0394-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0395-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0394-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0395-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0395-Potential-bed-API.patch b/patches/server/0396-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0395-Potential-bed-API.patch
rename to patches/server/0396-Potential-bed-API.patch
diff --git a/patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 90%
rename from patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch
index 6a46061520..728257ad50 100644
--- a/patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,10 +10,10 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ad7f14d78fea3e6aba9576114463907b292c45a0..020c6ee8df9a97ca84f1fb36b03abfcd5df24744 100644
+index a107751a13ccef2729068e9b9822509374d20187..e2b4e7fb68aeaa2a95f3d1dfdd04521746d18a8d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -902,6 +902,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -912,6 +912,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
@@ -22,7 +22,7 @@ index ad7f14d78fea3e6aba9576114463907b292c45a0..020c6ee8df9a97ca84f1fb36b03abfcd
          // CraftBukkit end
          this.getConnection().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5918b0296cf011f562e219984e6ad12a975318fb..4c4cee10d688aa0a3aab29f42c4cd8fd22488796 100644
+index dd0b8f158718af34275589d772c64d94dfcb911d..126552d1d27028f1872e9355c25a8a27ce199c73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1019,6 +1019,31 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 12f4cffe8e..48db3a4242 100644
--- a/patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -34,7 +34,7 @@ index c0227cda09b9ca508c1de1fbe1e57afd743a9426..93529defa5d36bb9b4c69eedda9b7ac3
  
                      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 8b0c85d341c75e86421fc7c72aefcce83a165075..ea11bea03a15bfd79b82da60c48bfb23a44acda4 100644
+index a9a4e27178a1d83812720f0d4d695b0d32badaf7..0a6fcbc876f787c71770e7244a15f342f1fd4670 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -516,6 +516,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0399-Ensure-safe-gateway-teleport.patch b/patches/server/0400-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0399-Ensure-safe-gateway-teleport.patch
rename to patches/server/0400-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0400-Add-option-for-console-having-all-permissions.patch b/patches/server/0401-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0400-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0401-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0401-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0402-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0401-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0402-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0402-Maps-shouldn-t-load-chunks.patch b/patches/server/0403-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0402-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0403-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0403-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0403-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0404-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0404-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0405-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0405-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0406-Fix-sand-duping.patch b/patches/server/0407-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0406-Fix-sand-duping.patch
rename to patches/server/0407-Fix-sand-duping.patch
diff --git a/patches/server/0407-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0407-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0408-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 91%
rename from patches/server/0408-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch
index 42d93ea8ba..9ec32da422 100644
--- a/patches/server/0408-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,10 +14,10 @@ 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 7f4bae60e44d9624871b5b447ea2df11f95d82fe..0790b86a4cb1068041d8e94aef84067b3039a055 100644
+index f4fc0edf454722b59ac89559fb3e5bb241dac5a2..d2a46b11bcfc5232e725fa0f0a7b9eab175990b9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1333,6 +1333,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1340,6 +1340,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                              this.player.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
                              this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
diff --git a/patches/server/0409-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0409-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0410-Improve-Arrow-API.patch b/patches/server/0411-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0410-Improve-Arrow-API.patch
rename to patches/server/0411-Improve-Arrow-API.patch
diff --git a/patches/server/0411-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from patches/server/0411-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch
index f5f8130ea0..b0ddb1b0a4 100644
--- a/patches/server/0411-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,10 +5,10 @@ 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 0790b86a4cb1068041d8e94aef84067b3039a055..f16327556a5302c319b164897d2c5b3b4883ed31 100644
+index d2a46b11bcfc5232e725fa0f0a7b9eab175990b9..2f06213e5f25953431ff0428693e275e2d781dba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2951,16 +2951,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2958,16 +2958,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              if (!this.player.containerMenu.stillValid(this.player)) {
                  ServerGamePacketListenerImpl.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
              } else {
diff --git a/patches/server/0412-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0413-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0412-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0413-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0413-Add-permission-for-command-blocks.patch b/patches/server/0414-Add-permission-for-command-blocks.patch
similarity index 96%
rename from patches/server/0413-Add-permission-for-command-blocks.patch
rename to patches/server/0414-Add-permission-for-command-blocks.patch
index 355266e757..674c168b77 100644
--- a/patches/server/0413-Add-permission-for-command-blocks.patch
+++ b/patches/server/0414-Add-permission-for-command-blocks.patch
@@ -18,10 +18,10 @@ index bdf11a98614c9c12d3112f437651be81d0d9872a..3622708c453feb6da3d5be192291d63a
                  return false;
              } else if (this.player.blockActionRestricted(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 f16327556a5302c319b164897d2c5b3b4883ed31..dc5bcf6cf46d32961da9a2a6e9691ab30bb96045 100644
+index 2f06213e5f25953431ff0428693e275e2d781dba..b27363ca1a4f491150b1795fbbc12399a5c0d5ac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -770,7 +770,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -777,7 +777,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
@@ -30,7 +30,7 @@ index f16327556a5302c319b164897d2c5b3b4883ed31..dc5bcf6cf46d32961da9a2a6e9691ab3
              this.player.sendSystemMessage(Component.translatable("advMode.notAllowed"));
          } else {
              BaseCommandBlock commandblocklistenerabstract = null;
-@@ -837,7 +837,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -844,7 +844,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
diff --git a/patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 74%
rename from patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch
index 759d5dd6ec..572985f135 100644
--- a/patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,10 +5,10 @@ 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 f57d9a298a6e3be63c37ed7e14c99b154d372709..7b182384ca7f2b36513856e247072c3c5c05b5e7 100644
+index 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b5cf68633 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -636,8 +636,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -688,8 +688,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setPos(double x, double y, double z) {
@@ -19,7 +19,7 @@ index f57d9a298a6e3be63c37ed7e14c99b154d372709..7b182384ca7f2b36513856e247072c3c
      }
  
      protected AABB makeBoundingBox() {
-@@ -4128,6 +4128,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4190,6 +4190,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -28,10 +28,10 @@ index f57d9a298a6e3be63c37ed7e14c99b154d372709..7b182384ca7f2b36513856e247072c3c
 +    }
 +    public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
 +        // Paper end
-         if (this.position.x != x || this.position.y != y || this.position.z != z) {
-             this.position = new Vec3(x, y, z);
-             int i = Mth.floor(x);
-@@ -4145,6 +4150,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+         // Paper start - rewrite chunk system
+         if (this.updatingSectionStatus) {
+             LOGGER.error("Refusing to update position for entity " + this + " to position " + new Vec3(x, y, z) + " since it is processing a section status update", new Throwable());
+@@ -4213,6 +4218,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 90%
rename from patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 0b82ddee43..f738d811a7 100644
--- a/patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 020c6ee8df9a97ca84f1fb36b03abfcd5df24744..ac7c70533659c5683f72ded537f76cb6ff4e3777 100644
+index e2b4e7fb68aeaa2a95f3d1dfdd04521746d18a8d..a106f5f573c9eec1f56fa88f7398ac28d231b5e5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -782,7 +782,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -20,7 +20,7 @@ index 020c6ee8df9a97ca84f1fb36b03abfcd5df24744..ac7c70533659c5683f72ded537f76cb6
  
          this.forceTicks = false;
          // CraftBukkit end
-@@ -1731,11 +1731,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1726,11 +1726,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -40,7 +40,7 @@ index 020c6ee8df9a97ca84f1fb36b03abfcd5df24744..ac7c70533659c5683f72ded537f76cb6
          }
      }
  
-@@ -1749,7 +1752,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1744,7 +1747,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
  
@@ -63,7 +63,7 @@ index 89be3991ef4fb2deb7276c5409cb571a7fb1f821..9c272f7cf8cbd2bbe147e57f7fabe135
                  return Component.translatable("commands.difficulty.success", difficulty.getDisplayName());
              }, true);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 967817ad15146407668361a85c89be6beb6a73f9..5d90fc103577a5dab63daf9a23ba46da7eba1e18 100644
+index 1f8dcc331505890ba72777b5d0cda2427e0ccfd1..a661f8a83d4e57ca48bbf28dc668f8ff5fd29c91 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -76,10 +76,10 @@ index 967817ad15146407668361a85c89be6beb6a73f9..5d90fc103577a5dab63daf9a23ba46da
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fcf875c6145c2428cab7a801442f34adc098b3ce..b70165b6ffce01aadf30af33746d347457dc150a 100644
+index 3523b35e629dc78343b891a495bbe310724595f8..40964032baa7a94ee0330f36123eaee638c847c2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1162,7 +1162,7 @@ public class ServerPlayer extends Player {
+@@ -1206,7 +1206,7 @@ public class ServerPlayer extends Player {
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
                  this.connection.send(new ClientboundRespawnPacket(this.createCommonSpawnInfo(worldserver), (byte) 3));
@@ -89,10 +89,10 @@ index fcf875c6145c2428cab7a801442f34adc098b3ce..b70165b6ffce01aadf30af33746d3474
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dc5bcf6cf46d32961da9a2a6e9691ab30bb96045..c6b5bc584fc117240c4290ba48dd71e5d70c2abb 100644
+index b27363ca1a4f491150b1795fbbc12399a5c0d5ac..1cf17df6cad66c4b27e1636f365024c9e1e080f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3153,7 +3153,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3160,7 +3160,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) {
@@ -102,7 +102,7 @@ index dc5bcf6cf46d32961da9a2a6e9691ab30bb96045..c6b5bc584fc117240c4290ba48dd71e5
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4c4cee10d688aa0a3aab29f42c4cd8fd22488796..cc28da02a5736508bc82f31401646de2c0d7ab99 100644
+index 126552d1d27028f1872e9355c25a8a27ce199c73..f212b3b42fa6086c8d6b60e246591d9dcd7cb6bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -958,8 +958,8 @@ public final class CraftServer implements Server {
@@ -117,10 +117,10 @@ index 4c4cee10d688aa0a3aab29f42c4cd8fd22488796..cc28da02a5736508bc82f31401646de2
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b266cd21fec4c48d2fc4676eb30b1bfdaa4acd98..4f40c0fcab774647cc89c04d51ae47444bc88874 100644
+index f5e54c4adc9466ba23a665cc8d14b2ce4efd00d5..872a0352008c6889f13b01f6a21e1a1da31f291e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1155,7 +1155,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1145,7 +1145,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setDifficulty(Difficulty difficulty) {
diff --git a/patches/server/0416-Paper-dumpitem-command.patch b/patches/server/0417-Paper-dumpitem-command.patch
similarity index 94%
rename from patches/server/0416-Paper-dumpitem-command.patch
rename to patches/server/0417-Paper-dumpitem-command.patch
index 92d411e39d..5722936af7 100644
--- a/patches/server/0416-Paper-dumpitem-command.patch
+++ b/patches/server/0417-Paper-dumpitem-command.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Paper dumpitem command
 Let's you quickly view the item in your hands NBT data
 
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index 43573b5ef76c8bb42411c3707cb13d90d531b905..a27c90ea7af63b0d42f202ed1a7dab6e42daed9f 100644
+index 5bfa245a621a0bf7ef60cd01f4c04576b770384e..a8b41d6a42e23a7cd839cc3d5e5cae84860f802c 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -40,6 +40,7 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("dumpplugins"), new DumpPluginsCommand());
+@@ -41,6 +41,7 @@ public final class PaperCommand extends Command {
          commands.put(Set.of("fixlight"), new FixLightCommand());
+         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
          commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
 +        commands.put(Set.of("dumpitem"), new DumpItemCommand());
  
diff --git a/patches/server/0417-Improve-Legacy-Component-serialization-size.patch b/patches/server/0418-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0417-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0418-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0419-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0418-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0419-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 94%
rename from patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index f619a97bc2..28c24c3f4f 100644
--- a/patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cc28da02a5736508bc82f31401646de2c0d7ab99..970a604108c0b7e410af356e3d12559af0b0b78b 100644
+index f212b3b42fa6086c8d6b60e246591d9dcd7cb6bf..ca77f684288a26ee81e0f8bf5fa649290c48d147 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -385,7 +385,7 @@ public final class CraftServer implements Server {
@@ -44,7 +44,7 @@ index cc28da02a5736508bc82f31401646de2c0d7ab99..970a604108c0b7e410af356e3d12559a
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4f40c0fcab774647cc89c04d51ae47444bc88874..6137e49ba4f7dd121bbb7b13add3d63285df52d5 100644
+index 872a0352008c6889f13b01f6a21e1a1da31f291e..53213501b5e818cdee4103c446ca9987f7e71d6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -279,7 +279,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -84,7 +84,7 @@ index 4f40c0fcab774647cc89c04d51ae47444bc88874..6137e49ba4f7dd121bbb7b13add3d632
          }
  
          return true;
-@@ -436,9 +448,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -439,9 +451,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
          // Paper start - Optimize this method
          ChunkPos chunkPos = new ChunkPos(x, z);
@@ -98,7 +98,7 @@ index 4f40c0fcab774647cc89c04d51ae47444bc88874..6137e49ba4f7dd121bbb7b13add3d632
              if (immediate == null) {
                  immediate = world.getChunkSource().chunkMap.getUnloadingChunk(x, z);
              }
-@@ -446,7 +461,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -449,7 +464,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                  if (!(immediate instanceof ImposterProtoChunk) && !(immediate instanceof net.minecraft.world.level.chunk.LevelChunk)) {
                      return false; // not full status
                  }
@@ -107,7 +107,7 @@ index 4f40c0fcab774647cc89c04d51ae47444bc88874..6137e49ba4f7dd121bbb7b13add3d632
                  world.getChunk(x, z); // make sure we're at ticket level 32 or lower
                  return true;
              }
-@@ -472,7 +487,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -475,7 +490,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              // we do this so we do not re-read the chunk data on disk
          }
  
@@ -116,7 +116,7 @@ index 4f40c0fcab774647cc89c04d51ae47444bc88874..6137e49ba4f7dd121bbb7b13add3d632
          world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
          return true;
          // Paper end
-@@ -2174,6 +2189,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2203,6 +2218,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
              net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
                  net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;
diff --git a/patches/server/0420-incremental-chunk-and-player-saving.patch b/patches/server/0421-incremental-chunk-and-player-saving.patch
similarity index 89%
rename from patches/server/0420-incremental-chunk-and-player-saving.patch
rename to patches/server/0421-incremental-chunk-and-player-saving.patch
index 30fff43725..9cca7cddf2 100644
--- a/patches/server/0420-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0421-incremental-chunk-and-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac7c70533659c5683f72ded537f76cb6ff4e3777..e82e5df0abf64b27733beedb4a545a0a1a2119f3 100644
+index a106f5f573c9eec1f56fa88f7398ac28d231b5e5..04258e07f806acd9a0d659b682e0119a5dc23adf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -845,7 +845,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -855,7 +855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index ac7c70533659c5683f72ded537f76cb6ff4e3777..e82e5df0abf64b27733beedb4a545a0a
              flag3 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1368,13 +1368,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1363,13 +1363,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
          }
  
@@ -53,10 +53,10 @@ index ac7c70533659c5683f72ded537f76cb6ff4e3777..e82e5df0abf64b27733beedb4a545a0a
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 7aceefc28f310e704ca8803e95c40ada13718988..70a7abf4738cc5da94d7465884d9a5a1dd7c828c 100644
+index 7881a34e01dd6c8e31b55577bb9323a0171d24bf..7b5851cd4f5a91bf7609464d7d6c4bb5a3da14bf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -603,6 +603,15 @@ public class ServerChunkCache extends ChunkSource {
+@@ -452,6 +452,15 @@ public class ServerChunkCache extends ChunkSource {
          } // Paper - Timings
      }
  
@@ -73,10 +73,10 @@ index 7aceefc28f310e704ca8803e95c40ada13718988..70a7abf4738cc5da94d7465884d9a5a1
      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 6bb7f2050e93f63045ea608672751da28138d3f8..b84a5fcda10711c896c9a670343d961b9536f888 100644
+index 5efd4d512f0a5ea90ff0f3131a91271310da8be0..6bb89597035894f9aedc52469a38f87f2be91893 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1051,6 +1051,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1283,6 +1283,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
@@ -112,10 +112,10 @@ index 6bb7f2050e93f63045ea608672751da28138d3f8..b84a5fcda10711c896c9a670343d961b
 +    // Paper end
 +
      public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
-         ServerChunkCache chunkproviderserver = this.getChunkSource();
- 
+         // Paper start - rewrite chunk system - add close param
+         this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b70165b6ffce01aadf30af33746d347457dc150a..0661ed6cac8da2a1cc94abe7e1017fcd04a9e9c2 100644
+index 40964032baa7a94ee0330f36123eaee638c847c2..b21a6f7624831d1ab152027a29bbdafa53cdda67 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -184,6 +184,7 @@ import org.bukkit.inventory.MainHand;
@@ -127,7 +127,7 @@ index b70165b6ffce01aadf30af33746d347457dc150a..0661ed6cac8da2a1cc94abe7e1017fcd
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fdd518b5ea21ae617069fd03429712de4b44841b..2de6d47c2289faac019e4f68dcc7df910a03e206 100644
+index 8b4c98ff8c411ee6f4efdf4839f9b34ea79fd599..76ab209f27afb88dfb26b8a45a6b36328f63ed45 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -522,6 +522,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0421-Support-old-UUID-format-for-NBT.patch b/patches/server/0422-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0421-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0422-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0422-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0422-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0423-Remove-some-streams-from-structures.patch b/patches/server/0424-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0423-Remove-some-streams-from-structures.patch
rename to patches/server/0424-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0425-Support-components-in-ItemMeta.patch b/patches/server/0426-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0425-Support-components-in-ItemMeta.patch
rename to patches/server/0426-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0426-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0426-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0427-Add-entity-liquid-API.patch b/patches/server/0428-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0427-Add-entity-liquid-API.patch
rename to patches/server/0428-Add-entity-liquid-API.patch
diff --git a/patches/server/0428-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0429-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0428-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0429-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0429-Spawn-player-in-correct-world-on-login.patch b/patches/server/0430-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0429-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0430-Spawn-player-in-correct-world-on-login.patch
index e0436de566..9c088c9864 100644
--- a/patches/server/0429-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0430-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2de6d47c2289faac019e4f68dcc7df910a03e206..55154eba25bc4724bc9523864b8308af4bfc5e87 100644
+index 76ab209f27afb88dfb26b8a45a6b36328f63ed45..fc89e30c529ffee9acfd6bab1a89bbe56e80ba51 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -204,7 +204,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0430-Add-PrepareResultEvent.patch b/patches/server/0431-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0430-Add-PrepareResultEvent.patch
rename to patches/server/0431-Add-PrepareResultEvent.patch
diff --git a/patches/server/0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0432-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0433-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0432-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0433-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0434-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0434-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0434-Fix-SPIGOT-5989.patch b/patches/server/0435-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0434-Fix-SPIGOT-5989.patch
rename to patches/server/0435-Fix-SPIGOT-5989.patch
index 184d76bc65..cf17a3f343 100644
--- a/patches/server/0434-Fix-SPIGOT-5989.patch
+++ b/patches/server/0435-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 55154eba25bc4724bc9523864b8308af4bfc5e87..426594705780125607b9cd88f30f59bec949f882 100644
+index fc89e30c529ffee9acfd6bab1a89bbe56e80ba51..1c95c4ff3f4b1811ff60ecb9518e0ef90c5120a5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -789,6 +789,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 97%
rename from patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 9c7eb0b8d7..f92eb1a39d 100644
--- a/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 6c3e0540dce5f810a7822cefe59228ef77528132..ef73e0a9b916ade0be91c837a82123c9fc4b5018 100644
+index 1b97195394161e067312b71c81ddd448b92c5e44..91b6aeae1e573dfbc8ec54f5ce279a5b43b055c7 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -177,8 +177,17 @@ public class Main {
diff --git a/patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 89%
rename from patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index dabede87f9..f5cba763c4 100644
--- a/patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index ef73e0a9b916ade0be91c837a82123c9fc4b5018..6e89b87dec5f9cb5e5657be0a6d23ae5edf7d2bd 100644
+index 91b6aeae1e573dfbc8ec54f5ce279a5b43b055c7..0368c64403eacf98b85ab15ed71312d932cb59c9 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -177,6 +177,7 @@ public class Main {
diff --git a/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0438-Fix-some-rails-connecting-improperly.patch b/patches/server/0439-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0438-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0439-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0440-Brand-support.patch b/patches/server/0441-Brand-support.patch
similarity index 95%
rename from patches/server/0440-Brand-support.patch
rename to patches/server/0441-Brand-support.patch
index 70ae9adebb..a14c9447df 100644
--- a/patches/server/0440-Brand-support.patch
+++ b/patches/server/0441-Brand-support.patch
@@ -48,10 +48,10 @@ index d1808bf9dc19fad84da5eb3b4c3d549bc624b00a..cce6febce229abdad859f183716cdefb
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e28872e0f86a0106e4ea4e06d1ea8e41128de5c7..a32084082239b71222e72e8d7a1e1b84333d775e 100644
+index f81ebf2e29bab66904644e106cdb2d1ca812a212..8a74046fd65f1bfa7ff22a0019fd8cdf989c7a00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2965,6 +2965,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3007,6 +3007,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0441-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0441-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0442-Don-t-require-FACING-data.patch b/patches/server/0443-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0442-Don-t-require-FACING-data.patch
rename to patches/server/0443-Don-t-require-FACING-data.patch
diff --git a/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 90%
rename from patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 90d8c3d0b7..d802fd7dba 100644
--- a/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0444-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 b84a5fcda10711c896c9a670343d961b9536f888..15a0bbc4e3bafb754b3de03f63b19ab848fe6635 100644
+index 6bb89597035894f9aedc52469a38f87f2be91893..2e2c85e58d311bff6fb65d7757987e42d1537ffe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1762,9 +1762,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1996,9 +1996,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public void setDefaultSpawnPos(BlockPos pos, float angle) {
          // Paper - configurable spawn radius
          BlockPos prevSpawn = this.getSharedSpawnPos();
@@ -21,7 +21,7 @@ index b84a5fcda10711c896c9a670343d961b9536f888..15a0bbc4e3bafb754b3de03f63b19ab8
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6137e49ba4f7dd121bbb7b13add3d63285df52d5..b9a5d94c31b20a87ed96d8e85a28e63400353353 100644
+index 53213501b5e818cdee4103c446ca9987f7e71d6d..874598a1ae8b9adc3e746c01565986c11d12ca45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -259,12 +259,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0444-Add-moon-phase-API.patch b/patches/server/0445-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0444-Add-moon-phase-API.patch
rename to patches/server/0445-Add-moon-phase-API.patch
diff --git a/patches/server/0445-Prevent-headless-pistons-from-being-created.patch b/patches/server/0446-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0445-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0446-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0446-Add-BellRingEvent.patch b/patches/server/0447-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0446-Add-BellRingEvent.patch
rename to patches/server/0447-Add-BellRingEvent.patch
diff --git a/patches/server/0447-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0448-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0447-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0448-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0448-Buffer-joins-to-world.patch b/patches/server/0449-Buffer-joins-to-world.patch
similarity index 90%
rename from patches/server/0448-Buffer-joins-to-world.patch
rename to patches/server/0449-Buffer-joins-to-world.patch
index 3aeacb5392..6b426e93c0 100644
--- a/patches/server/0448-Buffer-joins-to-world.patch
+++ b/patches/server/0449-Buffer-joins-to-world.patch
@@ -8,11 +8,11 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 81e49a770fd8a10e987f3e67a5ab99fc39d5e47f..a147c5e1929e8034b28af56f561f86478684fd08 100644
+index 69722e101f537a71576fd82957cf305c5feef5fa..4977a4880e95c7ba235ec805c5b6dc20d87a0670 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -403,14 +403,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         }
+@@ -432,14 +432,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+         } // Paper end - add pending task queue
      }
  
 +    private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
diff --git a/patches/server/0449-Eigencraft-redstone-implementation.patch b/patches/server/0450-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0449-Eigencraft-redstone-implementation.patch
rename to patches/server/0450-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0450-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0450-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0451-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0451-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0452-Add-more-Evoker-API.patch b/patches/server/0453-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0452-Add-more-Evoker-API.patch
rename to patches/server/0453-Add-more-Evoker-API.patch
diff --git a/patches/server/0453-Add-methods-to-get-translation-keys.patch b/patches/server/0454-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0453-Add-methods-to-get-translation-keys.patch
rename to patches/server/0454-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0454-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0455-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0454-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0455-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0455-Cache-block-data-strings.patch b/patches/server/0456-Cache-block-data-strings.patch
similarity index 95%
rename from patches/server/0455-Cache-block-data-strings.patch
rename to patches/server/0456-Cache-block-data-strings.patch
index e48ba086de..8267b220db 100644
--- a/patches/server/0455-Cache-block-data-strings.patch
+++ b/patches/server/0456-Cache-block-data-strings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e82e5df0abf64b27733beedb4a545a0a1a2119f3..c24e6d743da7f5e1dcd0be05a04bf3dd336ca7f4 100644
+index 04258e07f806acd9a0d659b682e0119a5dc23adf..14e82938f919975c4ff8d463307d1d26db18edc3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2054,6 +2054,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2049,6 +2049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
diff --git a/patches/server/0456-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 93%
rename from patches/server/0456-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 732b6ae9b2..4f37fd06da 100644
--- a/patches/server/0456-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0457-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 c6b5bc584fc117240c4290ba48dd71e5d70c2abb..c0c37203eb6ed180160bd0dc7f2a92887738e347 100644
+index 1cf17df6cad66c4b27e1636f365024c9e1e080f1..e7d584a4a5618c8d70ed7b74bc94b6c259da2daa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -657,7 +657,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -21,7 +21,7 @@ index c6b5bc584fc117240c4290ba48dd71e5d70c2abb..c0c37203eb6ed180160bd0dc7f2a9288
              this.lastGoodX = this.awaitingPositionFromClient.x;
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
-@@ -1549,7 +1549,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1556,7 +1556,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // CraftBukkit end
  
          this.awaitingTeleportTime = this.tickCount;
@@ -31,7 +31,7 @@ index c6b5bc584fc117240c4290ba48dd71e5d70c2abb..c0c37203eb6ed180160bd0dc7f2a9288
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7b182384ca7f2b36513856e247072c3c5c05b5e7..fcd8a25967f0eccb0da3e81d79baca9403b0d34f 100644
+index d4d151fd8b500e32ca5c0f866bd28d3b5cf68633..b0a73ddd7438b9ecd4462638f9f784d796c62c6c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -42,7 +42,7 @@ index 7b182384ca7f2b36513856e247072c3c5c05b5e7..fcd8a25967f0eccb0da3e81d79baca94
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1779,6 +1780,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1831,6 +1832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
diff --git a/patches/server/0457-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0458-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0457-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0458-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0458-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0458-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch
index 51ac6461fd..1098391a77 100644
--- a/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0460-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 15a0bbc4e3bafb754b3de03f63b19ab848fe6635..720568b34c903c80d916a5915c9733c4ed565dcf 100644
+index 2e2c85e58d311bff6fb65d7757987e42d1537ffe..c5a005352e540f004dd92ff4b867f427e4e3b701 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1275,6 +1275,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1509,6 +1509,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0460-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0460-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 4c0b82adb8..472afd4a88 100644
--- a/patches/server/0460-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ 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 fcd8a25967f0eccb0da3e81d79baca9403b0d34f..74c9e96f196d293c7ef68a00829ab24822e16e76 100644
+index b0a73ddd7438b9ecd4462638f9f784d796c62c6c..71dc4112cb932c6b1305f0f22e99f069517cac08 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4364,4 +4364,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4439,4 +4439,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0461-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0462-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0461-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0462-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0462-Entity-isTicking.patch b/patches/server/0463-Entity-isTicking.patch
similarity index 89%
rename from patches/server/0462-Entity-isTicking.patch
rename to patches/server/0463-Entity-isTicking.patch
index dd0216b228..4ef8d10eca 100644
--- a/patches/server/0462-Entity-isTicking.patch
+++ b/patches/server/0463-Entity-isTicking.patch
@@ -5,10 +5,10 @@ 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 74c9e96f196d293c7ef68a00829ab24822e16e76..a1f704600b8b4a43e05584cefdbeedacde6f2ed2 100644
+index 71dc4112cb932c6b1305f0f22e99f069517cac08..cfdc8c37d41473300ca9a8c251e27cb2a07ca4c7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4369,5 +4369,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4444,5 +4444,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0463-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 90%
rename from patches/server/0463-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 36f12a1c89..83811c96bb 100644
--- a/patches/server/0463-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c24e6d743da7f5e1dcd0be05a04bf3dd336ca7f4..22b1efc8927d6f168694b2bde957d960661bb1c4 100644
+index 14e82938f919975c4ff8d463307d1d26db18edc3..e01e32c66afbc0719e3c47cb61e2e205876da884 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2137,13 +2137,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2132,13 +2132,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.isEnforceWhitelist()) {
              PlayerList playerlist = source.getServer().getPlayerList();
              UserWhiteList whitelist = playerlist.getWhiteList();
diff --git a/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0465-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0465-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0465-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0465-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0466-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0467-Fix-for-large-move-vectors-crashing-server.patch
similarity index 96%
rename from patches/server/0466-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0467-Fix-for-large-move-vectors-crashing-server.patch
index 8b9827ba2a..c9f878d596 100644
--- a/patches/server/0466-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0467-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 c0c37203eb6ed180160bd0dc7f2a92887738e347..a4345db5d89b1a2384f4cab421946f05bf846687 100644
+index e7d584a4a5618c8d70ed7b74bc94b6c259da2daa..8293f8215382c32946f7df482e52a935573bbbdd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -464,9 +464,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -57,7 +57,7 @@ index c0c37203eb6ed180160bd0dc7f2a92887738e347..a4345db5d89b1a2384f4cab421946f05
                  boolean flag1 = entity.verticalCollisionBelow;
  
                  if (entity instanceof LivingEntity) {
-@@ -1241,7 +1252,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1248,7 +1259,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          double d7 = d1 - this.firstGoodY;
                          double d8 = d2 - this.firstGoodZ;
                          double d9 = this.player.getDeltaMovement().lengthSqr();
@@ -77,7 +77,7 @@ index c0c37203eb6ed180160bd0dc7f2a92887738e347..a4345db5d89b1a2384f4cab421946f05
  
                          if (this.player.isSleeping()) {
                              if (d10 > 1.0D) {
-@@ -1293,9 +1315,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1300,9 +1322,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                              AABB axisalignedbb = this.player.getBoundingBox();
  
diff --git a/patches/server/0467-Optimise-getType-calls.patch b/patches/server/0468-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0467-Optimise-getType-calls.patch
rename to patches/server/0468-Optimise-getType-calls.patch
diff --git a/patches/server/0468-Villager-resetOffers.patch b/patches/server/0469-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0468-Villager-resetOffers.patch
rename to patches/server/0469-Villager-resetOffers.patch
diff --git a/patches/server/0469-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0469-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch
index 4f20419c05..e579499e65 100644
--- a/patches/server/0469-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ea11bea03a15bfd79b82da60c48bfb23a44acda4..8236bfd8d0bdd322d1aeee7d4b1e32ae5dc1ae1f 100644
+index 0a6fcbc876f787c71770e7244a15f342f1fd4670..4596373017fd5786d85d7e5563366074dc119075 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -157,7 +157,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0471-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0471-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0471-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0472-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0471-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0472-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0472-Player-elytra-boost-API.patch b/patches/server/0473-Player-elytra-boost-API.patch
similarity index 90%
rename from patches/server/0472-Player-elytra-boost-API.patch
rename to patches/server/0473-Player-elytra-boost-API.patch
index a4b048f701..24243d0d54 100644
--- a/patches/server/0472-Player-elytra-boost-API.patch
+++ b/patches/server/0473-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a32084082239b71222e72e8d7a1e1b84333d775e..f842cbe25832b17d7225132eea0bd7704c8c6f08 100644
+index 8a74046fd65f1bfa7ff22a0019fd8cdf989c7a00..c7205ab86236fdd70d1dc4ce24174e19737db1b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -584,6 +584,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -626,6 +626,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          throw new RuntimeException("Unknown settings type");
      }
diff --git a/patches/server/0473-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0474-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0473-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0474-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0475-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0476-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0475-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0476-Add-getOfflinePlayerIfCached-String.patch
index 622b7869df..9711252056 100644
--- a/patches/server/0475-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0476-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 970a604108c0b7e410af356e3d12559af0b0b78b..d09fb11e67364a2c54bf6412b1a8a48797ece3be 100644
+index ca77f684288a26ee81e0f8bf5fa649290c48d147..aa16f21e6f47c3730294f1bec2c86ee8e3c028ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1814,6 +1814,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0476-Add-ignore-discounts-API.patch b/patches/server/0477-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0476-Add-ignore-discounts-API.patch
rename to patches/server/0477-Add-ignore-discounts-API.patch
diff --git a/patches/server/0477-Toggle-for-removing-existing-dragon.patch b/patches/server/0478-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0477-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0478-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0478-Fix-client-lag-on-advancement-loading.patch b/patches/server/0479-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0478-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0479-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0479-Item-no-age-no-player-pickup.patch b/patches/server/0480-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0479-Item-no-age-no-player-pickup.patch
rename to patches/server/0480-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0481-Beacon-API-custom-effect-ranges.patch b/patches/server/0482-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0481-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0482-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0482-Add-API-for-quit-reason.patch b/patches/server/0483-Add-API-for-quit-reason.patch
similarity index 87%
rename from patches/server/0482-Add-API-for-quit-reason.patch
rename to patches/server/0483-Add-API-for-quit-reason.patch
index 12b7d58849..b592209d7d 100644
--- a/patches/server/0482-Add-API-for-quit-reason.patch
+++ b/patches/server/0483-Add-API-for-quit-reason.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index a147c5e1929e8034b28af56f561f86478684fd08..7a98ea71fead97d3e18fa9774eb970359c18d931 100644
+index 4977a4880e95c7ba235ec805c5b6dc20d87a0670..79c55e1f9819345c46aa33f0ebf2555ee4506cce 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -167,12 +167,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -189,12 +189,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              this.handlingFault = true;
              if (this.channel.isOpen()) {
@@ -25,7 +25,7 @@ index a147c5e1929e8034b28af56f561f86478684fd08..7a98ea71fead97d3e18fa9774eb97035
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0661ed6cac8da2a1cc94abe7e1017fcd04a9e9c2..33f04964a2a56d36853d5ef53b79535bc56e7290 100644
+index b21a6f7624831d1ab152027a29bbdafa53cdda67..fadfdb96ce9e0f449780c73a992c79691e4f8469 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
@@ -34,8 +34,8 @@ index 0661ed6cac8da2a1cc94abe7e1017fcd04a9e9c2..33f04964a2a56d36853d5ef53b79535b
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
 +    public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
  
-     public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
-         super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
+     // Paper start - replace player chunk loader
+     private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 index cce6febce229abdad859f183716cdefbec4a8f2e..a38ad79aaf4ef5a928370152bdc5c0cc4c59d93e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -49,7 +49,7 @@ index cce6febce229abdad859f183716cdefbec4a8f2e..a38ad79aaf4ef5a928370152bdc5c0cc
              this.connection.disconnect(ichatbasecomponent);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 426594705780125607b9cd88f30f59bec949f882..75cf90dc8d061578b960b5f6f918b69d14e488ac 100644
+index 1c95c4ff3f4b1811ff60ecb9518e0ef90c5120a5..f5df936cd96688758a1acd8d3ff743e507bc2001 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -560,7 +560,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0483-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0484-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0483-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0484-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0484-Expose-world-spawn-angle.patch b/patches/server/0485-Expose-world-spawn-angle.patch
similarity index 91%
rename from patches/server/0484-Expose-world-spawn-angle.patch
rename to patches/server/0485-Expose-world-spawn-angle.patch
index 4b0fcd58ec..d4805d01c0 100644
--- a/patches/server/0484-Expose-world-spawn-angle.patch
+++ b/patches/server/0485-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 75cf90dc8d061578b960b5f6f918b69d14e488ac..ceb8e91ba1f14a6d6ab516753f87bbd5b681a18a 100644
+index f5df936cd96688758a1acd8d3ff743e507bc2001..303e207e6819e77cf489dd47fb9450c629b70975 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -832,7 +832,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0485-Add-Destroy-Speed-API.patch b/patches/server/0486-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0485-Add-Destroy-Speed-API.patch
rename to patches/server/0486-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 89%
rename from patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 25591bbee8..05d2a7bd40 100644
--- a/patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f842cbe25832b17d7225132eea0bd7704c8c6f08..f4572fdcb6cfbfed75436cdd3a9a829b7f47fe3f 100644
+index c7205ab86236fdd70d1dc4ce24174e19737db1b2..4e0612ebe2bee43d14a56679fa11b1aa69fe4bad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2494,7 +2494,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2536,7 +2536,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null) {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
diff --git a/patches/server/0487-Add-LivingEntity-clearActiveItem.patch b/patches/server/0488-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0487-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0488-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0488-Add-PlayerItemCooldownEvent.patch b/patches/server/0489-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0488-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0489-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0490-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0490-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0490-More-lightning-API.patch b/patches/server/0491-More-lightning-API.patch
similarity index 100%
rename from patches/server/0490-More-lightning-API.patch
rename to patches/server/0491-More-lightning-API.patch
diff --git a/patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch
index 2edeae6de1..976626b644 100644
--- a/patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a1f704600b8b4a43e05584cefdbeedacde6f2ed2..b8c41d759858fcb7b5db48351f352deac7796634 100644
+index cfdc8c37d41473300ca9a8c251e27cb2a07ca4c7..5705dd4c89c2e57540a2eaec0568e45e1947d8c6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1972,6 +1972,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2024,6 +2024,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean isPushable() {
diff --git a/patches/server/0492-Added-missing-default-perms-for-commands.patch b/patches/server/0493-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0492-Added-missing-default-perms-for-commands.patch
rename to patches/server/0493-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0493-Add-PlayerShearBlockEvent.patch b/patches/server/0494-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0493-Add-PlayerShearBlockEvent.patch
rename to patches/server/0494-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0494-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0495-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0494-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0495-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0495-Limit-recipe-packets.patch b/patches/server/0496-Limit-recipe-packets.patch
similarity index 94%
rename from patches/server/0495-Limit-recipe-packets.patch
rename to patches/server/0496-Limit-recipe-packets.patch
index 51678f9f15..5103c1fc78 100644
--- a/patches/server/0495-Limit-recipe-packets.patch
+++ b/patches/server/0496-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a4345db5d89b1a2384f4cab421946f05bf846687..38310db2a998dbac413eb73f128a9a945bcff100 100644
+index 8293f8215382c32946f7df482e52a935573bbbdd..bc38e5f4fbb465a3cb733b48bf296ed719ad09a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -24,7 +24,7 @@ index a4345db5d89b1a2384f4cab421946f05bf846687..38310db2a998dbac413eb73f128a9a94
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -2967,6 +2969,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2974,6 +2976,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
diff --git a/patches/server/0496-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0497-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0496-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0497-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0497-Player-Chunk-Load-Unload-Events.patch b/patches/server/0497-Player-Chunk-Load-Unload-Events.patch
deleted file mode 100644
index acdb2ea099..0000000000
--- a/patches/server/0497-Player-Chunk-Load-Unload-Events.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ysl3000 <yannicklamprecht@live.de>
-Date: Mon, 5 Oct 2020 21:25:16 +0200
-Subject: [PATCH] Player Chunk Load/Unload Events
-
-
-diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-index c509a1318bcef38fd4927e38b6ee9846853e2d15..c442be2119fcf5b4540b0b873519c64a1367c1f4 100644
---- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-+++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-@@ -45,6 +45,11 @@ public class PlayerChunkSender {
-     public void dropChunk(ServerPlayer player, ChunkPos pos) {
-         if (!this.pendingChunks.remove(pos.toLong()) && player.isAlive()) {
-             player.connection.send(new ClientboundForgetLevelChunkPacket(pos));
-+            // Paper start
-+            if(io.papermc.paper.event.packet.PlayerChunkUnloadEvent.getHandlerList().getRegisteredListeners().length > 0){
-+                new io.papermc.paper.event.packet.PlayerChunkUnloadEvent(player.getBukkitEntity().getWorld().getChunkAt(pos.longKey), player.getBukkitEntity()).callEvent();
-+            }
-+            // Paper end
-         }
- 
-     }
-@@ -77,6 +82,11 @@ public class PlayerChunkSender {
- 
-     private static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) {
-         handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null));
-+        // Paper start
-+        if(io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0){
-+            new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent();
-+        }
-+        // Paper end
-         ChunkPos chunkPos = chunk.getPos();
-         DebugPackets.sendPoiPacketsForChunk(world, chunkPos);
-     }
diff --git a/patches/server/0498-Player-Chunk-Load-Unload-Events.patch b/patches/server/0498-Player-Chunk-Load-Unload-Events.patch
new file mode 100644
index 0000000000..4d939dbfcd
--- /dev/null
+++ b/patches/server/0498-Player-Chunk-Load-Unload-Events.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ysl3000 <yannicklamprecht@live.de>
+Date: Mon, 5 Oct 2020 21:25:16 +0200
+Subject: [PATCH] Player Chunk Load/Unload Events
+
+
+diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
+index 0f7ee2eea68a5c910bdf4d6263ed09cbed592516..ef85236b958d8187959c7d446bc2f3c7480854bb 100644
+--- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
++++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
+@@ -45,6 +45,11 @@ public class PlayerChunkSender {
+     // Paper start - rewrite player chunk loader
+     public static void dropChunkStatic(ServerPlayer player, ChunkPos pos) {
+         player.connection.send(new ClientboundForgetLevelChunkPacket(pos));
++        // Paper start
++        if (io.papermc.paper.event.packet.PlayerChunkUnloadEvent.getHandlerList().getRegisteredListeners().length > 0) {
++            new io.papermc.paper.event.packet.PlayerChunkUnloadEvent(player.getBukkitEntity().getWorld().getChunkAt(pos.longKey), player.getBukkitEntity()).callEvent();
++        }
++        // Paper end
+     }
+     // Paper end - rewrite player chunk loader
+ 
+@@ -84,6 +89,11 @@ public class PlayerChunkSender {
+ 
+     public static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) { // Paper - rewrite chunk loader - public
+         handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null));
++        // Paper start
++        if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) {
++            new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent();
++        }
++        // Paper end
+         ChunkPos chunkPos = chunk.getPos();
+         DebugPackets.sendPoiPacketsForChunk(world, chunkPos);
+     }
diff --git a/patches/server/0498-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0499-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0498-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0499-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0499-Expose-LivingEntity-hurt-direction.patch b/patches/server/0500-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0499-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0500-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0501-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0501-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0502-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0502-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0503-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0503-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0503-Implement-TargetHitEvent.patch b/patches/server/0504-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0503-Implement-TargetHitEvent.patch
rename to patches/server/0504-Implement-TargetHitEvent.patch
diff --git a/patches/server/0504-MC-4-Fix-item-position-desync.patch b/patches/server/0505-MC-4-Fix-item-position-desync.patch
similarity index 88%
rename from patches/server/0504-MC-4-Fix-item-position-desync.patch
rename to patches/server/0505-MC-4-Fix-item-position-desync.patch
index 5559b6862a..109b4ceace 100644
--- a/patches/server/0504-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0505-MC-4-Fix-item-position-desync.patch
@@ -28,13 +28,13 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b8c41d759858fcb7b5db48351f352deac7796634..37906167da097b6a6308e8c358d6a344c605d550 100644
+index 5705dd4c89c2e57540a2eaec0568e45e1947d8c6..0d96f40ca4d08197f101a31cca7e334525542565 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4147,6 +4147,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
-     public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
-         // Paper end
+@@ -4215,6 +4215,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+             return;
+         }
+         // Paper end - rewrite chunk system
 +        // Paper start - fix MC-4
 +        if (this instanceof ItemEntity) {
 +            if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.fixEntityPositionDesync) {
diff --git a/patches/server/0505-Additional-Block-Material-API-s.patch b/patches/server/0506-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0505-Additional-Block-Material-API-s.patch
rename to patches/server/0506-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0506-Fix-harming-potion-dupe.patch b/patches/server/0507-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0506-Fix-harming-potion-dupe.patch
rename to patches/server/0507-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0508-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0508-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0508-Cache-burn-durations.patch b/patches/server/0509-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0508-Cache-burn-durations.patch
rename to patches/server/0509-Cache-burn-durations.patch
diff --git a/patches/server/0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0510-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0510-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0510-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0511-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0510-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0511-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0512-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0512-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0513-Fix-interact-event-not-being-called-sometimes.patch
similarity index 94%
rename from patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0513-Fix-interact-event-not-being-called-sometimes.patch
index 4e8f00d979..361ea5e2af 100644
--- a/patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0513-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 38310db2a998dbac413eb73f128a9a945bcff100..2921754736ce51b76337e1ef9d052e680af01db5 100644
+index bc38e5f4fbb465a3cb733b48bf296ed719ad09a0..a080b33b214f53c54143f6355e5fb549611ad0fd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1726,7 +1726,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1733,7 +1733,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  MutableComponent ichatmutablecomponent = Component.translatable("build.tooHigh", i - 1).withStyle(ChatFormatting.RED);
  
                                  this.player.sendSystemMessage(ichatmutablecomponent, true);
@@ -23,7 +23,7 @@ index 38310db2a998dbac413eb73f128a9a945bcff100..2921754736ce51b76337e1ef9d052e68
                                  this.player.swing(enumhand, true);
                              }
                          }
-@@ -2288,13 +2288,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2295,13 +2295,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          double d3 = player.gameMode.getGameModeForPlayer() == GameType.CREATIVE ? 5.0D : 4.5D;
          // SPIGOT-5607: Only call interact event if no block or entity is being clicked. Use bukkit ray trace method, because it handles blocks and entities at the same time
          // SPIGOT-7429: Make sure to call PlayerInteractEvent for spectators and non-pickable entities
diff --git a/patches/server/0513-Zombie-API-breaking-doors.patch b/patches/server/0514-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0513-Zombie-API-breaking-doors.patch
rename to patches/server/0514-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0514-Fix-nerfed-slime-when-splitting.patch b/patches/server/0515-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0514-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0515-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0515-Add-EntityLoadCrossbowEvent.patch b/patches/server/0516-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0515-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0516-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0516-Added-WorldGameRuleChangeEvent.patch b/patches/server/0517-Added-WorldGameRuleChangeEvent.patch
similarity index 96%
rename from patches/server/0516-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0517-Added-WorldGameRuleChangeEvent.patch
index 5cadd41d0c..0b2f2b4fbe 100644
--- a/patches/server/0516-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0517-Added-WorldGameRuleChangeEvent.patch
@@ -64,10 +64,10 @@ index 6a1001cb708a7f779a801428d2b00fbcde888bc1..2e240ad721928a9a68370114ba61c218
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b9a5d94c31b20a87ed96d8e85a28e63400353353..c4df1d66ecdecef0aa03d4995d9e951421dae6dd 100644
+index 874598a1ae8b9adc3e746c01565986c11d12ca45..78d89ba85910f1a8b5a85c7f9a5ff0752d664d57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1850,8 +1850,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1840,8 +1840,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule)) return false;
  
@@ -82,7 +82,7 @@ index b9a5d94c31b20a87ed96d8e85a28e63400353353..c4df1d66ecdecef0aa03d4995d9e9514
          handle.onChanged(this.getHandle().getServer());
          return true;
      }
-@@ -1887,8 +1892,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1877,8 +1882,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule.getName())) return false;
  
diff --git a/patches/server/0517-Added-ServerResourcesReloadedEvent.patch b/patches/server/0518-Added-ServerResourcesReloadedEvent.patch
similarity index 93%
rename from patches/server/0517-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0518-Added-ServerResourcesReloadedEvent.patch
index 7ee6c2bb39..ae3f1de8c5 100644
--- a/patches/server/0517-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0518-Added-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 22b1efc8927d6f168694b2bde957d960661bb1c4..2d2e7fe673962cdf21a7623b51e2731132cd3c01 100644
+index e01e32c66afbc0719e3c47cb61e2e205876da884..6301152b4b3297e6f764f8bccf7394986fc6c76f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2014,7 +2014,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index 22b1efc8927d6f168694b2bde957d960661bb1c4..2d2e7fe673962cdf21a7623b51e27311
          RegistryAccess.Frozen iregistrycustom_dimension = this.registries.getAccessForLoading(RegistryLayer.RELOADABLE);
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
-@@ -2055,6 +2061,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2050,6 +2056,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
              org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings, they can be defined by datapacks so refresh it here
diff --git a/patches/server/0518-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0519-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0518-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0519-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0520-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0519-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0520-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0520-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0521-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0520-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0521-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0521-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0522-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0521-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0522-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0522-Configurable-door-breaking-difficulty.patch b/patches/server/0523-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0522-Configurable-door-breaking-difficulty.patch
rename to patches/server/0523-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0523-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0524-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0523-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0524-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0524-Remove-stale-POIs.patch b/patches/server/0525-Remove-stale-POIs.patch
similarity index 86%
rename from patches/server/0524-Remove-stale-POIs.patch
rename to patches/server/0525-Remove-stale-POIs.patch
index 3bba02ef7c..46d23d529b 100644
--- a/patches/server/0524-Remove-stale-POIs.patch
+++ b/patches/server/0525-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 720568b34c903c80d916a5915c9733c4ed565dcf..752c7ecd4de3cbeded66f457248941f1604dedf5 100644
+index c5a005352e540f004dd92ff4b867f427e4e3b701..5bad3a21d4a520d7d0ea4e4483a1226da00699e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1831,6 +1831,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2065,6 +2065,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              });
              optional1.ifPresent((holder) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0525-Fix-villager-boat-exploit.patch b/patches/server/0526-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0525-Fix-villager-boat-exploit.patch
rename to patches/server/0526-Fix-villager-boat-exploit.patch
index 3a44dfaa9a..fab5613f59 100644
--- a/patches/server/0525-Fix-villager-boat-exploit.patch
+++ b/patches/server/0526-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ceb8e91ba1f14a6d6ab516753f87bbd5b681a18a..62f2a93fe4c9761251ce63bdb95757c72733da7b 100644
+index 303e207e6819e77cf489dd47fb9450c629b70975..709c37e41f566a8301ec26ca76eb28c44a9bf1cd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -585,6 +585,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0526-Add-sendOpLevel-API.patch b/patches/server/0527-Add-sendOpLevel-API.patch
similarity index 89%
rename from patches/server/0526-Add-sendOpLevel-API.patch
rename to patches/server/0527-Add-sendOpLevel-API.patch
index 347729ba1e..6ac7b014b5 100644
--- a/patches/server/0526-Add-sendOpLevel-API.patch
+++ b/patches/server/0527-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 62f2a93fe4c9761251ce63bdb95757c72733da7b..f8645e19492b8fb3ca4c36611e2d6e5cf84cf9d4 100644
+index 709c37e41f566a8301ec26ca76eb28c44a9bf1cd..adc96e0c4f81375253b540a3b003a00e12888cbc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1080,6 +1080,11 @@ public abstract class PlayerList {
@@ -32,10 +32,10 @@ index 62f2a93fe4c9761251ce63bdb95757c72733da7b..f8645e19492b8fb3ca4c36611e2d6e5c
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f4572fdcb6cfbfed75436cdd3a9a829b7f47fe3f..d6617dd0b7b57914a4449ab72873b027a73bcd7c 100644
+index 4e0612ebe2bee43d14a56679fa11b1aa69fe4bad..ad04638955bebdf1392f9dc58be1de699858f5b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -598,6 +598,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -640,6 +640,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
              : null;
      }
diff --git a/patches/server/0527-TODO-Registry-Modification-API.patch b/patches/server/0528-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0527-TODO-Registry-Modification-API.patch
rename to patches/server/0528-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0528-Add-StructuresLocateEvent.patch b/patches/server/0529-Add-StructuresLocateEvent.patch
similarity index 99%
rename from patches/server/0528-Add-StructuresLocateEvent.patch
rename to patches/server/0529-Add-StructuresLocateEvent.patch
index e78150874e..b2afd4140f 100644
--- a/patches/server/0528-Add-StructuresLocateEvent.patch
+++ b/patches/server/0529-Add-StructuresLocateEvent.patch
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..09837f6e6c6ab8a1df2aacdb86646993
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index d70317d0306a7b55ba88b0d2360c9b190454e049..511d0afbd7f3593c8a41e64ef716eaa6f32f3bf8 100644
+index 4da303d7e15496f04f0e27bfb613176bc2a72b76..3c7920721914588a3e7eaf1faff46f7305823416 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -121,6 +121,24 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0529-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0530-Collision-option-for-requiring-a-player-participant.patch
similarity index 94%
rename from patches/server/0529-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0530-Collision-option-for-requiring-a-player-participant.patch
index e0891b711a..ade169f618 100644
--- a/patches/server/0529-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0530-Collision-option-for-requiring-a-player-participant.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 37906167da097b6a6308e8c358d6a344c605d550..f30bafd45d038d6abcb929b138b332a18aa84307 100644
+index 0d96f40ca4d08197f101a31cca7e334525542565..027e4f9f9f3464af8f21cf1f67019aec15666c47 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1842,6 +1842,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1894,6 +1894,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void push(Entity entity) {
          if (!this.isPassengerOfSameVehicle(entity)) {
              if (!entity.noPhysics && !this.noPhysics) {
diff --git a/patches/server/0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0531-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0531-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0531-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0532-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0531-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0532-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0532-Make-schedule-command-per-world.patch b/patches/server/0533-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0532-Make-schedule-command-per-world.patch
rename to patches/server/0533-Make-schedule-command-per-world.patch
diff --git a/patches/server/0533-Configurable-max-leash-distance.patch b/patches/server/0534-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0533-Configurable-max-leash-distance.patch
rename to patches/server/0534-Configurable-max-leash-distance.patch
diff --git a/patches/server/0534-Implement-BlockPreDispenseEvent.patch b/patches/server/0535-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0534-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0535-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0536-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0536-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0536-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0537-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0536-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0537-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0537-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0538-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0537-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0538-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0539-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0539-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0539-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0540-Reset-shield-blocking-on-dimension-change.patch
similarity index 83%
rename from patches/server/0539-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0540-Reset-shield-blocking-on-dimension-change.patch
index 8dd35b6b35..0e2b854ed8 100644
--- a/patches/server/0539-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0540-Reset-shield-blocking-on-dimension-change.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 33f04964a2a56d36853d5ef53b79535bc56e7290..2f91d3938a81b058c95bb1bbd7967e8c309d5c15 100644
+index fadfdb96ce9e0f449780c73a992c79691e4f8469..d76d7a9687df04b99b9116b2ec42263ec767b40f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1199,6 +1199,11 @@ public class ServerPlayer extends Player {
+@@ -1243,6 +1243,11 @@ public class ServerPlayer extends Player {
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }
diff --git a/patches/server/0540-add-DragonEggFormEvent.patch b/patches/server/0541-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0540-add-DragonEggFormEvent.patch
rename to patches/server/0541-add-DragonEggFormEvent.patch
diff --git a/patches/server/0541-EntityMoveEvent.patch b/patches/server/0542-EntityMoveEvent.patch
similarity index 93%
rename from patches/server/0541-EntityMoveEvent.patch
rename to patches/server/0542-EntityMoveEvent.patch
index 2bf474bd6f..d216e8751f 100644
--- a/patches/server/0541-EntityMoveEvent.patch
+++ b/patches/server/0542-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2d2e7fe673962cdf21a7623b51e2731132cd3c01..8788b893329dcd424af53224338868bbf410e5a2 100644
+index 6301152b4b3297e6f764f8bccf7394986fc6c76f..e4a9d99e08d5ed033f20a916f791b9f989fa66fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1496,6 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1491,6 +1491,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -17,7 +17,7 @@ index 2d2e7fe673962cdf21a7623b51e2731132cd3c01..8788b893329dcd424af53224338868bb
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 752c7ecd4de3cbeded66f457248941f1604dedf5..cc5e6c2de2fb3455aab134b43ab207467b832107 100644
+index 5bad3a21d4a520d7d0ea4e4483a1226da00699e3..edf9c5d78f64604e75e6eb5b039edd99c8d48cc2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0543-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 80%
rename from patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0543-added-option-to-disable-pathfinding-updates-on-block.patch
index fb8ea3e316..fd380243ca 100644
--- a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0543-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc5e6c2de2fb3455aab134b43ab207467b832107..b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309 100644
+index edf9c5d78f64604e75e6eb5b039edd99c8d48cc2..01fd020f9539a59f924b96dfb95a43ae2274a720 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1420,6 +1420,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1654,6 +1654,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          this.getChunkSource().blockChanged(pos);
@@ -16,7 +16,7 @@ index cc5e6c2de2fb3455aab134b43ab207467b832107..b6e2e23d773ca3b9f35c7905bbc0f768
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
  
-@@ -1461,6 +1462,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1695,6 +1696,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
          }
diff --git a/patches/server/0543-Inline-shift-direction-fields.patch b/patches/server/0544-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0543-Inline-shift-direction-fields.patch
rename to patches/server/0544-Inline-shift-direction-fields.patch
diff --git a/patches/server/0544-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0545-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0544-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0545-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0546-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0546-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0546-living-entity-allow-attribute-registration.patch b/patches/server/0547-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0546-living-entity-allow-attribute-registration.patch
rename to patches/server/0547-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0547-fix-dead-slime-setSize-invincibility.patch b/patches/server/0548-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0547-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0548-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0548-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0549-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0548-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0549-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0549-Expose-Tracked-Players.patch b/patches/server/0550-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0549-Expose-Tracked-Players.patch
rename to patches/server/0550-Expose-Tracked-Players.patch
diff --git a/patches/server/0550-Remove-streams-from-SensorNearest.patch b/patches/server/0551-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0550-Remove-streams-from-SensorNearest.patch
rename to patches/server/0551-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0551-Improve-ServerGUI.patch b/patches/server/0552-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0551-Improve-ServerGUI.patch
rename to patches/server/0552-Improve-ServerGUI.patch
diff --git a/patches/server/0552-fix-converting-txt-to-json-file.patch b/patches/server/0553-fix-converting-txt-to-json-file.patch
similarity index 94%
rename from patches/server/0552-fix-converting-txt-to-json-file.patch
rename to patches/server/0553-fix-converting-txt-to-json-file.patch
index 98eb8e730e..948c7cb6e4 100644
--- a/patches/server/0552-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0553-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 5d90fc103577a5dab63daf9a23ba46da7eba1e18..c733f30d81c15984c3ab2eb5568a9b762a35bc96 100644
+index a661f8a83d4e57ca48bbf28dc668f8ff5fd29c91..b8bdafb97d2ca46887206b0aa144ee0c851c205d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -48,7 +48,7 @@ index 5d90fc103577a5dab63daf9a23ba46da7eba1e18..c733f30d81c15984c3ab2eb5568a9b76
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f8645e19492b8fb3ca4c36611e2d6e5cf84cf9d4..4c3d0bee54d6458daea83085e3ad0c9db6e3c759 100644
+index adc96e0c4f81375253b540a3b003a00e12888cbc..0958d43ae6a4ee42c944b72008d11c30262a732a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -178,6 +178,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0553-Add-worldborder-events.patch b/patches/server/0554-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0553-Add-worldborder-events.patch
rename to patches/server/0554-Add-worldborder-events.patch
diff --git a/patches/server/0554-added-PlayerNameEntityEvent.patch b/patches/server/0555-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0554-added-PlayerNameEntityEvent.patch
rename to patches/server/0555-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0555-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0556-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0555-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0556-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0556-Add-recipe-to-cook-events.patch b/patches/server/0557-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0556-Add-recipe-to-cook-events.patch
rename to patches/server/0557-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0557-Add-Block-isValidTool.patch b/patches/server/0558-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0557-Add-Block-isValidTool.patch
rename to patches/server/0558-Add-Block-isValidTool.patch
diff --git a/patches/server/0558-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0559-Allow-using-signs-inside-spawn-protection.patch
similarity index 91%
rename from patches/server/0558-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0559-Allow-using-signs-inside-spawn-protection.patch
index 74e1e4d7a5..2008ba6933 100644
--- a/patches/server/0558-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0559-Allow-using-signs-inside-spawn-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2921754736ce51b76337e1ef9d052e680af01db5..daca7fecba44a05d61d4537d6660f8707de91941 100644
+index a080b33b214f53c54143f6355e5fb549611ad0fd..2cd930b022867e1ba8cadf18b47b796d728e4dfd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1718,7 +1718,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1725,7 +1725,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      int i = this.player.level().getMaxBuildHeight();
  
                      if (blockposition.getY() < i) {
diff --git a/patches/server/0559-Expand-world-key-API.patch b/patches/server/0560-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0559-Expand-world-key-API.patch
rename to patches/server/0560-Expand-world-key-API.patch
index 18aadc903a..cb8ec89bcb 100644
--- a/patches/server/0559-Expand-world-key-API.patch
+++ b/patches/server/0560-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index b5981001d8ad4d6c79b965be9a446352971b0d29..0624ba7f1f5b352a5730b6b4736b2499
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d09fb11e67364a2c54bf6412b1a8a48797ece3be..7396ab40cd4b807babf7bbf3ac05c58efd8eb1df 100644
+index aa16f21e6f47c3730294f1bec2c86ee8e3c028ba..cca320f018e0a59c55af09f7707f9121ad99a0ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1140,9 +1140,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0561-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0561-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0561-Item-Rarity-API.patch b/patches/server/0562-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0561-Item-Rarity-API.patch
rename to patches/server/0562-Item-Rarity-API.patch
diff --git a/patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0563-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0563-Drop-carried-item-when-player-has-disconnected.patch
index 09bf44e024..5cc36baecf 100644
--- a/patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0563-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4c3d0bee54d6458daea83085e3ad0c9db6e3c759..b1ade7ad31fb7d42379333c9875d26b664135517 100644
+index 0958d43ae6a4ee42c944b72008d11c30262a732a..248fd1ff7a09cad178a87cb0d9b3be6c9d2f1473 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -578,6 +578,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0563-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0564-forced-whitelist-use-configurable-kick-message.patch
similarity index 87%
rename from patches/server/0563-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0564-forced-whitelist-use-configurable-kick-message.patch
index c2b3e16df5..6be6c5a54b 100644
--- a/patches/server/0563-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0564-forced-whitelist-use-configurable-kick-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8788b893329dcd424af53224338868bbf410e5a2..a708e61770ebe77cb43791eb033aeba2f6b3abab 100644
+index e4a9d99e08d5ed033f20a916f791b9f989fa66fb..6fbe95fea9faa830cde4ff8a8031d148223023e5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2153,7 +2153,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
diff --git a/patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0565-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 86%
rename from patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0565-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 90c47ebde2..b5addc1876 100644
--- a/patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0565-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,10 +5,10 @@ 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 daca7fecba44a05d61d4537d6660f8707de91941..84d8775c591a8c9f0cd843c20b2f0076139f0810 100644
+index 2cd930b022867e1ba8cadf18b47b796d728e4dfd..111a98eef2a6b5ba1800cfc82a8d001482012e6b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1179,7 +1179,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1186,7 +1186,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
  
          itemstack.addTagElement("pages", nbttaglist);
diff --git a/patches/server/0565-Expose-protocol-version.patch b/patches/server/0566-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0565-Expose-protocol-version.patch
rename to patches/server/0566-Expose-protocol-version.patch
diff --git a/patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0567-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0567-Enhance-console-tab-completions-for-brigadier-comman.patch
index cb56ad4c36..1952b16087 100644
--- a/patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0567-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c733f30d81c15984c3ab2eb5568a9b762a35bc96..e9f92a8c225f5f035d35c98743ed7af26cb064c0 100644
+index b8bdafb97d2ca46887206b0aa144ee0c851c205d..c6d8f705f684127f5ef328177f05713130d28db4 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0568-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0568-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0568-Add-bypass-host-check.patch b/patches/server/0569-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0568-Add-bypass-host-check.patch
rename to patches/server/0569-Add-bypass-host-check.patch
diff --git a/patches/server/0569-Set-area-affect-cloud-rotation.patch b/patches/server/0570-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0569-Set-area-affect-cloud-rotation.patch
rename to patches/server/0570-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0570-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0571-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0570-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0571-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0571-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0572-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0571-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0572-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0572-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0573-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0572-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0573-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0573-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0574-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0573-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0574-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0575-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 88%
rename from patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0575-fix-PlayerItemHeldEvent-firing-twice.patch
index 67c50141f5..23daaf3e24 100644
--- a/patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0575-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,10 +5,10 @@ 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 84d8775c591a8c9f0cd843c20b2f0076139f0810..0c32edbe85d849a1b0a125ad6a9bfc6a2e50c8b7 100644
+index 111a98eef2a6b5ba1800cfc82a8d001482012e6b..30bc43f728214c47d8b35cdbaa336390988b9290 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1887,6 +1887,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1894,6 +1894,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
          if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
diff --git a/patches/server/0575-Added-PlayerDeepSleepEvent.patch b/patches/server/0576-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0575-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0576-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0576-More-World-API.patch b/patches/server/0577-More-World-API.patch
similarity index 96%
rename from patches/server/0576-More-World-API.patch
rename to patches/server/0577-More-World-API.patch
index 01cbab2e38..b77b6f98e0 100644
--- a/patches/server/0576-More-World-API.patch
+++ b/patches/server/0577-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c4df1d66ecdecef0aa03d4995d9e951421dae6dd..202ebd562ec1e2b3f1087424da60cadca5da7d01 100644
+index 78d89ba85910f1a8b5a85c7f9a5ff0752d664d57..2091641963b0dec3931d0fb4701ba843533f0d51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2093,6 +2093,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2083,6 +2083,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value(), this.getHandle().registryAccess()), CraftLocation.toBukkit(found.getFirst(), this));
      }
  
diff --git a/patches/server/0577-Added-PlayerBedFailEnterEvent.patch b/patches/server/0578-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0577-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0578-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0579-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 96%
rename from patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0579-Implement-methods-to-convert-between-Component-and-B.patch
index e03948e6e9..8783bf2f94 100644
--- a/patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0579-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e9f92a8c225f5f035d35c98743ed7af26cb064c0..c0e822386bdc3724ca1f24a0ed4fb60e96d9b9eb 100644
+index c6d8f705f684127f5ef328177f05713130d28db4..f598c87dac7a2f852eb8a3948b5ba1a299e85492 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0580-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0580-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 4da17e796d..6dac578ff6 100644
--- a/patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0580-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b1ade7ad31fb7d42379333c9875d26b664135517..ac52a17c47a35a364c0c6e36b0e4dcd117b3f266 100644
+index 248fd1ff7a09cad178a87cb0d9b3be6c9d2f1473..11b44bf31cc0feae3c568bf100801633c0b34906 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -805,6 +805,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0580-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0581-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0580-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0581-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0582-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 92%
rename from patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0582-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 2a885d920d..297720e211 100644
--- a/patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0582-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,10 +5,10 @@ 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 0c32edbe85d849a1b0a125ad6a9bfc6a2e50c8b7..961bb94f61b7bea88aa9371bf804b503ca405bcf 100644
+index 30bc43f728214c47d8b35cdbaa336390988b9290..409fe5a9c904edfeb617f9447dcb77b7883742fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2621,7 +2621,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2628,7 +2628,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              case PERFORM_RESPAWN:
                  if (this.player.wonGame) {
                      this.player.wonGame = false;
@@ -18,7 +18,7 @@ index 0c32edbe85d849a1b0a125ad6a9bfc6a2e50c8b7..961bb94f61b7bea88aa9371bf804b503
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ac52a17c47a35a364c0c6e36b0e4dcd117b3f266..43dd6dbbc510320432aaafc1c5e4e91117fd8189 100644
+index 11b44bf31cc0feae3c568bf100801633c0b34906..8d7e99a331b21f2efbb60936974395b9c12ad5d6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -764,6 +764,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0582-Add-Channel-initialization-listeners.patch b/patches/server/0583-Add-Channel-initialization-listeners.patch
similarity index 96%
rename from patches/server/0582-Add-Channel-initialization-listeners.patch
rename to patches/server/0583-Add-Channel-initialization-listeners.patch
index 2a9c57a5c7..04d5634f92 100644
--- a/patches/server/0582-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0583-Add-Channel-initialization-listeners.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 7a98ea71fead97d3e18fa9774eb970359c18d931..07fc88f8d057c59070e5de97b91c5bf5760ff09a 100644
+index 79c55e1f9819345c46aa33f0ebf2555ee4506cce..30c45e2e92917f8f643d946e13d2e9946cfdba67 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -621,6 +621,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -650,6 +650,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              } else {
                  this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
              }
@@ -133,7 +133,7 @@ index 7a98ea71fead97d3e18fa9774eb970359c18d931..07fc88f8d057c59070e5de97b91c5bf5
          } else {
              if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
                  this.channel.pipeline().remove("decompress");
-@@ -629,6 +630,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -658,6 +659,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
                  this.channel.pipeline().remove("compress");
              }
diff --git a/patches/server/0583-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0584-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0583-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0584-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0584-Add-more-WanderingTrader-API.patch b/patches/server/0585-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0584-Add-more-WanderingTrader-API.patch
rename to patches/server/0585-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0585-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0586-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0585-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0586-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0588-Inventory-close.patch b/patches/server/0589-Inventory-close.patch
similarity index 100%
rename from patches/server/0588-Inventory-close.patch
rename to patches/server/0589-Inventory-close.patch
diff --git a/patches/server/0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0590-Fix-CraftPotionBrewer-cache.patch b/patches/server/0591-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0590-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0591-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0591-Add-basic-Datapack-API.patch b/patches/server/0592-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0591-Add-basic-Datapack-API.patch
rename to patches/server/0592-Add-basic-Datapack-API.patch
index 0f023f246b..e42c671b7b 100644
--- a/patches/server/0591-Add-basic-Datapack-API.patch
+++ b/patches/server/0592-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7396ab40cd4b807babf7bbf3ac05c58efd8eb1df..5dc8db6134c52442cf5abdca152deaaa86495b4d 100644
+index cca320f018e0a59c55af09f7707f9121ad99a0ac..d345a6a9ed7f97e3abcd38633617a2c4ee0a3563 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -304,6 +304,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0592-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0593-Add-environment-variable-to-disable-server-gui.patch
similarity index 85%
rename from patches/server/0592-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0593-Add-environment-variable-to-disable-server-gui.patch
index 67817d5306..15f4f2968a 100644
--- a/patches/server/0592-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0593-Add-environment-variable-to-disable-server-gui.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add environment variable to disable server gui
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 6e89b87dec5f9cb5e5657be0a6d23ae5edf7d2bd..cb986e6aa28729b6037ec380ad41c717cfcb7ef3 100644
+index 0368c64403eacf98b85ab15ed71312d932cb59c9..0ea4b588ae7426c59a47ec30e39c878c5fe3df85 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -299,6 +299,7 @@ public class Main {
+@@ -300,6 +300,7 @@ public class Main {
                  */
                  boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");
  
diff --git a/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0594-additions-to-PlayerGameModeChangeEvent.patch
similarity index 93%
rename from patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0594-additions-to-PlayerGameModeChangeEvent.patch
index c7ef10a7bc..e213914023 100644
--- a/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0594-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,10 +45,10 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2f91d3938a81b058c95bb1bbd7967e8c309d5c15..26733cb73d117af56457f7119f372c33a7dd1649 100644
+index d76d7a9687df04b99b9116b2ec42263ec767b40f..f88898431b8f7cb33e25f9d591c581368e36773d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1844,8 +1844,16 @@ public class ServerPlayer extends Player {
+@@ -1888,8 +1888,16 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -67,7 +67,7 @@ index 2f91d3938a81b058c95bb1bbd7967e8c309d5c15..26733cb73d117af56457f7119f372c33
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1857,7 +1865,7 @@ public class ServerPlayer extends Player {
+@@ -1901,7 +1909,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -76,7 +76,7 @@ index 2f91d3938a81b058c95bb1bbd7967e8c309d5c15..26733cb73d117af56457f7119f372c33
          }
      }
  
-@@ -2264,6 +2272,16 @@ public class ServerPlayer extends Player {
+@@ -2308,6 +2316,16 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
@@ -131,10 +131,10 @@ index 89f0c3d6e4dc9701f02fa7ed5331c3969de81ffc..0a15cda0919c0adf5009a023c17b3e25
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 961bb94f61b7bea88aa9371bf804b503ca405bcf..4d71ba9c16f4ff72a31eaf51a7264711b5e0ce1f 100644
+index 409fe5a9c904edfeb617f9447dcb77b7883742fc..82cf8b575c4622cbea8f9520b452391805b19d80 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2630,7 +2630,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2637,7 +2637,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
@@ -144,10 +144,10 @@ index 961bb94f61b7bea88aa9371bf804b503ca405bcf..4d71ba9c16f4ff72a31eaf51a7264711
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6617dd0b7b57914a4449ab72873b027a73bcd7c..8b75e41b379c5fb31c579be01dd96e0be88b9bd1 100644
+index ad04638955bebdf1392f9dc58be1de699858f5b3..18a446978fdf956e935e6a6c66413b7f528ea671 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1522,7 +1522,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1564,7 +1564,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(mode != null, "GameMode cannot be null");
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0594-ItemStack-repair-check-API.patch b/patches/server/0595-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0594-ItemStack-repair-check-API.patch
rename to patches/server/0595-ItemStack-repair-check-API.patch
diff --git a/patches/server/0595-More-Enchantment-API.patch b/patches/server/0596-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0595-More-Enchantment-API.patch
rename to patches/server/0596-More-Enchantment-API.patch
diff --git a/patches/server/0596-Move-range-check-for-block-placing-up.patch b/patches/server/0597-Move-range-check-for-block-placing-up.patch
similarity index 87%
rename from patches/server/0596-Move-range-check-for-block-placing-up.patch
rename to patches/server/0597-Move-range-check-for-block-placing-up.patch
index e12fc1fd3b..47aba255c1 100644
--- a/patches/server/0596-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0597-Move-range-check-for-block-placing-up.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4d71ba9c16f4ff72a31eaf51a7264711b5e0ce1f..60b03c03bd5497acc617b81ef9a47910d9a9a8c9 100644
+index 82cf8b575c4622cbea8f9520b452391805b19d80..2909ec699b241840e6d1827af0436535f8c88d77 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1704,6 +1704,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1711,6 +1711,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          if (itemstack.isItemEnabled(worldserver.enabledFeatures())) {
              BlockHitResult movingobjectpositionblock = packet.getHitResult();
              Vec3 vec3d = movingobjectpositionblock.getLocation();
diff --git a/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0598-Fix-and-optimise-world-force-upgrading.patch
similarity index 95%
rename from patches/server/0597-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0598-Fix-and-optimise-world-force-upgrading.patch
index f890bcecbc..156f945d70 100644
--- a/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0598-Fix-and-optimise-world-force-upgrading.patch
@@ -247,7 +247,7 @@ index 0000000000000000000000000000000000000000..513833c2ea23df5b079d157bc5cb89d5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index cb986e6aa28729b6037ec380ad41c717cfcb7ef3..06a2210ba7d17fe1676d59794639211e20c1d7ea 100644
+index 0ea4b588ae7426c59a47ec30e39c878c5fe3df85..963e9887bda7bbcd9555fcbb17d63362ef1be5a6 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -16,6 +16,7 @@ import java.nio.file.Path;
@@ -258,7 +258,7 @@ index cb986e6aa28729b6037ec380ad41c717cfcb7ef3..06a2210ba7d17fe1676d59794639211e
  import joptsimple.NonOptionArgumentSpec;
  import joptsimple.OptionParser;
  import joptsimple.OptionSet;
-@@ -357,6 +358,15 @@ public class Main {
+@@ -358,6 +359,15 @@ public class Main {
          return new WorldLoader.InitConfig(worldloader_d, Commands.CommandSelection.DEDICATED, serverPropertiesHandler.functionPermissionLevel);
      }
  
@@ -275,7 +275,7 @@ index cb986e6aa28729b6037ec380ad41c717cfcb7ef3..06a2210ba7d17fe1676d59794639211e
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a708e61770ebe77cb43791eb033aeba2f6b3abab..8f24c53f4c0d399d8583a862025da62445b1547d 100644
+index 6fbe95fea9faa830cde4ff8a8031d148223023e5..171ee674689042ec571c15bfde529bede7056f07 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -540,11 +540,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -306,7 +306,7 @@ index a708e61770ebe77cb43791eb033aeba2f6b3abab..8f24c53f4c0d399d8583a862025da624
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8236bfd8d0bdd322d1aeee7d4b1e32ae5dc1ae1f..24949c13b6e6c2297812e8a3988d4e52aca9136a 100644
+index 4596373017fd5786d85d7e5563366074dc119075..1ed9fbe7885fdc4f8b02364068519e833866aff9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -183,6 +183,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -326,14 +326,13 @@ index 8236bfd8d0bdd322d1aeee7d4b1e32ae5dc1ae1f..24949c13b6e6c2297812e8a3988d4e52
          return this.world;
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 37144c084bd242f9c50b972f46da5ac2671ed20d..66b07ea1b1611b7194a2d3ae1fe748b760166947 100644
+index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e696239f840ed 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -30,6 +30,31 @@ public class RegionFileStorage implements AutoCloseable {
-         this.sync = dsync;
+@@ -60,6 +60,29 @@ public class RegionFileStorage implements AutoCloseable {
      }
  
-+    // Paper start
+     // Paper start
 +    @Nullable
 +    public static ChunkPos getRegionFileCoordinates(Path file) {
 +        String fileName = file.getFileName().toString();
@@ -356,13 +355,12 @@ index 37144c084bd242f9c50b972f46da5ac2671ed20d..66b07ea1b1611b7194a2d3ae1fe748b7
 +            return null;
 +        }
 +    }
-+    // Paper end
-+
-     private RegionFile getRegionFile(ChunkPos chunkcoordintpair, boolean existingOnly) throws IOException { // CraftBukkit
-         long i = ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ());
-         RegionFile regionfile = (RegionFile) this.regionCache.getAndMoveToFirst(i);
++    
+     public synchronized RegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) {
+         return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
+     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5dc8db6134c52442cf5abdca152deaaa86495b4d..a1e10f2dc1786b6f0f1058b3fcac69ca7d10cc15 100644
+index d345a6a9ed7f97e3abcd38633617a2c4ee0a3563..3c2095addcf434ca52071100a9a22d6a8e2e6827 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1217,9 +1217,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0598-Add-Mob-lookAt-API.patch b/patches/server/0599-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0598-Add-Mob-lookAt-API.patch
rename to patches/server/0599-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0599-Add-Unix-domain-socket-support.patch b/patches/server/0600-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0599-Add-Unix-domain-socket-support.patch
rename to patches/server/0600-Add-Unix-domain-socket-support.patch
index 60a4e62f85..2657876138 100644
--- a/patches/server/0599-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0600-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c0e822386bdc3724ca1f24a0ed4fb60e96d9b9eb..34728cebe2de88e0a935707ea9969e068c0f6d7e 100644
+index f598c87dac7a2f852eb8a3948b5ba1a299e85492..b9a4447e790f34fd8f88f353bf0e24a18a298ee6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -93,10 +93,10 @@ index 2ea40a23539898b9c817440aafc91f4b5fd10977..2e7540b0e100347cd91624c9d61a5c46
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60b03c03bd5497acc617b81ef9a47910d9a9a8c9..b69d5c474d2cb1bd40c09ff1c644db4546530f80 100644
+index 2909ec699b241840e6d1827af0436535f8c88d77..75f47816336b6ad7568aa4abe7580e626f2838d5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2453,6 +2453,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2460,6 +2460,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      // Spigot Start
      public SocketAddress getRawAddress()
      {
diff --git a/patches/server/0600-Add-EntityInsideBlockEvent.patch b/patches/server/0601-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0600-Add-EntityInsideBlockEvent.patch
rename to patches/server/0601-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0601-Attributes-API-for-item-defaults.patch b/patches/server/0602-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0601-Attributes-API-for-item-defaults.patch
rename to patches/server/0602-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0603-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 92%
rename from patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0603-Add-cause-to-Weather-ThunderChangeEvents.patch
index 320f771f31..f22f9d8f60 100644
--- a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0603-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 b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309..c16d0e4f30e7b3c6d2c0b320353646589a84c6c8 100644
+index 01fd020f9539a59f924b96dfb95a43ae2274a720..0f6743717f1c219598692cce884cdfcea4cd1ae8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -437,8 +437,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -666,8 +666,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.serverLevelData.setClearWeatherTime(clearDuration);
          this.serverLevelData.setRainTime(rainDuration);
          this.serverLevelData.setThunderTime(rainDuration);
@@ -19,7 +19,7 @@ index b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309..c16d0e4f30e7b3c6d2c0b32035364658
      }
  
      @Override
-@@ -855,8 +855,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1087,8 +1087,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  this.serverLevelData.setThunderTime(j);
                  this.serverLevelData.setRainTime(k);
                  this.serverLevelData.setClearWeatherTime(i);
@@ -30,7 +30,7 @@ index b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309..c16d0e4f30e7b3c6d2c0b32035364658
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -922,14 +922,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1154,14 +1154,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private void resetWeatherCycle() {
          // CraftBukkit start
@@ -95,10 +95,10 @@ index 14b8011c8874e05647eb1636ee1eed5d90da8200..7bfc5bbfcf67e5bbf57e99e648ff5bed
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 202ebd562ec1e2b3f1087424da60cadca5da7d01..47a880bfabcd950ff985c2763531c68db80347f2 100644
+index 2091641963b0dec3931d0fb4701ba843533f0d51..aa30b166cc84088cac8ed27e9bcae0dd3403fd5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1191,7 +1191,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1181,7 +1181,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setStorm(boolean hasStorm) {
@@ -107,7 +107,7 @@ index 202ebd562ec1e2b3f1087424da60cadca5da7d01..47a880bfabcd950ff985c2763531c68d
          this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
          this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
      }
-@@ -1213,7 +1213,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1203,7 +1203,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setThundering(boolean thundering) {
diff --git a/patches/server/0603-More-Lidded-Block-API.patch b/patches/server/0604-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0603-More-Lidded-Block-API.patch
rename to patches/server/0604-More-Lidded-Block-API.patch
diff --git a/patches/server/0604-Limit-item-frame-cursors-on-maps.patch b/patches/server/0605-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0604-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0605-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0605-Add-PlayerKickEvent-causes.patch b/patches/server/0606-Add-PlayerKickEvent-causes.patch
similarity index 95%
rename from patches/server/0605-Add-PlayerKickEvent-causes.patch
rename to patches/server/0606-Add-PlayerKickEvent-causes.patch
index 08fa62c12c..143e4a1c9c 100644
--- a/patches/server/0605-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0606-Add-PlayerKickEvent-causes.patch
@@ -36,10 +36,10 @@ index b5f54ee82905e3e6ab5bfde35ab625f5feeb1393..c0a80824a0307ea673805015119cc834
  
          public boolean shouldDisconnect() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f24c53f4c0d399d8583a862025da62445b1547d..ee8d5345e8ce8e0e082d82e9e52f5918f92a242e 100644
+index 171ee674689042ec571c15bfde529bede7056f07..7e4f3b7a5790292b3b8439fb4696d9d6cfec0167 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2156,7 +2156,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2151,7 +2151,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
@@ -188,7 +188,7 @@ index a38ad79aaf4ef5a928370152bdc5c0cc4c59d93e..877dd962a689c016668d1144ad2fef85
          if (this.cserver.getServer().isRunning()) {
              this.cserver.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 b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a98dd9f9b7 100644
+index 75f47816336b6ad7568aa4abe7580e626f2838d5..5d5b796bc693b2c0f54ba4e6b279053b2180f0bf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -340,7 +340,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -244,8 +244,8 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
 +            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause
              return;
          }
-         // CraftBukkit end
-@@ -875,7 +875,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         // Paper start
+@@ -882,7 +882,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Paper start - validate pick item position
          if (!(packet.getSlot() >= 0 && packet.getSlot() < this.player.getInventory().items.size())) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
@@ -254,7 +254,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              return;
          }
          this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed
-@@ -1058,7 +1058,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1065,7 +1065,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
                      ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
@@ -263,7 +263,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
                      return;
                  }
                  byteTotal += byteLength;
-@@ -1081,14 +1081,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1088,14 +1088,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
@@ -280,7 +280,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              return;
          }
          this.lastBookTick = MinecraftServer.currentTick;
-@@ -1212,7 +1212,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1219,7 +1219,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(0.0D), packet.getY(0.0D), packet.getZ(0.0D), packet.getYRot(0.0F), packet.getXRot(0.0F))) {
@@ -289,7 +289,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
          } else {
              ServerLevel worldserver = this.player.serverLevel();
  
-@@ -1626,7 +1626,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1633,7 +1633,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          this.dropCount++;
                          if (this.dropCount >= 20) {
                              ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " dropped their items too quickly!");
@@ -298,7 +298,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
                              return;
                          }
                      }
-@@ -1909,7 +1909,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1916,7 +1916,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.player.resetLastActionTime();
          } else {
              ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
@@ -307,7 +307,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
          }
      }
  
-@@ -1922,7 +1922,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1929,7 +1929,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // CraftBukkit end
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) {
@@ -316,7 +316,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -1955,7 +1955,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1962,7 +1962,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleChatCommand(ServerboundChatCommandPacket packet) {
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
@@ -325,7 +325,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2010,7 +2010,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2017,7 +2017,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {
          if (exception.shouldDisconnect()) {
@@ -334,7 +334,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
          } else {
              this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED));
          }
-@@ -2041,7 +2041,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2048,7 +2048,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message);
@@ -343,7 +343,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              return Optional.empty();
          } else {
              Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);
-@@ -2064,7 +2064,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2071,7 +2071,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
              if (optional.isEmpty()) {
                  ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
@@ -352,7 +352,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              }
  
              return optional;
-@@ -2260,7 +2260,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2267,7 +2267,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // this.chatSpamTickCount += 20;
          if (this.chatSpamTickCount.addAndGet(20) > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
              // CraftBukkit end
@@ -361,7 +361,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
          }
  
      }
-@@ -2272,7 +2272,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2279,7 +2279,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          synchronized (this.lastSeenMessages) {
              if (!this.lastSeenMessages.applyOffset(packet.offset())) {
                  ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
@@ -370,7 +370,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              }
  
          }
-@@ -2425,7 +2425,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2432,7 +2432,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              }
  
              if (i > 4096) {
@@ -379,7 +379,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              }
  
          }
-@@ -2482,7 +2482,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2489,7 +2489,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Spigot Start
          if ( entity == this.player && !this.player.isSpectator() )
          {
@@ -388,7 +388,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              return;
          }
          // Spigot End
-@@ -2581,7 +2581,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2588,7 +2588,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  // CraftBukkit end
                              }
                          } else {
@@ -397,7 +397,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
                              ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", ServerGamePacketListenerImpl.this.player.getName().getString());
                          }
                      }
-@@ -2991,7 +2991,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2998,7 +2998,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -406,7 +406,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
                  return;
              }
          }
-@@ -3225,7 +3225,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3232,7 +3232,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          if (!Objects.equals(profilepublickey_a, profilepublickey_a1)) {
              if (profilepublickey_a != null && profilepublickey_a1.expiresAt().isBefore(profilepublickey_a.expiresAt())) {
@@ -415,7 +415,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
              } else {
                  try {
                      SignatureValidator signaturevalidator = this.server.getProfileKeySignatureValidator();
-@@ -3238,7 +3238,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3245,7 +3245,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
                      ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
@@ -425,7 +425,7 @@ index b69d5c474d2cb1bd40c09ff1c644db4546530f80..e73208ed05109b64b3607762224b62a9
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 43dd6dbbc510320432aaafc1c5e4e91117fd8189..53c453814c840ce8afed27cea4c6f5e01cddf17f 100644
+index 8d7e99a331b21f2efbb60936974395b9c12ad5d6..9a1f1548b7f095946edb105ddfd64932bf64a2df 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -665,7 +665,7 @@ public abstract class PlayerList {
@@ -479,10 +479,10 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b75e41b379c5fb31c579be01dd96e0be88b9bd1..e19c4f5e016859d702cad249992bebd9016adc5e 100644
+index 18a446978fdf956e935e6a6c66413b7f528ea671..058e5d18e72e07e50fc33e447e30d3c8861022ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -544,7 +544,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -586,7 +586,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          org.spigotmc.AsyncCatcher.catchOp("player kick"); // Spigot
          if (this.getHandle().connection == null) return;
  
@@ -491,7 +491,7 @@ index 8b75e41b379c5fb31c579be01dd96e0be88b9bd1..e19c4f5e016859d702cad249992bebd9
      }
  
      // Paper start
-@@ -556,10 +556,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -598,10 +598,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kick(final net.kyori.adventure.text.Component message) {
@@ -508,7 +508,7 @@ index 8b75e41b379c5fb31c579be01dd96e0be88b9bd1..e19c4f5e016859d702cad249992bebd9
          }
      }
  
-@@ -630,7 +635,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -672,7 +677,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Paper start - Improve chat handling
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
diff --git a/patches/server/0606-Add-PufferFishStateChangeEvent.patch b/patches/server/0607-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0606-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0607-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0608-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0608-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0609-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0609-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0609-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0610-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0609-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0610-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0610-Add-BellRevealRaiderEvent.patch b/patches/server/0611-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0610-Add-BellRevealRaiderEvent.patch
rename to patches/server/0611-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0611-Fix-invulnerable-end-crystals.patch b/patches/server/0612-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0611-Fix-invulnerable-end-crystals.patch
rename to patches/server/0612-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0612-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0613-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0612-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0613-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0613-Fix-dangerous-end-portal-logic.patch b/patches/server/0614-Fix-dangerous-end-portal-logic.patch
similarity index 93%
rename from patches/server/0613-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0614-Fix-dangerous-end-portal-logic.patch
index 6eb26012b5..c93cc3a95e 100644
--- a/patches/server/0613-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0614-Fix-dangerous-end-portal-logic.patch
@@ -11,13 +11,13 @@ 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 f30bafd45d038d6abcb929b138b332a18aa84307..55deac13e5af70689fe74127aebd0e3f880f0cb4 100644
+index 027e4f9f9f3464af8f21cf1f67019aec15666c47..e2f96c7259df87687cd1f560e46c4fb34d78e126 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -431,6 +431,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
-     // Paper end
+@@ -482,6 +482,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
+     public boolean updatingSectionStatus = false;
+     // Paper end
 +    // Paper start - make end portalling safe
 +    public BlockPos portalBlock;
 +    public ServerLevel portalWorld;
@@ -48,11 +48,10 @@ index f30bafd45d038d6abcb929b138b332a18aa84307..55deac13e5af70689fe74127aebd0e3f
 +        this.teleportTo(worldserver, null);
 +    }
 +    // Paper end - make end portalling safe
-+
+ 
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-         this.passengers = ImmutableList.of();
-@@ -2786,6 +2817,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2838,6 +2868,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0615-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0615-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0615-Make-item-validations-configurable.patch b/patches/server/0616-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0615-Make-item-validations-configurable.patch
rename to patches/server/0616-Make-item-validations-configurable.patch
diff --git a/patches/server/0616-Line-Of-Sight-Changes.patch b/patches/server/0617-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0616-Line-Of-Sight-Changes.patch
rename to patches/server/0617-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0617-add-per-world-spawn-limits.patch b/patches/server/0618-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0617-add-per-world-spawn-limits.patch
rename to patches/server/0618-add-per-world-spawn-limits.patch
index fb3c6d461a..d2b35a2549 100644
--- a/patches/server/0617-add-per-world-spawn-limits.patch
+++ b/patches/server/0618-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 47a880bfabcd950ff985c2763531c68db80347f2..d3489601ec89c9deea6beb3153bef9b30be85366 100644
+index aa30b166cc84088cac8ed27e9bcae0dd3403fd5a..b778a911ec072bf375232dd94fc29cb1de1ea88c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -212,6 +212,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0618-Fix-potions-splash-events.patch b/patches/server/0619-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0618-Fix-potions-splash-events.patch
rename to patches/server/0619-Fix-potions-splash-events.patch
diff --git a/patches/server/0619-Add-more-LimitedRegion-API.patch b/patches/server/0620-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0619-Add-more-LimitedRegion-API.patch
rename to patches/server/0620-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0621-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 91%
rename from patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0621-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 37e257bba4..251401b471 100644
--- a/patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0621-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 26733cb73d117af56457f7119f372c33a7dd1649..63a3f714f0a85966fe23507179d39cbfdaa0a1ee 100644
+index f88898431b8f7cb33e25f9d591c581368e36773d..8e6dbca728143f92d6fc5f3ef22b0e33d4ba68a6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2241,7 +2241,7 @@ public class ServerPlayer extends Player {
+@@ -2285,7 +2285,7 @@ public class ServerPlayer extends Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {
diff --git a/patches/server/0621-Missing-Entity-API.patch b/patches/server/0622-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0621-Missing-Entity-API.patch
rename to patches/server/0622-Missing-Entity-API.patch
diff --git a/patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0623-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 88%
rename from patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0623-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 783ba44b64..ef4f10d33f 100644
--- a/patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0623-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e73208ed05109b64b3607762224b62a98dd9f9b7..870707223be5478805ec55e02f17a8c17d3d9f00 100644
+index 5d5b796bc693b2c0f54ba4e6b279053b2180f0bf..c10ee6cf62f5f8c9ab92822d96f779e475f9cd79 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1088,7 +1088,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1095,7 +1095,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Paper end
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
diff --git a/patches/server/0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0624-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0624-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0625-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 94%
rename from patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0625-Use-getChunkIfLoadedImmediately-in-places.patch
index 603bb0a473..5b9b5191fe 100644
--- a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0625-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c16d0e4f30e7b3c6d2c0b320353646589a84c6c8..a81f77b6d057182a716549940f40052fe27e845c 100644
+index 0f6743717f1c219598692cce884cdfcea4cd1ae8..b71e404acd353757cb64489cfe3804988db70409 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index c16d0e4f30e7b3c6d2c0b320353646589a84c6c8..a81f77b6d057182a716549940f40052f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 24949c13b6e6c2297812e8a3988d4e52aca9136a..5b735d018a4b0b1c212f63d941c2aa6a00d129f6 100644
+index 1ed9fbe7885fdc4f8b02364068519e833866aff9..cab4dd0f87bd6e497416b67835b62b4f40539153 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -200,6 +200,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0625-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0626-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0625-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0626-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0626-Adds-PlayerArmSwingEvent.patch b/patches/server/0627-Adds-PlayerArmSwingEvent.patch
similarity index 88%
rename from patches/server/0626-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0627-Adds-PlayerArmSwingEvent.patch
index 63177861c9..7f484acccb 100644
--- a/patches/server/0626-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0627-Adds-PlayerArmSwingEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 870707223be5478805ec55e02f17a8c17d3d9f00..483fc6b3df30d298b023c7bd05cbc05e688229a9 100644
+index c10ee6cf62f5f8c9ab92822d96f779e475f9cd79..c89bd05c60f2180895baaa73d2285df5adc0fbf5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2310,7 +2310,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2317,7 +2317,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          } // Paper end
  
          // Arm swing animation
diff --git a/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0628-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 94%
rename from patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0628-Fixes-kick-event-leave-message-not-being-sent.patch
index fb44bd1c38..d1b6cd6e46 100644
--- a/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0628-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 63a3f714f0a85966fe23507179d39cbfdaa0a1ee..5614d8ed30a005fd7c11e47ced4331b464cddd96 100644
+index 8e6dbca728143f92d6fc5f3ef22b0e33d4ba68a6..f8d812b7cc47b5bebc71a14f5c69e3b650d07579 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -267,7 +267,6 @@ public class ServerPlayer extends Player {
@@ -50,10 +50,10 @@ index 877dd962a689c016668d1144ad2fef850fdbc31e..2a1cf4ff3d0cc062b593f5c58ee80b00
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 483fc6b3df30d298b023c7bd05cbc05e688229a9..4d670073d20d7d678f993b6bd1213ea106e93d6f 100644
+index c89bd05c60f2180895baaa73d2285df5adc0fbf5..7118825a47f3cc99a86d01b578c86144713810ff 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1848,6 +1848,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void onDisconnect(Component reason) {
@@ -66,7 +66,7 @@ index 483fc6b3df30d298b023c7bd05cbc05e688229a9..4d670073d20d7d678f993b6bd1213ea1
          // CraftBukkit start - Rarely it would send a disconnect line twice
          if (this.processedDisconnect) {
              return;
-@@ -1856,11 +1862,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1863,11 +1869,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // CraftBukkit end
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
@@ -85,7 +85,7 @@ index 483fc6b3df30d298b023c7bd05cbc05e688229a9..4d670073d20d7d678f993b6bd1213ea1
          this.chatMessageChain.close();
          // CraftBukkit start - Replace vanilla quit message handling with our own.
          /*
-@@ -1870,7 +1882,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1877,7 +1889,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          this.player.disconnect();
          // Paper start - Adventure
@@ -95,7 +95,7 @@ index 483fc6b3df30d298b023c7bd05cbc05e688229a9..4d670073d20d7d678f993b6bd1213ea1
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 53c453814c840ce8afed27cea4c6f5e01cddf17f..23a469c7950f06b9fca2e8680f1948cc894092a9 100644
+index 9a1f1548b7f095946edb105ddfd64932bf64a2df..14f3873d4bf43d5576a4c93b80d8a97841b23355 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -551,6 +551,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0628-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0629-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0628-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0629-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0629-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0630-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0629-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0630-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0630-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0631-Don-t-apply-cramming-damage-to-players.patch
similarity index 90%
rename from patches/server/0630-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0631-Don-t-apply-cramming-damage-to-players.patch
index 64f204f1dc..5a3e970ab6 100644
--- a/patches/server/0630-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0631-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5614d8ed30a005fd7c11e47ced4331b464cddd96..931673425d19d5bd3846bdc4b46e5e561ab8312c 100644
+index f8d812b7cc47b5bebc71a14f5c69e3b650d07579..840e2f5c629a7d488cc367d17f80550610035994 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
@@ -22,7 +22,7 @@ index 5614d8ed30a005fd7c11e47ced4331b464cddd96..931673425d19d5bd3846bdc4b46e5e56
  import net.minecraft.world.effect.MobEffectInstance;
  import net.minecraft.world.effect.MobEffects;
  import net.minecraft.world.entity.Entity;
-@@ -1431,7 +1432,7 @@ public class ServerPlayer extends Player {
+@@ -1475,7 +1476,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {
diff --git a/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0632-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0632-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0633-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0633-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0633-Stinger-API.patch b/patches/server/0634-Stinger-API.patch
similarity index 100%
rename from patches/server/0633-Stinger-API.patch
rename to patches/server/0634-Stinger-API.patch
diff --git a/patches/server/0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0635-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0635-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0635-Add-System.out-err-catcher.patch b/patches/server/0636-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0635-Add-System.out-err-catcher.patch
rename to patches/server/0636-Add-System.out-err-catcher.patch
index d99cfabb76..cdb6c08dc3 100644
--- a/patches/server/0635-Add-System.out-err-catcher.patch
+++ b/patches/server/0636-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a1e10f2dc1786b6f0f1058b3fcac69ca7d10cc15..37c613e63a63a5fd32f0b2ab82e3525f8d0dad36 100644
+index 3c2095addcf434ca52071100a9a22d6a8e2e6827..22610215d4b71843291eed9d482592dc3448ab0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0637-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0637-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0637-Improve-boat-collision-performance.patch b/patches/server/0638-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0637-Improve-boat-collision-performance.patch
rename to patches/server/0638-Improve-boat-collision-performance.patch
diff --git a/patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0639-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0639-Prevent-AFK-kick-while-watching-end-credits.patch
index 6549178445..c3de7f36fa 100644
--- a/patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0639-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4d670073d20d7d678f993b6bd1213ea106e93d6f..30cdbef6669684cac522e60a254386f23a14b407 100644
+index 7118825a47f3cc99a86d01b578c86144713810ff..0b1030da1dc0a745f7a89d98636ff618dde4d5e4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0639-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0640-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0639-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0640-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0640-Add-PlayerSetSpawnEvent.patch b/patches/server/0641-Add-PlayerSetSpawnEvent.patch
similarity index 95%
rename from patches/server/0640-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0641-Add-PlayerSetSpawnEvent.patch
index 1688bd8464..83b1be4be6 100644
--- a/patches/server/0640-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0641-Add-PlayerSetSpawnEvent.patch
@@ -49,10 +49,10 @@ index a2d0699e8427b2262a2396495111125eccafbb66..d797637f61bdf8a424f56fbb48e28b7c
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 931673425d19d5bd3846bdc4b46e5e561ab8312c..737c8fb2125d249f701d210a76b2ce781854b3b6 100644
+index 840e2f5c629a7d488cc367d17f80550610035994..6bbf5d348764f2cb74065f2ea29ca9f1eebc7c54 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1308,7 +1308,7 @@ public class ServerPlayer extends Player {
+@@ -1352,7 +1352,7 @@ public class ServerPlayer extends Player {
              } else if (this.bedBlocked(blockposition, enumdirection)) {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
@@ -61,7 +61,7 @@ index 931673425d19d5bd3846bdc4b46e5e561ab8312c..737c8fb2125d249f701d210a76b2ce78
                  if (this.level().isDay()) {
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2161,44 +2161,50 @@ public class ServerPlayer extends Player {
+@@ -2205,44 +2205,50 @@ public class ServerPlayer extends Player {
          return this.respawnForced;
      }
  
@@ -145,7 +145,7 @@ index 931673425d19d5bd3846bdc4b46e5e561ab8312c..737c8fb2125d249f701d210a76b2ce78
          } else {
              this.respawnPosition = null;
              this.respawnDimension = Level.OVERWORLD;
-@@ -2206,6 +2212,7 @@ public class ServerPlayer extends Player {
+@@ -2250,6 +2256,7 @@ public class ServerPlayer extends Player {
              this.respawnForced = false;
          }
  
@@ -154,7 +154,7 @@ index 931673425d19d5bd3846bdc4b46e5e561ab8312c..737c8fb2125d249f701d210a76b2ce78
  
      public SectionPos getLastSectionPos() {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 23a469c7950f06b9fca2e8680f1948cc894092a9..f266f35d245ce06a033a95f72e5bb5f95199bd8f 100644
+index 14f3873d4bf43d5576a4c93b80d8a97841b23355..965dd34bd9a23a2fb17e5800af3b294b75b1146a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -855,7 +855,7 @@ public abstract class PlayerList {
@@ -187,10 +187,10 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e19c4f5e016859d702cad249992bebd9016adc5e..610075864157c5db7f09b60228f22b615928cb21 100644
+index 058e5d18e72e07e50fc33e447e30d3c8861022ee..471f25a82a109a58c4093d3a834d8131357c32da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1281,9 +1281,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1323,9 +1323,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0641-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0642-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0641-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0642-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0642-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0643-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0642-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0643-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0643-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0644-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0643-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0644-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0644-Added-EntityDamageItemEvent.patch b/patches/server/0645-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0644-Added-EntityDamageItemEvent.patch
rename to patches/server/0645-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0645-Optimize-indirect-passenger-iteration.patch b/patches/server/0646-Optimize-indirect-passenger-iteration.patch
similarity index 87%
rename from patches/server/0645-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0646-Optimize-indirect-passenger-iteration.patch
index 3924aabb9a..ea38b0fd48 100644
--- a/patches/server/0645-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0646-Optimize-indirect-passenger-iteration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 55deac13e5af70689fe74127aebd0e3f880f0cb4..ef29f13cd146862e2b6e8be3300065ffaaaf1e08 100644
+index e2f96c7259df87687cd1f560e46c4fb34d78e126..5dc20ea46909eac7bb02bc6594a614621b11cf63 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3825,26 +3825,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3876,20 +3876,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,8 @@ index 55deac13e5af70689fe74127aebd0e3f880f0cb4..ef29f13cd146862e2b6e8be3300065ff
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-     }
+@@ -3906,6 +3920,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+     // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
 +        if (this.passengers.isEmpty()) { return false; } // Paper
diff --git a/patches/server/0646-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0647-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0646-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0647-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0647-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0648-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0647-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0648-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0648-Clear-bucket-NBT-after-dispense.patch b/patches/server/0649-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0648-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0649-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0649-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0650-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0649-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0650-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0650-Add-BlockBreakBlockEvent.patch b/patches/server/0651-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0650-Add-BlockBreakBlockEvent.patch
rename to patches/server/0651-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0652-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0652-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0652-More-CommandBlock-API.patch b/patches/server/0653-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0652-More-CommandBlock-API.patch
rename to patches/server/0653-More-CommandBlock-API.patch
diff --git a/patches/server/0653-Add-missing-team-sidebar-display-slots.patch b/patches/server/0654-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0653-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0654-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0654-Add-back-EntityPortalExitEvent.patch b/patches/server/0655-Add-back-EntityPortalExitEvent.patch
similarity index 93%
rename from patches/server/0654-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0655-Add-back-EntityPortalExitEvent.patch
index 78c74fb15d..b349e583a2 100644
--- a/patches/server/0654-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0655-Add-back-EntityPortalExitEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ef29f13cd146862e2b6e8be3300065ffaaaf1e08..bcc316a8d0de827e59198ddee086d3c21b3ef7ea 100644
+index 5dc20ea46909eac7bb02bc6594a614621b11cf63..3b7e54b4348f0486e43b4f7930ada0a16e989650 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3281,6 +3281,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3332,6 +3332,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -37,7 +37,7 @@ index ef29f13cd146862e2b6e8be3300065ffaaaf1e08..bcc316a8d0de827e59198ddee086d3c2
                  if (worldserver == this.level) {
                      // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
                      this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
-@@ -3300,8 +3322,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3351,8 +3373,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0656-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 87%
rename from patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0656-Add-methods-to-find-targets-for-lightning-strikes.patch
index eace4844e2..7acd6065b2 100644
--- a/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0656-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a81f77b6d057182a716549940f40052fe27e845c..7ad3942b39f071c23c10310d71bd259df445e0da 100644
+index b71e404acd353757cb64489cfe3804988db70409..257eedb5413521e1e3ce6a6a6376e0c8175c8c5e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -744,6 +744,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -976,6 +976,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      protected BlockPos findLightningTargetAround(BlockPos pos) {
@@ -22,7 +22,7 @@ index a81f77b6d057182a716549940f40052fe27e845c..7ad3942b39f071c23c10310d71bd259d
          BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
          Optional<BlockPos> optional = this.findLightningRod(blockposition1);
  
-@@ -758,6 +763,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -990,6 +995,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (!list.isEmpty()) {
                  return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
              } else {
@@ -31,10 +31,10 @@ index a81f77b6d057182a716549940f40052fe27e845c..7ad3942b39f071c23c10310d71bd259d
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d3489601ec89c9deea6beb3153bef9b30be85366..8f235460f24a7ac2e8d478bf14a3c83b8fef35df 100644
+index b778a911ec072bf375232dd94fc29cb1de1ea88c..b2137bc4ef0282f9d14068609b7aca7d0708bfe3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -703,6 +703,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -693,6 +693,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (LightningStrike) lightning.getBukkitEntity();
      }
  
diff --git a/patches/server/0656-Get-entity-default-attributes.patch b/patches/server/0657-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0656-Get-entity-default-attributes.patch
rename to patches/server/0657-Get-entity-default-attributes.patch
diff --git a/patches/server/0657-Left-handed-API.patch b/patches/server/0658-Left-handed-API.patch
similarity index 100%
rename from patches/server/0657-Left-handed-API.patch
rename to patches/server/0658-Left-handed-API.patch
diff --git a/patches/server/0658-Add-more-advancement-API.patch b/patches/server/0659-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0658-Add-more-advancement-API.patch
rename to patches/server/0659-Add-more-advancement-API.patch
diff --git a/patches/server/0659-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0660-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0659-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0660-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0660-Add-critical-damage-API.patch b/patches/server/0661-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0660-Add-critical-damage-API.patch
rename to patches/server/0661-Add-critical-damage-API.patch
diff --git a/patches/server/0661-Fix-issues-with-mob-conversion.patch b/patches/server/0662-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0661-Fix-issues-with-mob-conversion.patch
rename to patches/server/0662-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0662-Add-isCollidable-methods-to-various-places.patch b/patches/server/0663-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0662-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0663-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0663-Goat-ram-API.patch b/patches/server/0664-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0663-Goat-ram-API.patch
rename to patches/server/0664-Goat-ram-API.patch
diff --git a/patches/server/0664-Add-API-for-resetting-a-single-score.patch b/patches/server/0665-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0664-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0665-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0666-Add-Raw-Byte-Entity-Serialization.patch
similarity index 96%
rename from patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0666-Add-Raw-Byte-Entity-Serialization.patch
index 6404f5699d..4bbfe755cf 100644
--- a/patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0666-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bcc316a8d0de827e59198ddee086d3c21b3ef7ea..d3f7541d3ddfec80464fb060051f4fefd033b41d 100644
+index 3b7e54b4348f0486e43b4f7930ada0a16e989650..6512c3ca611233f7541c1d0119521e05f524615a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2062,6 +2062,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2113,6 +2113,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  
diff --git a/patches/server/0666-Vanilla-command-permission-fixes.patch b/patches/server/0667-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0666-Vanilla-command-permission-fixes.patch
rename to patches/server/0667-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0668-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 92%
rename from patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0668-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 183572bf15..c28488e52e 100644
--- a/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0668-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,10 +9,10 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7ad3942b39f071c23c10310d71bd259df445e0da..3cb0a648ad3f101acdbcae5d0666cf3aa0f8ce2c 100644
+index 257eedb5413521e1e3ce6a6a6376e0c8175c8c5e..f0f8d10140f0d06cba292f039d1e32ae26b940e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1321,9 +1321,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1555,9 +1555,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Spigot Start
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
@@ -28,10 +28,10 @@ index 7ad3942b39f071c23c10310d71bd259df445e0da..3cb0a648ad3f101acdbcae5d0666cf3a
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 737c8fb2125d249f701d210a76b2ce781854b3b6..46101c122bd5a31b24a24769dd4450b27df23555 100644
+index 6bbf5d348764f2cb74065f2ea29ca9f1eebc7c54..3df5ecfdfae2f0d7714bfbf3d0f32fc6a10e4d38 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1574,6 +1574,18 @@ public class ServerPlayer extends Player {
+@@ -1618,6 +1618,18 @@ public class ServerPlayer extends Player {
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }
diff --git a/patches/server/0668-Fix-GameProfileCache-concurrency.patch b/patches/server/0669-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0668-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0669-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0669-Improve-and-expand-AsyncCatcher.patch b/patches/server/0670-Improve-and-expand-AsyncCatcher.patch
similarity index 95%
rename from patches/server/0669-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0670-Improve-and-expand-AsyncCatcher.patch
index 4b6474beb9..2432deca32 100644
--- a/patches/server/0669-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0670-Improve-and-expand-AsyncCatcher.patch
@@ -17,10 +17,10 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 30cdbef6669684cac522e60a254386f23a14b407..87c9e00cf85809bb40ca043f56b6f180ae08269c 100644
+index 0b1030da1dc0a745f7a89d98636ff618dde4d5e4..08c4e9037d54e14d0a80f75e05a91a128fdc1446 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1536,6 +1536,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1543,6 +1543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<RelativeMovement> set) { // Paper
@@ -178,12 +178,12 @@ index 1a911126ccb7b7e298b66d3fec832dcd0c0e58f7..661638716cd4d1b20745f3a196f6d060
          return true;
      }
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 78669fa035b7537ff7e533cf32aaf2995625424f..e8e3cc48cf1c58bd8151d1f28df28781859cd0e3 100644
+index 05e94702e42b8f5c35d2a112c486d57948a3acba..d678ca116f9b81ab9d7d99a698e0ce066c132f34 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -11,6 +11,7 @@ public class AsyncCatcher
      {
-         if ( (AsyncCatcher.enabled || io.papermc.paper.util.TickThread.STRICT_THREAD_CHECKS) && Thread.currentThread() != MinecraftServer.getServer().serverThread ) // Paper
+         if ( !io.papermc.paper.util.TickThread.isTickThread() ) // Paper // Paper - rewrite chunk system
          {
 +            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); // Paper
              throw new IllegalStateException( "Asynchronous " + reason + "!" );
diff --git a/patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0671-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 96%
rename from patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0671-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 2dfd485194..318fd7edce 100644
--- a/patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0671-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -10,11 +10,11 @@ Also has a hover text on each mob category listing what entity types are
 in said category
 
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index a27c90ea7af63b0d42f202ed1a7dab6e42daed9f..1fd0854fb4f8ab3b5da3cda5ddd2535a0faa6adf 100644
+index a8b41d6a42e23a7cd839cc3d5e5cae84860f802c..b7fc337ab2bbe3c6d80ed70834e294ab3a7f9dc2 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -41,6 +41,7 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("fixlight"), new FixLightCommand());
+@@ -42,6 +42,7 @@ public final class PaperCommand extends Command {
+         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
          commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
          commands.put(Set.of("dumpitem"), new DumpItemCommand());
 +        commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
@@ -278,7 +278,7 @@ index 7983f9a21251cec4857529ad1180a62668ea5037..e1c4cf4b60b810837526c888ec82acbf
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 37c613e63a63a5fd32f0b2ab82e3525f8d0dad36..460350ad26df0a07fab623e404ed4eff117ead13 100644
+index 22610215d4b71843291eed9d482592dc3448ab0d..a39127c21e313b9bdd7796b57cfb5c241d589db5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2184,6 +2184,11 @@ public final class CraftServer implements Server {
@@ -294,10 +294,10 @@ index 37c613e63a63a5fd32f0b2ab82e3525f8d0dad36..460350ad26df0a07fab623e404ed4eff
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8f235460f24a7ac2e8d478bf14a3c83b8fef35df..888a60457bfbfd364e91b9e3d5c9df9dc7a2c564 100644
+index b2137bc4ef0282f9d14068609b7aca7d0708bfe3..cda158bb560c32f7dbea05cd4adb3d38f6db5280 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1709,9 +1709,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1699,9 +1699,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
  
diff --git a/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0672-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0671-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0672-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0672-Optimise-general-POI-access.patch b/patches/server/0673-Optimise-general-POI-access.patch
similarity index 99%
rename from patches/server/0672-Optimise-general-POI-access.patch
rename to patches/server/0673-Optimise-general-POI-access.patch
index 2bed2564be..332786d627 100644
--- a/patches/server/0672-Optimise-general-POI-access.patch
+++ b/patches/server/0673-Optimise-general-POI-access.patch
@@ -879,10 +879,10 @@ index 33fbf72b440e0d164ecd4fb0fdec72e2394d0a1e..8db20db72cd51046213625fac46c3585
                  BlockPos blockPos = path.getTarget();
                  Optional<Holder<PoiType>> optional = poiManager.getType(blockPos);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-index b18b896c624d5cadc02b1db9d011d82124d61d54..a0299e87bff5f86622efcc26530b9400ab928e44 100644
+index 6f2c7baea0d1ac7813c7b85e1f5558573745762c..12a7aaeaa8b4b788b620b1985591c3b93253ccd5 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-@@ -111,43 +111,62 @@ public class PoiManager extends SectionStorage<PoiSection> {
+@@ -127,43 +127,62 @@ public class PoiManager extends SectionStorage<PoiSection> {
      }
  
      public Optional<BlockPos> find(Predicate<Holder<PoiType>> typePredicate, Predicate<BlockPos> posPredicate, BlockPos pos, int radius, PoiManager.Occupancy occupationStatus) {
@@ -965,7 +965,7 @@ index b18b896c624d5cadc02b1db9d011d82124d61d54..a0299e87bff5f86622efcc26530b9400
  
      public boolean release(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-index 795a02941d7cecb58ec45b5e79c8d510ff21163a..5308c8ddb9f2413d332fe30e1c303e6260eaa1aa 100644
+index 3fc17817906876e83f040f908b8b1ba6cfa37b8b..9f138bc471b5c2a4fa813ff943dbe34018b8df74 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 @@ -26,7 +26,7 @@ import org.slf4j.Logger;
@@ -976,12 +976,12 @@ index 795a02941d7cecb58ec45b5e79c8d510ff21163a..5308c8ddb9f2413d332fe30e1c303e62
 +    private final Map<Holder<PoiType>, Set<PoiRecord>> byType = Maps.newHashMap(); public final Map<Holder<PoiType>, Set<PoiRecord>> getData() { return this.byType; } // Paper - public accessor
      private final Runnable setDirty;
      private boolean isValid;
- 
+     public final Optional<PoiSection> noAllocateOptional = Optional.of(this); // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 56f0e217276b01aed2f20a71f6849826285fc15b..087b7699c8a519923999a4bc079bf0b193ae5e7d 100644
+index 54db563d80bbabd87a2be6f5ead92b482ac07b10..4aac1979cf57300825a999c876fcf24d3170e68e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-@@ -70,11 +70,11 @@ public class SectionStorage<R> implements AutoCloseable {
+@@ -71,11 +71,11 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
      }
  
      @Nullable
diff --git a/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0674-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0674-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0675-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0674-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0675-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0676-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0676-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0677-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0677-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index d3043f74e2..f5667e4d21 100644
--- a/patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0677-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5b735d018a4b0b1c212f63d941c2aa6a00d129f6..a508716195953260a00497e925d86c3a1f8942d3 100644
+index cab4dd0f87bd6e497416b67835b62b4f40539153..4cdf476a1f3c5b255b7b4ff4793b6015387879d2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -453,6 +453,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0678-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 77%
rename from patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0678-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 80fbe55372..a1c18946b9 100644
--- a/patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0678-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
@@ -8,14 +8,14 @@ Lighting is purged on update anyways, so let's not add more
 into the conversion process
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-index 6c0f87535ffa95cf82ab4b03bb7bf8f2132d275f..9c92e936f7227d8fb8a51382907301ce1748513e 100644
+index b4e7c9b317d532d4915932f8f79dfebf2b63ff16..79c069d4ff5a72ca3d77c166faa1b7da6ea40d12 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-@@ -44,6 +44,7 @@ public class ChunkStorage implements AutoCloseable {
+@@ -51,6 +51,7 @@ public class ChunkStorage implements AutoCloseable {
  
      // CraftBukkit start
      private boolean check(ServerChunkCache cps, int x, int z) {
 +        if (true) return true; // Paper - this isn't even needed anymore, light is purged updating to 1.14+, why are we holding up the conversion process reading chunk data off disk - return true, we need to set light populated to true so the converter recognizes the chunk as being "full"
          ChunkPos pos = new ChunkPos(x, z);
          if (cps != null) {
-             com.google.common.base.Preconditions.checkState(org.bukkit.Bukkit.isPrimaryThread(), "primary thread");
+             //com.google.common.base.Preconditions.checkState(org.bukkit.Bukkit.isPrimaryThread(), "primary thread"); // Paper - this function is now MT-Safe
diff --git a/patches/server/0678-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0679-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0678-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0679-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0679-Time-scoreboard-search.patch b/patches/server/0680-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0679-Time-scoreboard-search.patch
rename to patches/server/0680-Time-scoreboard-search.patch
diff --git a/patches/server/0680-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0681-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0680-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0681-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0681-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0682-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0681-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0682-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0683-Oprimise-map-impl-for-tracked-players.patch
similarity index 87%
rename from patches/server/0682-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0683-Oprimise-map-impl-for-tracked-players.patch
index 4350d9fd37..059f3dea90 100644
--- a/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0683-Oprimise-map-impl-for-tracked-players.patch
@@ -7,10 +7,10 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4fa2076efd11a628e17d8124f3d89342a3299375..a1962946a32d73bcf2b3988482bc7c9199b8cbfc 100644
+index 463a82f08b7848a4b8a4eb89b201a6e8424c6831..aab0e00fb9c804178fa182542abfeac115ee82aa 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1775,7 +1775,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1210,7 +1210,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0683-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0684-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0683-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0684-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0684-Optimise-random-block-ticking.patch b/patches/server/0685-Optimise-random-block-ticking.patch
similarity index 97%
rename from patches/server/0684-Optimise-random-block-ticking.patch
rename to patches/server/0685-Optimise-random-block-ticking.patch
index 3cb4baa38b..5a372a7083 100644
--- a/patches/server/0684-Optimise-random-block-ticking.patch
+++ b/patches/server/0685-Optimise-random-block-ticking.patch
@@ -90,10 +90,10 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3cb0a648ad3f101acdbcae5d0666cf3aa0f8ce2c..bfdd623be1e84d7a761e1cd5ded7c9f7a483bf12 100644
+index f0f8d10140f0d06cba292f039d1e32ae26b940e4..e249d28198cee98cd04c34f334808e483eba83d7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -606,6 +606,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -838,6 +838,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entityplayer.stopSleepInBed(false, false);
          });
      }
@@ -104,7 +104,7 @@ index 3cb0a648ad3f101acdbcae5d0666cf3aa0f8ce2c..bfdd623be1e84d7a761e1cd5ded7c9f7
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
-@@ -615,8 +619,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -847,8 +851,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -116,7 +116,7 @@ index 3cb0a648ad3f101acdbcae5d0666cf3aa0f8ce2c..bfdd623be1e84d7a761e1cd5ded7c9f7
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -648,61 +654,67 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -880,61 +886,67 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (!this.paperConfig().environment.disableIceAndSnow) { // Paper
          for (int l = 0; l < randomTickSpeed; ++l) {
              if (this.random.nextInt(48) == 0) {
@@ -214,7 +214,7 @@ index 3cb0a648ad3f101acdbcae5d0666cf3aa0f8ce2c..bfdd623be1e84d7a761e1cd5ded7c9f7
              if (i > 0 && biomebase.shouldSnow(this, blockposition1)) {
                  BlockState iblockdata = this.getBlockState(blockposition1);
  
-@@ -720,12 +732,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -952,12 +964,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
@@ -318,10 +318,10 @@ index 652a8150f7343050b6da6c01f4e73a755138d491..5f57f13d50e051c621e401b63c0b55b3
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a508716195953260a00497e925d86c3a1f8942d3..6486ea4efcedb1008dd9aac87c2541e5997561f2 100644
+index 4cdf476a1f3c5b255b7b4ff4793b6015387879d2..d1a56519f5a8c07d0c0aa6361071775f5920b06d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1396,10 +1396,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1371,10 +1371,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public abstract RecipeManager getRecipeManager();
  
      public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
diff --git a/patches/server/0685-Remove-streams-for-villager-AI.patch b/patches/server/0686-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0685-Remove-streams-for-villager-AI.patch
rename to patches/server/0686-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
similarity index 98%
rename from patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
index 5b7ec427b7..4633ec2b6d 100644
--- a/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
@@ -264,10 +264,10 @@ index 859af8c845bae9781a62fa4acae56c6e2d449e10..ec7239fd6a2ecf732d2843f9426e4cb6
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 07fc88f8d057c59070e5de97b91c5bf5760ff09a..8ce56c24c0d8016b03ec626341609080e7cef232 100644
+index 30c45e2e92917f8f643d946e13d2e9946cfdba67..3e1746a33fbec4679a0ff413f55384b287405236 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -573,11 +573,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -602,11 +602,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          return networkmanager;
      }
  
@@ -300,7 +300,7 @@ index 07fc88f8d057c59070e5de97b91c5bf5760ff09a..8ce56c24c0d8016b03ec626341609080
  
      public boolean isEncrypted() {
          return this.encrypted;
-@@ -610,16 +627,17 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -639,16 +656,17 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
      public void setupCompression(int compressionThreshold, boolean rejectsBadPackets) {
          if (compressionThreshold >= 0) {
diff --git a/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0688-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0689-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0688-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0689-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0690-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 90%
rename from patches/server/0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0690-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index ed8be3ac0b..b23a113b16 100644
--- a/patches/server/0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0690-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bfdd623be1e84d7a761e1cd5ded7c9f7a483bf12..24cdec943931a3b64359c80cfaae44398e02057b 100644
+index e249d28198cee98cd04c34f334808e483eba83d7..97c8b8d28409f8f8c00192bcd959b199227897ef 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2364,6 +2364,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2613,6 +2613,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0690-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0691-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0690-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0691-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0692-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 85%
rename from patches/server/0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0692-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 706c02dc48..5ec3d82ccf 100644
--- a/patches/server/0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0692-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 87c9e00cf85809bb40ca043f56b6f180ae08269c..67f2de8c2ad186fb6fa6cf68a87964f687605c64 100644
+index 08c4e9037d54e14d0a80f75e05a91a128fdc1446..da2d5681963b8d14056cee36c789dfb54633df42 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -727,6 +727,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             return;
+@@ -734,6 +734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
+         // Paper end
          // CraftBukkit end
 +        // Paper start - Don't suggest if tab-complete is disabled
 +        if (org.spigotmc.SpigotConfig.tabComplete < 0) {
diff --git a/patches/server/0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0693-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0693-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0693-Ensure-valid-vehicle-status.patch b/patches/server/0694-Ensure-valid-vehicle-status.patch
similarity index 84%
rename from patches/server/0693-Ensure-valid-vehicle-status.patch
rename to patches/server/0694-Ensure-valid-vehicle-status.patch
index 88774868dc..e84a5f7bd0 100644
--- a/patches/server/0693-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0694-Ensure-valid-vehicle-status.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 46101c122bd5a31b24a24769dd4450b27df23555..6974a1a4c1142339dffedfd4e0205103274bfa5b 100644
+index 3df5ecfdfae2f0d7714bfbf3d0f32fc6a10e4d38..3931232e5ddc71c6bf595236763c2b39cc2ef742 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -526,7 +526,7 @@ public class ServerPlayer extends Player {
+@@ -570,7 +570,7 @@ public class ServerPlayer extends Player {
              }
          }
  
diff --git a/patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0695-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0695-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0696-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0696-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0696-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0697-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0696-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0697-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0697-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0698-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0697-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0698-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0698-Preserve-overstacked-loot.patch b/patches/server/0699-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0698-Preserve-overstacked-loot.patch
rename to patches/server/0699-Preserve-overstacked-loot.patch
diff --git a/patches/server/0699-Update-head-rotation-in-missing-places.patch b/patches/server/0700-Update-head-rotation-in-missing-places.patch
similarity index 84%
rename from patches/server/0699-Update-head-rotation-in-missing-places.patch
rename to patches/server/0700-Update-head-rotation-in-missing-places.patch
index db4808a7f4..31fffacd0f 100644
--- a/patches/server/0699-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0700-Update-head-rotation-in-missing-places.patch
@@ -8,10 +8,10 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d3f7541d3ddfec80464fb060051f4fefd033b41d..2487452f4ac5665208691eaeb68b91f116a2d231 100644
+index 6512c3ca611233f7541c1d0119521e05f524615a..cb609b3fad147cfa5c951c5a3b72f093fd98614f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1785,6 +1785,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1836,6 +1836,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index d3f7541d3ddfec80464fb060051f4fefd033b41d..2487452f4ac5665208691eaeb68b91f1
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1823,6 +1824,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1874,6 +1875,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();
diff --git a/patches/server/0700-prevent-unintended-light-block-manipulation.patch b/patches/server/0701-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0700-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0701-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0701-Fix-CraftCriteria-defaults-map.patch b/patches/server/0702-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0701-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0702-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0702-Fix-upstreams-block-state-factories.patch b/patches/server/0703-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0702-Fix-upstreams-block-state-factories.patch
rename to patches/server/0703-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0703-Configurable-feature-seeds.patch b/patches/server/0704-Configurable-feature-seeds.patch
similarity index 91%
rename from patches/server/0703-Configurable-feature-seeds.patch
rename to patches/server/0704-Configurable-feature-seeds.patch
index f46e665d46..2e7ba7f297 100644
--- a/patches/server/0703-Configurable-feature-seeds.patch
+++ b/patches/server/0704-Configurable-feature-seeds.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable feature seeds
 Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 38f01952153348d937e326da0ec102cd9b0f80af..2d4090b95193de431f56eaafd4d4561ecccdf99c 100644
+index 1080e1f67afe5574baca0df50cdb1d029a7a586a..a2f71a6d1a9e98133dff6cd0f625da9435a8af14 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -284,7 +284,7 @@ public class TimingsExport extends Thread {
+@@ -288,7 +288,7 @@ public class TimingsExport extends Thread {
          JSONObject object = new JSONObject();
          for (String key : config.getKeys(false)) {
              String fullKey = (parentKey != null ? parentKey + "." + key : key);
@@ -19,7 +19,7 @@ index 38f01952153348d937e326da0ec102cd9b0f80af..2d4090b95193de431f56eaafd4d4561e
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 511d0afbd7f3593c8a41e64ef716eaa6f32f3bf8..a94ddf0d9a72ce9507a146fa935197b5685a7dd1 100644
+index 3c7920721914588a3e7eaf1faff46f7305823416..eee2239cd715d01c5adbf1cd79282e115f42cd2e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -431,7 +431,14 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0704-Add-root-admin-user-detection.patch b/patches/server/0705-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0704-Add-root-admin-user-detection.patch
rename to patches/server/0705-Add-root-admin-user-detection.patch
index 9b179fc63e..00bf912738 100644
--- a/patches/server/0704-Add-root-admin-user-detection.patch
+++ b/patches/server/0705-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 34728cebe2de88e0a935707ea9969e068c0f6d7e..17d47e201da2bcbe55807f17dcc5e938e9944aea 100644
+index b9a4447e790f34fd8f88f353bf0e24a18a298ee6..c7894892afe97eb3cb453c37a2d9a23d811d70b8 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0705-Always-allow-item-changing-in-Fireball.patch b/patches/server/0706-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0705-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0706-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0706-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0707-don-t-attempt-to-teleport-dead-entities.patch
similarity index 85%
rename from patches/server/0706-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0707-don-t-attempt-to-teleport-dead-entities.patch
index d6b8da0979..de74ae0251 100644
--- a/patches/server/0706-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0707-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2487452f4ac5665208691eaeb68b91f116a2d231..658fd3abef087c873ebc2833a38a111660311576 100644
+index cb609b3fad147cfa5c951c5a3b72f093fd98614f..b8bc1578f1352c2368ba020cd8069b5780290664 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -703,7 +703,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -754,7 +754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
diff --git a/patches/server/0707-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0708-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0707-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0708-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0709-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0709-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0709-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0710-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0709-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0710-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0711-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0711-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0711-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0712-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 97%
rename from patches/server/0711-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0712-Hide-unnecessary-itemmeta-from-clients.patch
index d5666b77aa..d052f68ed1 100644
--- a/patches/server/0711-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0712-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,10 +18,10 @@ index dcf412aa557cdc7464893264b86b916e0ffbb0b8..1f71e11ec2bd617595de788f42562a43
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 67f2de8c2ad186fb6fa6cf68a87964f687605c64..3dcffcf52a5342b515a26a426820491ebde15d33 100644
+index da2d5681963b8d14056cee36c789dfb54633df42..a89915d288d517a1d3674d7d1eb28e8e3f3028a1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2543,8 +2543,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2550,8 +2550,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  // Refresh the current entity metadata
                                  entity.getEntityData().refresh(player);
                                  // SPIGOT-7136 - Allays
diff --git a/patches/server/0712-Fix-Spigot-growth-modifiers.patch b/patches/server/0713-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0712-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0713-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0713-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0714-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0713-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0714-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0714-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0715-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0714-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0715-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0715-Optimize-HashMapPalette.patch b/patches/server/0716-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0715-Optimize-HashMapPalette.patch
rename to patches/server/0716-Optimize-HashMapPalette.patch
diff --git a/patches/server/0716-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0717-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0716-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0717-Allow-delegation-to-vanilla-chunk-gen.patch
index c4f67f723e..e5000ed732 100644
--- a/patches/server/0716-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0717-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 460350ad26df0a07fab623e404ed4eff117ead13..8dc88ba48dbbf97c41d15cd1f01a5292b4e5a56c 100644
+index a39127c21e313b9bdd7796b57cfb5c241d589db5..f951c5ff4058f91540eb2da95ca433be5e590196 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2364,6 +2364,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0718-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0718-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 7a23969860..470596ac1b 100644
--- a/patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0718-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,10 +1180,10 @@ index 0000000000000000000000000000000000000000..3d2fa2466fe40e0b9d7749498684587a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6974a1a4c1142339dffedfd4e0205103274bfa5b..aab560700503a0c3415e4aaf09a86e907106bd63 100644
+index 3931232e5ddc71c6bf595236763c2b39cc2ef742..f6adb75984927e4254b98e4b6dc26ba4e5bc03d5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -419,7 +419,7 @@ public class ServerPlayer extends Player {
+@@ -463,7 +463,7 @@ public class ServerPlayer extends Player {
  
                  if (blockposition1 != null) {
                      this.moveTo(blockposition1, 0.0F, 0.0F);
@@ -1192,7 +1192,7 @@ index 6974a1a4c1142339dffedfd4e0205103274bfa5b..aab560700503a0c3415e4aaf09a86e90
                          break;
                      }
                  }
-@@ -427,7 +427,7 @@ public class ServerPlayer extends Player {
+@@ -471,7 +471,7 @@ public class ServerPlayer extends Player {
          } else {
              this.moveTo(blockposition, 0.0F, 0.0F);
  
@@ -1202,7 +1202,7 @@ index 6974a1a4c1142339dffedfd4e0205103274bfa5b..aab560700503a0c3415e4aaf09a86e90
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f266f35d245ce06a033a95f72e5bb5f95199bd8f..805a1031713e276c316306cdc88c696e11f33d5d 100644
+index 965dd34bd9a23a2fb17e5800af3b294b75b1146a..c493f883940819913f0cecb5e374fe94123df24c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -892,7 +892,7 @@ public abstract class PlayerList {
@@ -1215,10 +1215,10 @@ index f266f35d245ce06a033a95f72e5bb5f95199bd8f..805a1031713e276c316306cdc88c696e
              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 658fd3abef087c873ebc2833a38a111660311576..71b5d3a7ecbdc798847209c02458d11dbbe23556 100644
+index b8bc1578f1352c2368ba020cd8069b5780290664..2815f111aff55ba4ec758c8af836aca83ffa1ac0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1091,9 +1091,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1142,9 +1142,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  float f = this.getBlockSpeedFactor();
  
                  this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
@@ -1266,7 +1266,7 @@ index 658fd3abef087c873ebc2833a38a111660311576..71b5d3a7ecbdc798847209c02458d11d
                      if (this.remainingFireTicks <= 0) {
                          this.setRemainingFireTicks(-this.getFireImmuneTicks());
                      }
-@@ -1266,32 +1301,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1317,32 +1352,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Vec3 collide(Vec3 movement) {
@@ -1366,7 +1366,7 @@ index 658fd3abef087c873ebc2833a38a111660311576..71b5d3a7ecbdc798847209c02458d11d
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -2493,11 +2574,31 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2544,11 +2625,31 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              float f = this.dimensions.width * 0.8F;
              AABB axisalignedbb = AABB.ofSize(this.getEyePosition(), (double) f, 1.0E-6D, (double) f);
  
@@ -1472,10 +1472,10 @@ index c476e37df8a75d77f5093b2a449e04f25ef2c2dd..05d91e5c09015a4064317a3a9c0d4bd0
  
      default boolean noBlockCollision(@Nullable Entity entity, AABB box) {
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index c41d0efb40f137d71b2a038dd362d17ddb2fac60..e82a56c32f4179dc6a8df97f314dc3b4370e818d 100644
+index a25497eec004add7408a63b1a0f09e3fa443b324..258824816894d8fc0d8f1ee80489f66658a9ae80 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -37,7 +37,7 @@ public interface EntityGetter {
+@@ -49,7 +49,7 @@ public interface EntityGetter {
              return true;
          } else {
              for(Entity entity : this.getEntities(except, shape.bounds())) {
@@ -1484,7 +1484,7 @@ index c41d0efb40f137d71b2a038dd362d17ddb2fac60..e82a56c32f4179dc6a8df97f314dc3b4
                      return false;
                  }
              }
-@@ -55,7 +55,7 @@ public interface EntityGetter {
+@@ -67,7 +67,7 @@ public interface EntityGetter {
              return List.of();
          } else {
              Predicate<Entity> predicate = entity == null ? EntitySelector.CAN_BE_COLLIDED_WITH : EntitySelector.NO_SPECTATORS.and(entity::canCollideWith);
diff --git a/patches/server/0718-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0719-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 96%
rename from patches/server/0718-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0719-Optimise-collision-checking-in-player-move-packet-ha.patch
index fba57c7403..4774447c39 100644
--- a/patches/server/0718-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0719-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3dcffcf52a5342b515a26a426820491ebde15d33..735b47f2c452229f7d6951b5b1869ef40b14d26b 100644
+index a89915d288d517a1d3674d7d1eb28e8e3f3028a1..b998ec2a7350814ae7239d79a3dccf21b08670ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -534,7 +534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -90,7 +90,7 @@ index 3dcffcf52a5342b515a26a426820491ebde15d33..735b47f2c452229f7d6951b5b1869ef4
      }
  
      @Override
-@@ -1227,7 +1261,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1234,7 +1268,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  }
  
                  if (this.awaitingPositionFromClient != null) {
@@ -99,7 +99,7 @@ index 3dcffcf52a5342b515a26a426820491ebde15d33..735b47f2c452229f7d6951b5b1869ef4
                          this.awaitingTeleportTime = this.tickCount;
                          this.teleport(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.getYRot(), this.player.getXRot());
                      }
-@@ -1320,7 +1354,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1327,7 +1361,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  }
                              }
  
@@ -108,7 +108,7 @@ index 3dcffcf52a5342b515a26a426820491ebde15d33..735b47f2c452229f7d6951b5b1869ef4
  
                              d6 = d0 - this.lastGoodX; // Paper - diff on change, used for checking large move vectors above
                              d7 = d1 - this.lastGoodY; // Paper - diff on change, used for checking large move vectors above
-@@ -1362,6 +1396,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1369,6 +1403,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                              this.player.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
                              this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
@@ -116,7 +116,7 @@ index 3dcffcf52a5342b515a26a426820491ebde15d33..735b47f2c452229f7d6951b5b1869ef4
                              // Paper start - prevent position desync
                              if (this.awaitingPositionFromClient != null) {
                                  return; // ... thanks Mojang for letting move calls teleport across dimensions.
-@@ -1380,11 +1415,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1387,11 +1422,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              boolean flag2 = false;
  
                              if (!this.player.isChangingDimension() && d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
@@ -142,7 +142,7 @@ index 3dcffcf52a5342b515a26a426820491ebde15d33..735b47f2c452229f7d6951b5b1869ef4
                                  this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet()); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                                  this.player.doCheckFallDamage(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5, packet.isOnGround());
                              } else {
-@@ -1470,6 +1517,26 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1477,6 +1524,26 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
      }
  
diff --git a/patches/server/0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0720-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 92%
rename from patches/server/0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0720-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 933d9fca68..c0e3e643ee 100644
--- a/patches/server/0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0720-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 719730451635d418b3f5024c35620412add42b7f..51e46990f3c27b4e96a3dc0a2d8a62b24cd281c6 100644
+index b738e1f7debac7d70910d5ac908ca9d4f60640d5..007fd353bd55056ecddba2e16c5fa8c479961402 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -333,13 +333,17 @@ public class CraftChunk implements Chunk {
+@@ -289,13 +289,17 @@ public class CraftChunk implements Chunk {
          PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>>[] biome = (includeBiome || includeBiomeTempRain) ? new PalettedContainer[cs.length] : null;
  
          Registry<net.minecraft.world.level.biome.Biome> iregistry = this.worldServer.registryAccess().registryOrThrow(Registries.BIOME);
@@ -31,7 +31,7 @@ index 719730451635d418b3f5024c35620412add42b7f..51e46990f3c27b4e96a3dc0a2d8a62b2
  
              LevelLightEngine lightengine = this.worldServer.getLightEngine();
              DataLayer skyLightArray = lightengine.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(x, i, z));
-@@ -358,8 +362,7 @@ public class CraftChunk implements Chunk {
+@@ -314,8 +318,7 @@ public class CraftChunk implements Chunk {
              }
  
              if (biome != null) {
diff --git a/patches/server/0720-Add-more-Campfire-API.patch b/patches/server/0721-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0720-Add-more-Campfire-API.patch
rename to patches/server/0721-Add-more-Campfire-API.patch
diff --git a/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0722-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 88%
rename from patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0722-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 13b66f0ec2..6e5867a5d8 100644
--- a/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0722-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
@@ -8,10 +8,10 @@ This ensures at least a valid version of the chunk exists
 on disk, even if outdated
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 13ab2d2d8d0d3ab0facbae8285b09267765cc97d..a030d149d7b65d9d3983fecc77a560fbd304f0d3 100644
+index 8ef37d5f9a60f1bc62d5ef54a419ec1404659dde..9eaf2ab59f141e757c5c63e573943add4851a95c 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -520,6 +520,9 @@ public class RegionFile implements AutoCloseable {
+@@ -529,6 +529,9 @@ public class RegionFile implements AutoCloseable {
          }
  
      }
@@ -21,7 +21,7 @@ index 13ab2d2d8d0d3ab0facbae8285b09267765cc97d..a030d149d7b65d9d3983fecc77a560fb
      // Paper end
      private class ChunkBuffer extends ByteArrayOutputStream {
  
-@@ -535,6 +538,24 @@ public class RegionFile implements AutoCloseable {
+@@ -544,6 +547,24 @@ public class RegionFile implements AutoCloseable {
              this.pos = chunkcoordintpair;
          }
  
@@ -47,10 +47,10 @@ index 13ab2d2d8d0d3ab0facbae8285b09267765cc97d..a030d149d7b65d9d3983fecc77a560fb
              ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 66b07ea1b1611b7194a2d3ae1fe748b760166947..224b25f748c9a942c19349511d7a25402e31d7a2 100644
+index 7dee0f7d49f3492c92fceff7750e696239f840ed..293eb41507d5a023bd9399b3577f0b2a905b8d2a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -239,10 +239,17 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -314,10 +314,17 @@ public class RegionFileStorage implements AutoCloseable {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
                  regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - cache status on disk
                  regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone
@@ -69,7 +69,7 @@ index 66b07ea1b1611b7194a2d3ae1fe748b760166947..224b25f748c9a942c19349511d7a2540
                      } catch (Throwable throwable1) {
                          throwable.addSuppressed(throwable1);
                      }
-@@ -250,10 +257,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -325,10 +332,7 @@ public class RegionFileStorage implements AutoCloseable {
  
                  throw throwable;
              }
@@ -81,7 +81,7 @@ index 66b07ea1b1611b7194a2d3ae1fe748b760166947..224b25f748c9a942c19349511d7a2540
          }
          // Paper start
          return;
-@@ -296,4 +300,13 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -374,4 +378,13 @@ public class RegionFileStorage implements AutoCloseable {
          }
  
      }
diff --git a/patches/server/0722-Fix-tripwire-state-inconsistency.patch b/patches/server/0723-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0722-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0723-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0723-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0724-Forward-CraftEntity-in-teleport-command.patch
similarity index 88%
rename from patches/server/0723-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0724-Forward-CraftEntity-in-teleport-command.patch
index 1cc1ea7bcf..d290a0b9d9 100644
--- a/patches/server/0723-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0724-Forward-CraftEntity-in-teleport-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 71b5d3a7ecbdc798847209c02458d11dbbe23556..addd14088a5fa1671345de1537fbbd9d57dd4b40 100644
+index 2815f111aff55ba4ec758c8af836aca83ffa1ac0..48abd5d9f62f527d8bd9c9d58b4d806d12270ffc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3354,6 +3354,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3405,6 +3405,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index 71b5d3a7ecbdc798847209c02458d11dbbe23556..addd14088a5fa1671345de1537fbbd9d
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3440,10 +3447,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3491,10 +3498,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
                          ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
                      }
diff --git a/patches/server/0724-Improve-scoreboard-entries.patch b/patches/server/0725-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0724-Improve-scoreboard-entries.patch
rename to patches/server/0725-Improve-scoreboard-entries.patch
diff --git a/patches/server/0725-Entity-powdered-snow-API.patch b/patches/server/0726-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0725-Entity-powdered-snow-API.patch
rename to patches/server/0726-Entity-powdered-snow-API.patch
diff --git a/patches/server/0726-Add-API-for-item-entity-health.patch b/patches/server/0727-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0726-Add-API-for-item-entity-health.patch
rename to patches/server/0727-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0728-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0728-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0729-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0729-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0729-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0730-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0729-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0730-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0731-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0731-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0731-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0732-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0731-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0732-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0732-Fix-bees-aging-inside-hives.patch b/patches/server/0733-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0732-Fix-bees-aging-inside-hives.patch
rename to patches/server/0733-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0733-Bucketable-API.patch b/patches/server/0734-Bucketable-API.patch
similarity index 100%
rename from patches/server/0733-Bucketable-API.patch
rename to patches/server/0734-Bucketable-API.patch
diff --git a/patches/server/0734-Validate-usernames.patch b/patches/server/0735-Validate-usernames.patch
similarity index 97%
rename from patches/server/0734-Validate-usernames.patch
rename to patches/server/0735-Validate-usernames.patch
index be9e5082a9..3bce88f5c0 100644
--- a/patches/server/0734-Validate-usernames.patch
+++ b/patches/server/0735-Validate-usernames.patch
@@ -56,7 +56,7 @@ index f10647075a55630d91673ef3ccf91f9079f69d37..542cd004b9ebee8c5bfc96d6ae0dc682
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 805a1031713e276c316306cdc88c696e11f33d5d..b61861afdb6f9f3af42f1ab8884fccd68fc7bd58 100644
+index c493f883940819913f0cecb5e374fe94123df24c..d5d83e605a33d2edd1c7c0ef7cfa8af35e22dcc9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -660,7 +660,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0735-Make-water-animal-spawn-height-configurable.patch b/patches/server/0736-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0735-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0736-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0737-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0737-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 33428db458..6a74fe6790 100644
--- a/patches/server/0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0737-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ee8d5345e8ce8e0e082d82e9e52f5918f92a242e..d9ec9577d3686cafe6f9a9e33361b8f04c5089b2 100644
+index 7e4f3b7a5790292b3b8439fb4696d9d6cfec0167..d3a54f4557f5eb91bf71877e6f7a1d24d9d34cb0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -550,7 +550,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index ee8d5345e8ce8e0e082d82e9e52f5918f92a242e..d9ec9577d3686cafe6f9a9e33361b8f0
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8dc88ba48dbbf97c41d15cd1f01a5292b4e5a56c..86558a2080973ab2810085ee3d713285bf56e40d 100644
+index f951c5ff4058f91540eb2da95ca433be5e590196..7efd83f26c26166e51f7c2c6f08cf83291db61c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1224,7 +1224,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 8dc88ba48dbbf97c41d15cd1f01a5292b4e5a56c..86558a2080973ab2810085ee3d713285
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 888a60457bfbfd364e91b9e3d5c9df9dc7a2c564..54809679dcc4307b91af1e97e6bf0395d6baf403 100644
+index cda158bb560c32f7dbea05cd4adb3d38f6db5280..6b111e7397af92ac6e80001b783e42a26186b930 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -202,6 +202,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0737-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0738-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0737-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0738-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0738-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0739-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0738-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0739-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0739-Multiple-Entries-with-Scoreboards.patch b/patches/server/0740-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0739-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0740-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0740-Reset-placed-block-on-exception.patch b/patches/server/0741-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0740-Reset-placed-block-on-exception.patch
rename to patches/server/0741-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0741-Add-configurable-height-for-slime-spawn.patch b/patches/server/0742-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0741-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0742-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0743-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0743-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0743-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0744-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0743-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0744-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0744-Kick-on-main-for-illegal-chat.patch b/patches/server/0745-Kick-on-main-for-illegal-chat.patch
similarity index 90%
rename from patches/server/0744-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0745-Kick-on-main-for-illegal-chat.patch
index f448011b0f..c42eee6b54 100644
--- a/patches/server/0744-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0745-Kick-on-main-for-illegal-chat.patch
@@ -7,10 +7,10 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 735b47f2c452229f7d6951b5b1869ef40b14d26b..46a5cc73b1fef1cfa69e110619eedc431e1b7fa9 100644
+index b998ec2a7350814ae7239d79a3dccf21b08670ce..9526dc19ef02f612db02a909392569f6d49a4a26 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2007,7 +2007,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2014,7 +2014,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // CraftBukkit end
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) {
@@ -20,7 +20,7 @@ index 735b47f2c452229f7d6951b5b1869ef40b14d26b..46a5cc73b1fef1cfa69e110619eedc43
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2040,7 +2042,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2047,7 +2049,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleChatCommand(ServerboundChatCommandPacket packet) {
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
@@ -30,7 +30,7 @@ index 735b47f2c452229f7d6951b5b1869ef40b14d26b..46a5cc73b1fef1cfa69e110619eedc43
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2126,7 +2130,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2133,7 +2137,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message);
diff --git a/patches/server/0745-Multi-Block-Change-API-Implementation.patch b/patches/server/0746-Multi-Block-Change-API-Implementation.patch
similarity index 95%
rename from patches/server/0745-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0746-Multi-Block-Change-API-Implementation.patch
index 98f7cc0ef4..b1439fff6d 100644
--- a/patches/server/0745-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0746-Multi-Block-Change-API-Implementation.patch
@@ -24,10 +24,10 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 610075864157c5db7f09b60228f22b615928cb21..91d572075ea018e4768f11115723d67b06018bf0 100644
+index 471f25a82a109a58c4093d3a834d8131357c32da..5b9701ef6d2e6ba42d5459add9d3b6370df80f5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -849,6 +849,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -891,6 +891,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0746-Fix-NotePlayEvent.patch b/patches/server/0747-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0746-Fix-NotePlayEvent.patch
rename to patches/server/0747-Fix-NotePlayEvent.patch
diff --git a/patches/server/0747-Freeze-Tick-Lock-API.patch b/patches/server/0748-Freeze-Tick-Lock-API.patch
similarity index 92%
rename from patches/server/0747-Freeze-Tick-Lock-API.patch
rename to patches/server/0748-Freeze-Tick-Lock-API.patch
index 28d6759434..22951cb83d 100644
--- a/patches/server/0747-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0748-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index addd14088a5fa1671345de1537fbbd9d57dd4b40..353cf7574aea63413899a4b6d5edf43cc675c1da 100644
+index 48abd5d9f62f527d8bd9c9d58b4d806d12270ffc..9c3d683e0b2589ecfef549461b349e1dd3fb3a99 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -16,7 +16,7 @@ index addd14088a5fa1671345de1537fbbd9d57dd4b40..353cf7574aea63413899a4b6d5edf43c
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -749,7 +750,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -800,7 +801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.setRemainingFireTicks(this.remainingFireTicks - 1);
              }
  
@@ -25,7 +25,7 @@ index addd14088a5fa1671345de1537fbbd9d57dd4b40..353cf7574aea63413899a4b6d5edf43c
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2299,6 +2300,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2350,6 +2351,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (fromNetherPortal) {
                  nbt.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index addd14088a5fa1671345de1537fbbd9d57dd4b40..353cf7574aea63413899a4b6d5edf43c
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2464,6 +2468,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2515,6 +2519,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
diff --git a/patches/server/0748-Dolphin-API.patch b/patches/server/0749-Dolphin-API.patch
similarity index 100%
rename from patches/server/0748-Dolphin-API.patch
rename to patches/server/0749-Dolphin-API.patch
diff --git a/patches/server/0749-More-PotionEffectType-API.patch b/patches/server/0750-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0749-More-PotionEffectType-API.patch
rename to patches/server/0750-More-PotionEffectType-API.patch
diff --git a/patches/server/0750-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0751-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0750-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0751-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0751-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0752-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0751-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0752-API-for-creating-command-sender-which-forwards-feedb.patch
index f4403a7c24..58661a78dc 100644
--- a/patches/server/0751-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0752-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 86558a2080973ab2810085ee3d713285bf56e40d..527a93067e8d134e77ca80cde554e0212c1568da 100644
+index 7efd83f26c26166e51f7c2c6f08cf83291db61c0..bb57e6653bea7a465eec5c2eba68f2f08611a391 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2015,6 +2015,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0752-Add-missing-structure-set-seed-configs.patch b/patches/server/0753-Add-missing-structure-set-seed-configs.patch
similarity index 99%
rename from patches/server/0752-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0753-Add-missing-structure-set-seed-configs.patch
index ac18f7bea2..f299fd82ac 100644
--- a/patches/server/0752-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0753-Add-missing-structure-set-seed-configs.patch
@@ -20,7 +20,7 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index a94ddf0d9a72ce9507a146fa935197b5685a7dd1..9cdfc9e7614708934cc05146f1464c187d736aed 100644
+index eee2239cd715d01c5adbf1cd79282e115f42cd2e..8bab3fcfc6aa6c0b37621474a69f15e94bda2113 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -568,7 +568,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0753-Implement-regenerateChunk.patch b/patches/server/0754-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0753-Implement-regenerateChunk.patch
rename to patches/server/0754-Implement-regenerateChunk.patch
index d78b9ce3a8..7b18c96983 100644
--- a/patches/server/0753-Implement-regenerateChunk.patch
+++ b/patches/server/0754-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 54809679dcc4307b91af1e97e6bf0395d6baf403..a37f411baab87fa0c13b1379e23cd0b62ed67de2 100644
+index 6b111e7397af92ac6e80001b783e42a26186b930..4c53a4188d20cc1d8c2de25485aa1cd25fb9d08e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -141,6 +141,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0754-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0755-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0754-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0755-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0755-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0756-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 92%
rename from patches/server/0755-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0756-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 87a7a58457..5d052d796c 100644
--- a/patches/server/0755-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0756-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 527a93067e8d134e77ca80cde554e0212c1568da..c4edd7e5b7b7f71dba397f2694642bbf1ed65ae9 100644
+index bb57e6653bea7a465eec5c2eba68f2f08611a391..62d9ad45da897e7e336f12a49d1225dff5f089d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2192,6 +2192,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0756-Add-GameEvent-tags.patch b/patches/server/0757-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0756-Add-GameEvent-tags.patch
rename to patches/server/0757-Add-GameEvent-tags.patch
index e349fd44d7..d34eff7b13 100644
--- a/patches/server/0756-Add-GameEvent-tags.patch
+++ b/patches/server/0757-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c4edd7e5b7b7f71dba397f2694642bbf1ed65ae9..c781078f2858fdbc633f0eeaa57121b816645e90 100644
+index 62d9ad45da897e7e336f12a49d1225dff5f089d0..69e5d0359a967bb766c189a89780f3743e33fcf4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2613,6 +2613,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0757-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0758-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 87%
rename from patches/server/0757-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0758-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 87f800a14d..3bbba7ace9 100644
--- a/patches/server/0757-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0758-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,10 +9,10 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d9ec9577d3686cafe6f9a9e33361b8f04c5089b2..da43ef3d1ec41f91d755cea834ab0dd528c66c3a 100644
+index d3a54f4557f5eb91bf71877e6f7a1d24d9d34cb0..0640c7a30ac3e2be0fcf0b738efa810ac39ab37a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1292,6 +1292,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1287,6 +1287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (super.pollTask()) {
              return true;
          } else {
@@ -20,7 +20,7 @@ index d9ec9577d3686cafe6f9a9e33361b8f04c5089b2..da43ef3d1ec41f91d755cea834ab0dd5
              if (this.haveTime()) {
                  Iterator iterator = this.getAllLevels().iterator();
  
-@@ -1299,12 +1300,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1294,12 +1295,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ServerLevel worldserver = (ServerLevel) iterator.next();
  
                      if (worldserver.getChunkSource().pollTask()) {
diff --git a/patches/server/0758-Furnace-RecipesUsed-API.patch b/patches/server/0759-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0758-Furnace-RecipesUsed-API.patch
rename to patches/server/0759-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0759-Configurable-sculk-sensor-listener-range.patch b/patches/server/0760-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0759-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0760-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0760-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0761-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0760-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0761-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0761-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0762-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0761-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0762-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 2228511068..bfb0d611db 100644
--- a/patches/server/0761-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0762-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index da43ef3d1ec41f91d755cea834ab0dd528c66c3a..9fdbec87b9da0fd0ff965fd694fc1cdf7a56a0d3 100644
+index 0640c7a30ac3e2be0fcf0b738efa810ac39ab37a..2173bc1c73b1d95f6625e7c5021f1904b18eb15e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -577,7 +577,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0762-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0763-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 84%
rename from patches/server/0762-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0763-Put-world-into-worldlist-before-initing-the-world.patch
index 6ea1f713c1..e4c00891b1 100644
--- a/patches/server/0762-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0763-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9fdbec87b9da0fd0ff965fd694fc1cdf7a56a0d3..71b46f4f4739fa744bdbbf4729609d4bb3ca2669 100644
+index 2173bc1c73b1d95f6625e7c5021f1904b18eb15e..f7a84e81a638e986de3be413c28091b428fbc2af 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -589,9 +589,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index 9fdbec87b9da0fd0ff965fd694fc1cdf7a56a0d3..71b46f4f4739fa744bdbbf4729609d4b
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c781078f2858fdbc633f0eeaa57121b816645e90..f92e3f2f1a2947a1ff1dff3c54ff29e9da2856a6 100644
+index 69e5d0359a967bb766c189a89780f3743e33fcf4..94526278422fc42a5893bec0bf96af707ae67c17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1253,10 +1253,11 @@ public final class CraftServer implements Server {
@@ -38,4 +38,4 @@ index c781078f2858fdbc633f0eeaa57121b816645e90..f92e3f2f1a2947a1ff1dff3c54ff29e9
 +        // Paper - move up
  
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
-         internal.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
+         //internal.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API // Paper - rewrite chunk system
diff --git a/patches/server/0763-Fix-Entity-Position-Desync.patch b/patches/server/0764-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0763-Fix-Entity-Position-Desync.patch
rename to patches/server/0764-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0764-Custom-Potion-Mixes.patch b/patches/server/0765-Custom-Potion-Mixes.patch
similarity index 97%
rename from patches/server/0764-Custom-Potion-Mixes.patch
rename to patches/server/0765-Custom-Potion-Mixes.patch
index d3665b7ef2..0ab6c82a8d 100644
--- a/patches/server/0764-Custom-Potion-Mixes.patch
+++ b/patches/server/0765-Custom-Potion-Mixes.patch
@@ -24,10 +24,10 @@ index 0000000000000000000000000000000000000000..6b0bed550763f34e18c9e92f9a47ec0c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 71b46f4f4739fa744bdbbf4729609d4bb3ca2669..624533bd0acea1a444fbd2b396528f8946cf5b2f 100644
+index f7a84e81a638e986de3be413c28091b428fbc2af..37a4c4cb59e7135ac12749d432fd6d356c820726 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2062,6 +2062,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2057,6 +2057,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
@@ -164,7 +164,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f92e3f2f1a2947a1ff1dff3c54ff29e9da2856a6..23057d0463af66041ab151ff5f198bb6d1fba124 100644
+index 94526278422fc42a5893bec0bf96af707ae67c17..f8d31fdbacf23a366ccbea4d96157fab3d0c3b88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -307,6 +307,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0765-Force-close-world-loading-screen.patch b/patches/server/0766-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0765-Force-close-world-loading-screen.patch
rename to patches/server/0766-Force-close-world-loading-screen.patch
index 86571cfe21..e7da434a89 100644
--- a/patches/server/0765-Force-close-world-loading-screen.patch
+++ b/patches/server/0766-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b61861afdb6f9f3af42f1ab8884fccd68fc7bd58..66226cf2c730b2192d1bf9f39c91b0c54ae85eea 100644
+index d5d83e605a33d2edd1c7c0ef7cfa8af35e22dcc9..58ea720291298af851b6241b2848b16d4a50fa50 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -379,6 +379,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0766-Fix-falling-block-spawn-methods.patch b/patches/server/0767-Fix-falling-block-spawn-methods.patch
similarity index 93%
rename from patches/server/0766-Fix-falling-block-spawn-methods.patch
rename to patches/server/0767-Fix-falling-block-spawn-methods.patch
index 2fd1e22e3d..316145f840 100644
--- a/patches/server/0766-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0767-Fix-falling-block-spawn-methods.patch
@@ -24,10 +24,10 @@ index 977012bfa4c42d619f2e9729c2be032999c403f7..5ca1bc3a0574c1080cb000245dbc8fa0
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a37f411baab87fa0c13b1379e23cd0b62ed67de2..8a94c27fc380878f57719b1c480e18e8401c24aa 100644
+index 4c53a4188d20cc1d8c2de25485aa1cd25fb9d08e..73069a5cdb42d6bc3db5c02f0b668af69e786501 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1402,7 +1402,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1392,7 +1392,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(material != null, "Material cannot be null");
          Preconditions.checkArgument(material.isBlock(), "Material.%s must be a block", material);
  
@@ -41,7 +41,7 @@ index a37f411baab87fa0c13b1379e23cd0b62ed67de2..8a94c27fc380878f57719b1c480e18e8
          return (FallingBlock) entity.getBukkitEntity();
      }
  
-@@ -1411,7 +1416,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1401,7 +1406,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(location != null, "Location cannot be null");
          Preconditions.checkArgument(data != null, "BlockData cannot be null");
  
diff --git a/patches/server/0767-Expose-furnace-minecart-push-values.patch b/patches/server/0768-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0767-Expose-furnace-minecart-push-values.patch
rename to patches/server/0768-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0768-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0769-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0768-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0769-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0769-More-Projectile-API.patch b/patches/server/0770-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0769-More-Projectile-API.patch
rename to patches/server/0770-More-Projectile-API.patch
diff --git a/patches/server/0770-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0771-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0770-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0771-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0771-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0772-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0771-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0772-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index b5354f931f..d695401ac1 100644
--- a/patches/server/0771-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0772-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 46a5cc73b1fef1cfa69e110619eedc431e1b7fa9..303b6298171238d314c98bd52dda2c7bf71b13dd 100644
+index 9526dc19ef02f612db02a909392569f6d49a4a26..1d65adfddb19cfa343d0a16a0e0762d8bd6d947d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0772-Implement-getComputedBiome-API.patch b/patches/server/0773-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0772-Implement-getComputedBiome-API.patch
rename to patches/server/0773-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0773-Make-some-itemstacks-nonnull.patch b/patches/server/0774-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0773-Make-some-itemstacks-nonnull.patch
rename to patches/server/0774-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0774-Implement-enchantWithLevels-API.patch b/patches/server/0775-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0774-Implement-enchantWithLevels-API.patch
rename to patches/server/0775-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0775-Fix-saving-in-unloadWorld.patch b/patches/server/0776-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0775-Fix-saving-in-unloadWorld.patch
rename to patches/server/0776-Fix-saving-in-unloadWorld.patch
index bce536e950..16014f9a59 100644
--- a/patches/server/0775-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0776-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 23057d0463af66041ab151ff5f198bb6d1fba124..2aad18226c0cc4dc32db51070b6b7c7be5686451 100644
+index f8d31fdbacf23a366ccbea4d96157fab3d0c3b88..a2b2d054232ba74935e94b899dc3944cbe374bbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1301,7 +1301,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0776-Buffer-OOB-setBlock-calls.patch b/patches/server/0777-Buffer-OOB-setBlock-calls.patch
similarity index 95%
rename from patches/server/0776-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0777-Buffer-OOB-setBlock-calls.patch
index f6a8f1f789..4e1905eb3b 100644
--- a/patches/server/0776-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0777-Buffer-OOB-setBlock-calls.patch
@@ -13,7 +13,7 @@ we'll also only gen a trace for the first one, I see no real pressing need
 to generate more, given that that would *massively* negate this patch otherwise
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index e96a0ca47e4701ba187555bd92c968345bc85677..d99626d529ac2d18f662e5af0264643e8582e12d 100644
+index 73b96f804079288e9c5fcc11da54e61e89a6782a..52fd12c474c01f3b53d0f6596b7a6fafee52bd0d 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 @@ -275,6 +275,7 @@ public class WorldGenRegion implements WorldGenLevel {
diff --git a/patches/server/0777-Add-TameableDeathMessageEvent.patch b/patches/server/0778-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0777-Add-TameableDeathMessageEvent.patch
rename to patches/server/0778-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0778-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0779-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0778-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0779-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0779-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0780-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 87%
rename from patches/server/0779-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0780-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 667dcbd3cf..5d201d11d4 100644
--- a/patches/server/0779-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0780-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index aab560700503a0c3415e4aaf09a86e907106bd63..68658d9c204c5e720e81b58d0ee68003ab1030c2 100644
+index f6adb75984927e4254b98e4b6dc26ba4e5bc03d5..8e06894ba02a9f68cbbb77a6316f927dd021da89 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -874,12 +874,14 @@ public class ServerPlayer extends Player {
+@@ -918,12 +918,14 @@ public class ServerPlayer extends Player {
                  }
              }
          }
diff --git a/patches/server/0780-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0781-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 84%
rename from patches/server/0780-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0781-Ensure-entity-passenger-world-matches-ridden-entity.patch
index f535bd39f2..76251fb155 100644
--- a/patches/server/0780-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0781-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 353cf7574aea63413899a4b6d5edf43cc675c1da..0027f9ae4b184f7718778d7fc7634c05d323af26 100644
+index 9c3d683e0b2589ecfef549461b349e1dd3fb3a99..fcd6320a171e580e740b5dbc5bf669916682e997 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2668,7 +2668,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2719,7 +2719,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean startRiding(Entity entity, boolean force) {
diff --git a/patches/server/0781-Guard-against-invalid-entity-positions.patch b/patches/server/0782-Guard-against-invalid-entity-positions.patch
similarity index 88%
rename from patches/server/0781-Guard-against-invalid-entity-positions.patch
rename to patches/server/0782-Guard-against-invalid-entity-positions.patch
index f9451667f8..5e31dfafd4 100644
--- a/patches/server/0781-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0782-Guard-against-invalid-entity-positions.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0027f9ae4b184f7718778d7fc7634c05d323af26..0ac21fc03b26766724c14bf9275a72e2fe6f9ada 100644
+index fcd6320a171e580e740b5dbc5bf669916682e997..d3bc01dc0a1e131668659ec57257582ea084a6d6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4337,11 +4337,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4398,11 +4398,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
@@ -41,5 +41,5 @@ index 0027f9ae4b184f7718778d7fc7634c05d323af26..0ac21fc03b26766724c14bf9275a72e2
 +        }
 +        // Paper end - block invalid positions
          // Paper end
-         // Paper start - fix MC-4
-         if (this instanceof ItemEntity) {
+         // Paper start - rewrite chunk system
+         if (this.updatingSectionStatus) {
diff --git a/patches/server/0782-cache-resource-keys.patch b/patches/server/0783-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0782-cache-resource-keys.patch
rename to patches/server/0783-cache-resource-keys.patch
diff --git a/patches/server/0783-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0784-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0783-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0784-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0784-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0785-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0784-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0785-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0785-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0786-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0785-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0786-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0786-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0787-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 89%
rename from patches/server/0786-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0787-Prevent-tile-entity-copies-loading-chunks.patch
index 0ab323990a..a8ee15e3e6 100644
--- a/patches/server/0786-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0787-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 303b6298171238d314c98bd52dda2c7bf71b13dd..4e67a4689e8c373df611f90ca7ca7e7cfed66563 100644
+index 1d65adfddb19cfa343d0a16a0e0762d8bd6d947d..f4986bbb784febbeb5731ccf5392b4f153f5d466 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3174,7 +3174,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3181,7 +3181,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
  
                  if (this.player.level().isLoaded(blockposition)) {
diff --git a/patches/server/0787-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0788-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0787-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0788-Use-username-instead-of-display-name-in-PlayerList-g.patch
index b010c9182e..f199d4acfb 100644
--- a/patches/server/0787-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0788-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 66226cf2c730b2192d1bf9f39c91b0c54ae85eea..e8abcff2ce955140643b7122edad51057b40e6a4 100644
+index 58ea720291298af851b6241b2848b16d4a50fa50..446b77a31c1cd40449b80cfeefd1339d7f60a771 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1424,7 +1424,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0788-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0789-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0788-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0789-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0789-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 96%
rename from patches/server/0789-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
index 8e6c5dca97..1b3a85985e 100644
--- a/patches/server/0789-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 17d47e201da2bcbe55807f17dcc5e938e9944aea..f1e5798c47ee6c8d8b9d599fa503e8cefe18aa19 100644
+index c7894892afe97eb3cb453c37a2d9a23d811d70b8..2d06a8f85c5e29688aa0fd4726fd576721535384 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,10 +18,10 @@ index 17d47e201da2bcbe55807f17dcc5e938e9944aea..f1e5798c47ee6c8d8b9d599fa503e8ce
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4e67a4689e8c373df611f90ca7ca7e7cfed66563..fadda21fe9e28529b48945ad075173783539c5d4 100644
+index f4986bbb784febbeb5731ccf5392b4f153f5d466..e18d0c9d1ac520e574b81fe3a7545703006bed49 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2737,7 +2737,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2744,7 +2744,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
                          this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
@@ -167,10 +167,10 @@ index 2e240ad721928a9a68370114ba61c21884ef1472..1a72fc5368731be617f9cab72e9e756d
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8a94c27fc380878f57719b1c480e18e8401c24aa..2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab 100644
+index 73069a5cdb42d6bc3db5c02f0b668af69e786501..50820bf2a2050985947005ce682e27d11f587584 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1955,7 +1955,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1945,7 +1945,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule));
          handle.deserialize(event.getValue()); // Paper
@@ -179,7 +179,7 @@ index 8a94c27fc380878f57719b1c480e18e8401c24aa..2ec9d65ce7c9947021cf95f0827c3bc1
          return true;
      }
  
-@@ -1996,7 +1996,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1986,7 +1986,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName()));
          handle.deserialize(event.getValue()); // Paper
diff --git a/patches/server/0790-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0790-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0791-WorldCreator-keepSpawnLoaded.patch b/patches/server/0792-WorldCreator-keepSpawnLoaded.patch
similarity index 77%
rename from patches/server/0791-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0792-WorldCreator-keepSpawnLoaded.patch
index ca7d6de088..b473333506 100644
--- a/patches/server/0791-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0792-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2aad18226c0cc4dc32db51070b6b7c7be5686451..6e5d942ec82a5b34c5047c978ecbff176cb8c849 100644
+index a2b2d054232ba74935e94b899dc3944cbe374bbf..a264f215c65eab124dc420be92cdd5bee26e0fdd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1260,6 +1260,7 @@ public final class CraftServer implements Server {
@@ -14,5 +14,5 @@ index 2aad18226c0cc4dc32db51070b6b7c7be5686451..6e5d942ec82a5b34c5047c978ecbff17
  
 +        internal.keepSpawnInMemory = creator.keepSpawnLoaded().toBooleanOrElse(internal.getWorld().getKeepSpawnInMemory()); // Paper
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
-         internal.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
+         //internal.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API // Paper - rewrite chunk system
  
diff --git a/patches/server/0792-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0792-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0793-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0793-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0794-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0794-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0795-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0796-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0795-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0796-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0796-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0797-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0796-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0797-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0797-Add-PlayerStopUsingItemEvent.patch b/patches/server/0798-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0797-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0798-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0798-FallingBlock-auto-expire-setting.patch b/patches/server/0799-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0798-FallingBlock-auto-expire-setting.patch
rename to patches/server/0799-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0799-Don-t-tick-markers.patch b/patches/server/0800-Don-t-tick-markers.patch
similarity index 71%
rename from patches/server/0799-Don-t-tick-markers.patch
rename to patches/server/0800-Don-t-tick-markers.patch
index 1043d13253..3eae8d8116 100644
--- a/patches/server/0799-Don-t-tick-markers.patch
+++ b/patches/server/0800-Don-t-tick-markers.patch
@@ -23,10 +23,10 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5f43aedc6596e2b1ac7af97115157147
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 24cdec943931a3b64359c80cfaae44398e02057b..59642ded6fc41f65a6eb7590d1744294237591a1 100644
+index 97c8b8d28409f8f8c00192bcd959b199227897ef..2faa7cd5944d2bd3b907e7c2f2c7a8e3d64f3de9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2274,6 +2274,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2523,6 +2523,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          public void onTickingStart(Entity entity) {
@@ -35,15 +35,21 @@ index 24cdec943931a3b64359c80cfaae44398e02057b..59642ded6fc41f65a6eb7590d1744294
          }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index b1e844b1c0dafb2dfc9904d2d4ad0e8fd5b6e572..e119f21ad06cfcbb279f20acabfa3121839d2891 100644
+index 50ddcd7ee9c3ffe7549361f942df01b8ef078932..2f9e5a1adf9d67ffe18d95f2822ca3d2288fb27a 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -211,7 +211,7 @@ public class ActivationRange
-             ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, worldHeight, villagerActivationRange );
-             // Paper end
+@@ -213,8 +213,14 @@ public class ActivationRange
  
--            world.getEntities().get(maxBB, ActivationRange::activateEntity);
-+            world.getEntities().get(world.paperConfig().entities.markers.tick ? null : (e) -> !(e instanceof net.minecraft.world.entity.Marker), maxBB, ActivationRange::activateEntity); // Paper - configurable marker ticking
-         }
-         MinecraftTimings.entityActivationCheckTimer.stopTiming();
-     }
+             // Paper start
+             java.util.List<Entity> entities = world.getEntities((Entity)null, maxBB, null);
++            boolean tickMarkers = world.paperConfig().entities.markers.tick; // Paper - configurable marker ticking
+             for (int i = 0; i < entities.size(); i++) {
+                 Entity entity = entities.get(i);
++                // Paper start - configurable marker ticking
++                if (!tickMarkers && entity instanceof net.minecraft.world.entity.Marker) {
++                    continue;
++                }
++                // Paper end - configurable marker ticking
+                 ActivationRange.activateEntity(entity);
+             }
+             // Paper end
diff --git a/patches/server/0800-Do-not-accept-invalid-client-settings.patch b/patches/server/0801-Do-not-accept-invalid-client-settings.patch
similarity index 89%
rename from patches/server/0800-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0801-Do-not-accept-invalid-client-settings.patch
index c0299bc07b..d9446b8003 100644
--- a/patches/server/0800-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0801-Do-not-accept-invalid-client-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fadda21fe9e28529b48945ad075173783539c5d4..97d50c49178d0bbd736c652a4676a37f0dcb8a3b 100644
+index e18d0c9d1ac520e574b81fe3a7545703006bed49..7bacbc914e05ae2780a32b93dec4522d494cd9db 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3298,6 +3298,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3305,6 +3305,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleClientInformation(ServerboundClientInformationPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0801-Add-support-for-Proxy-Protocol.patch b/patches/server/0802-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0801-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0802-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0802-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0803-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0802-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0803-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0803-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0803-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0804-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0805-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0804-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0805-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0805-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0806-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0805-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0806-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0806-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch
similarity index 95%
rename from patches/server/0806-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch
index 8048f10ef4..dee04e17d0 100644
--- a/patches/server/0806-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0ac21fc03b26766724c14bf9275a72e2fe6f9ada..a45f7b96fb3afc9ebe1354d9c61c4a66a67fae69 100644
+index d3bc01dc0a1e131668659ec57257582ea084a6d6..8de9ba5e3dfaa33ffbc05c1030d31d2affcb682a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -712,6 +712,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -763,6 +763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public void baseTick() {
          this.level().getProfiler().push("entityBaseTick");
diff --git a/patches/server/0807-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 90%
rename from patches/server/0807-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch
index ab78181097..9ca9e96b81 100644
--- a/patches/server/0807-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 624533bd0acea1a444fbd2b396528f8946cf5b2f..ff70a2d03ffb85b64829e15bfdfd7a2f35dc9323 100644
+index 37a4c4cb59e7135ac12749d432fd6d356c820726..a90c0abadfb5195ff69305c2efa99af839e94c71 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 624533bd0acea1a444fbd2b396528f8946cf5b2f..ff70a2d03ffb85b64829e15bfdfd7a2f
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1474,7 +1475,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1469,7 +1470,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getFunctions().tick();
          MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
          this.profiler.popPush("levels");
@@ -27,7 +27,7 @@ index 624533bd0acea1a444fbd2b396528f8946cf5b2f..ff70a2d03ffb85b64829e15bfdfd7a2f
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
-@@ -1506,6 +1507,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1501,6 +1502,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
@@ -36,7 +36,7 @@ index 624533bd0acea1a444fbd2b396528f8946cf5b2f..ff70a2d03ffb85b64829e15bfdfd7a2f
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-@@ -1552,6 +1555,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1547,6 +1550,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
@@ -45,7 +45,7 @@ index 624533bd0acea1a444fbd2b396528f8946cf5b2f..ff70a2d03ffb85b64829e15bfdfd7a2f
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6e5d942ec82a5b34c5047c978ecbff176cb8c849..17eaf05dbf0542f7867e92421148cf4edf47bd80 100644
+index a264f215c65eab124dc420be92cdd5bee26e0fdd..2e734dea30809bed1b11905a34e54ab5fe65b6f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -877,6 +877,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0808-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0809-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0808-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0809-Add-Alternate-Current-redstone-implementation.patch
index 0e020020e0..56107ed730 100644
--- a/patches/server/0808-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0809-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 59642ded6fc41f65a6eb7590d1744294237591a1..491e285de9ab6c0c09aa879d1e5f3219bce9dc9e 100644
+index 2faa7cd5944d2bd3b907e7c2f2c7a8e3d64f3de9..5e246e6706e83eeb5cb884fae55eb81587419aad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2019,7 +2019,7 @@ index 59642ded6fc41f65a6eb7590d1744294237591a1..491e285de9ab6c0c09aa879d1e5f3219
      public static Throwable getAddToWorldStackTrace(Entity entity) {
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
-@@ -2263,6 +2264,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2512,6 +2513,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return this.randomSequences;
      }
  
@@ -2034,14 +2034,13 @@ index 59642ded6fc41f65a6eb7590d1744294237591a1..491e285de9ab6c0c09aa879d1e5f3219
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6486ea4efcedb1008dd9aac87c2541e5997561f2..7d39cdfec62884a8ee98af3ca71aa3c9908cc3d8 100644
+index d1a56519f5a8c07d0c0aa6361071775f5920b06d..1bfa5971f049525ea7829df783facc59d95223da 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1453,4 +1453,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
-         private ExplosionInteraction() {}
+@@ -1469,4 +1469,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         return ret;
      }
-+
+     // Paper end
 +    // Paper start - optimize redstone (Alternate Current)
 +    public alternate.current.wire.WireHandler getWireHandler() {
 +        // This method is overridden in ServerLevel.
@@ -2051,7 +2050,7 @@ index 6486ea4efcedb1008dd9aac87c2541e5997561f2..7d39cdfec62884a8ee98af3ca71aa3c9
 +        // an instance of Level to ServerLevel.
 +        return null;
 +    }
-+    // Paper end
++    // Paper end - optimize redstone (Alternate Current)
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
 index a0ae3635ae8c3fd3ac17dd9fa614ec84c7b1b0ca..2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c 100644
diff --git a/patches/server/0809-Dont-resent-entity-on-art-update.patch b/patches/server/0810-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0809-Dont-resent-entity-on-art-update.patch
rename to patches/server/0810-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0810-Add-WardenAngerChangeEvent.patch b/patches/server/0811-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0810-Add-WardenAngerChangeEvent.patch
rename to patches/server/0811-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0811-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 94%
rename from patches/server/0811-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch
index c8519a5ddf..253a34e19c 100644
--- a/patches/server/0811-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,10 +24,10 @@ index d4a673a9fb604876c554f955ed13ad31a2adb217..e75b3df4db9cb618aef4837acb8cde92
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 68658d9c204c5e720e81b58d0ee68003ab1030c2..545e5ef99560291210310d69e2572b40f25c605b 100644
+index 8e06894ba02a9f68cbbb77a6316f927dd021da89..b3db504ccd063122348426f7422bab34fac74d7f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1273,6 +1273,12 @@ public class ServerPlayer extends Player {
+@@ -1317,6 +1317,12 @@ public class ServerPlayer extends Player {
          ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
          ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level());
  
diff --git a/patches/server/0812-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 84%
rename from patches/server/0812-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch
index a0e6aa2eec..d3763517ff 100644
--- a/patches/server/0812-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch
@@ -53,25 +53,20 @@ index 6fbf1eab2ea818a0dd0adde0c9247a2d95aac2e0..311808903b42a03b28bad8c75223f95a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 629178347039893fb9de710810fe8112499bb91c..0bb9cbdceaca055860e7a2a887426c6ba3194b3e 100644
+index d5861dfa771c4eb217e082e3c832c3a6c603710d..1233788274f1cbdaa564d3145214b4908ae1f573 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -258,4 +258,18 @@ public class DummyGeneratorAccess implements WorldGenLevel {
-     public boolean destroyBlock(BlockPos pos, boolean drop, Entity breakingEntity, int maxUpdateDepth) {
-         return false; // SPIGOT-6515
-     }
-+
-+    // Paper start
-+    @Override
-+    public void scheduleTick(BlockPos pos, Fluid fluid, int delay) {
-+    }
+@@ -274,4 +274,13 @@ public class DummyGeneratorAccess implements WorldGenLevel {
+     @Override
+     public <T> void getEntitiesByClass(Class<? extends T> clazz, Entity except, AABB box, List<? super T> into, Predicate<? super T> predicate) {}
+     // Paper end
++    // Paper start - add more methods
++    public void scheduleTick(BlockPos pos, Fluid fluid, int delay) {}
 +
 +    @Override
-+    public void scheduleTick(BlockPos pos, Block block, int delay, net.minecraft.world.ticks.TickPriority priority) {
-+    }
++    public void scheduleTick(BlockPos pos, Block block, int delay, net.minecraft.world.ticks.TickPriority priority) {}
 +
 +    @Override
-+    public void scheduleTick(BlockPos pos, Fluid fluid, int delay, net.minecraft.world.ticks.TickPriority priority) {
-+    }
-+    // Paper end
++    public void scheduleTick(BlockPos pos, Fluid fluid, int delay, net.minecraft.world.ticks.TickPriority priority) {}
++    // Paper end - add more methods
  }
diff --git a/patches/server/0813-Nameable-Banner-API.patch b/patches/server/0814-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0813-Nameable-Banner-API.patch
rename to patches/server/0814-Nameable-Banner-API.patch
diff --git a/patches/server/0814-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0814-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch
index fe8d55b49a..c0bd53a43f 100644
--- a/patches/server/0814-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 17eaf05dbf0542f7867e92421148cf4edf47bd80..097ceaa948469f6b63362dfa00525cd0fd01d907 100644
+index 2e734dea30809bed1b11905a34e54ab5fe65b6f6..8f3c46827225ea8194b7759b5fb5ad7dc6a2bee1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1777,7 +1777,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0815-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch
similarity index 94%
rename from patches/server/0815-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch
index 6d4d0613c9..70d514a1a1 100644
--- a/patches/server/0815-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,10 +7,10 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 491e285de9ab6c0c09aa879d1e5f3219bce9dc9e..cefe6fdcb6ef975b49a2417f5354775578391933 100644
+index 5e246e6706e83eeb5cb884fae55eb81587419aad..bd261dcd35f23f94ef5353db1b0d0b1c965e1db4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1296,6 +1296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1530,6 +1530,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0816-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0816-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0817-Add-Player-getFishHook.patch b/patches/server/0818-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0817-Add-Player-getFishHook.patch
rename to patches/server/0818-Add-Player-getFishHook.patch
diff --git a/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0819-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 96%
rename from patches/server/0819-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch
index 7861f36ae8..6e5b14d248 100644
--- a/patches/server/0819-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a45f7b96fb3afc9ebe1354d9c61c4a66a67fae69..56060d5d962a1827873d3b2311f30b766c64575f 100644
+index 8de9ba5e3dfaa33ffbc05c1030d31d2affcb682a..200e3aeb234ae3f13deca88d808933cdb206b287 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2559,6 +2559,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2610,6 +2610,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
  
              entityitem.setDefaultPickUpDelay();
diff --git a/patches/server/0820-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0821-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 90%
rename from patches/server/0820-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0821-Add-some-minimal-debug-information-to-chat-packet-er.patch
index f64bd36243..078ec48435 100644
--- a/patches/server/0820-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0821-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 97d50c49178d0bbd736c652a4676a37f0dcb8a3b..70925fb9fd4ee22b8c519861fa5cd1ba93bfc2b3 100644
+index 7bacbc914e05ae2780a32b93dec4522d494cd9db..0d70654255777ae7c842feca343ccf7bd077c082 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2134,7 +2134,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2141,7 +2141,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
diff --git a/patches/server/0821-Fix-Bee-flower-NPE.patch b/patches/server/0822-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0821-Fix-Bee-flower-NPE.patch
rename to patches/server/0822-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 87%
rename from patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 5ef99cd8c5..d10ce589fa 100644
--- a/patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 70925fb9fd4ee22b8c519861fa5cd1ba93bfc2b3..cd29d29c15b478cea14373b470f3f44d9cace59b 100644
+index 0d70654255777ae7c842feca343ccf7bd077c082..bf8b5375147d186e2615d4f1e6658fe8ae43bcde 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2354,7 +2354,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2361,7 +2361,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // Spigot end
          // this.chatSpamTickCount += 20;
diff --git a/patches/server/0823-More-Teleport-API.patch b/patches/server/0824-More-Teleport-API.patch
similarity index 95%
rename from patches/server/0823-More-Teleport-API.patch
rename to patches/server/0824-More-Teleport-API.patch
index 28821001a2..c4802fe23e 100644
--- a/patches/server/0823-More-Teleport-API.patch
+++ b/patches/server/0824-More-Teleport-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cd29d29c15b478cea14373b470f3f44d9cace59b..940345ce1797fae5c322273deda11418676049e8 100644
+index bf8b5375147d186e2615d4f1e6658fe8ae43bcde..03dd7c827e537e0d2619632ad728ab4165032643 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1591,11 +1591,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1598,11 +1598,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              return false; // CraftBukkit - Return event status
          }
  
@@ -74,10 +74,10 @@ index 87c303ff576cd05291d50d5676e86ca93a13b301..b19665fd570c86274caef62dc3e365f0
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 91d572075ea018e4768f11115723d67b06018bf0..17a4390514b72481de6dc0676eb8130428fabf89 100644
+index 5b9701ef6d2e6ba42d5459add9d3b6370df80f5a..c0b8e37112c6e69fa04d35c39393fde6b780340d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1170,13 +1170,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1212,13 +1212,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -180,7 +180,7 @@ index 91d572075ea018e4768f11115723d67b06018bf0..17a4390514b72481de6dc0676eb81304
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1189,7 +1277,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1231,7 +1319,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
          }
  
@@ -189,7 +189,7 @@ index 91d572075ea018e4768f11115723d67b06018bf0..17a4390514b72481de6dc0676eb81304
              return false;
          }
  
-@@ -1207,7 +1295,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1249,7 +1337,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -198,7 +198,7 @@ index 91d572075ea018e4768f11115723d67b06018bf0..17a4390514b72481de6dc0676eb81304
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1223,13 +1311,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1265,13 +1353,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle();
  
          // Close any foreign inventory
diff --git a/patches/server/0824-Add-EntityPortalReadyEvent.patch b/patches/server/0825-Add-EntityPortalReadyEvent.patch
similarity index 88%
rename from patches/server/0824-Add-EntityPortalReadyEvent.patch
rename to patches/server/0825-Add-EntityPortalReadyEvent.patch
index b3cccfa7c0..5b61bf6f4b 100644
--- a/patches/server/0824-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0825-Add-EntityPortalReadyEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 56060d5d962a1827873d3b2311f30b766c64575f..2a13d5f4cf86b4ae5e5cf2d0602fbcd275b1c080 100644
+index 200e3aeb234ae3f13deca88d808933cdb206b287..e6356b1400030f9c288b0bf33ac7a7371913815f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2922,6 +2922,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2973,6 +2973,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
                      this.level().getProfiler().push("portal");
                      this.portalTime = i;
@@ -22,7 +22,7 @@ index 56060d5d962a1827873d3b2311f30b766c64575f..2a13d5f4cf86b4ae5e5cf2d0602fbcd2
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -2929,6 +2936,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2980,6 +2987,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0825-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0826-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0825-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0826-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0826-Send-block-entities-after-destroy-prediction.patch b/patches/server/0827-Send-block-entities-after-destroy-prediction.patch
similarity index 97%
rename from patches/server/0826-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0827-Send-block-entities-after-destroy-prediction.patch
index 6df6413a0e..cc5e862644 100644
--- a/patches/server/0826-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0827-Send-block-entities-after-destroy-prediction.patch
@@ -57,10 +57,10 @@ index f968dee743f58fe71935097701866800c0f382a1..73e2948210139e40e234b5e2107f9008
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 940345ce1797fae5c322273deda11418676049e8..cb17ed108583b3a374865e47c1951d504516cc63 100644
+index 03dd7c827e537e0d2619632ad728ab4165032643..df6be8a358052c3305efdbf2704433b74ffc3a0f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1737,8 +1737,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1744,8 +1744,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      return;
                  }
                  // Paper end - Don't allow digging in unloaded chunks
diff --git a/patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 90%
rename from patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch
index f515563238..c469cf6bd0 100644
--- a/patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7d39cdfec62884a8ee98af3ca71aa3c9908cc3d8..aa5879aef6e6e517ead13a422fed7674f715c994 100644
+index 1bfa5971f049525ea7829df783facc59d95223da..3a2ad20ab45bebebd4bce8b17e902f704f748338 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -440,7 +440,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -18,7 +18,7 @@ index 7d39cdfec62884a8ee98af3ca71aa3c9908cc3d8..aa5879aef6e6e517ead13a422fed7674
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab..c7e6e73507ab198224de1b549f7c71887341c6a6 100644
+index 50820bf2a2050985947005ce682e27d11f587584..9707487f2533c30dc1998fafc626e50948ee4dab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -310,9 +310,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -54,7 +54,7 @@ index 2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab..c7e6e73507ab198224de1b549f7c7188
          // Paper start - implement regenerateChunk method
          final ServerLevel serverLevel = this.world;
          final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
-@@ -514,6 +530,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -517,6 +533,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@@ -62,7 +62,7 @@ index 2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab..c7e6e73507ab198224de1b549f7c7188
          // Paper start - Optimize this method
          ChunkPos chunkPos = new ChunkPos(x, z);
          ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z); // Paper
-@@ -577,6 +594,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -580,6 +597,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean addPluginChunkTicket(int x, int z, Plugin plugin) {
@@ -70,7 +70,7 @@ index 2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab..c7e6e73507ab198224de1b549f7c7188
          Preconditions.checkArgument(plugin != null, "null plugin");
          Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
  
-@@ -658,6 +676,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -648,6 +666,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setChunkForceLoaded(int x, int z, boolean forced) {
@@ -78,7 +78,7 @@ index 2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab..c7e6e73507ab198224de1b549f7c7188
          this.getHandle().setChunkForced(x, z, forced);
      }
  
-@@ -970,6 +989,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -960,6 +979,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -86,7 +86,7 @@ index 2ec9d65ce7c9947021cf95f0827c3bc1cc2166ab..c7e6e73507ab198224de1b549f7c7188
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
      }
-@@ -2342,6 +2362,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2371,6 +2391,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot end
      // Paper start
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
diff --git a/patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
similarity index 90%
rename from patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
index c4e65e6af1..3d19341d3e 100644
--- a/patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 17a4390514b72481de6dc0676eb8130428fabf89..ba93dbec8b22809133335e975f64caa85df30c9b 100644
+index c0b8e37112c6e69fa04d35c39393fde6b780340d..4fd4f2dee936c9b96b5297e16bb0061f3bfe2579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -610,6 +610,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -652,6 +652,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
      }
diff --git a/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0830-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0830-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0830-Collision-API.patch b/patches/server/0831-Collision-API.patch
similarity index 100%
rename from patches/server/0830-Collision-API.patch
rename to patches/server/0831-Collision-API.patch
diff --git a/patches/server/0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0832-Block-Ticking-API.patch b/patches/server/0833-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0832-Block-Ticking-API.patch
rename to patches/server/0833-Block-Ticking-API.patch
diff --git a/patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch
index 951b56352b..0ee93597dc 100644
--- a/patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..c4934979b1ed85bfc4f8d9e6f8848b2b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f1e5798c47ee6c8d8b9d599fa503e8cefe18aa19..c1882185ad93315925ca97a085482197f6ae9f4a 100644
+index 2d06a8f85c5e29688aa0fd4726fd576721535384..dbccbcb9b44e4efacdf53c2d161115cc20b36cff 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -213,7 +213,7 @@ index ced150fa9160310408f57e89d115de740097eaf5..b926a487791901a61862b551ce2dbfda
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 097ceaa948469f6b63362dfa00525cd0fd01d907..615baf99dd8680b97aa1f03d4a961e15bcdd832b 100644
+index 8f3c46827225ea8194b7759b5fb5ad7dc6a2bee1..ef4c259504694d27534834a5d33e78a8d33ece6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -806,7 +806,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0834-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0835-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0834-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0835-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0835-Add-NamespacedKey-biome-methods.patch b/patches/server/0836-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0835-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0836-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 92%
rename from patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch
index b038ba671b..5cdae05723 100644
--- a/patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,16 +37,16 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff70a2d03ffb85b64829e15bfdfd7a2f35dc9323..bf9e396505c5004b0fb640837b41a4885bcab08e 100644
+index a90c0abadfb5195ff69305c2efa99af839e94c71..fd39dee91754137b7a52f06a03644f00e22bb8ef 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -998,6 +998,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -980,6 +980,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
          } catch (Exception e) {
          }
 +        io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
          this.onServerExit();
-         // Paper end
+         // Paper end - move final shutdown items here
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index 224be855fd16b37c8766c3c07b81905d50d5518d..6f816ec287f35dca6e196f86d016a2c28617bab6 100644
diff --git a/patches/server/0837-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0837-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 99%
rename from patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch
index 3bf6e98229..e36430b7ef 100644
--- a/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch
@@ -260,7 +260,7 @@ index 4f24d5453522c68c22f15beed87e5237163c701a..38cb52d185e543c4df9eebfcd856df6f
              generatoraccess.setBlock(blockposition, iblockdata1, 3);
              generatoraccess.gameEvent(GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(entity, iblockdata1));
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 0bb9cbdceaca055860e7a2a887426c6ba3194b3e..9cfb2d3dbb06b189765293233a28b3ebd1898946 100644
+index 1233788274f1cbdaa564d3145214b4908ae1f573..23ee60e8843a6a05e7ae6512248a57ec2a08321b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 @@ -120,7 +120,7 @@ public class DummyGeneratorAccess implements WorldGenLevel {
diff --git a/patches/server/0839-Missing-eating-regain-reason.patch b/patches/server/0840-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0839-Missing-eating-regain-reason.patch
rename to patches/server/0840-Missing-eating-regain-reason.patch
diff --git a/patches/server/0840-Missing-effect-cause.patch b/patches/server/0841-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0840-Missing-effect-cause.patch
rename to patches/server/0841-Missing-effect-cause.patch
diff --git a/patches/server/0841-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0842-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0841-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0842-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0844-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0843-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0844-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0844-Configurable-chat-thread-limit.patch b/patches/server/0845-Configurable-chat-thread-limit.patch
similarity index 95%
rename from patches/server/0844-Configurable-chat-thread-limit.patch
rename to patches/server/0845-Configurable-chat-thread-limit.patch
index a59b030b07..4d82e89994 100644
--- a/patches/server/0844-Configurable-chat-thread-limit.patch
+++ b/patches/server/0845-Configurable-chat-thread-limit.patch
@@ -22,10 +22,10 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 4b3bb5fad1d80c9baea20ca224663b1ebc2b83e9..eb4a70f4e21e46f61e60235fb0569c0d6b2672f9 100644
+index 3a5abb89d3742a6f38799c183a098947686e16ab..3bc7230ca62ebe3426da293e436a962bb0134f85 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -262,13 +262,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -286,13 +286,26 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Misc misc;
  
      public class Misc extends ConfigurationPart {
diff --git a/patches/server/0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0846-fix-Jigsaw-block-kicking-user.patch b/patches/server/0847-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0846-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0847-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0847-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0848-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0847-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0848-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0848-Add-getDrops-to-BlockState.patch b/patches/server/0849-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0848-Add-getDrops-to-BlockState.patch
rename to patches/server/0849-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 98%
rename from patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
index 82ce18cc8d..b53c6a53ea 100644
--- a/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch
@@ -111,10 +111,10 @@ index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb1
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a1962946a32d73bcf2b3988482bc7c9199b8cbfc..93937a1cb4526f093db74d71d2bf3bd72785ca13 100644
+index aab0e00fb9c804178fa182542abfeac115ee82aa..7887e3c725ce45fd2e2d6d3fd3a8ff12930cc722 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1331,7 +1331,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -825,7 +825,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end
  
@@ -124,10 +124,10 @@ index a1962946a32d73bcf2b3988482bc7c9199b8cbfc..93937a1cb4526f093db74d71d2bf3bd7
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cefe6fdcb6ef975b49a2417f5354775578391933..5090fa956e39f1bfb0890550872ae9ca1d79ea2e 100644
+index bd261dcd35f23f94ef5353db1b0d0b1c965e1db4..880969b3db018fdd8bf3c35a2521140aca7ad8ba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -771,7 +771,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1003,7 +1003,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          } else {
              AABB axisalignedbb = (new AABB(blockposition1, new BlockPos(blockposition1.getX(), this.getMaxBuildHeight(), blockposition1.getZ()))).inflate(3.0D);
              List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
diff --git a/patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 87%
rename from patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch
index d61a45739e..0add81806c 100644
--- a/patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5090fa956e39f1bfb0890550872ae9ca1d79ea2e..dcd756b849407c3f63dbc4f523bad1514bbd33c1 100644
+index 880969b3db018fdd8bf3c35a2521140aca7ad8ba..0df3b3a1683ebe6123520c59550c02c67c32d20a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2310,7 +2310,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2559,7 +2559,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (entity instanceof Mob) {
                  Mob entityinsentient = (Mob) entity;
  
@@ -17,7 +17,7 @@ index 5090fa956e39f1bfb0890550872ae9ca1d79ea2e..dcd756b849407c3f63dbc4f523bad151
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2395,7 +2395,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2644,7 +2644,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (entity instanceof Mob) {
                  Mob entityinsentient = (Mob) entity;
  
diff --git a/patches/server/0851-Fix-custom-piglin-loved-items.patch b/patches/server/0852-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0851-Fix-custom-piglin-loved-items.patch
rename to patches/server/0852-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0852-EntityPickupItemEvent-fixes.patch b/patches/server/0853-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0852-EntityPickupItemEvent-fixes.patch
rename to patches/server/0853-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0853-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0854-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0853-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0854-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch
similarity index 95%
rename from patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch
index c24277ab39..3026a16622 100644
--- a/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 545e5ef99560291210310d69e2572b40f25c605b..e9ddb8380534a49be7c9c82eb16c6fa1389f694a 100644
+index b3db504ccd063122348426f7422bab34fac74d7f..0f4c93396257b95a348a2d2fc1c796c5e0b2ad5f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -328,6 +328,25 @@ public class ServerPlayer extends Player {
+@@ -372,6 +372,25 @@ public class ServerPlayer extends Player {
  
                  }
              }
diff --git a/patches/server/0855-Elder-Guardian-appearance-API.patch b/patches/server/0856-Elder-Guardian-appearance-API.patch
similarity index 84%
rename from patches/server/0855-Elder-Guardian-appearance-API.patch
rename to patches/server/0856-Elder-Guardian-appearance-API.patch
index 14b9befb7f..d8cd1b222a 100644
--- a/patches/server/0855-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0856-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba93dbec8b22809133335e975f64caa85df30c9b..b4007ef683c64aeb8656d38a592d1037fcf8edaa 100644
+index 4fd4f2dee936c9b96b5297e16bb0061f3bfe2579..a60aa6f6fd00cc52cb7bedcf620b4b665191676d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3128,6 +3128,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3170,6 +3170,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0856-Allow-changing-bed-s-occupied-property.patch b/patches/server/0857-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0856-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0857-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0857-Add-entity-knockback-API.patch b/patches/server/0858-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0857-Add-entity-knockback-API.patch
rename to patches/server/0858-Add-entity-knockback-API.patch
diff --git a/patches/server/0858-Detect-headless-JREs.patch b/patches/server/0859-Detect-headless-JREs.patch
similarity index 96%
rename from patches/server/0858-Detect-headless-JREs.patch
rename to patches/server/0859-Detect-headless-JREs.patch
index 4aa739c75e..21cb522e88 100644
--- a/patches/server/0858-Detect-headless-JREs.patch
+++ b/patches/server/0859-Detect-headless-JREs.patch
@@ -27,7 +27,7 @@ index 6bd0afddbcc461149dfe9a5c7a86fff6ea13a5f1..148d233f4f5278ff39eacdaa0f4f0e7d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 06a2210ba7d17fe1676d59794639211e20c1d7ea..dbf230ab5a89b39dba724a0507076102574e860f 100644
+index 963e9887bda7bbcd9555fcbb17d63362ef1be5a6..ae0e39461e416cecd8e6904cb2fa69ad55a510e1 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -178,6 +178,18 @@ public class Main {
diff --git a/patches/server/0859-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0860-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0859-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0860-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0860-optimized-dirt-and-snow-spreading.patch b/patches/server/0861-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0860-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0861-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0861-Added-EntityToggleSitEvent.patch b/patches/server/0862-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0861-Added-EntityToggleSitEvent.patch
rename to patches/server/0862-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0862-Add-fire-tick-delay-option.patch b/patches/server/0863-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0862-Add-fire-tick-delay-option.patch
rename to patches/server/0863-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0863-Add-Moving-Piston-API.patch b/patches/server/0864-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0863-Add-Moving-Piston-API.patch
rename to patches/server/0864-Add-Moving-Piston-API.patch
diff --git a/patches/server/0864-Ignore-impossible-spawn-tick.patch b/patches/server/0865-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0864-Ignore-impossible-spawn-tick.patch
rename to patches/server/0865-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0865-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0866-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0865-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0866-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 91%
rename from patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index a7254dda99..7885ac68f3 100644
--- a/patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2a13d5f4cf86b4ae5e5cf2d0602fbcd275b1c080..53f5f0497cbebaf65afe232ba7603f4e14376e46 100644
+index e6356b1400030f9c288b0bf33ac7a7371913815f..026e06476e4da489f3d5ad9d1595f06fb3428682 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3201,6 +3201,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3252,6 +3252,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
diff --git a/patches/server/0868-Prevent-compass-from-loading-chunks.patch b/patches/server/0869-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0868-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0869-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0869-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0869-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0870-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0870-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0871-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0870-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0871-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0871-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0872-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0871-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0872-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0872-Add-Player-Warden-Warning-API.patch b/patches/server/0873-Add-Player-Warden-Warning-API.patch
similarity index 93%
rename from patches/server/0872-Add-Player-Warden-Warning-API.patch
rename to patches/server/0873-Add-Player-Warden-Warning-API.patch
index 392849a615..7664022221 100644
--- a/patches/server/0872-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0873-Add-Player-Warden-Warning-API.patch
@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b4007ef683c64aeb8656d38a592d1037fcf8edaa..3aa1a23c439ab6a54f2229654278395a65deadfe 100644
+index a60aa6f6fd00cc52cb7bedcf620b4b665191676d..b119a4cce62a7fc10b1bf369f0abfa55e4fa9a38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3133,6 +3133,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3175,6 +3175,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0873-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0874-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0873-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0874-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0874-Add-paper-dumplisteners-command.patch b/patches/server/0875-Add-paper-dumplisteners-command.patch
similarity index 98%
rename from patches/server/0874-Add-paper-dumplisteners-command.patch
rename to patches/server/0875-Add-paper-dumplisteners-command.patch
index 1919006e5d..9669276c0a 100644
--- a/patches/server/0874-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0875-Add-paper-dumplisteners-command.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add /paper dumplisteners command
 Co-authored-by: TwoLeggedCat <80929284+TwoLeggedCat@users.noreply.github.com>
 
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index 1fd0854fb4f8ab3b5da3cda5ddd2535a0faa6adf..a6793f227fa90a37260cf0b9d5e9b6f1f47ff920 100644
+index b7fc337ab2bbe3c6d80ed70834e294ab3a7f9dc2..05b29305f5e3018a662884c2ef1af5ae4f6867ee 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -42,6 +42,7 @@ public final class PaperCommand extends Command {
+@@ -43,6 +43,7 @@ public final class PaperCommand extends Command {
          commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
          commands.put(Set.of("dumpitem"), new DumpItemCommand());
          commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
diff --git a/patches/server/0875-check-global-player-list-where-appropriate.patch b/patches/server/0876-check-global-player-list-where-appropriate.patch
similarity index 93%
rename from patches/server/0875-check-global-player-list-where-appropriate.patch
rename to patches/server/0876-check-global-player-list-where-appropriate.patch
index 72ac559acb..9926a025cd 100644
--- a/patches/server/0875-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0876-check-global-player-list-where-appropriate.patch
@@ -7,10 +7,10 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dcd756b849407c3f63dbc4f523bad1514bbd33c1..81149d55c48a87ce769b070bb5248f4190536090 100644
+index 0df3b3a1683ebe6123520c59550c02c67c32d20a..6ecc40a786d431838af4e865e23bcf1bab84fc78 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2432,4 +2432,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2681,4 +2681,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
@@ -50,10 +50,10 @@ index 4b2cd6d34ea4081cad86041f57ccda41807d4279..807cff3fb51269b97d9aecbcc4706f0a
              if (entityhuman instanceof ServerPlayer) {
                  CriteriaTriggers.CURED_ZOMBIE_VILLAGER.trigger((ServerPlayer) entityhuman, this, entityvillager);
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index e82a56c32f4179dc6a8df97f314dc3b4370e818d..8f3c767449f63fad54e45cbbb7a50352e5dbee4b 100644
+index 258824816894d8fc0d8f1ee80489f66658a9ae80..a7e646071e739da363d75d5c35f48e473e405c6b 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -231,4 +231,11 @@ public interface EntityGetter {
+@@ -243,4 +243,11 @@ public interface EntityGetter {
  
          return null;
      }
diff --git a/patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 95%
rename from patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch
index 4c25ef6ec5..3d040ad44c 100644
--- a/patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix async entity add due to fungus trees
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index d99626d529ac2d18f662e5af0264643e8582e12d..277984647658a067e66fd1766ab00736ea9083c3 100644
+index 52fd12c474c01f3b53d0f6596b7a6fafee52bd0d..877498729c66de9aa6a27c9148f7494d7895615c 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 @@ -228,6 +228,7 @@ public class WorldGenRegion implements WorldGenLevel {
diff --git a/patches/server/0877-ItemStack-damage-API.patch b/patches/server/0878-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0877-ItemStack-damage-API.patch
rename to patches/server/0878-ItemStack-damage-API.patch
diff --git a/patches/server/0878-Friction-API.patch b/patches/server/0879-Friction-API.patch
similarity index 100%
rename from patches/server/0878-Friction-API.patch
rename to patches/server/0879-Friction-API.patch
diff --git a/patches/server/0879-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0880-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0879-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0880-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0880-Fix-player-kick-on-shutdown.patch b/patches/server/0881-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0880-Fix-player-kick-on-shutdown.patch
rename to patches/server/0881-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0881-Sync-offhand-slot-in-menus.patch b/patches/server/0882-Sync-offhand-slot-in-menus.patch
similarity index 95%
rename from patches/server/0881-Sync-offhand-slot-in-menus.patch
rename to patches/server/0882-Sync-offhand-slot-in-menus.patch
index c8f730ce02..1bc0805daa 100644
--- a/patches/server/0881-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0882-Sync-offhand-slot-in-menus.patch
@@ -8,10 +8,10 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e9ddb8380534a49be7c9c82eb16c6fa1389f694a..299c960b7601ca695d95ef96e31bf652a2bb7dac 100644
+index 0f4c93396257b95a348a2d2fc1c796c5e0b2ad5f..6ad4afe60e97a79af0358a783be2b69dd2dcef35 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -297,6 +297,13 @@ public class ServerPlayer extends Player {
+@@ -341,6 +341,13 @@ public class ServerPlayer extends Player {
  
              }
  
diff --git a/patches/server/0882-Player-Entity-Tracking-Events.patch b/patches/server/0883-Player-Entity-Tracking-Events.patch
similarity index 91%
rename from patches/server/0882-Player-Entity-Tracking-Events.patch
rename to patches/server/0883-Player-Entity-Tracking-Events.patch
index 470f1edb23..dab3d66e0d 100644
--- a/patches/server/0882-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0883-Player-Entity-Tracking-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 93937a1cb4526f093db74d71d2bf3bd72785ca13..3dabfece31e57bdd1d416cdb0f30ac942842be49 100644
+index 7887e3c725ce45fd2e2d6d3fd3a8ff12930cc722..85ae57e8f58fe5c28322d5d986452baf4457a95c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1847,9 +1847,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1282,9 +1282,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // CraftBukkit end
                  if (flag) {
                      if (this.seenBy.add(player.connection)) {
diff --git a/patches/server/0883-Limit-pet-look-distance.patch b/patches/server/0884-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0883-Limit-pet-look-distance.patch
rename to patches/server/0884-Limit-pet-look-distance.patch
diff --git a/patches/server/0884-Properly-resend-entities.patch b/patches/server/0885-Properly-resend-entities.patch
similarity index 96%
rename from patches/server/0884-Properly-resend-entities.patch
rename to patches/server/0885-Properly-resend-entities.patch
index c700f93b0b..c760c1bd39 100644
--- a/patches/server/0884-Properly-resend-entities.patch
+++ b/patches/server/0885-Properly-resend-entities.patch
@@ -82,10 +82,10 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..15add3f4dfd718ec09bb1db4f2222346
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cb17ed108583b3a374865e47c1951d504516cc63..9c260a029eea77c4bc47596458e2f77f1c9dc1c2 100644
+index df6be8a358052c3305efdbf2704433b74ffc3a0f..aee557c408a914d8213e2e6a92838c507b8f830c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2634,7 +2634,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2641,7 +2641,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                              // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
@@ -95,7 +95,7 @@ index cb17ed108583b3a374865e47c1951d504516cc63..9c260a029eea77c4bc47596458e2f77f
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e8abcff2ce955140643b7122edad51057b40e6a4..7923059d6ed145f8421378656b8a921a8bd2a793 100644
+index 446b77a31c1cd40449b80cfeefd1339d7f60a771..34e1f6399f78a7e507f1e73b535c5fb2eec77ebb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -357,7 +357,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0886-fix-Instruments.patch b/patches/server/0887-fix-Instruments.patch
similarity index 93%
rename from patches/server/0886-fix-Instruments.patch
rename to patches/server/0887-fix-Instruments.patch
index b6bb8893b0..8ee99ca334 100644
--- a/patches/server/0886-fix-Instruments.patch
+++ b/patches/server/0887-fix-Instruments.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3aa1a23c439ab6a54f2229654278395a65deadfe..7f26c6bff8fcc51d0d1c544225caceb2cb7c2d0c 100644
+index b119a4cce62a7fc10b1bf369f0abfa55e4fa9a38..ecca4cc87fa3b00ac29db87ee69aaa1a24d4e00f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -684,29 +684,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -726,29 +726,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0889-Add-BlockLockCheckEvent.patch b/patches/server/0890-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0889-Add-BlockLockCheckEvent.patch
rename to patches/server/0890-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0890-Add-Sneaking-API-for-Entities.patch b/patches/server/0891-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0890-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0891-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0891-Improve-logging-and-errors.patch b/patches/server/0892-Improve-logging-and-errors.patch
similarity index 95%
rename from patches/server/0891-Improve-logging-and-errors.patch
rename to patches/server/0892-Improve-logging-and-errors.patch
index 6dfa0e48af..ea15648f0b 100644
--- a/patches/server/0891-Improve-logging-and-errors.patch
+++ b/patches/server/0892-Improve-logging-and-errors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve logging and errors
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9c260a029eea77c4bc47596458e2f77f1c9dc1c2..74dab2bc00ea3ea4fa1d93f73a51129d59872467 100644
+index aee557c408a914d8213e2e6a92838c507b8f830c..4a3a7a57100dd2c69ffd3cfb1c49e811801e1409 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3371,7 +3371,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3378,7 +3378,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
diff --git a/patches/server/0892-Improve-PortalEvents.patch b/patches/server/0893-Improve-PortalEvents.patch
similarity index 89%
rename from patches/server/0892-Improve-PortalEvents.patch
rename to patches/server/0893-Improve-PortalEvents.patch
index ef0370353a..806b319fba 100644
--- a/patches/server/0892-Improve-PortalEvents.patch
+++ b/patches/server/0893-Improve-PortalEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 53f5f0497cbebaf65afe232ba7603f4e14376e46..466518499122eb6c05303d0c547b4712779b97f6 100644
+index 026e06476e4da489f3d5ad9d1595f06fb3428682..cb618238da529dbf5aeab54e4b26cac111a9b120 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3584,7 +3584,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3635,7 +3635,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          Location enter = bukkitEntity.getLocation();
          Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
diff --git a/patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 93%
rename from patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch
index 081745c25c..2b34b4856e 100644
--- a/patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 466518499122eb6c05303d0c547b4712779b97f6..05d351c60e86014b384195c20bfeddcc214b7d4e 100644
+index cb618238da529dbf5aeab54e4b26cac111a9b120..4e764cd56b309f23baf7aef9b0f2022d33d22f51 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -16,7 +16,7 @@ index 466518499122eb6c05303d0c547b4712779b97f6..05d351c60e86014b384195c20bfeddcc
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -1343,7 +1344,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1394,7 +1395,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, this.level.paperConfig().chunks.preventMovingIntoUnloadedChunks,
                  false, false, null, null);
  
diff --git a/patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 88%
rename from patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch
index 384866aff8..e99b9a53cc 100644
--- a/patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 74dab2bc00ea3ea4fa1d93f73a51129d59872467..75da5b590a60061fa42b8af5898cedc0ac7601a8 100644
+index 4a3a7a57100dd2c69ffd3cfb1c49e811801e1409..be6245a1b01cb76641d31f33e2edeb7b815fae6a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2098,7 +2098,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2105,7 +2105,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private void performChatCommand(ServerboundChatCommandPacket packet, LastSeenMessages lastSeenMessages) {
          // CraftBukkit start
          String command = "/" + packet.command();
diff --git a/patches/server/0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0896-Flying-Fall-Damage.patch b/patches/server/0897-Flying-Fall-Damage.patch
similarity index 93%
rename from patches/server/0896-Flying-Fall-Damage.patch
rename to patches/server/0897-Flying-Fall-Damage.patch
index d82409661d..8a8aa0a61d 100644
--- a/patches/server/0896-Flying-Fall-Damage.patch
+++ b/patches/server/0897-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index 6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d..d58b4c0dbe651b5068212e5f14dce316
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7f26c6bff8fcc51d0d1c544225caceb2cb7c2d0c..0c1e4c7c1c57dec05b59e8c89c4534e9015de79d 100644
+index ecca4cc87fa3b00ac29db87ee69aaa1a24d4e00f..3db0278b66d11cf2d7e4c415e859ed39efbec5d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2350,6 +2350,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2392,6 +2392,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 86%
rename from patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 72aa2e4c36..be45916461 100644
--- a/patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 05d351c60e86014b384195c20bfeddcc214b7d4e..b31a574278bb5c6168d85d5d48b96ccac2d1ceaf 100644
+index 4e764cd56b309f23baf7aef9b0f2022d33d22f51..2e99b06e1f3992853694dc867ec0af9fc623f7f1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1037,7 +1037,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1088,7 +1088,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      }
  
                      if (!bl.getType().isAir()) {
diff --git a/patches/server/0899-config-for-disabling-entity-tag-tags.patch b/patches/server/0900-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0899-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0900-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0900-Use-single-player-info-update-packet-on-join.patch b/patches/server/0901-Use-single-player-info-update-packet-on-join.patch
similarity index 92%
rename from patches/server/0900-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0901-Use-single-player-info-update-packet-on-join.patch
index f476101da4..548fddb9d3 100644
--- a/patches/server/0900-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0901-Use-single-player-info-update-packet-on-join.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75da5b590a60061fa42b8af5898cedc0ac7601a8..8d47dd35369d7ed99e46eaadb5bda8e9c6850aab 100644
+index be6245a1b01cb76641d31f33e2edeb7b815fae6a..7abada5b8b6b92f998154b6cb9851c4d0a19e717 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3401,7 +3401,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3408,7 +3408,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
          this.chatMessageChain.append((executor) -> {
              this.player.setChatSession(session);
@@ -18,7 +18,7 @@ index 75da5b590a60061fa42b8af5898cedc0ac7601a8..8d47dd35369d7ed99e46eaadb5bda8e9
          });
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7923059d6ed145f8421378656b8a921a8bd2a793..dbebf8887589961b271a2c157e9e4763cc8c506f 100644
+index 34e1f6399f78a7e507f1e73b535c5fb2eec77ebb..178ad4c574de4fb509e313e32f69a59723512d8a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -339,6 +339,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0901-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0902-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0901-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0902-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0902-Win-Screen-API.patch b/patches/server/0903-Win-Screen-API.patch
similarity index 88%
rename from patches/server/0902-Win-Screen-API.patch
rename to patches/server/0903-Win-Screen-API.patch
index 40f6d4a3ee..06a50044be 100644
--- a/patches/server/0902-Win-Screen-API.patch
+++ b/patches/server/0903-Win-Screen-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0c1e4c7c1c57dec05b59e8c89c4534e9015de79d..80903afc3678828eccece4149395538a51d20d3d 100644
+index 3db0278b66d11cf2d7e4c415e859ed39efbec5d7..e2dd9441bdcebe0a31f2047b0d704c2b90d32dfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1173,6 +1173,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1215,6 +1215,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0903-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0903-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0904-Fix-force-opening-enchantment-tables.patch b/patches/server/0905-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0904-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0905-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0905-Add-Entity-Body-Yaw-API.patch b/patches/server/0906-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0905-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0906-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 90%
rename from patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch
index fdb1d3f49a..20753d800a 100644
--- a/patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index aa5879aef6e6e517ead13a422fed7674f715c994..5841a5be7e0b206ecb120a0a5771733ca6439989 100644
+index 3a2ad20ab45bebebd4bce8b17e902f704f748338..70b473bfebd387a958ed0766cb87ac5f39450d37 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -550,6 +550,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0908-Add-EntityFertilizeEggEvent.patch b/patches/server/0909-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0908-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0909-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0911-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0912-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0911-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0912-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0912-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0913-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0912-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0913-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0913-Fix-text-display-error-on-spawn.patch b/patches/server/0914-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0913-Fix-text-display-error-on-spawn.patch
rename to patches/server/0914-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0914-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0915-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0914-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0915-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0915-Add-Shearable-API.patch b/patches/server/0916-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0915-Add-Shearable-API.patch
rename to patches/server/0916-Add-Shearable-API.patch
diff --git a/patches/server/0916-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0917-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0916-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0917-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0917-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0918-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0917-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0918-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0918-Optimize-Hoppers.patch b/patches/server/0919-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0918-Optimize-Hoppers.patch
rename to patches/server/0919-Optimize-Hoppers.patch
index 1c11d8da9a..b2a8761704 100644
--- a/patches/server/0918-Optimize-Hoppers.patch
+++ b/patches/server/0919-Optimize-Hoppers.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bf9e396505c5004b0fb640837b41a4885bcab08e..189efb8de2b712d554dcbdcfc50faf207a8beed1 100644
+index fd39dee91754137b7a52f06a03644f00e22bb8ef..f1ba2f3fa8488dadd59cc2f8f2acc5d86981efdd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1513,6 +1513,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1508,6 +1508,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
diff --git a/patches/server/0919-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0920-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0919-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0920-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0921-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0921-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0921-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0922-Treat-sequence-violations-like-they-should-be.patch
similarity index 86%
rename from patches/server/0921-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0922-Treat-sequence-violations-like-they-should-be.patch
index 672f372c97..7f031d741d 100644
--- a/patches/server/0921-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0922-Treat-sequence-violations-like-they-should-be.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8d47dd35369d7ed99e46eaadb5bda8e9c6850aab..3401718d5d6a67da3d3e1625d8f055b328dcc744 100644
+index 7abada5b8b6b92f998154b6cb9851c4d0a19e717..af6a7c14b1028745d0bb51ee90d819cc9e75395d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1997,6 +1997,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2004,6 +2004,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      public void ackBlockChangesUpTo(int sequence) {
          if (sequence < 0) {
diff --git a/patches/server/0922-remove-duplicate-animate-packet-for-records.patch b/patches/server/0923-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0922-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0923-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0924-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 95%
rename from patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0924-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 3c9dd41d35..10e6ba0b2c 100644
--- a/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0924-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 40ac5cf19934207f06755fbea02d4626d7aa0511..32e3f347e2e025e2675e9410116386e4
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3401718d5d6a67da3d3e1625d8f055b328dcc744..1b2a706ae2f1ffa06b14282cc026c665c9f94ebf 100644
+index af6a7c14b1028745d0bb51ee90d819cc9e75395d..d3591313fab215a2d29480e3427eadf2c30f9b63 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -284,6 +284,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -49,7 +49,7 @@ index 3401718d5d6a67da3d3e1625d8f055b328dcc744..1b2a706ae2f1ffa06b14282cc026c665
      }
  
      public void resetPosition() {
-@@ -3399,6 +3407,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3406,6 +3414,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      private void resetPlayerChatState(RemoteChatSession session) {
          this.chatSession = session;
diff --git a/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0925-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 84%
rename from patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0925-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index cf75bb9d65..4691d5a2ea 100644
--- a/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0925-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 81149d55c48a87ce769b070bb5248f4190536090..310c7b81dc92a24aadc0a0a5f1c124e9e416fdce 100644
+index 6ecc40a786d431838af4e865e23bcf1bab84fc78..e8b371b735924f0c574216c388b6154b1cb50074 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1433,6 +1433,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1667,6 +1667,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void gameEvent(GameEvent event, Vec3 emitterPos, GameEvent.Context emitter) {
diff --git a/patches/server/0925-Use-array-for-gamerule-storage.patch b/patches/server/0926-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0925-Use-array-for-gamerule-storage.patch
rename to patches/server/0926-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0926-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0927-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0926-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0927-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0928-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 88%
rename from patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0928-Fix-demo-flag-not-enabling-demo-mode.patch
index 302ea43453..1c9d5aefe4 100644
--- a/patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0928-Fix-demo-flag-not-enabling-demo-mode.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix demo flag not enabling demo mode
 https://github.com/PaperMC/Paper/issues/9046
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index dbf230ab5a89b39dba724a0507076102574e860f..d6f5174387f9bb3838aa41fa0d4cd0bb19f721ec 100644
+index ae0e39461e416cecd8e6904cb2fa69ad55a510e1..ec268189b19b6fa5c4521f96ce211a531db35ec5 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -307,7 +307,9 @@ public class Main {
+@@ -308,7 +308,9 @@ public class Main {
  
                  /*
                  dedicatedserver1.setPort((Integer) optionset.valueOf(optionspec10));
diff --git a/patches/server/0928-Add-Mob-Experience-reward-API.patch b/patches/server/0929-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0928-Add-Mob-Experience-reward-API.patch
rename to patches/server/0929-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0929-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0930-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0929-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0930-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0930-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0931-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0930-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0931-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0932-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0932-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0932-More-accurate-isInOpenWater-impl.patch b/patches/server/0933-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0932-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0933-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0934-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0934-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0934-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0935-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0934-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0935-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0935-Expand-PlayerItemMendEvent.patch b/patches/server/0936-Expand-PlayerItemMendEvent.patch
similarity index 96%
rename from patches/server/0935-Expand-PlayerItemMendEvent.patch
rename to patches/server/0936-Expand-PlayerItemMendEvent.patch
index f416435c57..25dc159753 100644
--- a/patches/server/0935-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0936-Expand-PlayerItemMendEvent.patch
@@ -33,10 +33,10 @@ index 8d8fe55a05eea237a8af99ed15ab16d6167daa77..eca634792d2a7cc649675e3394e84dba
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 80903afc3678828eccece4149395538a51d20d3d..0eddcd61a7253fe840b84f69ba4a4ada6cb716ff 100644
+index e2dd9441bdcebe0a31f2047b0d704c2b90d32dfa..6a6e3dcdd4cbf93ab68361b0a388a1028b4f96d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1695,11 +1695,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1737,11 +1737,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
  
              int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
diff --git a/patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0937-Refresh-ProjectileSource-for-projectiles.patch
similarity index 97%
rename from patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0937-Refresh-ProjectileSource-for-projectiles.patch
index 8a69d4d616..76667871ec 100644
--- a/patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0937-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b31a574278bb5c6168d85d5d48b96ccac2d1ceaf..567d2a315503280f90497f2728b2ee220403cbad 100644
+index 2e99b06e1f3992853694dc867ec0af9fc623f7f1..65557c81e02faa316b9c681f84ba37d94217a65f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -381,6 +381,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0937-Add-transient-modifier-API.patch b/patches/server/0938-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0937-Add-transient-modifier-API.patch
rename to patches/server/0938-Add-transient-modifier-API.patch
diff --git a/patches/server/0938-Fix-block-place-logic.patch b/patches/server/0939-Fix-block-place-logic.patch
similarity index 96%
rename from patches/server/0938-Fix-block-place-logic.patch
rename to patches/server/0939-Fix-block-place-logic.patch
index e644382eaa..8fc67ee6e8 100644
--- a/patches/server/0938-Fix-block-place-logic.patch
+++ b/patches/server/0939-Fix-block-place-logic.patch
@@ -41,10 +41,10 @@ index 08464c7f114a04169c9ddeceef936749952770e6..62fc1b110ec319bb91aa0639b18aa354
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5841a5be7e0b206ecb120a0a5771733ca6439989..019a86e964f3f0d89aea9e1db18ad551914b07ef 100644
+index 70b473bfebd387a958ed0766cb87ac5f39450d37..f67f5cef69621e0baf9b4ba157993d97e431f3d1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -659,17 +659,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -664,17 +664,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0940-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0940-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0940-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0941-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0940-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0941-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0942-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0942-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0943-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 94%
rename from patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0943-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 7a3bb28a6f..2f5b244c61 100644
--- a/patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0943-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 615baf99dd8680b97aa1f03d4a961e15bcdd832b..6438891e243d0c25f1b3fbe0303ef1c133637cbb 100644
+index ef4c259504694d27534834a5d33e78a8d33ece6c..9b0877f67d5845030b3f11240e89e77401a01c3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -360,7 +360,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0943-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0944-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0943-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0944-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0944-Fix-sniffer-removeExploredLocation.patch b/patches/server/0945-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0944-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0945-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0945-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0946-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0945-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0946-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0947-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0947-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0948-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0948-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0948-Properly-Cancel-Usable-Items.patch b/patches/server/0949-Properly-Cancel-Usable-Items.patch
similarity index 95%
rename from patches/server/0948-Properly-Cancel-Usable-Items.patch
rename to patches/server/0949-Properly-Cancel-Usable-Items.patch
index 04f02c4506..c0f8f43763 100644
--- a/patches/server/0948-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0949-Properly-Cancel-Usable-Items.patch
@@ -34,10 +34,10 @@ index 482e6b217c073ceff30c238c3a8cd8ea526bb07c..034960c1d321e159b3881a900f823ba5
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1b2a706ae2f1ffa06b14282cc026c665c9f94ebf..15a3ede8e1ee37f455c264c5b2f53c99f25d0be7 100644
+index d3591313fab215a2d29480e3427eadf2c30f9b63..41b8cab749d3fd8b6517297ff5d511204dccdf20 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1909,6 +1909,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1916,6 +1916,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              }
  
              if (cancelled) {
diff --git a/patches/server/0949-Add-event-for-player-editing-sign.patch b/patches/server/0950-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0949-Add-event-for-player-editing-sign.patch
rename to patches/server/0950-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0950-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0951-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0950-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0951-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0951-Improve-command-function-perm-level-checks.patch b/patches/server/0952-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0951-Improve-command-function-perm-level-checks.patch
rename to patches/server/0952-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0952-Add-option-to-disable-block-updates.patch b/patches/server/0953-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0952-Add-option-to-disable-block-updates.patch
rename to patches/server/0953-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0953-Call-missing-BlockDispenseEvent.patch b/patches/server/0954-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0953-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0954-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0955-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 84%
rename from patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0955-Don-t-load-chunks-for-supporting-block-checks.patch
index 59dce5ec60..24c268f2a9 100644
--- a/patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0955-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 567d2a315503280f90497f2728b2ee220403cbad..4f2fa0a5b809f6ec55d00a466dced9a5b0713c38 100644
+index 65557c81e02faa316b9c681f84ba37d94217a65f..59914195962b45f4667ccb6afcb90de68cbe7361 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1230,7 +1230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1281,7 +1281,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      protected BlockPos getOnPos(float offset) {
diff --git a/patches/server/0955-Optimize-player-lookups-for-beacons.patch b/patches/server/0956-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0955-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0956-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0956-Add-Sign-getInteractableSideFor.patch b/patches/server/0957-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0956-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0957-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0957-Array-backed-synched-entity-data.patch b/patches/server/0958-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0957-Array-backed-synched-entity-data.patch
rename to patches/server/0958-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0959-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0958-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0959-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0959-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0960-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0959-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0960-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0960-Fix-BanList-API.patch b/patches/server/0961-Fix-BanList-API.patch
similarity index 98%
rename from patches/server/0960-Fix-BanList-API.patch
rename to patches/server/0961-Fix-BanList-API.patch
index 2acf1e097d..cfa843a407 100644
--- a/patches/server/0960-Fix-BanList-API.patch
+++ b/patches/server/0961-Fix-BanList-API.patch
@@ -208,10 +208,10 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0eddcd61a7253fe840b84f69ba4a4ada6cb716ff..a041fcf0702d2f8510365eac5d7d52dcaf1091d5 100644
+index 6a6e3dcdd4cbf93ab68361b0a388a1028b4f96d9..8b2ed0f06bc8dd5cf3b1ad51ead49539c9206b30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1593,23 +1593,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1635,23 +1635,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
@@ -240,7 +240,7 @@ index 0eddcd61a7253fe840b84f69ba4a4ada6cb716ff..a041fcf0702d2f8510365eac5d7d52dc
          if (kickPlayer) {
              this.kickPlayer(reason);
          }
-@@ -1617,12 +1617,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1659,12 +1659,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0962-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0962-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0962-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0963-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0962-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0963-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0964-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0964-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0964-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0965-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0964-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0965-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0965-Don-t-tick-signs.patch b/patches/server/0966-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0965-Don-t-tick-signs.patch
rename to patches/server/0966-Don-t-tick-signs.patch
diff --git a/patches/server/0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0967-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0967-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0967-Add-whitelist-events.patch b/patches/server/0968-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0967-Add-whitelist-events.patch
rename to patches/server/0968-Add-whitelist-events.patch
diff --git a/patches/server/0968-Implement-PlayerFailMoveEvent.patch b/patches/server/0969-Implement-PlayerFailMoveEvent.patch
similarity index 94%
rename from patches/server/0968-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0969-Implement-PlayerFailMoveEvent.patch
index 64a95d5c54..d6ccbccd31 100644
--- a/patches/server/0968-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0969-Implement-PlayerFailMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 15a3ede8e1ee37f455c264c5b2f53c99f25d0be7..a1617da6552962fdf8f0e3bba2948ed7936814c8 100644
+index 41b8cab749d3fd8b6517297ff5d511204dccdf20..2cb2d0e89687be15b54a801c077f7755040f7b0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1284,8 +1284,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1291,8 +1291,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      double d0 = ServerGamePacketListenerImpl.clampHorizontal(packet.getX(this.player.getX())); final double toX = d0; // Paper - OBFHELPER
                      double d1 = ServerGamePacketListenerImpl.clampVertical(packet.getY(this.player.getY())); final double toY = d1;
                      double d2 = ServerGamePacketListenerImpl.clampHorizontal(packet.getZ(this.player.getZ())); final double toZ = d2; // Paper - OBFHELPER
@@ -19,7 +19,7 @@ index 15a3ede8e1ee37f455c264c5b2f53c99f25d0be7..a1617da6552962fdf8f0e3bba2948ed7
  
                      if (this.player.isPassenger()) {
                          this.player.absMoveTo(this.player.getX(), this.player.getY(), this.player.getZ(), f, f1);
-@@ -1351,8 +1351,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1358,8 +1358,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              }
                              // Paper start - Prevent moving into unloaded chunks
                              if (this.player.level().paperConfig().chunks.preventMovingIntoUnloadedChunks && (this.player.getX() != toX || this.player.getZ() != toZ) && !worldserver.areChunksLoadedForMove(this.player.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(this.player.position())))) {
@@ -34,7 +34,7 @@ index 15a3ede8e1ee37f455c264c5b2f53c99f25d0be7..a1617da6552962fdf8f0e3bba2948ed7
                              }
                              // Paper end
  
-@@ -1361,9 +1367,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1368,9 +1374,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                                  if (d10 - d9 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
                                  // CraftBukkit end
@@ -51,7 +51,7 @@ index 15a3ede8e1ee37f455c264c5b2f53c99f25d0be7..a1617da6552962fdf8f0e3bba2948ed7
                                  }
                              }
  
-@@ -1428,8 +1441,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1435,8 +1448,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              boolean flag2 = false;
  
                              if (!this.player.isChangingDimension() && d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
@@ -67,7 +67,7 @@ index 15a3ede8e1ee37f455c264c5b2f53c99f25d0be7..a1617da6552962fdf8f0e3bba2948ed7
                              }
  
                              // Paper start - optimise out extra getCubes
-@@ -1442,6 +1462,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1449,6 +1469,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  if (didCollide || !axisalignedbb.equals(newBox)) {
                                      // note: only call after setLocation, or else getBoundingBox is wrong
                                      teleportBack = this.hasNewCollision(worldserver, this.player, axisalignedbb, newBox);
@@ -83,7 +83,7 @@ index 15a3ede8e1ee37f455c264c5b2f53c99f25d0be7..a1617da6552962fdf8f0e3bba2948ed7
                                  } // else: no collision at all detected, why do we care?
                              }
                              if (!this.player.noPhysics && !this.player.isSleeping() && teleportBack) { // Paper end - optimise out extra getCubes
-@@ -1530,6 +1559,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1537,6 +1566,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
      }
  
diff --git a/patches/server/0969-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0970-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0969-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0970-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0970-API-for-updating-recipes-on-clients.patch b/patches/server/0971-API-for-updating-recipes-on-clients.patch
similarity index 95%
rename from patches/server/0970-API-for-updating-recipes-on-clients.patch
rename to patches/server/0971-API-for-updating-recipes-on-clients.patch
index 957f9ab109..6dae1aa831 100644
--- a/patches/server/0970-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0971-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dbebf8887589961b271a2c157e9e4763cc8c506f..5b7694556c5a280fbcb9dd5d974f9b4ef285fb2c 100644
+index 178ad4c574de4fb509e313e32f69a59723512d8a..e43e70b3f115fbac2e1f13b92fc040a44599bf2f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1517,6 +1517,13 @@ public abstract class PlayerList {
@@ -39,7 +39,7 @@ index dbebf8887589961b271a2c157e9e4763cc8c506f..5b7694556c5a280fbcb9dd5d974f9b4e
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6438891e243d0c25f1b3fbe0303ef1c133637cbb..0f0052aa556a40eef6525a21a68919cd5a42fe43 100644
+index 9b0877f67d5845030b3f11240e89e77401a01c3e..07805b419cb6e56f811c500e83b6a32f4adbcb96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1062,6 +1062,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0971-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0972-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0971-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0972-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0972-Only-capture-actual-tree-growth.patch b/patches/server/0973-Only-capture-actual-tree-growth.patch
similarity index 93%
rename from patches/server/0972-Only-capture-actual-tree-growth.patch
rename to patches/server/0973-Only-capture-actual-tree-growth.patch
index 01609cca3c..f0a4c3f19b 100644
--- a/patches/server/0972-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0973-Only-capture-actual-tree-growth.patch
@@ -29,21 +29,20 @@ index 7bb47643e748f57a51c613d0a2ee8d05e1fe1798..16f087adbf94b8fd6726ffd300b103dd
                      }
                      entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 019a86e964f3f0d89aea9e1db18ad551914b07ef..70e6071e455cc21f38a3ccca6bff3cd86a8622be 100644
+index f67f5cef69621e0baf9b4ba157993d97e431f3d1..2db9a575ca79c46ab36c092f7748fd1654d00bf0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1466,4 +1466,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1481,4 +1481,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
-     // Paper end
-+
-+    // Paper start
+     // Paper end - optimize redstone (Alternate Current)
++    // Paper start - notify observers even if grow failed
 +    public void checkCapturedTreeStateForObserverNotify(final BlockPos pos, final CraftBlockState craftBlockState) {
 +        if (craftBlockState.getPosition().getY() == pos.getY() && this.getBlockState(craftBlockState.getPosition()) == craftBlockState.getHandle()) { // notify observers if the block state is the same and the Y level equals the original y level (for mega trees)
 +            this.notifyAndUpdatePhysics(craftBlockState.getPosition(), null, craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getFlag(), 512);
 +        }
 +    }
-+    // Paper end
++    // Paper end - notify observers even if grow failed
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/SaplingBlock.java b/src/main/java/net/minecraft/world/level/block/SaplingBlock.java
 index f43e6fe77e943239c1f1d6fa3e31235949f79546..53ac4e618fec3fe384d8a106c521f3eace0b5b35 100644
diff --git a/patches/server/0973-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0974-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0973-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0974-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0974-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0975-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0974-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0975-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0975-Use-correct-seed-on-api-world-load.patch b/patches/server/0976-Use-correct-seed-on-api-world-load.patch
similarity index 90%
rename from patches/server/0975-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0976-Use-correct-seed-on-api-world-load.patch
index b25aeba653..6e892d0933 100644
--- a/patches/server/0975-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0976-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0f0052aa556a40eef6525a21a68919cd5a42fe43..843507ce8ad907509cb0ca5347ef6834ce7fcc35 100644
+index 07805b419cb6e56f811c500e83b6a32f4adbcb96..5fd6212c589df06b946a40d2f9f9c657c2e3f112 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1243,7 +1243,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0977-Cache-map-ids-on-item-frames.patch b/patches/server/0978-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0977-Cache-map-ids-on-item-frames.patch
rename to patches/server/0978-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0978-Fix-custom-statistic-criteria-creation.patch b/patches/server/0979-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0978-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0979-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0979-Bandaid-fix-for-Effect.patch b/patches/server/0980-Bandaid-fix-for-Effect.patch
similarity index 95%
rename from patches/server/0979-Bandaid-fix-for-Effect.patch
rename to patches/server/0980-Bandaid-fix-for-Effect.patch
index b506460040..3a386db86c 100644
--- a/patches/server/0979-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0980-Bandaid-fix-for-Effect.patch
@@ -45,10 +45,10 @@ index 5a5a8945c786e16ff0df62494ddd1ac85c42b53f..63f9735d356dafd579cee4423d3037eb
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c7e6e73507ab198224de1b549f7c71887341c6a6..d6b789764abc50856dcc1c8da5e9e481f54d61ca 100644
+index 9707487f2533c30dc1998fafc626e50948ee4dab..1b996cbbbbf3f753f1144d553f763e15f23593bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1379,7 +1379,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1369,7 +1369,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public <T> void playEffect(Location loc, Effect effect, T data, int radius) {
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
@@ -58,10 +58,10 @@ index c7e6e73507ab198224de1b549f7c71887341c6a6..d6b789764abc50856dcc1c8da5e9e481
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a041fcf0702d2f8510365eac5d7d52dcaf1091d5..6c217dd817c6af0e49e33334b2aef79299372b66 100644
+index 8b2ed0f06bc8dd5cf3b1ad51ead49539c9206b30..1975444d38d5130efde54f9122387997658d87e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -820,7 +820,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -862,7 +862,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(effect != null, "Effect cannot be null");
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
diff --git a/patches/server/0980-SculkCatalyst-bloom-API.patch b/patches/server/0981-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0980-SculkCatalyst-bloom-API.patch
rename to patches/server/0981-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0981-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0982-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0981-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0982-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 92%
rename from patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 4c0b4004a5..ecc1be44be 100644
--- a/patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3dabfece31e57bdd1d416cdb0f30ac942842be49..4a32830185b21722b93a5a783ce5f667acad3ce5 100644
+index 85ae57e8f58fe5c28322d5d986452baf4457a95c..0d320f2aeab9d6b9faea48cf5f7778fbc7e66f98 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -339,8 +339,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -313,8 +313,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
@@ -39,10 +39,10 @@ index 3dabfece31e57bdd1d416cdb0f30ac942842be49..4a32830185b21722b93a5a783ce5f667
      // 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 70a7abf4738cc5da94d7465884d9a5a1dd7c828c..da0719ca2634913b2ee04426c850f6304480c8ce 100644
+index 7b5851cd4f5a91bf7609464d7d6c4bb5a3da14bf..3354865ba418ceb7241cf5ce6ec2f1ee4008802c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -686,7 +686,17 @@ public class ServerChunkCache extends ChunkSource {
+@@ -532,7 +532,17 @@ public class ServerChunkCache extends ChunkSource {
              if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
                  // re-set mob counts
                  for (ServerPlayer player : this.level.players) {
@@ -62,7 +62,7 @@ index 70a7abf4738cc5da94d7465884d9a5a1dd7c828c..da0719ca2634913b2ee04426c850f630
                  spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 299c960b7601ca695d95ef96e31bf652a2bb7dac..4ea7930f5d93e917dacaeff972a49886ff90847c 100644
+index 6ad4afe60e97a79af0358a783be2b69dd2dcef35..08690b59871fda8a5474764e3a0c7d54ce0f284e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -252,6 +252,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 96%
rename from patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch
index 36a00cca64..00f0a02597 100644
--- a/patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 843507ce8ad907509cb0ca5347ef6834ce7fcc35..87cecad5190a2b23e3955ffb7244015f62533f82 100644
+index 5fd6212c589df06b946a40d2f9f9c657c2e3f112..74e002a1bfbc83f72af6951555511f2e89630731 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1785,6 +1785,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 92%
rename from patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 61d228acbb..eebb66bcfe 100644
--- a/patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,10 +11,10 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a1617da6552962fdf8f0e3bba2948ed7936814c8..7b2e7d74a4735546c9cb00af87f12cfd8e73b861 100644
+index 2cb2d0e89687be15b54a801c077f7755040f7b0d..2dddfea4bb9f1d613d7497dd84d59ecd99f09b7a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -798,6 +798,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -805,6 +805,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
  
                          this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
diff --git a/patches/server/0985-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0986-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0985-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0986-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0986-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0987-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0986-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0987-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 90%
rename from patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 08cde2321a..901a8d659a 100644
--- a/patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4a32830185b21722b93a5a783ce5f667acad3ce5..fa581b1e11409e43af9e1111a0e5cace48fe305d 100644
+index 0d320f2aeab9d6b9faea48cf5f7778fbc7e66f98..e7bac5f1b4a557be32a87b31573910c61b418d7d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1858,6 +1858,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1293,6 +1293,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z;
                  double d2 = d0 * d0;
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
diff --git a/patches/server/0988-Add-Listing-API-for-Player.patch b/patches/server/0989-Add-Listing-API-for-Player.patch
similarity index 97%
rename from patches/server/0988-Add-Listing-API-for-Player.patch
rename to patches/server/0989-Add-Listing-API-for-Player.patch
index 6246d38ab8..e5bc8c111c 100644
--- a/patches/server/0988-Add-Listing-API-for-Player.patch
+++ b/patches/server/0989-Add-Listing-API-for-Player.patch
@@ -76,7 +76,7 @@ index 32e3f347e2e025e2675e9410116386e472bd6a79..929483116d05a803d317ece7a44861af
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5b7694556c5a280fbcb9dd5d974f9b4ef285fb2c..778faaa31b93e6b5c3e92b41b7c69ac3625e729e 100644
+index e43e70b3f115fbac2e1f13b92fc040a44599bf2f..e99e865afd7b029f7b110efedfe44cec87844d38 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -337,14 +337,22 @@ public abstract class PlayerList {
@@ -113,7 +113,7 @@ index 5b7694556c5a280fbcb9dd5d974f9b4ef285fb2c..778faaa31b93e6b5c3e92b41b7c69ac3
          // Paper end
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6c217dd817c6af0e49e33334b2aef79299372b66..65bed768299b3827e27eae9b0c8852ba69bdcf8b 100644
+index 1975444d38d5130efde54f9122387997658d87e7..5db28d16070b5d5ec076ec3c7c84e5d7cf230601 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -184,6 +184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -124,7 +124,7 @@ index 6c217dd817c6af0e49e33334b2aef79299372b66..65bed768299b3827e27eae9b0c8852ba
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
      private double health = 20;
-@@ -1933,7 +1934,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1975,7 +1976,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  otherPlayer.setUUID(uuidOverride);
              }
              // Paper end
@@ -133,7 +133,7 @@ index 6c217dd817c6af0e49e33334b2aef79299372b66..65bed768299b3827e27eae9b0c8852ba
              if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
          }
  
-@@ -2042,6 +2043,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2084,6 +2085,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (entity != null) ? this.canSee(entity) : false; // If we can't find it, we can't see it
      }
  
diff --git a/patches/server/0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/0990-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0991-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0990-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0991-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0991-Expand-Pose-API.patch b/patches/server/0992-Expand-Pose-API.patch
similarity index 93%
rename from patches/server/0991-Expand-Pose-API.patch
rename to patches/server/0992-Expand-Pose-API.patch
index c7d344837b..7c3372e2d4 100644
--- a/patches/server/0991-Expand-Pose-API.patch
+++ b/patches/server/0992-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4f2fa0a5b809f6ec55d00a466dced9a5b0713c38..f90bcd757d86f85f72f88ff052b8c33aac34ff66 100644
+index 59914195962b45f4667ccb6afcb90de68cbe7361..fa494b582d5697dbbdf0f3bbbae7ddc3035d7834 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -404,6 +404,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -16,7 +16,7 @@ index 4f2fa0a5b809f6ec55d00a466dced9a5b0713c38..f90bcd757d86f85f72f88ff052b8c33a
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -605,6 +606,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -656,6 +657,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void onClientRemoval() {}
  
      public void setPose(net.minecraft.world.entity.Pose pose) {
diff --git a/patches/server/0992-More-DragonBattle-API.patch b/patches/server/0993-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0992-More-DragonBattle-API.patch
rename to patches/server/0993-More-DragonBattle-API.patch
diff --git a/patches/server/0993-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0994-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0993-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0994-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0994-Add-PlayerPickItemEvent.patch b/patches/server/0995-Add-PlayerPickItemEvent.patch
similarity index 94%
rename from patches/server/0994-Add-PlayerPickItemEvent.patch
rename to patches/server/0995-Add-PlayerPickItemEvent.patch
index d6fb33fc14..ebf1e56e2c 100644
--- a/patches/server/0994-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0995-Add-PlayerPickItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7b2e7d74a4735546c9cb00af87f12cfd8e73b861..44f245c3cc7c2b36f40a423abf2418c0b7882735 100644
+index 2dddfea4bb9f1d613d7497dd84d59ecd99f09b7a..264307bf5e1352f1ea82f1ec04c9645047b4ff9b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -935,7 +935,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -942,7 +942,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.disconnect("Invalid hotbar selection (Hacking?)", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
              return;
          }
diff --git a/patches/server/0995-Improve-performance-of-mass-crafts.patch b/patches/server/0996-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0995-Improve-performance-of-mass-crafts.patch
rename to patches/server/0996-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0996-Allow-trident-custom-damage.patch b/patches/server/0997-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0996-Allow-trident-custom-damage.patch
rename to patches/server/0997-Allow-trident-custom-damage.patch
diff --git a/patches/server/0997-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0998-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0997-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/0998-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/0998-Optimize-nearest-structure-border-iteration.patch b/patches/server/0999-Optimize-nearest-structure-border-iteration.patch
similarity index 95%
rename from patches/server/0998-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0999-Optimize-nearest-structure-border-iteration.patch
index bd48dcbad1..07d0358cbb 100644
--- a/patches/server/0998-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0999-Optimize-nearest-structure-border-iteration.patch
@@ -14,7 +14,7 @@ ensure that the returned found structure (which may for example be a buried
 treasure that will be marked on a treasure map) is the same as in vanilla.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 9cdfc9e7614708934cc05146f1464c187d736aed..c32351d357552698836a865f8155462c461779ed 100644
+index 8bab3fcfc6aa6c0b37621474a69f15e94bda2113..d5c2a608e1b4c8099c96b33d9d758e968350a46d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -260,12 +260,15 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0999-Implement-OfflinePlayer-isConnected.patch b/patches/server/1000-Implement-OfflinePlayer-isConnected.patch
similarity index 90%
rename from patches/server/0999-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1000-Implement-OfflinePlayer-isConnected.patch
index 959a9ddf83..157d1931e9 100644
--- a/patches/server/0999-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/1000-Implement-OfflinePlayer-isConnected.patch
@@ -23,10 +23,10 @@ index c6129dc565b8f874b73e2fefcabd4be1c221fd73..c1b874cd6e0498fce3cd53fdbaca30d2
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 65bed768299b3827e27eae9b0c8852ba69bdcf8b..5b82093715c35b1c6d1e3c639f5a056cb9b3180b 100644
+index 5db28d16070b5d5ec076ec3c7c84e5d7cf230601..ae3ded93ea1440ec2cb9bb7740e9a983210de0fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -232,6 +232,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -274,6 +274,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return server.getPlayer(getUniqueId()) != null;
      }
  
diff --git a/patches/server/1000-Fix-inventory-desync.patch b/patches/server/1001-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1000-Fix-inventory-desync.patch
rename to patches/server/1001-Fix-inventory-desync.patch
diff --git a/patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 97%
rename from patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch
index 7e949e50c1..9169d23a4c 100644
--- a/patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4ea7930f5d93e917dacaeff972a49886ff90847c..74b7b364d85b9343981822f3bf4f3d6ca442cd0c 100644
+index 08690b59871fda8a5474764e3a0c7d54ce0f284e..00cb28d91455576653f0fbe48f37210a511d0144 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1517,12 +1517,17 @@ public class ServerPlayer extends Player {
+@@ -1561,12 +1561,17 @@ public class ServerPlayer extends Player {
              this.nextContainerCounter();
              AbstractContainerMenu container = factory.createMenu(this.containerCounter, this.getInventory(), this);
  
@@ -27,7 +27,7 @@ index 4ea7930f5d93e917dacaeff972a49886ff90847c..74b7b364d85b9343981822f3bf4f3d6c
                  if (container == null && !cancelled) { // Let pre-cancelled events fall through
                      // SPIGOT-5263 - close chest if cancelled
                      if (factory instanceof Container) {
-@@ -1544,7 +1549,7 @@ public class ServerPlayer extends Player {
+@@ -1588,7 +1593,7 @@ public class ServerPlayer extends Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;
diff --git a/patches/server/1002-Configure-sniffer-egg-hatch-time.patch b/patches/server/1003-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1002-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1003-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1003-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1004-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1003-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1004-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1005-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/1005-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1006-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1007-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1006-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/1007-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1007-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1008-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1007-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1008-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1008-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1009-Fix-silent-equipment-change-for-mobs.patch
similarity index 95%
rename from patches/server/1008-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1009-Fix-silent-equipment-change-for-mobs.patch
index e99f77a011..4b369a1977 100644
--- a/patches/server/1008-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1009-Fix-silent-equipment-change-for-mobs.patch
@@ -47,12 +47,12 @@ index 8e9469fec42f7b6a132cf173f6f5a95777a29b3b..b319021b22c5dceba6199ed27814b2dc
              this.reassessWeaponGoal();
          }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 70e6071e455cc21f38a3ccca6bff3cd86a8622be..1d35e0bba35c0b3f41412f78ec86dd3f099c6668 100644
+index 2db9a575ca79c46ab36c092f7748fd1654d00bf0..07def52078fa926c41b8edff35fa310a4f456594 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1469,7 +1469,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
-     // Paper start
+@@ -1483,7 +1483,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     // Paper end - optimize redstone (Alternate Current)
+     // Paper start - notify observers even if grow failed
      public void checkCapturedTreeStateForObserverNotify(final BlockPos pos, final CraftBlockState craftBlockState) {
 -        if (craftBlockState.getPosition().getY() == pos.getY() && this.getBlockState(craftBlockState.getPosition()) == craftBlockState.getHandle()) { // notify observers if the block state is the same and the Y level equals the original y level (for mega trees)
 +        // notify observers if the block state is the same and the Y level equals the original y level (for mega trees)
diff --git a/patches/server/1009-Fix-spigot-s-Forced-Stats.patch b/patches/server/1010-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1009-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1010-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1010-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1011-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1010-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1011-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
new file mode 100644
index 0000000000..90ac2b3acc
--- /dev/null
+++ b/patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Sun, 18 Jun 2023 23:04:46 -0700
+Subject: [PATCH] Do not read tile entities in chunks that are positioned
+ outside of the chunk
+
+The tile entities are not accessible and so should not be loaded.
+This can happen as a result of users moving regionfiles around,
+which would cause a crash on Folia but would appear to function
+fine on Paper.
+
+diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
+index 97cdd8cd7749185230471f34f7d1ce3abcd0fd11..06369a22f96c4efdb63c7fa41be9f8f1293080df 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
++++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
+@@ -341,6 +341,13 @@ public class ChunkSerializer {
+             for (int k1 = 0; k1 < nbttaglist3.size(); ++k1) {
+                 CompoundTag nbttagcompound4 = nbttaglist3.getCompound(k1);
+ 
++                // Paper start - do not read tile entities positioned outside the chunk
++                BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound4);
++                if ((blockposition.getX() >> 4) != chunkPos.x || (blockposition.getZ() >> 4) != chunkPos.z) {
++                    LOGGER.warn("Tile entity serialized in chunk " + chunkPos + " in world '" + world.getWorld().getName() + "' positioned at " + blockposition + " is located outside of the chunk");
++                    continue;
++                }
++                // Paper end - do not read tile entities positioned outside the chunk
+                 ((ChunkAccess) object1).setBlockEntityNbt(nbttagcompound4);
+             }
+ 
+@@ -639,10 +646,19 @@ public class ChunkSerializer {
+                     CompoundTag nbttagcompound1 = nbttaglist1.getCompound(i);
+                     boolean flag = nbttagcompound1.getBoolean("keepPacked");
+ 
++                    // Paper start - do not read tile entities positioned outside the chunk
++                    BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound1); //  moved up
++                    ChunkPos chunkPos = chunk.getPos();
++                    if ((blockposition.getX() >> 4) != chunkPos.x || (blockposition.getZ() >> 4) != chunkPos.z) {
++                        LOGGER.warn("Tile entity serialized in chunk " + chunkPos + " in world '" + world.getWorld().getName() + "' positioned at " + blockposition + " is located outside of the chunk");
++                        continue;
++                    }
++                    // Paper end - do not read tile entities positioned outside the chunk
++
+                     if (flag) {
+                         chunk.setBlockEntityNbt(nbttagcompound1);
+                     } else {
+-                        BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound1);
++                        // Paper - do not read tile entities positioned outside the chunk - move up
+                         BlockEntity tileentity = BlockEntity.loadStatic(blockposition, chunk.getBlockState(blockposition), nbttagcompound1);
+ 
+                         if (tileentity != null) {