From c60e47fa58c171befcfb4ca48f38a201d559f90b Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 3 Dec 2024 19:21:12 +0100
Subject: [PATCH] More more work

---
 ...ke-parrots-stay-on-shoulders-despite.patch | 16 +++---
 patches/server/0150-Add-PlayerJumpEvent.patch |  2 +-
 .../server/0160-AsyncTabCompleteEvent.patch   |  2 +-
 ...ld.spawnParticle-API-and-add-Builder.patch |  4 +-
 .../server/0201-Expand-Explosions-API.patch   |  2 +-
 .../0206-InventoryCloseEvent-Reason-API.patch |  6 +--
 ...nd-make-tab-spam-limits-configurable.patch |  2 +-
 ...ies-option-to-debug-dupe-uuid-issues.patch |  2 +-
 ...event-players-from-moving-into-unloa.patch |  2 +-
 ...57-Reset-players-airTicks-on-respawn.patch |  4 +-
 ...-after-profile-lookups-if-not-needed.patch |  0
 ...er-Thread-Pool-and-Thread-Priorities.patch | 50 +++++++++++--------
 .../0260-Optimize-World-Time-Updates.patch    |  2 +-
 ...store-custom-InventoryHolder-support.patch |  0
 .../0262-Fix-SpongeAbsortEvent-handling.patch |  2 +-
 ...t-allow-digging-into-unloaded-chunks.patch | 16 +++---
 ...ault-permission-message-configurable.patch |  0
 ...entity-dismount-during-teleportation.patch | 24 ++++-----
 .../server/0266-Add-more-Zombie-API.patch     |  0
 .../server/0267-Book-size-limits.patch        |  4 +-
 .../0268-Add-PlayerConnectionCloseEvent.patch |  2 +-
 ...-Replace-OfflinePlayer-getLastPlayed.patch |  6 +--
 ...vehicle-tracking-issue-on-disconnect.patch |  4 +-
 ...r-remove-if-the-handle-is-a-custom-p.patch |  2 +-
 .../server/0272-BlockDestroyEvent.patch       |  6 +--
 .../0273-Async-command-map-building.patch     |  2 +-
 .../server/0274-Brigadier-Mojang-API.patch    |  4 +-
 .../0275-Limit-Client-Sign-length-more.patch  |  6 +--
 ...oggleEvent-when-whitelist-is-toggled.patch |  0
 ...nd-additions-to-the-spawn-reason-API.patch | 32 ++++++------
 .../server/0278-Fire-event-on-GS4-query.patch |  0
 .../0279-Add-PlayerPostRespawnEvent.patch     |  0
 .../server/0280-Server-Tick-Events.patch      |  2 +-
 ...0281-PlayerDeathEvent-getItemsToKeep.patch |  6 +--
 ...Optimize-Captured-BlockEntity-Lookup.patch |  4 +-
 .../0283-Mob-Spawner-API-Enhancements.patch   |  0
 ...l-to-changed-postToMainThread-method.patch |  0
 ...n-item-frames-are-modified-MC-123450.patch |  0
 .../0286-Implement-CraftBlockSoundGroup.patch |  0
 ...287-Expose-the-internal-current-tick.patch |  0
 ...ate-location-if-we-failed-to-read-it.patch |  0
 ...al-Spawned-mobs-towards-natural-spaw.patch |  0
 ...gurable-projectile-relative-velocity.patch |  2 +-
 .../0291-offset-item-frame-ticking.patch      |  0
 ...revent-consuming-the-wrong-itemstack.patch |  8 +--
 ...93-Dont-send-unnecessary-sign-update.patch |  2 +-
 ...d-option-to-disable-pillager-patrols.patch |  0
 ...nk-loads-when-villagers-try-to-find-.patch |  0
 .../0296-Duplicate-UUID-Resolve-Option.patch  |  2 +-
 ...layerDeathEvent-shouldDropExperience.patch |  4 +-
 ...oading-chunks-checking-hive-position.patch |  4 +-
 ...Chunks-from-Hoppers-and-other-things.patch |  0
 ...ptimise-EntityGetter-getPlayerByUUID.patch |  4 +-
 .../server/0301-Fix-item-EAR-ticks.patch      |  0
 ...mize-call-to-getFluid-for-explosions.patch |  2 +-
 ...rializing-mismatching-chunk-coordina.patch |  0
 .../0304-Alternative-item-despawn-rate.patch  |  0
 .../0305-Tracking-Range-Improvements.patch    |  0
 ...get-gravity-in-void.-Fixes-MC-167279.patch |  4 +-
 ...307-Improve-Block-breakNaturally-API.patch |  0
 ...e-getChunkAt-calls-for-loaded-chunks.patch |  0
 .../0309-Add-debug-for-sync-chunk-loads.patch |  4 +-
 .../0310-Improve-java-version-check.patch     |  2 +-
 .../server/0311-Add-ThrownEggHatchEvent.patch |  0
 .../server/0312-Entity-Jump-API.patch         | 10 ++--
 ...n-to-nerf-pigmen-from-nether-portals.patch |  8 +--
 .../0314-Make-the-GUI-graph-fancier.patch     |  0
 ...315-add-hand-to-BlockMultiPlaceEvent.patch |  0
 ...ripwire-hook-placement-before-update.patch |  0
 ...to-allow-iron-golems-to-spawn-in-air.patch |  0
 ...-chance-of-villager-zombie-infection.patch |  0
 .../server/0319-Optimise-Chunk-getFluid.patch |  6 +--
 ...erbose-world-setting-to-false-by-def.patch |  0
 ...-Add-tick-times-API-and-mspt-command.patch |  2 +-
 ...322-Expose-MinecraftServer-isRunning.patch |  0
 ...Add-Raw-Byte-ItemStack-Serialization.patch |  2 +-
 ...spawn-settings-and-per-player-option.patch |  4 +-
 ...nnections-shouldn-t-hold-up-shutdown.patch |  0
 ...26-Do-not-allow-Vexes-to-load-chunks.patch |  0
 ...-PlayerChunkMap-adds-crashing-server.patch |  6 +--
 .../server/0328-Don-t-tick-dead-players.patch |  4 +-
 ...d-Player-s-shouldn-t-be-able-to-move.patch |  4 +-
 ...move-existing-players-to-world-spawn.patch |  6 +--
 .../server/0331-Optimize-Pathfinding.patch    |  0
 ...32-Reduce-Either-Optional-allocation.patch |  0
 ...duce-memory-footprint-of-CompoundTag.patch |  0
 ...vent-opening-inventories-when-frozen.patch | 12 ++---
 ...-entity-collision-code-if-not-needed.patch |  4 +-
 ...-Implement-Player-Client-Options-API.patch | 10 ++--
 ...layer-is-attempted-to-be-removed-fro.patch |  2 +-
 ...nEvent-when-Player-is-actually-ready.patch |  4 +-
 ...pawn-point-if-spawn-in-unloaded-worl.patch |  4 +-
 ...PlayerAttackEntityCooldownResetEvent.patch |  4 +-
 ...t-fire-BlockFade-on-worldgen-threads.patch |  2 +-
 ...ntom-creative-and-insomniac-controls.patch |  2 +-
 ...item-duplication-and-teleport-issues.patch | 26 +++++-----
 .../server/0344-Villager-Restocks-API.patch   |  0
 ...per-thread-native-byte-buffer-cache.patch} |  2 +-
 .../0346-misc-debugging-dumps.patch}          |  2 +-
 ...7-Prevent-teleporting-dead-entities.patch} |  4 +-
 .../0348-Implement-Mob-Goal-API.patch}        |  2 +-
 .../0349-Add-villager-reputation-API.patch}   |  0
 ...eOrb-merging-stacking-API-and-fixes.patch} |  8 +--
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  2 +-
 .../0352-Potential-bed-API.patch}             |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  2 +-
 ...er-respects-game-and-entity-rules-f.patch} |  2 +-
 ...-for-console-having-all-permissions.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 .../0357-Maps-shouldn-t-load-chunks.patch}    |  2 +-
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  2 +-
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...-position-desync-causing-tp-exploit.patch} |  4 +-
 ...older-method-without-block-snapshot.patch} |  0
 ...0364-Add-PlayerRecipeBookClickEvent.patch} |  6 +--
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...6-Add-permission-for-command-blocks.patch} |  8 +--
 ...position-and-AABB-are-never-invalid.patch} |  8 +--
 ...d-Difficulty-Remembering-Difficulty.patch} |  8 +--
 .../0369-Paper-dumpitem-command.patch}        |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...-Add-BlockStateMeta-clearBlockState.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  4 +-
 ...-not-accept-invalid-client-settings.patch} |  8 +--
 ...e-fix-EntityTargetLivingEntityEvent.patch} |  0
 .../0375-Add-entity-liquid-API.patch}         |  0
 .../0376-Add-PrepareResultEvent.patch}        |  4 +-
 ...-for-portal-on-world-gen-entity-add.patch} |  4 +-
 ...x-arrows-never-despawning-MC-125757.patch} |  4 +-
 ...Vanilla-Command-permission-checking.patch} |  0
 ...-Bukkit-world-container-is-not-used.patch} |  4 +-
 ...5885-Unable-to-disable-advancements.patch} |  4 +-
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 .../0386-Brand-support.patch}                 |  8 +--
 ...PickupItemAnimation-to-LivingEntity.patch} |  2 +-
 .../0388-Don-t-require-FACING-data.patch}     |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  6 +--
 .../0390-Add-moon-phase-API.patch}            |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...headless-pistons-from-being-created.patch} |  2 +-
 .../0393-Add-BellRingEvent.patch}             |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 .../0395-Buffer-joins-to-world.patch}         |  2 +-
 ...s-not-working-in-some-kick-messages.patch} |  0
 .../0397-Add-more-Evoker-API.patch}           |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  4 +-
 .../0400-Cache-block-data-strings.patch}      |  6 +--
 ...rtation-and-cancel-velocity-if-tele.patch} | 10 ++--
 ...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} |  6 +--
 ...track-plugin-scoreboards-by-default.patch} |  0
 .../0407-Entity-isTicking.patch}              |  4 +-
 ...non-whitelisted-player-when-white-l.patch} |  2 +-
 ...-Concurrency-issue-in-ShufflingList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} | 26 +++++-----
 .../0412-Optimise-getType-calls.patch}        |  2 +-
 .../0413-Villager-resetOffers.patch}          |  2 +-
 ...ce-order-when-capturing-blockstates.patch} |  4 +-
 ...em-locations-dropped-from-campfires.patch} |  0
 ...6-Fix-bell-block-entity-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  2 +-
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 .../0419-Add-ignore-discounts-API.patch}      |  2 +-
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 .../0422-Item-no-age-no-player-pickup.patch}  |  0
 ...423-Beacon-API-custom-effect-ranges.patch} |  0
 .../0424-Add-API-for-quit-reason.patch}       |  6 +--
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 .../0426-Add-Destroy-Speed-API.patch}         |  4 +-
 ...-spawnParticle-x-y-z-precision-loss.patch} |  8 +--
 ...28-Add-LivingEntity-clearActiveItem.patch} |  2 +-
 .../0429-Add-PlayerItemCooldownEvent.patch}   |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 .../0431-More-lightning-API.patch}            |  0
 ...should-not-bypass-cramming-gamerule.patch} | 16 +++---
 ...-missing-default-perms-for-commands.patch} |  0
 .../0434-Add-PlayerShearBlockEvent.patch}     |  2 +-
 .../0435-Limit-recipe-packets.patch}          |  8 +--
 ...-CraftSound-backwards-compatibility.patch} |  0
 ...437-Player-Chunk-Load-Unload-Events.patch} |  0
 ...8-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  6 +--
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...valid-ingredient-lists-in-VillagerA.patch} |  2 +-
 .../0442-Add-TargetHitEvent.patch}            |  0
 .../0443-MC-4-Fix-item-position-desync.patch} |  4 +-
 .../0444-Additional-Block-Material-API.patch} |  0
 ...t-Material-from-Boats-and-Minecarts.patch} |  0
 ...PickItem-Packet-and-kick-for-invalid.patch | 26 ----------
 199 files changed, 315 insertions(+), 335 deletions(-)
 rename patches/{unapplied => }/server/0257-Reset-players-airTicks-on-respawn.patch (84%)
 rename patches/{unapplied => }/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch (100%)
 rename patches/{unapplied => }/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch (75%)
 rename patches/{unapplied => }/server/0260-Optimize-World-Time-Updates.patch (96%)
 rename patches/{unapplied => }/server/0261-Restore-custom-InventoryHolder-support.patch (100%)
 rename patches/{unapplied => }/server/0262-Fix-SpongeAbsortEvent-handling.patch (93%)
 rename patches/{unapplied => }/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch (88%)
 rename patches/{unapplied => }/server/0264-Make-the-default-permission-message-configurable.patch (100%)
 rename patches/{unapplied => }/server/0265-force-entity-dismount-during-teleportation.patch (89%)
 rename patches/{unapplied => }/server/0266-Add-more-Zombie-API.patch (100%)
 rename patches/{unapplied => }/server/0267-Book-size-limits.patch (94%)
 rename patches/{unapplied => }/server/0268-Add-PlayerConnectionCloseEvent.patch (98%)
 rename patches/{unapplied => }/server/0269-Replace-OfflinePlayer-getLastPlayed.patch (96%)
 rename patches/{unapplied => }/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch (86%)
 rename patches/{unapplied => }/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch (92%)
 rename patches/{unapplied => }/server/0272-BlockDestroyEvent.patch (92%)
 rename patches/{unapplied => }/server/0273-Async-command-map-building.patch (98%)
 rename patches/{unapplied => }/server/0274-Brigadier-Mojang-API.patch (98%)
 rename patches/{unapplied => }/server/0275-Limit-Client-Sign-length-more.patch (92%)
 rename patches/{unapplied => }/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch (100%)
 rename patches/{unapplied => }/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch (92%)
 rename patches/{unapplied => }/server/0278-Fire-event-on-GS4-query.patch (100%)
 rename patches/{unapplied => }/server/0279-Add-PlayerPostRespawnEvent.patch (100%)
 rename patches/{unapplied => }/server/0280-Server-Tick-Events.patch (94%)
 rename patches/{unapplied => }/server/0281-PlayerDeathEvent-getItemsToKeep.patch (93%)
 rename patches/{unapplied => }/server/0282-Optimize-Captured-BlockEntity-Lookup.patch (90%)
 rename patches/{unapplied => }/server/0283-Mob-Spawner-API-Enhancements.patch (100%)
 rename patches/{unapplied => }/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch (100%)
 rename patches/{unapplied => }/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch (100%)
 rename patches/{unapplied => }/server/0286-Implement-CraftBlockSoundGroup.patch (100%)
 rename patches/{unapplied => }/server/0287-Expose-the-internal-current-tick.patch (100%)
 rename patches/{unapplied => }/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch (100%)
 rename patches/{unapplied => }/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch (100%)
 rename patches/{unapplied => }/server/0290-Configurable-projectile-relative-velocity.patch (96%)
 rename patches/{unapplied => }/server/0291-offset-item-frame-ticking.patch (100%)
 rename patches/{unapplied => }/server/0292-Prevent-consuming-the-wrong-itemstack.patch (88%)
 rename patches/{unapplied => }/server/0293-Dont-send-unnecessary-sign-update.patch (92%)
 rename patches/{unapplied => }/server/0294-Add-option-to-disable-pillager-patrols.patch (100%)
 rename patches/{unapplied => }/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch (100%)
 rename patches/{unapplied => }/server/0296-Duplicate-UUID-Resolve-Option.patch (97%)
 rename patches/{unapplied => }/server/0297-PlayerDeathEvent-shouldDropExperience.patch (86%)
 rename patches/{unapplied => }/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch (88%)
 rename patches/{unapplied => }/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch (100%)
 rename patches/{unapplied => }/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch (92%)
 rename patches/{unapplied => }/server/0301-Fix-item-EAR-ticks.patch (100%)
 rename patches/{unapplied => }/server/0302-Optimize-call-to-getFluid-for-explosions.patch (92%)
 rename patches/{unapplied => }/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch (100%)
 rename patches/{unapplied => }/server/0304-Alternative-item-despawn-rate.patch (100%)
 rename patches/{unapplied => }/server/0305-Tracking-Range-Improvements.patch (100%)
 rename patches/{unapplied => }/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch (90%)
 rename patches/{unapplied => }/server/0307-Improve-Block-breakNaturally-API.patch (100%)
 rename patches/{unapplied => }/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch (100%)
 rename patches/{unapplied => }/server/0309-Add-debug-for-sync-chunk-loads.patch (98%)
 rename patches/{unapplied => }/server/0310-Improve-java-version-check.patch (95%)
 rename patches/{unapplied => }/server/0311-Add-ThrownEggHatchEvent.patch (100%)
 rename patches/{unapplied => }/server/0312-Entity-Jump-API.patch (90%)
 rename patches/{unapplied => }/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch (89%)
 rename patches/{unapplied => }/server/0314-Make-the-GUI-graph-fancier.patch (100%)
 rename patches/{unapplied => }/server/0315-add-hand-to-BlockMultiPlaceEvent.patch (100%)
 rename patches/{unapplied => }/server/0316-Validate-tripwire-hook-placement-before-update.patch (100%)
 rename patches/{unapplied => }/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch (100%)
 rename patches/{unapplied => }/server/0318-Configurable-chance-of-villager-zombie-infection.patch (100%)
 rename patches/{unapplied => }/server/0319-Optimise-Chunk-getFluid.patch (92%)
 rename patches/{unapplied => }/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch (100%)
 rename patches/{unapplied => }/server/0321-Add-tick-times-API-and-mspt-command.patch (98%)
 rename patches/{unapplied => }/server/0322-Expose-MinecraftServer-isRunning.patch (100%)
 rename patches/{unapplied => }/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch (97%)
 rename patches/{unapplied => }/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch (97%)
 rename patches/{unapplied => }/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch (100%)
 rename patches/{unapplied => }/server/0326-Do-not-allow-Vexes-to-load-chunks.patch (100%)
 rename patches/{unapplied => }/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch (93%)
 rename patches/{unapplied => }/server/0328-Don-t-tick-dead-players.patch (85%)
 rename patches/{unapplied => }/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch (84%)
 rename patches/{unapplied => }/server/0330-Don-t-move-existing-players-to-world-spawn.patch (92%)
 rename patches/{unapplied => }/server/0331-Optimize-Pathfinding.patch (100%)
 rename patches/{unapplied => }/server/0332-Reduce-Either-Optional-allocation.patch (100%)
 rename patches/{unapplied => }/server/0333-Reduce-memory-footprint-of-CompoundTag.patch (100%)
 rename patches/{unapplied => }/server/0334-Prevent-opening-inventories-when-frozen.patch (86%)
 rename patches/{unapplied => }/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch (93%)
 rename patches/{unapplied => }/server/0336-Implement-Player-Client-Options-API.patch (96%)
 rename patches/{unapplied => }/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch (92%)
 rename patches/{unapplied => }/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch (97%)
 rename patches/{unapplied => }/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch (97%)
 rename patches/{unapplied => }/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch (92%)
 rename patches/{unapplied => }/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch (94%)
 rename patches/{unapplied => }/server/0342-Add-phantom-creative-and-insomniac-controls.patch (97%)
 rename patches/{unapplied => }/server/0343-Fix-item-duplication-and-teleport-issues.patch (89%)
 rename patches/{unapplied => }/server/0344-Villager-Restocks-API.patch (100%)
 rename patches/{unapplied/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => server/0345-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename patches/{unapplied/server/0347-misc-debugging-dumps.patch => server/0346-misc-debugging-dumps.patch} (98%)
 rename patches/{unapplied/server/0348-Prevent-teleporting-dead-entities.patch => server/0347-Prevent-teleporting-dead-entities.patch} (89%)
 rename patches/{unapplied/server/0349-Implement-Mob-Goal-API.patch => server/0348-Implement-Mob-Goal-API.patch} (99%)
 rename patches/{unapplied/server/0350-Add-villager-reputation-API.patch => server/0349-Add-villager-reputation-API.patch} (100%)
 rename patches/{unapplied/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch => server/0350-ExperienceOrb-merging-stacking-API-and-fixes.patch} (95%)
 rename patches/{unapplied/server/0352-Fix-PotionEffect-ignores-icon-flag.patch => server/0351-Fix-PotionEffect-ignores-icon-flag.patch} (97%)
 rename patches/{unapplied/server/0353-Potential-bed-API.patch => server/0352-Potential-bed-API.patch} (100%)
 rename patches/{unapplied/server/0354-Wait-for-Async-Tasks-during-shutdown.patch => server/0353-Wait-for-Async-Tasks-during-shutdown.patch} (97%)
 rename patches/{unapplied/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => server/0354-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (91%)
 rename patches/{unapplied/server/0356-Add-option-for-console-having-all-permissions.patch => server/0355-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/{unapplied/server/0357-Fix-villager-trading-demand-MC-163962.patch => server/0356-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/{unapplied/server/0358-Maps-shouldn-t-load-chunks.patch => server/0357-Maps-shouldn-t-load-chunks.patch} (95%)
 rename patches/{unapplied/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => server/0358-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (91%)
 rename patches/{unapplied/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => server/0359-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/{unapplied/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch => server/0360-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/{unapplied/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch => server/0361-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/{unapplied/server/0363-Prevent-position-desync-causing-tp-exploit.patch => server/0362-Prevent-position-desync-causing-tp-exploit.patch} (91%)
 rename patches/{unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch => server/0363-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/{unapplied/server/0365-Add-PlayerRecipeBookClickEvent.patch => server/0364-Add-PlayerRecipeBookClickEvent.patch} (95%)
 rename patches/{unapplied/server/0366-Hide-sync-chunk-writes-behind-flag.patch => server/0365-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/{unapplied/server/0367-Add-permission-for-command-blocks.patch => server/0366-Add-permission-for-command-blocks.patch} (95%)
 rename patches/{unapplied/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch => server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch} (91%)
 rename patches/{unapplied/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (95%)
 rename patches/{unapplied/server/0370-Paper-dumpitem-command.patch => server/0369-Paper-dumpitem-command.patch} (100%)
 rename patches/{unapplied/server/0371-Improve-Legacy-Component-serialization-size.patch => server/0370-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/{unapplied/server/0372-Add-BlockStateMeta-clearBlockState.patch => server/0371-Add-BlockStateMeta-clearBlockState.patch} (100%)
 rename patches/{unapplied/server/0373-Convert-legacy-attributes-in-Item-Meta.patch => server/0372-Convert-legacy-attributes-in-Item-Meta.patch} (95%)
 rename patches/{unapplied/server/0374-Do-not-accept-invalid-client-settings.patch => server/0373-Do-not-accept-invalid-client-settings.patch} (78%)
 rename patches/{unapplied/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch => server/0374-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/{unapplied/server/0376-Add-entity-liquid-API.patch => server/0375-Add-entity-liquid-API.patch} (100%)
 rename patches/{unapplied/server/0377-Add-PrepareResultEvent.patch => server/0376-Add-PrepareResultEvent.patch} (98%)
 rename patches/{unapplied/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (85%)
 rename patches/{unapplied/server/0379-Fix-arrows-never-despawning-MC-125757.patch => server/0378-Fix-arrows-never-despawning-MC-125757.patch} (85%)
 rename patches/{unapplied/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch => server/0379-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/{unapplied/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => server/0380-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (96%)
 rename patches/{unapplied/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => server/0381-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (85%)
 rename patches/{unapplied/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => server/0382-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/{unapplied/server/0384-Optimize-NetworkManager-Exception-Handling.patch => server/0383-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/{unapplied/server/0385-Fix-some-rails-connecting-improperly.patch => server/0384-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/{unapplied/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => server/0385-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/{unapplied/server/0387-Brand-support.patch => server/0386-Brand-support.patch} (93%)
 rename patches/{unapplied/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch => server/0387-Add-playPickupItemAnimation-to-LivingEntity.patch} (90%)
 rename patches/{unapplied/server/0389-Don-t-require-FACING-data.patch => server/0388-Don-t-require-FACING-data.patch} (100%)
 rename patches/{unapplied/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (90%)
 rename patches/{unapplied/server/0391-Add-moon-phase-API.patch => server/0390-Add-moon-phase-API.patch} (100%)
 rename patches/{unapplied/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch => server/0391-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/{unapplied/server/0393-Prevent-headless-pistons-from-being-created.patch => server/0392-Prevent-headless-pistons-from-being-created.patch} (95%)
 rename patches/{unapplied/server/0394-Add-BellRingEvent.patch => server/0393-Add-BellRingEvent.patch} (100%)
 rename patches/{unapplied/server/0395-Add-zombie-targets-turtle-egg-config.patch => server/0394-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/{unapplied/server/0396-Buffer-joins-to-world.patch => server/0395-Buffer-joins-to-world.patch} (95%)
 rename patches/{unapplied/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch => server/0396-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/{unapplied/server/0398-Add-more-Evoker-API.patch => server/0397-Add-more-Evoker-API.patch} (100%)
 rename patches/{unapplied/server/0399-Add-methods-to-get-translation-keys.patch => server/0398-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/{unapplied/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch => server/0399-Create-HoverEvent-from-ItemStack-Entity.patch} (94%)
 rename patches/{unapplied/server/0401-Cache-block-data-strings.patch => server/0400-Cache-block-data-strings.patch} (93%)
 rename patches/{unapplied/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (94%)
 rename patches/{unapplied/server/0403-Add-additional-open-container-api-to-HumanEntity.patch => server/0402-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/{unapplied/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => server/0403-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/{unapplied/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch => server/0404-Extend-block-drop-capture-to-capture-all-items-added.patch} (94%)
 rename patches/{unapplied/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (85%)
 rename patches/{unapplied/server/0407-Lazily-track-plugin-scoreboards-by-default.patch => server/0406-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/{unapplied/server/0408-Entity-isTicking.patch => server/0407-Entity-isTicking.patch} (90%)
 rename patches/{unapplied/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => server/0408-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (94%)
 rename patches/{unapplied/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch => server/0409-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/{unapplied/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch => server/0410-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/{unapplied/server/0412-Fix-for-large-move-vectors-crashing-server.patch => server/0411-Fix-for-large-move-vectors-crashing-server.patch} (84%)
 rename patches/{unapplied/server/0413-Optimise-getType-calls.patch => server/0412-Optimise-getType-calls.patch} (98%)
 rename patches/{unapplied/server/0414-Villager-resetOffers.patch => server/0413-Villager-resetOffers.patch} (94%)
 rename patches/{unapplied/server/0415-Retain-block-place-order-when-capturing-blockstates.patch => server/0414-Retain-block-place-order-when-capturing-blockstates.patch} (89%)
 rename patches/{unapplied/server/0416-Fix-item-locations-dropped-from-campfires.patch => server/0415-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/{unapplied/server/0417-Fix-bell-block-entity-memory-leak.patch => server/0416-Fix-bell-block-entity-memory-leak.patch} (100%)
 rename patches/{unapplied/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => server/0417-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (97%)
 rename patches/{unapplied/server/0419-Add-getOfflinePlayerIfCached-String.patch => server/0418-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/{unapplied/server/0420-Add-ignore-discounts-API.patch => server/0419-Add-ignore-discounts-API.patch} (99%)
 rename patches/{unapplied/server/0421-Toggle-for-removing-existing-dragon.patch => server/0420-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/{unapplied/server/0422-Fix-client-lag-on-advancement-loading.patch => server/0421-Fix-client-lag-on-advancement-loading.patch} (95%)
 rename patches/{unapplied/server/0423-Item-no-age-no-player-pickup.patch => server/0422-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/{unapplied/server/0424-Beacon-API-custom-effect-ranges.patch => server/0423-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/{unapplied/server/0425-Add-API-for-quit-reason.patch => server/0424-Add-API-for-quit-reason.patch} (95%)
 rename patches/{unapplied/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch => server/0425-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/{unapplied/server/0427-Add-Destroy-Speed-API.patch => server/0426-Add-Destroy-Speed-API.patch} (98%)
 rename patches/{unapplied/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => server/0427-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (68%)
 rename patches/{unapplied/server/0429-Add-LivingEntity-clearActiveItem.patch => server/0428-Add-LivingEntity-clearActiveItem.patch} (90%)
 rename patches/{unapplied/server/0430-Add-PlayerItemCooldownEvent.patch => server/0429-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/{unapplied/server/0431-Significantly-improve-performance-of-the-end-generat.patch => server/0430-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/{unapplied/server/0432-More-lightning-API.patch => server/0431-More-lightning-API.patch} (100%)
 rename patches/{unapplied/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch => server/0432-Climbing-should-not-bypass-cramming-gamerule.patch} (92%)
 rename patches/{unapplied/server/0434-Add-missing-default-perms-for-commands.patch => server/0433-Add-missing-default-perms-for-commands.patch} (100%)
 rename patches/{unapplied/server/0435-Add-PlayerShearBlockEvent.patch => server/0434-Add-PlayerShearBlockEvent.patch} (98%)
 rename patches/{unapplied/server/0436-Limit-recipe-packets.patch => server/0435-Limit-recipe-packets.patch} (90%)
 rename patches/{unapplied/server/0437-Fix-CraftSound-backwards-compatibility.patch => server/0436-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/{unapplied/server/0438-Player-Chunk-Load-Unload-Events.patch => server/0437-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/{unapplied/server/0439-Optimize-Dynamic-get-Missing-Keys.patch => server/0438-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/{unapplied/server/0440-Expose-LivingEntity-hurt-direction.patch => server/0439-Expose-LivingEntity-hurt-direction.patch} (90%)
 rename patches/{unapplied/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => server/0440-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/{unapplied/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch => server/0441-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch} (93%)
 rename patches/{unapplied/server/0443-Add-TargetHitEvent.patch => server/0442-Add-TargetHitEvent.patch} (100%)
 rename patches/{unapplied/server/0444-MC-4-Fix-item-position-desync.patch => server/0443-MC-4-Fix-item-position-desync.patch} (93%)
 rename patches/{unapplied/server/0445-Additional-Block-Material-API.patch => server/0444-Additional-Block-Material-API.patch} (100%)
 rename patches/{unapplied/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch => server/0445-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%)
 delete mode 100644 patches/unapplied/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch

diff --git a/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index f6e6df4935..4341ca031a 100644
--- a/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -14,20 +14,18 @@ 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 8a8f073a29daf7cb36e5fd0e4d4e5932636bb04f..c459d32e85aaea647e3dc5239e1c4e106a69ad46 100644
+index 8a8f073a29daf7cb36e5fd0e4d4e5932636bb04f..cb49090cacca331a0f3eb419de86f4562621bcae 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2342,6 +2342,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2342,6 +2342,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              switch (packet.getAction()) {
                  case PRESS_SHIFT_KEY:
                      this.player.setShiftKeyDown(true);
-+
-+                // Paper start - Add option to make parrots stay
-+                if (this.player.level().paperConfig().entities.behavior.parrotsAreUnaffectedByPlayerMovement) {
-+                    this.player.removeEntitiesOnShoulder();
-+                }
-+                // Paper end - Add option to make parrots stay
-+
++                    // Paper start - Add option to make parrots stay
++                    if (this.player.level().paperConfig().entities.behavior.parrotsAreUnaffectedByPlayerMovement) {
++                        this.player.removeEntitiesOnShoulder();
++                    }
++                    // Paper end - Add option to make parrots stay
                      break;
                  case RELEASE_SHIFT_KEY:
                      this.player.setShiftKeyDown(false);
diff --git a/patches/server/0150-Add-PlayerJumpEvent.patch b/patches/server/0150-Add-PlayerJumpEvent.patch
index 5d7e98b9d6..c3a6510729 100644
--- a/patches/server/0150-Add-PlayerJumpEvent.patch
+++ b/patches/server/0150-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ 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 c459d32e85aaea647e3dc5239e1c4e106a69ad46..85b81b06e834e1575588a2a7e840a8bcc65c3306 100644
+index cb49090cacca331a0f3eb419de86f4562621bcae..8beb2773ba6ca8c37f1d7c63c98cfcb26d0d3b3f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1270,7 +1270,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0160-AsyncTabCompleteEvent.patch b/patches/server/0160-AsyncTabCompleteEvent.patch
index a10bfdb711..80e25173b8 100644
--- a/patches/server/0160-AsyncTabCompleteEvent.patch
+++ b/patches/server/0160-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ 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 85b81b06e834e1575588a2a7e840a8bcc65c3306..f2b6162562a2f35c8f610c9386172984ae30bf17 100644
+index 8beb2773ba6ca8c37f1d7c63c98cfcb26d0d3b3f..cbdf69371a65339294b3ffd3514bb0bf8c03ff36 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -720,21 +720,58 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch
index eacc37f6ea..0baeb8eaad 100644
--- a/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ 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 9cb02b168384f597fce1251696e77a1e74f0d774..e80dc81423538e7e8a5510e5d82e97ab2097c225 100644
+index 9cb02b168384f597fce1251696e77a1e74f0d774..95c3b8524faac2218a4966965d4a8e322c0bdcd7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1542,12 +1542,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -20,7 +20,7 @@ index 9cb02b168384f597fce1251696e77a1e74f0d774..e80dc81423538e7e8a5510e5d82e97ab
 +        // Paper start - Particle API
 +        return this.sendParticlesSource(this.players, sender, t0, flag, flag1, d0, d1, d2, i, d3, d4, d5, d6);
 +    }
-+    public <T extends ParticleOptions> int sendParticlesSource(List<ServerPlayer> receivers, ServerPlayer sender, T t0, boolean flag, boolean flag1, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
++    public <T extends ParticleOptions> int sendParticlesSource(List<ServerPlayer> receivers, @Nullable ServerPlayer sender, T t0, boolean flag, boolean flag1, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
 +        // Paper end - Particle API
          // CraftBukkit end
          ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(t0, flag, flag1, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
diff --git a/patches/server/0201-Expand-Explosions-API.patch b/patches/server/0201-Expand-Explosions-API.patch
index b10058e3c2..52b7ff6bf0 100644
--- a/patches/server/0201-Expand-Explosions-API.patch
+++ b/patches/server/0201-Expand-Explosions-API.patch
@@ -9,7 +9,7 @@ Co-authored-by: Esoteric Enderman <90862990+EsotericEnderman@users.noreply.githu
 Co-authored-by: Bjarne Koll <git@lynxplay.dev>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e80dc81423538e7e8a5510e5d82e97ab2097c225..74f7467caf7d86011f0b8aea7a8c1f5c644f690a 100644
+index 95c3b8524faac2218a4966965d4a8e322c0bdcd7..1c15dc6143ce00aa4a8cdc6468d9fba0e398ec43 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1425,6 +1425,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/patches/server/0206-InventoryCloseEvent-Reason-API.patch b/patches/server/0206-InventoryCloseEvent-Reason-API.patch
index 39b8f269e4..a7895495df 100644
--- a/patches/server/0206-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0206-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ 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 74f7467caf7d86011f0b8aea7a8c1f5c644f690a..99db41834d7e8fb8fbbe83bd70a4b8d7c016c3e2 100644
+index 1c15dc6143ce00aa4a8cdc6468d9fba0e398ec43..2ed077ba041f9d1a629320cd41b87ba19f3803d0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1210,7 +1210,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -75,10 +75,10 @@ index 1ebd8d20e510b7af2cdf461fff9eb949a0017ae6..0a5aeb9b50dfec3b791040348f6a9e92
          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 f2b6162562a2f35c8f610c9386172984ae30bf17..b4edc64f3eacdbfb6187106989d190303b0541ac 100644
+index cbdf69371a65339294b3ffd3514bb0bf8c03ff36..405dec328cf591f533600ed9e2aa7360a4a8e96d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2714,10 +2714,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2712,10 +2712,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleContainerClose(ServerboundContainerClosePacket packet) {
diff --git a/patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch
index 300f431158..f0179371ee 100644
--- a/patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0220-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 b4edc64f3eacdbfb6187106989d190303b0541ac..0e1abdd619f26dbc334061f5f13ba126ee3006b5 100644
+index 405dec328cf591f533600ed9e2aa7360a4a8e96d..5f3d7ea96d690b68897d9092c624c77e49822af4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -276,6 +276,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 9074301896..1abf86051d 100644
--- a/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 99db41834d7e8fb8fbbe83bd70a4b8d7c016c3e2..967357ec91036a03407eb7e410f717112fe96b16 100644
+index 2ed077ba041f9d1a629320cd41b87ba19f3803d0..52e2137f759e52d210abda7b47c1fd4b5f831d1f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1172,6 +1172,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 84c4327a00..7ad3e12b37 100644
--- a/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0256-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 0e1abdd619f26dbc334061f5f13ba126ee3006b5..8aacca1e3b310125a618de02b9277aedc949268f 100644
+index 5f3d7ea96d690b68897d9092c624c77e49822af4..a87ea0f22b44c2fb67fd51bc8c9b0067aacac7de 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -500,9 +500,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/unapplied/server/0257-Reset-players-airTicks-on-respawn.patch b/patches/server/0257-Reset-players-airTicks-on-respawn.patch
similarity index 84%
rename from patches/unapplied/server/0257-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0257-Reset-players-airTicks-on-respawn.patch
index 1755009e76..f5b4175d65 100644
--- a/patches/unapplied/server/0257-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0257-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 419476f7ee7c55552655ef0098da0ddbc2434361..90587b5acee5c2d854604b53ef83c5f7d8c87a08 100644
+index e73377782c388c9f750f0548f3c427bc52246fbc..d54213bab1099bb96c8175f0c03a1b034cc41ce2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -3052,6 +3052,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -3032,6 +3032,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
          this.setHealth(this.getMaxHealth());
          this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
diff --git a/patches/unapplied/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/unapplied/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/unapplied/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 75%
rename from patches/unapplied/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 5096a0a4a5..006c49494d 100644
--- a/patches/unapplied/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..b60f59cf5cc8eb84a6055b7861857dec
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 8cac2075077b1d9c2b01e09c99780ff9e204abb2..dbf79a018260a006bf5d16608b35bcbea9adb963 100644
+index 3d5bca1b637234df48ca3228c7ffbce21116a0c7..e78f40f7f10a2ed0675b3cb9a2c5730dbc0141db 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -92,7 +92,7 @@ public class Util {
@@ -50,41 +50,29 @@ index 8cac2075077b1d9c2b01e09c99780ff9e204abb2..dbf79a018260a006bf5d16608b35bcbe
      private static final TracingExecutor IO_POOL = makeIoExecutor("IO-Worker-", false);
      private static final TracingExecutor DOWNLOAD_POOL = makeIoExecutor("Download-", true);
      // Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
-@@ -163,15 +163,28 @@ public class Util {
+@@ -163,15 +163,16 @@ public class Util {
          return FILENAME_DATE_TIME_FORMATTER.format(ZonedDateTime.now());
      }
  
 -    private static TracingExecutor makeExecutor(String name) {
--        int i = Mth.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, getMaxThreads());
-+    private static TracingExecutor makeExecutor(String s, final int priorityModifier) { // Paper - Perf: add priority
++    private static TracingExecutor makeExecutor(String name, final int priorityModifier) { // Paper - Perf: add priority
+         int i = maxAllowedExecutorThreads();
+-        ExecutorService executorService;
 +        // Paper start - Perf: use simpler thread pool that allows 1 thread and reduce worldgen thread worker count for low core count CPUs
-+        int cpus = Runtime.getRuntime().availableProcessors() / 2;
-+        int i;
-+        if (cpus <= 4) {
-+            i = cpus <= 2 ? 1 : 2;
-+        } else if (cpus <= 8) {
-+            // [5, 8]
-+            i = Math.max(3, cpus - 2);
-+        } else {
-+            i = cpus * 2 / 3;
-+        }
-+        i = Math.min(8, i);
-+        i = Integer.getInteger("Paper.WorkerThreadCount", i);
-+
-         ExecutorService executorService;
++        final ExecutorService executorService;
          if (i <= 0) {
              executorService = MoreExecutors.newDirectExecutorService();
          } else {
 -            AtomicInteger atomicInteger = new AtomicInteger(1);
 -            executorService = new ForkJoinPool(i, pool -> {
 -                final String string2 = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
-+            executorService = Executors.newFixedThreadPool(i, target -> new io.papermc.paper.util.ServerWorkerThread(target, s, priorityModifier));
++            executorService = Executors.newFixedThreadPool(i, target -> new io.papermc.paper.util.ServerWorkerThread(target, name, priorityModifier));
 +        }
 +        /*      final String string2 = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
                  ForkJoinWorkerThread forkJoinWorkerThread = new ForkJoinWorkerThread(pool) {
                      @Override
                      protected void onStart() {
-@@ -193,7 +206,7 @@ public class Util {
+@@ -193,13 +194,26 @@ public class Util {
                  forkJoinWorkerThread.setName(string2);
                  return forkJoinWorkerThread;
              }, Util::onThreadException, true);
@@ -93,8 +81,28 @@ index 8cac2075077b1d9c2b01e09c99780ff9e204abb2..dbf79a018260a006bf5d16608b35bcbe
  
          return new TracingExecutor(executorService);
      }
+ 
+     public static int maxAllowedExecutorThreads() {
+-        return Mth.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, getMaxThreads());
++        // Paper start - Perf: use simpler thread pool that allows 1 thread and reduce worldgen thread worker count for low core count CPUs
++        final int cpus = Runtime.getRuntime().availableProcessors() / 2;
++        int maxExecutorThreads;
++        if (cpus <= 4) {
++            maxExecutorThreads = cpus <= 2 ? 1 : 2;
++        } else if (cpus <= 8) {
++            // [5, 8]
++            maxExecutorThreads = Math.max(3, cpus - 2);
++        } else {
++            maxExecutorThreads = cpus * 2 / 3;
++        }
++        maxExecutorThreads = Math.min(8, maxExecutorThreads);
++        return Integer.getInteger("Paper.WorkerThreadCount", maxExecutorThreads);
++        // Paper end - Perf: use simpler thread pool that allows 1 thread and reduce worldgen thread worker count for low core count CPUs
+     }
+ 
+     private static int getMaxThreads() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af20a16e18673a629fc3033d8e7e07eba855b1c7..2a4f8075867a302afd98bdf9ac8b11622c29082d 100644
+index 65dee566937104e301b917d037f2db456751801c..848f0faa50a5c4d6fbfe5fe1e168d1946fd9c28c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -332,6 +332,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0260-Optimize-World-Time-Updates.patch b/patches/server/0260-Optimize-World-Time-Updates.patch
similarity index 96%
rename from patches/unapplied/server/0260-Optimize-World-Time-Updates.patch
rename to patches/server/0260-Optimize-World-Time-Updates.patch
index 9ef59882f0..bd906c6ede 100644
--- a/patches/unapplied/server/0260-Optimize-World-Time-Updates.patch
+++ b/patches/server/0260-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ 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 2a4f8075867a302afd98bdf9ac8b11622c29082d..9a9291282f7ec99be9badf8b32fab5f0ea0f1037 100644
+index 848f0faa50a5c4d6fbfe5fe1e168d1946fd9c28c..698536a52e9e61d20556b4bc58de256e89726180 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1603,10 +1603,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0261-Restore-custom-InventoryHolder-support.patch b/patches/server/0261-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/unapplied/server/0261-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0261-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/unapplied/server/0262-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0262-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from patches/unapplied/server/0262-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0262-Fix-SpongeAbsortEvent-handling.patch
index 5fb5190058..4291eb69f2 100644
--- a/patches/unapplied/server/0262-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0262-Fix-SpongeAbsortEvent-handling.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-index 569bdef574680319b4fd6569ef05b2b3c04c739d..59cf905b1b5686f6f4f2bad94730ffa69d3a2834 100644
+index 0f4d244948b81a2298927f0f1635b03ef0977c09..e9a77c1ae09af42d2d444ad6b5f6c8ac395044e1 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 @@ -137,7 +137,11 @@ public class SpongeBlock extends Block {
diff --git a/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 88%
rename from patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
index 3c5725587c..6f9db2ddeb 100644
--- a/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,19 +59,19 @@ index 4c8189a2a7edea824545a24dccb376b8eceac001..4623c8acd125dff4919c4e2045b84831
  
                  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 f57c133de5e974d2c86145f697d3636347a29d65..c3e281754a1cd9d5ce5f4aab36822f9f5d34be39 100644
+index a87ea0f22b44c2fb67fd51bc8c9b0067aacac7de..1be04d0c910ebd58f2eededcdf81c94279d521c7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1606,6 +1606,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             case START_DESTROY_BLOCK:
-             case ABORT_DESTROY_BLOCK:
-             case STOP_DESTROY_BLOCK:
+@@ -1668,6 +1668,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                 case START_DESTROY_BLOCK:
+                 case ABORT_DESTROY_BLOCK:
+                 case STOP_DESTROY_BLOCK:
 +                // Paper start - Don't allow digging into unloaded chunks
 +                if (this.player.level().getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) == null) {
 +                    this.player.connection.ackBlockChangesUpTo(packet.getSequence());
 +                    return;
 +                }
 +                // Paper end - Don't allow digging into unloaded chunks
-                 this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence());
-                 this.player.connection.ackBlockChangesUpTo(packet.getSequence());
-                 return;
+                     this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence());
+                     this.player.connection.ackBlockChangesUpTo(packet.getSequence());
+                     return;
diff --git a/patches/unapplied/server/0264-Make-the-default-permission-message-configurable.patch b/patches/server/0264-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/unapplied/server/0264-Make-the-default-permission-message-configurable.patch
rename to patches/server/0264-Make-the-default-permission-message-configurable.patch
diff --git a/patches/unapplied/server/0265-force-entity-dismount-during-teleportation.patch b/patches/server/0265-force-entity-dismount-during-teleportation.patch
similarity index 89%
rename from patches/unapplied/server/0265-force-entity-dismount-during-teleportation.patch
rename to patches/server/0265-force-entity-dismount-during-teleportation.patch
index 3cd8ed1fac..50b9d2ccc6 100644
--- a/patches/unapplied/server/0265-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0265-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/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 90587b5acee5c2d854604b53ef83c5f7d8c87a08..a2342c9cfa8db2c012a77cc95378e3adb2a98287 100644
+index d54213bab1099bb96c8175f0c03a1b034cc41ce2..2db5ef211ac36d5aa7f337dd4a5c2600796d8b66 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2826,9 +2826,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2806,9 +2806,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
      @Override
      public void stopRiding() {
@@ -41,10 +41,10 @@ index 90587b5acee5c2d854604b53ef83c5f7d8c87a08..a2342c9cfa8db2c012a77cc95378e3ad
              Iterator iterator = entityliving.getActiveEffects().iterator();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e67d8da5be50e07cb0473b7bfe6d381da044155a..a430a3e2c3b4ae53cad1fbaf4dd71b9e2f24ccf7 100644
+index 87ab16a82b4ba58fd469eb845d79e9ad98cf45bc..3cc210dc92f74c37f4de6eaf31ff3ec7aa11248a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2822,17 +2822,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2852,17 +2852,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void removeVehicle() {
@@ -75,7 +75,7 @@ index e67d8da5be50e07cb0473b7bfe6d381da044155a..a430a3e2c3b4ae53cad1fbaf4dd71b9e
      }
  
      protected void addPassenger(Entity passenger) {
-@@ -2857,7 +2868,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2887,7 +2898,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
      }
  
@@ -87,7 +87,7 @@ index e67d8da5be50e07cb0473b7bfe6d381da044155a..a430a3e2c3b4ae53cad1fbaf4dd71b9e
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2867,7 +2881,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2897,7 +2911,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) this.getBukkitEntity(),
@@ -96,7 +96,7 @@ index e67d8da5be50e07cb0473b7bfe6d381da044155a..a430a3e2c3b4ae53cad1fbaf4dd71b9e
                  );
                  // Suppress during worldgen
                  if (this.valid) {
-@@ -2880,7 +2894,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2910,7 +2924,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
              }
  
@@ -106,10 +106,10 @@ index e67d8da5be50e07cb0473b7bfe6d381da044155a..a430a3e2c3b4ae53cad1fbaf4dd71b9e
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7ba5e60eae4fc230c86956ed8ee895c9e1585d42..901336aac08f4c49328316aeccb7c48a591ed6b0 100644
+index df7dce2bff49023d22622c90795428222dc489ce..782c187d2b4f706463a1e643f1976512104797a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3757,9 +3757,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3768,9 +3768,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Override
      public void stopRiding() {
@@ -127,7 +127,7 @@ index 7ba5e60eae4fc230c86956ed8ee895c9e1585d42..901336aac08f4c49328316aeccb7c48a
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 04e973430bf5706d5264423c24d73b903bc3f0aa..dc1870baf172982ebb34eccd4ee79497f48f8050 100644
+index b2149a977f30524bd526eafa248b2ca369ae4648..74fa6d2b569b42ac2dbb7efb10df658b9ffeecc4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -289,7 +289,13 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -146,10 +146,10 @@ index 04e973430bf5706d5264423c24d73b903bc3f0aa..dc1870baf172982ebb34eccd4ee79497
              this.clientOldAttachPosition = this.blockPosition();
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7eb4563299e7c54ec4df53c966f6d1a86fb2ec4e..4d8929a1f5390af10fbde1dcc13c0136b0a3a745 100644
+index 833e2b338671b81401409fc390ab1515f3520442..858f123934021b7a3911d3d5cfcb8352293a8302 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1131,7 +1131,13 @@ public abstract class Player extends LivingEntity {
+@@ -1134,7 +1134,13 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void removeVehicle() {
diff --git a/patches/unapplied/server/0266-Add-more-Zombie-API.patch b/patches/server/0266-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/unapplied/server/0266-Add-more-Zombie-API.patch
rename to patches/server/0266-Add-more-Zombie-API.patch
diff --git a/patches/unapplied/server/0267-Book-size-limits.patch b/patches/server/0267-Book-size-limits.patch
similarity index 94%
rename from patches/unapplied/server/0267-Book-size-limits.patch
rename to patches/server/0267-Book-size-limits.patch
index 8e4d723b12..e43d682a1b 100644
--- a/patches/unapplied/server/0267-Book-size-limits.patch
+++ b/patches/server/0267-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 c3e281754a1cd9d5ce5f4aab36822f9f5d34be39..542899c382309986f3aaa16bf534b677aaac82f5 100644
+index 1be04d0c910ebd58f2eededcdf81c94279d521c7..ca0aa2acbc1316201d7a9c69e4aad8ffe4d61d83 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1056,6 +1056,44 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1117,6 +1117,44 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {
diff --git a/patches/unapplied/server/0268-Add-PlayerConnectionCloseEvent.patch b/patches/server/0268-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from patches/unapplied/server/0268-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0268-Add-PlayerConnectionCloseEvent.patch
index 30540debea..b9c961d672 100644
--- a/patches/unapplied/server/0268-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0268-Add-PlayerConnectionCloseEvent.patch
@@ -38,7 +38,7 @@ public net.minecraft.server.network.ServerLoginPacketListenerImpl$State
 public net.minecraft.server.network.ServerLoginPacketListenerImpl state
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index c45b8b2c89ffec7bd6a6875963c61f11185d3ee1..38947f40864f3661df2eb4baa0aef5740b82f9d9 100644
+index ca2125fe63d5c2bc5af0ecec177bb457c54b111a..e9429b3b1db612aa552237fe5d0c37727501ff8d 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -692,6 +692,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/unapplied/server/0269-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from patches/unapplied/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
index 37ad223e8b..6cc9f04ae6 100644
--- a/patches/unapplied/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0269-Replace-OfflinePlayer-getLastPlayed.patch
@@ -16,10 +16,10 @@ 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 a2342c9cfa8db2c012a77cc95378e3adb2a98287..9d6910c6a685d1c8f6804cfe086c958a0fcb0526 100644
+index 2db5ef211ac36d5aa7f337dd4a5c2600796d8b66..ae922d01caae4b2ed42641ae5039abe33603fa29 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -296,6 +296,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -294,6 +294,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      private int containerCounter;
      public boolean wonGame;
      private int containerUpdateDelay; // Paper - Configurable container update tick rate
@@ -106,7 +106,7 @@ index f6b2ca92fd3510a76cbf56d0ea55aa6caaf12ba1..e0d342a0ddd140b342f7af138c71596c
      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 054892e472636d1a5c7f06c46ee28ebe4736f24d..5cdd18e071f069adc8137561c164bd533dea7c7c 100644
+index 63cc339b42c47879401628c8d0e0f62bd7dd76b4..d5f89783d12c61967637ed1e87037710df563308 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/unapplied/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 86%
rename from patches/unapplied/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 809a66aefa..ff52e9af11 100644
--- a/patches/unapplied/server/0270-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0270-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 9d6910c6a685d1c8f6804cfe086c958a0fcb0526..3fbdc6394c1f431d1bf8ee13513a69b96f69bdd9 100644
+index ae922d01caae4b2ed42641ae5039abe33603fa29..71352f1b86c594ea2edf5d1735410054d909291a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2078,6 +2078,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2061,6 +2061,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      public void disconnect() {
          this.disconnected = true;
          this.ejectPassengers();
diff --git a/patches/unapplied/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
similarity index 92%
rename from patches/unapplied/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
rename to patches/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 9a7359c010..0c4a2ca7f9 100644
--- a/patches/unapplied/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0271-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5cdd18e071f069adc8137561c164bd533dea7c7c..7c7f66ea38babab7b04e76d14e19cc0dac9c4b54 100644
+index d5f89783d12c61967637ed1e87037710df563308..e548834f2bd6e1e0a510a14040cc6aca63e2e6f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -229,8 +229,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/unapplied/server/0272-BlockDestroyEvent.patch b/patches/server/0272-BlockDestroyEvent.patch
similarity index 92%
rename from patches/unapplied/server/0272-BlockDestroyEvent.patch
rename to patches/server/0272-BlockDestroyEvent.patch
index 6e560f06f5..371106a466 100644
--- a/patches/unapplied/server/0272-BlockDestroyEvent.patch
+++ b/patches/server/0272-BlockDestroyEvent.patch
@@ -11,10 +11,10 @@ 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 924b496aaaa19c7ef69498730725ae9287e46e28..0f4b9b5d3e34b5e08f9ca2f78c5e8bcec9f5a85e 100644
+index 09bcffea6b9510a108c5e7d2a32d2930c6abe6b3..7d1d009def581b83794425892f454b4d2a76c634 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -24,6 +24,7 @@ import net.minecraft.core.registries.Registries;
+@@ -25,6 +25,7 @@ import net.minecraft.core.registries.Registries;
  import net.minecraft.network.protocol.Packet;
  import net.minecraft.resources.ResourceKey;
  import net.minecraft.resources.ResourceLocation;
@@ -22,7 +22,7 @@ index 924b496aaaa19c7ef69498730725ae9287e46e28..0f4b9b5d3e34b5e08f9ca2f78c5e8bce
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.FullChunkStatus;
  import net.minecraft.server.level.ServerLevel;
-@@ -574,9 +575,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -575,9 +576,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/unapplied/server/0273-Async-command-map-building.patch b/patches/server/0273-Async-command-map-building.patch
similarity index 98%
rename from patches/unapplied/server/0273-Async-command-map-building.patch
rename to patches/server/0273-Async-command-map-building.patch
index 5fb46253e8..48ea8c3ab1 100644
--- a/patches/unapplied/server/0273-Async-command-map-building.patch
+++ b/patches/server/0273-Async-command-map-building.patch
@@ -83,7 +83,7 @@ index 2008fd542eaf1c2fac776ae1751c227a3b6dde4b..6212d94503023f7bb5ca21785cbb69ba
              }
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9a9291282f7ec99be9badf8b32fab5f0ea0f1037..feb45369b41b597fd603c12f3da23759923b6a6d 100644
+index 698536a52e9e61d20556b4bc58de256e89726180..d69af4ad646134fa79dea8a845f2311a9a0cb086 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -944,6 +944,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0274-Brigadier-Mojang-API.patch b/patches/server/0274-Brigadier-Mojang-API.patch
similarity index 98%
rename from patches/unapplied/server/0274-Brigadier-Mojang-API.patch
rename to patches/server/0274-Brigadier-Mojang-API.patch
index 9925490b27..dcabb54ddb 100644
--- a/patches/unapplied/server/0274-Brigadier-Mojang-API.patch
+++ b/patches/server/0274-Brigadier-Mojang-API.patch
@@ -119,10 +119,10 @@ index 6212d94503023f7bb5ca21785cbb69babe4421c3..642d5c6849debc5a266605b0df30d552
  
              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 542899c382309986f3aaa16bf534b677aaac82f5..b234957d0563f1ccf533f927e60d8b6b77c33a25 100644
+index ca0aa2acbc1316201d7a9c69e4aad8ffe4d61d83..c32dd209e751f8c0e8e73c91a9d4b2c21c59b883 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -780,19 +780,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -778,19 +778,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      builder.suggest(completion.suggestion(), PaperAdventure.asVanilla(completion.tooltip()));
                  }
              }
diff --git a/patches/unapplied/server/0275-Limit-Client-Sign-length-more.patch b/patches/server/0275-Limit-Client-Sign-length-more.patch
similarity index 92%
rename from patches/unapplied/server/0275-Limit-Client-Sign-length-more.patch
rename to patches/server/0275-Limit-Client-Sign-length-more.patch
index adfa39c698..8e4daa3d06 100644
--- a/patches/unapplied/server/0275-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0275-Limit-Client-Sign-length-more.patch
@@ -22,10 +22,10 @@ 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 b234957d0563f1ccf533f927e60d8b6b77c33a25..8a58c1bdda065edd7b8560cd43e805de3fe0b178 100644
+index c32dd209e751f8c0e8e73c91a9d4b2c21c59b883..969fee86d2422cbadfbce18d8bbaf72ff30b5c3d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -308,6 +308,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -310,6 +310,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private final MessageSignatureCache messageSignatureCache = MessageSignatureCache.createDefault();
      private final FutureChain chatMessageChain;
      private boolean waitingForSwitchToConfig;
@@ -33,7 +33,7 @@ index b234957d0563f1ccf533f927e60d8b6b77c33a25..8a58c1bdda065edd7b8560cd43e805de
  
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
          super(server, connection, clientData, player); // CraftBukkit
-@@ -3201,7 +3202,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3260,7 +3261,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
diff --git a/patches/unapplied/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/unapplied/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0276-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/unapplied/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
similarity index 92%
rename from patches/unapplied/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
rename to patches/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
index bdf01442fe..206d4526b3 100644
--- a/patches/unapplied/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
+++ b/patches/server/0277-Fixes-and-additions-to-the-spawn-reason-API.patch
@@ -26,10 +26,10 @@ index f55832ce841621daab4d3a910650ab6562cefcda..f635da34335cd2901adf975fcd74c5c6
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 01c4f405692116813bbd3d851738f52a50b548a2..ddff9f9f5322f62286f32161888e1b6a160fddfd 100644
+index 52e2137f759e52d210abda7b47c1fd4b5f831d1f..209257ed04623ea41b7aba40b0b03a88a7f4eb21 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1177,6 +1177,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1178,6 +1178,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              return true;
          }
          // Paper end - extra debug info
@@ -38,10 +38,10 @@ index 01c4f405692116813bbd3d851738f52a50b548a2..ddff9f9f5322f62286f32161888e1b6a
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3fbdc6394c1f431d1bf8ee13513a69b96f69bdd9..33677b85b2727134dfe98c31e7395caf615b1c08 100644
+index 71352f1b86c594ea2edf5d1735410054d909291a..49d4feda5b352bd135aadf3c4677d236134861b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -716,7 +716,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -714,7 +714,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
                  ServerLevel worldserver = (ServerLevel) world;
                  CompoundTag nbttagcompound = ((CompoundTag) nbt.get()).getCompound("RootVehicle");
                  Entity entity = EntityType.loadEntityRecursive(nbttagcompound.getCompound("Entity"), worldserver, EntitySpawnReason.LOAD, (entity1) -> {
@@ -67,7 +67,7 @@ index 97b48186a48ca037645d4a5ae84e3a95fd413a33..a04cfa09d9f8594a7ad3120855efe164
          String s1 = connection.getLoggableAddress(this.server.logIPs());
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a430a3e2c3b4ae53cad1fbaf4dd71b9e2f24ccf7..49310b11116259193a93aca37da9c6a6949eb948 100644
+index 3cc210dc92f74c37f4de6eaf31ff3ec7aa11248a..e932bd4c922d7015bba0ef06e349d74f5c1a209c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -256,6 +256,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -78,7 +78,7 @@ index a430a3e2c3b4ae53cad1fbaf4dd71b9e2f24ccf7..49310b11116259193a93aca37da9c6a6
  
      private CraftEntity bukkitEntity;
  
-@@ -2391,6 +2392,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2414,6 +2415,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
                  nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -88,7 +88,7 @@ index a430a3e2c3b4ae53cad1fbaf4dd71b9e2f24ccf7..49310b11116259193a93aca37da9c6a6
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
-@@ -2538,6 +2542,26 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2563,6 +2567,26 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
@@ -116,7 +116,7 @@ index a430a3e2c3b4ae53cad1fbaf4dd71b9e2f24ccf7..49310b11116259193a93aca37da9c6a6
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 8f4ec4f0ea7ff2f9a952120785aea65f6559f897..989b766bc166141a391e0a7c1a5eb815e20acfac 100644
+index 768edafa018961ce38306f87e5cfe6aa99537305..d62c17c01f39d41d7cd422d37326a66791804090 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -433,7 +433,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -173,7 +173,7 @@ index 2eecdcbea3d51b1fb6e0c3db0667464a699ca0df..c68ddccd5fbe27f6a62cedbdc2337f1b
                  this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
              }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 6c7f644738548da30908a08dcfde8142b597c0b7..80637835a35dbfd7c7458b246ddee9d836e5101a 100644
+index 23b7894761ef8871a7771e228b39ff01702afbcd..ae18b23e07b1aa7505b54f0512b1612e5f3da6db 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -214,7 +214,12 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -247,20 +247,20 @@ index fc26713a869d0c1fad1634ef4a6c6282fef5aa31..4f8224841865f956aaa969ab7f543c80
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
-index dc6b18527222d23e9719e2210b684a1aa797c70d..ea53c25c350c0cf8e0360ea409cd1f69a62054a8 100644
+index 32f0493bac35e8c931ba2950f604a1f2cdd883c6..4bc3eded897b067e00c8e310c1be603aa7097ac4 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
-@@ -189,7 +189,7 @@ public class SculkShriekerBlockEntity extends BlockEntity implements GameEventLi
- 
+@@ -190,7 +190,7 @@ public class SculkShriekerBlockEntity extends BlockEntity implements GameEventLi
      private boolean trySummonWarden(ServerLevel world) {
          return this.warningLevel >= 4
--            && SpawnUtil.trySpawnMob(EntityType.WARDEN, EntitySpawnReason.TRIGGERED, world, this.getBlockPos(), 20, 5, 6, SpawnUtil.Strategy.ON_TOP_OF_COLLIDER)
-+            && SpawnUtil.trySpawnMob(EntityType.WARDEN, EntitySpawnReason.TRIGGERED, world, this.getBlockPos(), 20, 5, 6, SpawnUtil.Strategy.ON_TOP_OF_COLLIDER, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL, null) // Paper - Entity#getEntitySpawnReason
+             && SpawnUtil.trySpawnMob(
+-                    EntityType.WARDEN, EntitySpawnReason.TRIGGERED, world, this.getBlockPos(), 20, 5, 6, SpawnUtil.Strategy.ON_TOP_OF_COLLIDER, false
++                    EntityType.WARDEN, EntitySpawnReason.TRIGGERED, world, this.getBlockPos(), 20, 5, 6, SpawnUtil.Strategy.ON_TOP_OF_COLLIDER, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL, null // Paper - Entity#getEntitySpawnReason
+                 )
                  .isPresent();
      }
- 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java
-index f0163b7fa8b27823db9df5b8d2b6adcb63023164..de9d00ec932c8d07b28dd68ac9b8e6d5b94f7a8d 100644
+index 150a525772dd87f0aca39ad74f0bcefa0693d7d8..476caf7fb4f0124daa35822f2161e11620f18621 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java
 @@ -231,6 +231,7 @@ public final class TrialSpawner {
diff --git a/patches/unapplied/server/0278-Fire-event-on-GS4-query.patch b/patches/server/0278-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/unapplied/server/0278-Fire-event-on-GS4-query.patch
rename to patches/server/0278-Fire-event-on-GS4-query.patch
diff --git a/patches/unapplied/server/0279-Add-PlayerPostRespawnEvent.patch b/patches/server/0279-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/unapplied/server/0279-Add-PlayerPostRespawnEvent.patch
rename to patches/server/0279-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/unapplied/server/0280-Server-Tick-Events.patch b/patches/server/0280-Server-Tick-Events.patch
similarity index 94%
rename from patches/unapplied/server/0280-Server-Tick-Events.patch
rename to patches/server/0280-Server-Tick-Events.patch
index f137fe9a78..1b3c36ca3d 100644
--- a/patches/unapplied/server/0280-Server-Tick-Events.patch
+++ b/patches/server/0280-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ 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 feb45369b41b597fd603c12f3da23759923b6a6d..2690048e2ac612f0d1261bcdecf5f745ebbddec2 100644
+index d69af4ad646134fa79dea8a845f2311a9a0cb086..a7eeb4f3098a4bea05592890b5fecbfbac3090e4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1481,6 +1481,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0281-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0281-PlayerDeathEvent-getItemsToKeep.patch
similarity index 93%
rename from patches/unapplied/server/0281-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0281-PlayerDeathEvent-getItemsToKeep.patch
index 2f8fa65443..b714a01141 100644
--- a/patches/unapplied/server/0281-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0281-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 33677b85b2727134dfe98c31e7395caf615b1c08..2e81c8dc6bad9e4e2f2847bf841d3fee8cbfbeed 100644
+index 49d4feda5b352bd135aadf3c4677d236134861b0..7ef374236e6a08d74fe2d71280e23dac73fb5c54 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1157,6 +1157,46 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -1154,6 +1154,46 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          });
      }
  
@@ -61,7 +61,7 @@ index 33677b85b2727134dfe98c31e7395caf615b1c08..2e81c8dc6bad9e4e2f2847bf841d3fee
      @Override
      public void die(DamageSource damageSource) {
          // this.gameEvent(GameEvent.ENTITY_DIE); // Paper - move below event cancellation check
-@@ -1241,7 +1281,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -1238,7 +1278,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          this.dropExperience(this.serverLevel(), damageSource.getEntity());
          // 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/unapplied/server/0282-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
similarity index 90%
rename from patches/unapplied/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
rename to patches/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
index 4dedbb8d9c..658f977bf4 100644
--- a/patches/unapplied/server/0282-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0282-Optimize-Captured-BlockEntity-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 0f4b9b5d3e34b5e08f9ca2f78c5e8bcec9f5a85e..1e22ee380237a33c506316e3cfe3f6efb7f9ae4a 100644
+index 7d1d009def581b83794425892f454b4d2a76c634..36d183d6b52185405f3dbf67d09bc21631e86870 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -865,9 +865,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -866,9 +866,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/unapplied/server/0283-Mob-Spawner-API-Enhancements.patch b/patches/server/0283-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/unapplied/server/0283-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0283-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/unapplied/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/unapplied/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0284-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/unapplied/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/unapplied/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0285-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/unapplied/server/0286-Implement-CraftBlockSoundGroup.patch b/patches/server/0286-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/unapplied/server/0286-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0286-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/unapplied/server/0287-Expose-the-internal-current-tick.patch b/patches/server/0287-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/unapplied/server/0287-Expose-the-internal-current-tick.patch
rename to patches/server/0287-Expose-the-internal-current-tick.patch
diff --git a/patches/unapplied/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/unapplied/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0288-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/unapplied/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/unapplied/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0289-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/unapplied/server/0290-Configurable-projectile-relative-velocity.patch b/patches/server/0290-Configurable-projectile-relative-velocity.patch
similarity index 96%
rename from patches/unapplied/server/0290-Configurable-projectile-relative-velocity.patch
rename to patches/server/0290-Configurable-projectile-relative-velocity.patch
index 93e1cc2d7d..ac231b040d 100644
--- a/patches/unapplied/server/0290-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0290-Configurable-projectile-relative-velocity.patch
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 80637835a35dbfd7c7458b246ddee9d836e5101a..0e4ba92d97998937ccb83ebd60aaad3fb68f7546 100644
+index ae18b23e07b1aa7505b54f0512b1612e5f3da6db..5cff58ab33657e7fb2642928e42b728e7b0b4689 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -192,8 +192,11 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/unapplied/server/0291-offset-item-frame-ticking.patch b/patches/server/0291-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/unapplied/server/0291-offset-item-frame-ticking.patch
rename to patches/server/0291-offset-item-frame-ticking.patch
diff --git a/patches/unapplied/server/0292-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0292-Prevent-consuming-the-wrong-itemstack.patch
similarity index 88%
rename from patches/unapplied/server/0292-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0292-Prevent-consuming-the-wrong-itemstack.patch
index 3a31b4866f..e25611838e 100644
--- a/patches/unapplied/server/0292-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0292-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 901336aac08f4c49328316aeccb7c48a591ed6b0..caf74116e44a9e3269cec9b65708e604403ffc77 100644
+index 782c187d2b4f706463a1e643f1976512104797a6..4e6bd9f2e8a1a3b3db8e7fff88eefe88a0f2be65 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3994,9 +3994,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4001,9 +4001,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void startUsingItem(InteractionHand hand) {
@@ -24,7 +24,7 @@ index 901336aac08f4c49328316aeccb7c48a591ed6b0..caf74116e44a9e3269cec9b65708e604
              this.useItem = itemstack;
              this.useItemRemaining = itemstack.getUseDuration(this);
              if (!this.level().isClientSide) {
-@@ -4067,6 +4072,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4074,6 +4079,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  this.releaseUsingItem();
              } else {
                  if (!this.useItem.isEmpty() && this.isUsingItem()) {
@@ -32,7 +32,7 @@ index 901336aac08f4c49328316aeccb7c48a591ed6b0..caf74116e44a9e3269cec9b65708e604
                      // CraftBukkit start - fire PlayerItemConsumeEvent
                      ItemStack itemstack;
                      PlayerItemConsumeEvent event = null; // Paper
-@@ -4104,8 +4110,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4111,8 +4117,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }
  
                      this.stopUsingItem();
diff --git a/patches/unapplied/server/0293-Dont-send-unnecessary-sign-update.patch b/patches/server/0293-Dont-send-unnecessary-sign-update.patch
similarity index 92%
rename from patches/unapplied/server/0293-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0293-Dont-send-unnecessary-sign-update.patch
index cccd627a78..897869e4a7 100644
--- a/patches/unapplied/server/0293-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0293-Dont-send-unnecessary-sign-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 469d0046ba98289e98aa0f3f66e3ed27026a98a2..3339130f3a02e6e395bcd8e3047b35f6f4eca9a9 100644
+index 0e80e4f01e0175a9a2e90dc950ba0580af6b1520..9861388bdca8d32b7e9a49a251088c98283d8234 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -185,6 +185,7 @@ public class SignBlockEntity extends BlockEntity {
diff --git a/patches/unapplied/server/0294-Add-option-to-disable-pillager-patrols.patch b/patches/server/0294-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/unapplied/server/0294-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0294-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/unapplied/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/unapplied/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0295-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/unapplied/server/0296-Duplicate-UUID-Resolve-Option.patch b/patches/server/0296-Duplicate-UUID-Resolve-Option.patch
similarity index 97%
rename from patches/unapplied/server/0296-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0296-Duplicate-UUID-Resolve-Option.patch
index b42bece1fc..e2475f9564 100644
--- a/patches/unapplied/server/0296-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0296-Duplicate-UUID-Resolve-Option.patch
@@ -33,7 +33,7 @@ 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/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java
-index 412caefe776df6c8e931f6a1a48ea2525ec6610e..aff4c3d63a97d5bbde004a616f7e14fca59b5ab9 100644
+index 459a20453d3b447cae20fbe6426dfdc62a34949a..3d8a35d8cf29447ee7ac750dbc6ffcdb0f89b81b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java
 @@ -178,10 +178,51 @@ public class ChunkStatusTasks {
diff --git a/patches/unapplied/server/0297-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0297-PlayerDeathEvent-shouldDropExperience.patch
similarity index 86%
rename from patches/unapplied/server/0297-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0297-PlayerDeathEvent-shouldDropExperience.patch
index 2b8ecf9f4c..c5a0739995 100644
--- a/patches/unapplied/server/0297-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0297-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 2e81c8dc6bad9e4e2f2847bf841d3fee8cbfbeed..00d55b6c5879b706d84ed6b913431e728730da81 100644
+index 7ef374236e6a08d74fe2d71280e23dac73fb5c54..a624cab05e9a4308a7f887f9edcf0ec1555f94a8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1278,7 +1278,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -1275,7 +1275,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
              this.tellNeutralMobsThatIDied();
          }
          // SPIGOT-5478 must be called manually now
diff --git a/patches/unapplied/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 88%
rename from patches/unapplied/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
index ce7ab4dd4d..efa3a972db 100644
--- a/patches/unapplied/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0298-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index b1a72ed404f4bc31f32dd771dd320b7c783c9651..310a2aa23365f9a8a8b7b6fa2323aed792f95adb 100644
+index dc5b2797871b40946eb2fbc57c381aceaf2891ad..3f028876ea1959cecce716a568ba839b4953cc1b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -514,7 +514,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -518,7 +518,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
      @Nullable
      BeehiveBlockEntity getBeehiveBlockEntity() {
diff --git a/patches/unapplied/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/unapplied/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0299-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/unapplied/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 92%
rename from patches/unapplied/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
index 1f06a4645d..ac62199199 100644
--- a/patches/unapplied/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0300-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,10 +6,10 @@ 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 ddff9f9f5322f62286f32161888e1b6a160fddfd..32117fe89ca946658a7d292b4a470736a09bfa62 100644
+index 209257ed04623ea41b7aba40b0b03a88a7f4eb21..6430e759c3d89033418f79c7f7aacb8ca5a5135b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -336,6 +336,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -337,6 +337,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      }
      // Paper end
  
diff --git a/patches/unapplied/server/0301-Fix-item-EAR-ticks.patch b/patches/server/0301-Fix-item-EAR-ticks.patch
similarity index 100%
rename from patches/unapplied/server/0301-Fix-item-EAR-ticks.patch
rename to patches/server/0301-Fix-item-EAR-ticks.patch
diff --git a/patches/unapplied/server/0302-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0302-Optimize-call-to-getFluid-for-explosions.patch
similarity index 92%
rename from patches/unapplied/server/0302-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0302-Optimize-call-to-getFluid-for-explosions.patch
index b6eb87bb5e..94c1392d26 100644
--- a/patches/unapplied/server/0302-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0302-Optimize-call-to-getFluid-for-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java
-index d1878f597c3d8119e9b248f4fe8af435ce8c9710..d3d74a7f306d88b0d5cd83893b3ee5e750fd4caf 100644
+index 4c03ec11fb2c36291b8b6cb73a7c63eabb9dcd4f..290fd9d57c5de2c92afe23babfcdc3d110a35b9e 100644
 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java
 +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java
 @@ -150,7 +150,7 @@ public class ServerExplosion implements Explosion {
diff --git a/patches/unapplied/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/unapplied/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0303-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/unapplied/server/0304-Alternative-item-despawn-rate.patch b/patches/server/0304-Alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/unapplied/server/0304-Alternative-item-despawn-rate.patch
rename to patches/server/0304-Alternative-item-despawn-rate.patch
diff --git a/patches/unapplied/server/0305-Tracking-Range-Improvements.patch b/patches/server/0305-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/unapplied/server/0305-Tracking-Range-Improvements.patch
rename to patches/server/0305-Tracking-Range-Improvements.patch
diff --git a/patches/unapplied/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 90%
rename from patches/unapplied/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index cf391a4f9f..32588f2b12 100644
--- a/patches/unapplied/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0306-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 310a2aa23365f9a8a8b7b6fa2323aed792f95adb..adff3bec90786b87323653cf4f94a38c7b9ef7ff 100644
+index 3f028876ea1959cecce716a568ba839b4953cc1b..a48a29b5b1963db679b053f3530f64d2b9560290 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -150,7 +150,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -154,7 +154,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      public Bee(EntityType<? extends Bee> type, Level world) {
          super(type, world);
          this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(this.random, 20, 60);
diff --git a/patches/unapplied/server/0307-Improve-Block-breakNaturally-API.patch b/patches/server/0307-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/unapplied/server/0307-Improve-Block-breakNaturally-API.patch
rename to patches/server/0307-Improve-Block-breakNaturally-API.patch
diff --git a/patches/unapplied/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/unapplied/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0308-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/unapplied/server/0309-Add-debug-for-sync-chunk-loads.patch b/patches/server/0309-Add-debug-for-sync-chunk-loads.patch
similarity index 98%
rename from patches/unapplied/server/0309-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0309-Add-debug-for-sync-chunk-loads.patch
index 224d9b01ef..f3652f680c 100644
--- a/patches/unapplied/server/0309-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0309-Add-debug-for-sync-chunk-loads.patch
@@ -314,10 +314,10 @@ index 2bd7f0554bdf668930c990156f65e97e4b64d8bc..6a2af3cd3aebe525a5ff41a801929547
              ChunkAccess ichunkaccess1 = (ChunkAccess) chunkresult.orElse(null); // CraftBukkit - decompile error
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 32117fe89ca946658a7d292b4a470736a09bfa62..af3adf1bf771c2327b2972a4f9db9df4c4775f1a 100644
+index 6430e759c3d89033418f79c7f7aacb8ca5a5135b..578d284a3e39368c5285eafe84056b081a240e3d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -415,6 +415,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -416,6 +416,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
      }
  
diff --git a/patches/unapplied/server/0310-Improve-java-version-check.patch b/patches/server/0310-Improve-java-version-check.patch
similarity index 95%
rename from patches/unapplied/server/0310-Improve-java-version-check.patch
rename to patches/server/0310-Improve-java-version-check.patch
index f25e71069d..13df515e7c 100644
--- a/patches/unapplied/server/0310-Improve-java-version-check.patch
+++ b/patches/server/0310-Improve-java-version-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve java version check
 Co-Authored-By: MiniDigger <admin@benndorf.dev>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2a95a42ade0e82a509f08e2bec7f0c64f55b185c..6eb053f88860ce8693a7baa35eddc9e3fccaced3 100644
+index bb3203dc75df1e480b221fb2de44909759bbf07f..d84afe883d5af0800b5c85649a691bc811c2e357 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -203,11 +203,20 @@ public class Main {
diff --git a/patches/unapplied/server/0311-Add-ThrownEggHatchEvent.patch b/patches/server/0311-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/unapplied/server/0311-Add-ThrownEggHatchEvent.patch
rename to patches/server/0311-Add-ThrownEggHatchEvent.patch
diff --git a/patches/unapplied/server/0312-Entity-Jump-API.patch b/patches/server/0312-Entity-Jump-API.patch
similarity index 90%
rename from patches/unapplied/server/0312-Entity-Jump-API.patch
rename to patches/server/0312-Entity-Jump-API.patch
index c4fbb06bf0..8fe49892fd 100644
--- a/patches/unapplied/server/0312-Entity-Jump-API.patch
+++ b/patches/server/0312-Entity-Jump-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Entity Jump API
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index caf74116e44a9e3269cec9b65708e604403ffc77..559c949f5ddf086877a798a7e8eb492c329b62c8 100644
+index 4e6bd9f2e8a1a3b3db8e7fff88eefe88a0f2be65..043d4e85b7021c7bec724c3aef76d1278a7d34d5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3538,8 +3538,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3549,8 +3549,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
              } else if (this.isInLava() && (!this.onGround() || d3 > d4)) {
                  this.jumpInLiquid(FluidTags.LAVA);
              } else if ((this.onGround() || flag && d3 <= d4) && this.noJumpDelay == 0) {
@@ -36,10 +36,10 @@ index 0b0887b7d2c69138617bee6ec3145f0a83b8734d..705c26ceff9371b09311bd7fa796c0ef
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 32973d9c7bf4c4105d7bd82d3723e0b70cd79644..c661ae4e5c07494c7de852cc8d01f0f9839c1590 100644
+index 6c909ea334310f1f9b2d9a2e2cc2f23f2badba37..772476d44ee72aed1ba35d10fe51f0ffda34d3f8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -174,7 +174,9 @@ public class Ravager extends Raider {
+@@ -171,7 +171,9 @@ public class Ravager extends Raider {
                      }
  
                      if (!flag && this.onGround()) {
@@ -50,7 +50,7 @@ index 32973d9c7bf4c4105d7bd82d3723e0b70cd79644..c661ae4e5c07494c7de852cc8d01f0f9
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c4c83b4e17aac23794fdb51acfba4e7ef8451e2c..81034513faa3bd4f306430bc48532ba671a7b94b 100644
+index db21f7eeeca48f1df95b37ffa7e9bf7f71f37d5d..c763d3524794a2505a6296917d34b6f7e737402d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -993,4 +993,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 89%
rename from patches/unapplied/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
index a5fe2fd06d..2bbd5a37f8 100644
--- a/patches/unapplied/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0313-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 49310b11116259193a93aca37da9c6a6949eb948..8cea6fccdea8965e372983ab3cf8ba61911e439f 100644
+index e932bd4c922d7015bba0ef06e349d74f5c1a209c..a330a603349f7f9d694cef66f67ba465e3110a1c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -407,6 +407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index 49310b11116259193a93aca37da9c6a6949eb948..8cea6fccdea8965e372983ab3cf8ba61
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      // Paper start - Entity origin API
      @javax.annotation.Nullable
-@@ -2399,6 +2400,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2422,6 +2423,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (spawnedViaMobSpawner) {
                  nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
              }
@@ -26,7 +26,7 @@ index 49310b11116259193a93aca37da9c6a6949eb948..8cea6fccdea8965e372983ab3cf8ba61
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -2542,6 +2546,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2567,6 +2571,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
@@ -35,7 +35,7 @@ index 49310b11116259193a93aca37da9c6a6949eb948..8cea6fccdea8965e372983ab3cf8ba61
                  String spawnReasonName = nbt.getString("Paper.SpawnReason");
                  try {
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 5d4c0d7fec42bf843b11875f7a09bcb9279b3b54..dea13596eb8a3b7bc69c19545b2227b4c45ed241 100644
+index a8cb0d5019d06de64b2cc30e6830bbd6ad43a155..e404722c119631e31c0519111ccd5f1682c2638d 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -89,6 +89,10 @@ public class NetherPortalBlock extends Block implements Portal {
diff --git a/patches/unapplied/server/0314-Make-the-GUI-graph-fancier.patch b/patches/server/0314-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/unapplied/server/0314-Make-the-GUI-graph-fancier.patch
rename to patches/server/0314-Make-the-GUI-graph-fancier.patch
diff --git a/patches/unapplied/server/0315-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/unapplied/server/0315-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/unapplied/server/0316-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0316-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/unapplied/server/0316-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0316-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/unapplied/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/unapplied/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/unapplied/server/0318-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0318-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/unapplied/server/0318-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0318-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/unapplied/server/0319-Optimise-Chunk-getFluid.patch b/patches/server/0319-Optimise-Chunk-getFluid.patch
similarity index 92%
rename from patches/unapplied/server/0319-Optimise-Chunk-getFluid.patch
rename to patches/server/0319-Optimise-Chunk-getFluid.patch
index b81a71067c..05f68c017f 100644
--- a/patches/unapplied/server/0319-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0319-Optimise-Chunk-getFluid.patch
@@ -8,10 +8,10 @@ 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 a1b6c13d496519ef6ce240036cec6642626903b9..d4bd4cbc5c4773659662a6d7a09b21a99463c1fb 100644
+index 31696856600db18d1dc401b7fa72a7c9ff219304..b6fb9014d0e4de35b0f5a7e9e99f9db7ec89edcd 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -293,18 +293,20 @@ public class LevelChunk extends ChunkAccess {
+@@ -298,18 +298,20 @@ public class LevelChunk extends ChunkAccess {
      }
  
      public FluidState getFluidState(int x, int y, int z) {
@@ -38,7 +38,7 @@ index a1b6c13d496519ef6ce240036cec6642626903b9..d4bd4cbc5c4773659662a6d7a09b21a9
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Getting fluid state");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block being got");
-@@ -314,6 +316,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -319,6 +321,7 @@ public class LevelChunk extends ChunkAccess {
              });
              throw new ReportedException(crashreport);
          }
diff --git a/patches/unapplied/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/unapplied/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/unapplied/server/0321-Add-tick-times-API-and-mspt-command.patch b/patches/server/0321-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/unapplied/server/0321-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0321-Add-tick-times-API-and-mspt-command.patch
index 0a4e7fd4e5..fc732e1f3d 100644
--- a/patches/unapplied/server/0321-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0321-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 2690048e2ac612f0d1261bcdecf5f745ebbddec2..7a4ab569090c758f6d707173aa68dd4de87f3654 100644
+index a7eeb4f3098a4bea05592890b5fecbfbac3090e4..e1a15f3721e3c661be0185d65073a39f293f0589 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -263,6 +263,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0322-Expose-MinecraftServer-isRunning.patch b/patches/server/0322-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/unapplied/server/0322-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0322-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/unapplied/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 97%
rename from patches/unapplied/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
index 70ced2037c..9389066286 100644
--- a/patches/unapplied/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 61efb305e25b23fe6309276e15efdb41a46c7738..b50d1ddfd23bf1af16d86e5edcb72196b4674868 100644
+index e27f10d0d5720c144729ce83e27aa1c70170ebe2..1e41803952f2410c8f1e213d8be8d141773853d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -480,6 +480,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/unapplied/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 97%
rename from patches/unapplied/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
index da308c4970..9ff443b665 100644
--- a/patches/unapplied/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,10 +10,10 @@ 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 00d55b6c5879b706d84ed6b913431e728730da81..a4c6f458703cdd794d2825e81ce00e5af63d21bd 100644
+index a624cab05e9a4308a7f887f9edcf0ec1555f94a8..df409f2dc2c49282f128a9fdd9c248a2f6d9a7c9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -297,6 +297,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -295,6 +295,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      public boolean wonGame;
      private int containerUpdateDelay; // Paper - Configurable container update tick rate
      public long loginTime; // Paper - Replace OfflinePlayer#getLastPlayed
diff --git a/patches/unapplied/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/unapplied/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/unapplied/server/0326-Do-not-allow-Vexes-to-load-chunks.patch b/patches/server/0326-Do-not-allow-Vexes-to-load-chunks.patch
similarity index 100%
rename from patches/unapplied/server/0326-Do-not-allow-Vexes-to-load-chunks.patch
rename to patches/server/0326-Do-not-allow-Vexes-to-load-chunks.patch
diff --git a/patches/unapplied/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 93%
rename from patches/unapplied/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 41397d9f6a..2c2336e60a 100644
--- a/patches/unapplied/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -25,10 +25,10 @@ index 9baec6e78bdebd9b38b3f12e4fba99f9ad039c1e..914e9e0af7533cbf487ea0413da447d5
              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 af3adf1bf771c2327b2972a4f9db9df4c4775f1a..161b556e5c5f3719b5623e71876a2250abc7f391 100644
+index 578d284a3e39368c5285eafe84056b081a240e3d..eb65b1768c46f3cc3f490b06c2215044aebab178 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2207,7 +2207,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2213,7 +2213,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -37,7 +37,7 @@ index af3adf1bf771c2327b2972a4f9db9df4c4775f1a..161b556e5c5f3719b5623e71876a2250
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
                  ServerLevel.this.updateSleepingPlayerList();
-@@ -2237,6 +2237,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2243,6 +2243,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
              entity.valid = true; // CraftBukkit
diff --git a/patches/unapplied/server/0328-Don-t-tick-dead-players.patch b/patches/server/0328-Don-t-tick-dead-players.patch
similarity index 85%
rename from patches/unapplied/server/0328-Don-t-tick-dead-players.patch
rename to patches/server/0328-Don-t-tick-dead-players.patch
index a283819a3e..f9381a4e08 100644
--- a/patches/unapplied/server/0328-Don-t-tick-dead-players.patch
+++ b/patches/server/0328-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 a4c6f458703cdd794d2825e81ce00e5af63d21bd..9f3a7ba170b729fad228e212436f15bb8169f906 100644
+index df409f2dc2c49282f128a9fdd9c248a2f6d9a7c9..957266d14ce2b9b99f7c97289458fc837e4d665a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -993,7 +993,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -990,7 +990,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
      public void doTick() {
          try {
diff --git a/patches/unapplied/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 84%
rename from patches/unapplied/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 068a5a06f9..705855f9ab 100644
--- a/patches/unapplied/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,10 +7,10 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4d8929a1f5390af10fbde1dcc13c0136b0a3a745..917ac21794f1aabc6e95ab2fff2ea7547b9778a8 100644
+index 858f123934021b7a3911d3d5cfcb8352293a8302..c23b8f00d7ce3a46f9d104ffae5e4c6124a111ce 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1143,7 +1143,7 @@ public abstract class Player extends LivingEntity {
+@@ -1146,7 +1146,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      protected boolean isImmobile() {
diff --git a/patches/unapplied/server/0330-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch
similarity index 92%
rename from patches/unapplied/server/0330-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch
index e7da8ffb65..918a46fbf7 100644
--- a/patches/unapplied/server/0330-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0330-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 9f3a7ba170b729fad228e212436f15bb8169f906..5437ccea0205c23435de3584b26ee5a48afc5d1b 100644
+index 957266d14ce2b9b99f7c97289458fc837e4d665a..21f7b26bbf2b3e231032b7a09fa6e82f8244f495 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 net.minecraft.world.entity.player.Player {
+@@ -417,7 +417,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          this.server = server;
          this.stats = server.getPlayerList().getPlayerStats(this);
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
@@ -25,7 +25,7 @@ index 9f3a7ba170b729fad228e212436f15bb8169f906..5437ccea0205c23435de3584b26ee5a4
          this.updateOptions(clientOptions);
          this.object = null;
  
-@@ -856,7 +856,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -854,7 +854,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
                  position = Vec3.atCenterOf(world.getSharedSpawnPos());
              }
              this.setLevel(world);
diff --git a/patches/unapplied/server/0331-Optimize-Pathfinding.patch b/patches/server/0331-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/unapplied/server/0331-Optimize-Pathfinding.patch
rename to patches/server/0331-Optimize-Pathfinding.patch
diff --git a/patches/unapplied/server/0332-Reduce-Either-Optional-allocation.patch b/patches/server/0332-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/unapplied/server/0332-Reduce-Either-Optional-allocation.patch
rename to patches/server/0332-Reduce-Either-Optional-allocation.patch
diff --git a/patches/unapplied/server/0333-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0333-Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/unapplied/server/0333-Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0333-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/unapplied/server/0334-Prevent-opening-inventories-when-frozen.patch b/patches/server/0334-Prevent-opening-inventories-when-frozen.patch
similarity index 86%
rename from patches/unapplied/server/0334-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0334-Prevent-opening-inventories-when-frozen.patch
index bcbb0054b2..5df9fdb825 100644
--- a/patches/unapplied/server/0334-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0334-Prevent-opening-inventories-when-frozen.patch
@@ -5,19 +5,19 @@ 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 5437ccea0205c23435de3584b26ee5a48afc5d1b..0c68c0a9ec9b353b353eff0c36af2993df5f59b3 100644
+index 21f7b26bbf2b3e231032b7a09fa6e82f8244f495..ba6dbbd56f5b0c2eb5566172e64fbf258f146ef0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -938,7 +938,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
-             containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
+@@ -935,7 +935,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+             this.containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
          }
          // Paper end - Configurable container update tick rate
--        if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
-+        if (!this.level().isClientSide && this.containerMenu != this.inventoryMenu && (this.isImmobile() || !this.containerMenu.stillValid(this))) { // Paper - Prevent opening inventories when frozen
+-        if (!this.containerMenu.stillValid(this)) {
++        if (this.containerMenu != this.inventoryMenu && (this.isImmobile() || !this.containerMenu.stillValid(this))) { // Paper - Prevent opening inventories when frozen
              this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
              this.containerMenu = this.inventoryMenu;
          }
-@@ -1903,7 +1903,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -1886,7 +1886,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;
diff --git a/patches/unapplied/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 93%
rename from patches/unapplied/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
index 2ee05c9c08..1f1a31479b 100644
--- a/patches/unapplied/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,10 +12,10 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 559c949f5ddf086877a798a7e8eb492c329b62c8..428881b560f30cd7804dfc660a62f0ec94bd7f4c 100644
+index 043d4e85b7021c7bec724c3aef76d1278a7d34d5..77c924d5eecd8ee7fae0c6b49d46a6c91abc969a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3682,10 +3682,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3693,10 +3693,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (!(world instanceof ServerLevel worldserver)) {
              this.level().getEntities(EntityTypeTest.forClass(net.minecraft.world.entity.player.Player.class), this.getBoundingBox(), EntitySelector.pushableBy(this)).forEach(this::doPush);
          } else {
diff --git a/patches/unapplied/server/0336-Implement-Player-Client-Options-API.patch b/patches/server/0336-Implement-Player-Client-Options-API.patch
similarity index 96%
rename from patches/unapplied/server/0336-Implement-Player-Client-Options-API.patch
rename to patches/server/0336-Implement-Player-Client-Options-API.patch
index 16b7e0f349..bafe2fdfae 100644
--- a/patches/unapplied/server/0336-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0336-Implement-Player-Client-Options-API.patch
@@ -88,10 +88,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 0c68c0a9ec9b353b353eff0c36af2993df5f59b3..eebf44c7124c4f48b6d48562a00633b1e8ff9b00 100644
+index ba6dbbd56f5b0c2eb5566172e64fbf258f146ef0..d00d43697d7fc5b7fa162fd4e773f21fb5594087 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -420,7 +420,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -418,7 +418,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          this.stats = server.getPlayerList().getPlayerStats(this);
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
          // this.moveTo(this.adjustSpawnLocation(world, world.getSharedSpawnPos()).getBottomCenter(), 0.0F, 0.0F); // Paper - Don't move existing players to world spawn
@@ -100,7 +100,7 @@ index 0c68c0a9ec9b353b353eff0c36af2993df5f59b3..eebf44c7124c4f48b6d48562a00633b1
          this.object = null;
  
          // CraftBukkit start
-@@ -2405,6 +2405,19 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2385,6 +2385,19 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      }
  
      public void updateOptions(ClientInformation clientOptions) {
@@ -120,7 +120,7 @@ index 0c68c0a9ec9b353b353eff0c36af2993df5f59b3..eebf44c7124c4f48b6d48562a00633b1
          // CraftBukkit start
          if (this.getMainArm() != clientOptions.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
-@@ -2415,6 +2428,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2395,6 +2408,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
              this.server.server.getPluginManager().callEvent(event);
          }
          // CraftBukkit end
@@ -133,7 +133,7 @@ index 0c68c0a9ec9b353b353eff0c36af2993df5f59b3..eebf44c7124c4f48b6d48562a00633b1
          this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7c7f66ea38babab7b04e76d14e19cc0dac9c4b54..574bcdd1d10c0341afc324822d9cd28af3fc2fdd 100644
+index e548834f2bd6e1e0a510a14040cc6aca63e2e6f5..589c78cf8acc8868be686123ac893421b4848239 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -658,6 +658,30 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/unapplied/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 92%
rename from patches/unapplied/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 0db5556d5a..fac3a9bc22 100644
--- a/patches/unapplied/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -7,7 +7,7 @@ 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 6c2339d6a93172e25040c4868a3a47473a1f5336..f7c2c03749d6be25bf33afd61e1da120770b3432 100644
+index e7bca3db8c7d29fe984decddda83569ef921cc31..c24644d5a77d87ae6c139f9598feafea308f2158 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -281,8 +281,8 @@ public abstract class DistanceManager {
diff --git a/patches/unapplied/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 97%
rename from patches/unapplied/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index 40a942f17c..4e4817d0f1 100644
--- a/patches/unapplied/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -43,10 +43,10 @@ index 914e9e0af7533cbf487ea0413da447d5eb8d527b..69f54e812794b23e5f54606da86f7116
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eebf44c7124c4f48b6d48562a00633b1e8ff9b00..8c80a852ed00c2bf79bb68da9d535af425893deb 100644
+index d00d43697d7fc5b7fa162fd4e773f21fb5594087..07b1bc1a06ac1fec83ba76a73b3cc1bd8f560208 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -317,6 +317,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -315,6 +315,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      public double maxHealthCache;
      public boolean joining = true;
      public boolean sentListPacket = false;
diff --git a/patches/unapplied/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 97%
rename from patches/unapplied/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 6c67ce040e..938cb46bbe 100644
--- a/patches/unapplied/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -84,10 +84,10 @@ index ac5725230b04bc1a333863e251fe86580f909ea9..54de4e701adea123c0fdfb5787e95169
          }
          // Paper end - Entity#getEntitySpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8cea6fccdea8965e372983ab3cf8ba61911e439f..dce9bdf371ebbfd4407ac7ca940df29777384232 100644
+index a330a603349f7f9d694cef66f67ba465e3110a1c..e5c280df931fc712e41f4decfeb2871b870d2e4a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2503,27 +2503,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2528,27 +2528,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
              // CraftBukkit end
  
diff --git a/patches/unapplied/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 92%
rename from patches/unapplied/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
index 83513aec23..4851f70e32 100644
--- a/patches/unapplied/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 428881b560f30cd7804dfc660a62f0ec94bd7f4c..06cac1b4c9e97cade7dd6e7971ca06e934b495ac 100644
+index 77c924d5eecd8ee7fae0c6b49d46a6c91abc969a..52a1581a301a3aa481b4fe4afc978b0e426e814b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2353,7 +2353,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2364,7 +2364,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
              }
  
              if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) {
diff --git a/patches/unapplied/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 94%
rename from patches/unapplied/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
index cafa4896df..92b514b27e 100644
--- a/patches/unapplied/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index f44457c0d75efe323cc8242ef5173a3d5067fad0..065d6164b5c9d65d20e7790c607d77e9ad70dfef 100644
+index 422e5750669457bea6e4b8de799d289e8e315a09..bd7835a8b470662b32cc28a4d8f777d4bb8dc60c 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -108,6 +108,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/unapplied/server/0342-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch
similarity index 97%
rename from patches/unapplied/server/0342-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch
index eed8a10b78..3d6d830fae 100644
--- a/patches/unapplied/server/0342-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch
@@ -17,7 +17,7 @@ index 3a4c1d4afddd7d8d1f43554a7a08855686cadf56..b8d57e25851dd7da905100dfd4022e4b
      private EntitySelector() {}
      // Paper start - Affects Spawning API
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 748f07c7036fe5955d76e28c4e7d23f8c0235d5f..d0820b3a561db7e1e5667594b2b6ea13214dfa58 100644
+index 93013ca49e56f3ac47d67d0c48d87d53fca32a4f..1171a4e45bed0455b29b2cf012fbc2883b16d061 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -550,6 +550,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/unapplied/server/0343-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch
similarity index 89%
rename from patches/unapplied/server/0343-Fix-item-duplication-and-teleport-issues.patch
rename to patches/server/0343-Fix-item-duplication-and-teleport-issues.patch
index 8b468ae1a2..459708b9ce 100644
--- a/patches/unapplied/server/0343-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0343-Fix-item-duplication-and-teleport-issues.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 dce9bdf371ebbfd4407ac7ca940df29777384232..5ed8a86b6525992a3e8ffa63feef82e29180f0e9 100644
+index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fac9317cf2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2631,11 +2631,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2656,11 +2656,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          } 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 dce9bdf371ebbfd4407ac7ca940df29777384232..5ed8a86b6525992a3e8ffa63feef82e2
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -3463,6 +3464,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3493,6 +3494,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public Entity teleport(TeleportTransition teleportTarget) {
          Level world = this.level();
  
@@ -47,7 +47,7 @@ index dce9bdf371ebbfd4407ac7ca940df29777384232..5ed8a86b6525992a3e8ffa63feef82e2
          if (world instanceof ServerLevel worldserver) {
              if (!this.isRemoved()) {
                  // CraftBukkit start
-@@ -3551,6 +3558,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3581,6 +3588,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              gameprofilerfiller.pop();
              return null;
          } else {
@@ -59,7 +59,7 @@ index dce9bdf371ebbfd4407ac7ca940df29777384232..5ed8a86b6525992a3e8ffa63feef82e2
              entity.restoreFrom(this);
              this.removeAfterChangingDimensions();
              // CraftBukkit start - Forward the CraftEntity to the new entity
-@@ -3663,6 +3675,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3693,6 +3705,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean canTeleport(Level from, Level to) {
@@ -68,23 +68,23 @@ index dce9bdf371ebbfd4407ac7ca940df29777384232..5ed8a86b6525992a3e8ffa63feef82e2
              Iterator iterator = this.getPassengers().iterator();
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 06cac1b4c9e97cade7dd6e7971ca06e934b495ac..911dcfb9b34d94e38db71c17022b8a8c1e707eb7 100644
+index 52a1581a301a3aa481b4fe4afc978b0e426e814b..9a4bcbfde22ea3c7761099152db8f793c01aedb5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1765,9 +1765,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1776,9 +1776,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  // Paper start
                  org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(worldserver, damageSource);
                  if (deathEvent == null || !deathEvent.isCancelled()) {
--                    if (this.deathScore >= 0 && entityliving != null) {
--                        entityliving.awardKillScore(this, this.deathScore, damageSource);
+-                    if (entityliving != null) {
+-                        entityliving.awardKillScore(this, damageSource);
 -                    }
-+                    // if (this.deathScore >= 0 && entityliving != null) { // Paper - Fix item duplication and teleport issues; moved to be run earlier in #dropAllDeathLoot before destroying the drop items in CraftEventFactory#callEntityDeathEvent
-+                    //     entityliving.awardKillScore(this, this.deathScore, damageSource);
-+                    // }
++                    //if (entityliving != null) { // Paper - Fix item duplication and teleport issues; moved to be run earlier in #dropAllDeathLoot before destroying the drop items in CraftEventFactory#callEntityDeathEvent
++                    //    entityliving.awardKillScore(this, damageSource);
++                    //}
                      // Paper start - clear equipment if event is not cancelled
                      if (this instanceof Mob) {
                          for (EquipmentSlot slot : this.clearedEquipmentSlots) {
-@@ -1861,8 +1861,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1872,8 +1872,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.dropCustomDeathLoot(world, damageSource, flag);
              this.clearEquipmentSlots = prev; // Paper
          }
diff --git a/patches/unapplied/server/0344-Villager-Restocks-API.patch b/patches/server/0344-Villager-Restocks-API.patch
similarity index 100%
rename from patches/unapplied/server/0344-Villager-Restocks-API.patch
rename to patches/server/0344-Villager-Restocks-API.patch
diff --git a/patches/unapplied/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0345-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/unapplied/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0345-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index d9be497c9d..e423cfabe1 100644
--- a/patches/unapplied/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0345-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6eb053f88860ce8693a7baa35eddc9e3fccaced3..29838b7c28409776e124641878def8d6d87630f5 100644
+index d84afe883d5af0800b5c85649a691bc811c2e357..dd2e1ff287ccb86b7ba714604672d2f3d7ef8c61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -27,6 +27,7 @@ public class Main {
diff --git a/patches/unapplied/server/0347-misc-debugging-dumps.patch b/patches/server/0346-misc-debugging-dumps.patch
similarity index 98%
rename from patches/unapplied/server/0347-misc-debugging-dumps.patch
rename to patches/server/0346-misc-debugging-dumps.patch
index 1f99d1c3dc..fc898c3359 100644
--- a/patches/unapplied/server/0347-misc-debugging-dumps.patch
+++ b/patches/server/0346-misc-debugging-dumps.patch
@@ -49,7 +49,7 @@ index 642d5c6849debc5a266605b0df30d55222339438..b34abf66c7dc756e88e08637af976f77
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7a4ab569090c758f6d707173aa68dd4de87f3654..c84a5bdbea0497231c78c9a0230cdf70e30a2ff3 100644
+index e1a15f3721e3c661be0185d65073a39f293f0589..8e205796d0c9abbf01bf6ec191e2dfc7b972a0dd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -929,6 +929,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0348-Prevent-teleporting-dead-entities.patch b/patches/server/0347-Prevent-teleporting-dead-entities.patch
similarity index 89%
rename from patches/unapplied/server/0348-Prevent-teleporting-dead-entities.patch
rename to patches/server/0347-Prevent-teleporting-dead-entities.patch
index 3f17b011a4..7582f1a3d6 100644
--- a/patches/unapplied/server/0348-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0347-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 59c12f6d5d96835b4b37ed5a761f25f8f147c54a..6c9f7a4d3c7551157d22f17e8a66ada2c50c0550 100644
+index 969fee86d2422cbadfbce18d8bbaf72ff30b5c3d..d754eda8e8111886e610bc68e8980b54b43eadb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1571,6 +1571,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1625,6 +1625,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      public void internalTeleport(PositionMoveRotation positionmoverotation, Set<Relative> set) {
diff --git a/patches/unapplied/server/0349-Implement-Mob-Goal-API.patch b/patches/server/0348-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/unapplied/server/0349-Implement-Mob-Goal-API.patch
rename to patches/server/0348-Implement-Mob-Goal-API.patch
index d4a5da1492..c0213e9da3 100644
--- a/patches/unapplied/server/0349-Implement-Mob-Goal-API.patch
+++ b/patches/server/0348-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cb100e337521fd278893ec775606f128717105f7..d253682a020cc5cb41c9fdae48adf5c85258be62 100644
+index 221c7dace9950bd4e57299eeff46b2ee4cd05258..3be55cc6e95c02fb43d6e1cd13d05e4e4857ac6b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -54,6 +54,7 @@ dependencies {
diff --git a/patches/unapplied/server/0350-Add-villager-reputation-API.patch b/patches/server/0349-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/unapplied/server/0350-Add-villager-reputation-API.patch
rename to patches/server/0349-Add-villager-reputation-API.patch
diff --git a/patches/unapplied/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0350-ExperienceOrb-merging-stacking-API-and-fixes.patch
similarity index 95%
rename from patches/unapplied/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch
rename to patches/server/0350-ExperienceOrb-merging-stacking-API-and-fixes.patch
index 41ff454c98..83f8e86f82 100644
--- a/patches/unapplied/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch
+++ b/patches/server/0350-ExperienceOrb-merging-stacking-API-and-fixes.patch
@@ -21,10 +21,10 @@ Co-authored-by: Aikar <aikar@aikar.co>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 9d9e3daebc5da0af627c3d3cdb50029aacbc587b..3a7af27bb1ce0cbe56bd3760cd400083daf98d4c 100644
+index 9ef7227c2b88f9d0e92e70b33bbd97e22bd71eca..42e8dc24e5cb7b02639d4b80f831b8856f0f45d5 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -245,6 +245,7 @@ public class ExperienceOrb extends Entity {
+@@ -247,6 +247,7 @@ public class ExperienceOrb extends Entity {
      }
  
      private static boolean tryMergeToExisting(ServerLevel world, Vec3 pos, int amount) {
@@ -32,7 +32,7 @@ index 9d9e3daebc5da0af627c3d3cdb50029aacbc587b..3a7af27bb1ce0cbe56bd3760cd400083
          AABB axisalignedbb = AABB.ofSize(pos, 1.0D, 1.0D, 1.0D);
          int j = world.getRandom().nextInt(40);
          List<ExperienceOrb> list = world.getEntities(EntityTypeTest.forClass(ExperienceOrb.class), axisalignedbb, (entityexperienceorb) -> {
-@@ -271,6 +272,11 @@ public class ExperienceOrb extends Entity {
+@@ -273,6 +274,11 @@ public class ExperienceOrb extends Entity {
      }
  
      private void merge(ExperienceOrb other) {
@@ -44,7 +44,7 @@ index 9d9e3daebc5da0af627c3d3cdb50029aacbc587b..3a7af27bb1ce0cbe56bd3760cd400083
          this.count += other.count;
          this.age = Math.min(this.age, other.age);
          other.discard(EntityRemoveEvent.Cause.MERGE); // CraftBukkit - add Bukkit remove cause
-@@ -364,7 +370,7 @@ public class ExperienceOrb extends Entity {
+@@ -366,7 +372,7 @@ public class ExperienceOrb extends Entity {
                  int l = amount - k * amount / j;
  
                  if (l > 0) {
diff --git a/patches/unapplied/server/0352-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0351-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 97%
rename from patches/unapplied/server/0352-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0351-Fix-PotionEffect-ignores-icon-flag.patch
index 9dff9c741c..6d08a4cd68 100644
--- a/patches/unapplied/server/0352-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0351-Fix-PotionEffect-ignores-icon-flag.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 81034513faa3bd4f306430bc48532ba671a7b94b..35130dc4e20ef644b5764091fcbccda2e4da780b 100644
+index c763d3524794a2505a6296917d34b6f7e737402d..1873b5c22d3b351b6120cb832c6ff045d9ad38f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -494,7 +494,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied/server/0353-Potential-bed-API.patch b/patches/server/0352-Potential-bed-API.patch
similarity index 100%
rename from patches/unapplied/server/0353-Potential-bed-API.patch
rename to patches/server/0352-Potential-bed-API.patch
diff --git a/patches/unapplied/server/0354-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0353-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 97%
rename from patches/unapplied/server/0354-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0353-Wait-for-Async-Tasks-during-shutdown.patch
index e26fbcde1f..c5497b4e08 100644
--- a/patches/unapplied/server/0354-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0353-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ 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 c84a5bdbea0497231c78c9a0230cdf70e30a2ff3..c2ba34f6d5765fd8574a61825a6aab8fdd98a0f2 100644
+index 8e205796d0c9abbf01bf6ec191e2dfc7b972a0dd..84999223df47a9eccbcec4e1ea80786090d8d9c5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -955,6 +955,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0354-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 91%
rename from patches/unapplied/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0354-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 1a72e117f5..60f62b1aef 100644
--- a/patches/unapplied/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0354-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure EntityRaider respects game and entity rules for
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 96c6a2a6cb015d4ac90f98ce48a4c345ab72fd7a..6ac2351b3476aa04872196836ce00c622adab315 100644
+index 0fb8779648c9c4ead7ffcc24781a6644a855b65b..b6f1d989df3811f423d1cdff98b05ecc4a9268fe 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -338,6 +338,7 @@ public abstract class Raider extends PatrollingMonster {
diff --git a/patches/unapplied/server/0356-Add-option-for-console-having-all-permissions.patch b/patches/server/0355-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/unapplied/server/0356-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0355-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/unapplied/server/0357-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0356-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/unapplied/server/0357-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0356-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/unapplied/server/0358-Maps-shouldn-t-load-chunks.patch b/patches/server/0357-Maps-shouldn-t-load-chunks.patch
similarity index 95%
rename from patches/unapplied/server/0358-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0357-Maps-shouldn-t-load-chunks.patch
index 450ca270e1..5466a9cdef 100644
--- a/patches/unapplied/server/0358-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0357-Maps-shouldn-t-load-chunks.patch
@@ -15,7 +15,7 @@ Previously maps would load all chunks in a certain radius depending on
  five ticks that movement occur in anyways.
 
 diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index 2715c89fb9ea098d8c77b124be1be634835ecb93..af78d15aead7a2dc8304c541e37e306215b761be 100644
+index 9780a719773480e20b667b753983e804127b73cd..adec25694820189b6f77913db1bf7c581458d2ab 100644
 --- a/src/main/java/net/minecraft/world/item/MapItem.java
 +++ b/src/main/java/net/minecraft/world/item/MapItem.java
 @@ -97,8 +97,8 @@ public class MapItem extends Item {
diff --git a/patches/unapplied/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0358-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 91%
rename from patches/unapplied/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0358-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index fa9145353c..a9541d0791 100644
--- a/patches/unapplied/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0358-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use seed based lookup for Treasure Maps - Fixes lag from
 
 
 diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index af78d15aead7a2dc8304c541e37e306215b761be..571f2540a1e9422025efe651167e26b44b437daa 100644
+index adec25694820189b6f77913db1bf7c581458d2ab..8ff50a4c7461bbd9f469d503f6b5ee482d2463d7 100644
 --- a/src/main/java/net/minecraft/world/item/MapItem.java
 +++ b/src/main/java/net/minecraft/world/item/MapItem.java
 @@ -205,7 +205,7 @@ public class MapItem extends Item {
diff --git a/patches/unapplied/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0359-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/unapplied/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0359-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/unapplied/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0360-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/unapplied/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0360-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/unapplied/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0361-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/unapplied/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0361-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/unapplied/server/0363-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch
similarity index 91%
rename from patches/unapplied/server/0363-Prevent-position-desync-causing-tp-exploit.patch
rename to patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch
index 8b73d196cf..a3f9d5b3c7 100644
--- a/patches/unapplied/server/0363-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,10 +13,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 6c9f7a4d3c7551157d22f17e8a66ada2c50c0550..12827fdd39bb7571739efa482ceb1e32f64ea982 100644
+index d754eda8e8111886e610bc68e8980b54b43eadb1..7d7fff91beafd5cf67296efaa06308f1363585a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1359,6 +1359,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1413,6 +1413,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/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0363-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/unapplied/server/0364-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0363-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/unapplied/server/0365-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from patches/unapplied/server/0365-Add-PlayerRecipeBookClickEvent.patch
rename to patches/server/0364-Add-PlayerRecipeBookClickEvent.patch
index 8083914a42..abaa3fa71e 100644
--- a/patches/unapplied/server/0365-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 12827fdd39bb7571739efa482ceb1e32f64ea982..300f543913979427b28578e5bb3270b20065098c 100644
+index 7d7fff91beafd5cf67296efaa06308f1363585a0..a7d1b4d4668b90445e1cba786be74fbd069d3330 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -199,6 +199,7 @@ import net.minecraft.world.phys.Vec3;
+@@ -201,6 +201,7 @@ import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.phys.shapes.BooleanOp;
  import net.minecraft.world.phys.shapes.Shapes;
  import net.minecraft.world.phys.shapes.VoxelShape;
@@ -16,7 +16,7 @@ index 12827fdd39bb7571739efa482ceb1e32f64ea982..300f543913979427b28578e5bb3270b2
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -3090,21 +3091,41 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3157,21 +3158,41 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  ServerGamePacketListenerImpl.LOGGER.debug("Player {} tried to place impossible recipe {}", this.player, recipeholder.id().location());
                                  return;
                              }
diff --git a/patches/unapplied/server/0366-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0365-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/unapplied/server/0366-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0365-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/unapplied/server/0367-Add-permission-for-command-blocks.patch b/patches/server/0366-Add-permission-for-command-blocks.patch
similarity index 95%
rename from patches/unapplied/server/0367-Add-permission-for-command-blocks.patch
rename to patches/server/0366-Add-permission-for-command-blocks.patch
index 0a7fb386cc..604ac9cb23 100644
--- a/patches/unapplied/server/0367-Add-permission-for-command-blocks.patch
+++ b/patches/server/0366-Add-permission-for-command-blocks.patch
@@ -18,10 +18,10 @@ index 4623c8acd125dff4919c4e2045b848310d785da5..86e4559da2344f228ef4d1c4ac3c115f
                  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 300f543913979427b28578e5bb3270b20065098c..0884f71d3264c2a09d2a0958d4751962e4156526 100644
+index a7d1b4d4668b90445e1cba786be74fbd069d3330..1aec0f76636b1bdc5bb0b300690099ad341873e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -818,7 +818,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -816,7 +816,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 300f543913979427b28578e5bb3270b20065098c..0884f71d3264c2a09d2a0958d4751962
              this.player.sendSystemMessage(Component.translatable("advMode.notAllowed"));
          } else {
              BaseCommandBlock commandblocklistenerabstract = null;
-@@ -885,7 +885,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -883,7 +883,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
@@ -53,7 +53,7 @@ index 0898dfd42de0c25938d9a25c18f43d5b1a16aa6c..a0e59b236dff1f861a0e987764a77ee2
          } else {
              if (player.getCommandSenderWorld().isClientSide) {
 diff --git a/src/main/java/net/minecraft/world/level/block/CommandBlock.java b/src/main/java/net/minecraft/world/level/block/CommandBlock.java
-index 68b44cd7c115c0f42992815171197e6bff50f8c6..fb5777b6a729a465c2482c5f89ced2bc79b425bc 100644
+index 090846f3b310959b3a7d16ed341f8d2100938c9d..40c79df819a111b88adbbd006e3696f3684090c9 100644
 --- a/src/main/java/net/minecraft/world/level/block/CommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CommandBlock.java
 @@ -152,7 +152,7 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock {
diff --git a/patches/unapplied/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch
similarity index 91%
rename from patches/unapplied/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch
rename to patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 2b16e5d032..e9facd6c2a 100644
--- a/patches/unapplied/server/0368-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <Spottedleaf@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 5ed8a86b6525992a3e8ffa63feef82e29180f0e9..9833c1876a6fdce15326f10ff9a44ab3587eaf32 100644
+index 15d084e983e8cdfd00dda7fcc2d3c6fac9317cf2..54650ee682cc307a515e558cc2bd8041aeed01f0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -678,8 +678,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -19,8 +19,8 @@ index 5ed8a86b6525992a3e8ffa63feef82e29180f0e9..9833c1876a6fdce15326f10ff9a44ab3
 +        // this.setBoundingBox(this.makeBoundingBox()); // Paper - Block invalid positions and bounding box; move into setPosRaw
      }
  
-     protected AABB makeBoundingBox() {
-@@ -4442,7 +4442,29 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     protected final AABB makeBoundingBox() {
+@@ -4468,7 +4468,29 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
@@ -50,7 +50,7 @@ index 5ed8a86b6525992a3e8ffa63feef82e29180f0e9..9833c1876a6fdce15326f10ff9a44ab3
          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);
-@@ -4460,6 +4482,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4486,6 +4508,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.levelCallback.onMove();
          }
  
diff --git a/patches/unapplied/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 95%
rename from patches/unapplied/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 9f8d3ba3ec..cf9db52420 100644
--- a/patches/unapplied/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0368-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 c2ba34f6d5765fd8574a61825a6aab8fdd98a0f2..74515a58cd698ebca3ee98bd89a8f9de477736e7 100644
+index 84999223df47a9eccbcec4e1ea80786090d8d9c5..83848e30eeff52ccad591deb0d9e3a8ba1a122ed 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -850,7 +850,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -76,10 +76,10 @@ index fe1975675189c6d1a63c42b7959fa40b5ac95ef8..9a3e73a5c206b78dfcf6f41a47b61434
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0884f71d3264c2a09d2a0958d4751962e4156526..8bb1b0e7caa938170169379ce22f21c1c772db60 100644
+index 1aec0f76636b1bdc5bb0b300690099ad341873e8..11f9853bd48cec693c99edb3d43f0356a0852d5e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3308,7 +3308,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3366,7 +3366,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()) {
@@ -104,7 +104,7 @@ index ca8eb3216c4331a95ab44f923f6b49641662505f..9905555f249db72649bde8401835dd81
              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 74b65238eb4fe53d361ab70447c1be385b5a3951..a42e7a70accff20aa5a7142e8cb136fec9d05236 100644
+index c310a8bae84af6c20f7d976fb7cd683885407cc8..031c46e8cf1c49c4db2887dc32cbad75532f8faa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1170,7 +1170,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/unapplied/server/0370-Paper-dumpitem-command.patch b/patches/server/0369-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/unapplied/server/0370-Paper-dumpitem-command.patch
rename to patches/server/0369-Paper-dumpitem-command.patch
diff --git a/patches/unapplied/server/0371-Improve-Legacy-Component-serialization-size.patch b/patches/server/0370-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/unapplied/server/0371-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0370-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/unapplied/server/0372-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0371-Add-BlockStateMeta-clearBlockState.patch
similarity index 100%
rename from patches/unapplied/server/0372-Add-BlockStateMeta-clearBlockState.patch
rename to patches/server/0371-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/unapplied/server/0373-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0372-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 95%
rename from patches/unapplied/server/0373-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0372-Convert-legacy-attributes-in-Item-Meta.patch
index 1e6448aecc..bfbf591996 100644
--- a/patches/unapplied/server/0373-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0372-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,10 +30,10 @@ index de40e522960469b98f987bd688489740446d9f85..5678d2007d5adf45dec0638c5dd848b6
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index cd4c0d691f65cc04ef7a72c7e8c0ead33047ff36..f93870955c83505432c352f627cd105dfa4e5b78 100644
+index 3c44f5509e63dd673f0b8e701720984b78b9b7c4..fba042d6934f7e871114c81f97a6ac88a9b59212 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -810,7 +810,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -816,7 +816,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
              AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
  
diff --git a/patches/unapplied/server/0374-Do-not-accept-invalid-client-settings.patch b/patches/server/0373-Do-not-accept-invalid-client-settings.patch
similarity index 78%
rename from patches/unapplied/server/0374-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0373-Do-not-accept-invalid-client-settings.patch
index ba6f03a6ba..c59997797f 100644
--- a/patches/unapplied/server/0374-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0373-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 8bb1b0e7caa938170169379ce22f21c1c772db60..00ce20359f6d73acf3f1016806e5f4f3b6d01bcd 100644
+index 11f9853bd48cec693c99edb3d43f0356a0852d5e..417930ad0ffe395e9211a6bf1e6c192af659471b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3300,6 +3300,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3352,6 +3352,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleClientInformation(ServerboundClientInformationPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
@@ -19,6 +19,6 @@ index 8bb1b0e7caa938170169379ce22f21c1c772db60..00ce20359f6d73acf3f1016806e5f4f3
 +            return;
 +        }
 +        // Paper end - do not accept invalid information
+         boolean flag = this.player.isModelPartShown(PlayerModelPart.HAT);
+ 
          this.player.updateOptions(packet.information());
-         this.connection.channel.attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).set(net.kyori.adventure.translation.Translator.parseLocale(packet.information().language())); // Paper
-     }
diff --git a/patches/unapplied/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0374-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/unapplied/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0374-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/unapplied/server/0376-Add-entity-liquid-API.patch b/patches/server/0375-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/unapplied/server/0376-Add-entity-liquid-API.patch
rename to patches/server/0375-Add-entity-liquid-API.patch
diff --git a/patches/unapplied/server/0377-Add-PrepareResultEvent.patch b/patches/server/0376-Add-PrepareResultEvent.patch
similarity index 98%
rename from patches/unapplied/server/0377-Add-PrepareResultEvent.patch
rename to patches/server/0376-Add-PrepareResultEvent.patch
index 6f987bb449..50383f0c23 100644
--- a/patches/unapplied/server/0377-Add-PrepareResultEvent.patch
+++ b/patches/server/0376-Add-PrepareResultEvent.patch
@@ -82,10 +82,10 @@ index 4b0d07a22cb922aa5ef0c99279663158a5918f1f..89d2f26504bb072c2d75af4ec600ca12
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index 0fb0ee5b22dc96c48d68e4391fd71b03d4e799f0..97837d1baf6b929a50e5562ef466050e70c2c8b1 100644
+index 01df301bdacd02255dd00b7dc8b5ea0359d4174a..46d6bc61ba54ab23eb35915073cfd5a3ab0111f1 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-@@ -170,6 +170,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+@@ -174,6 +174,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
              this.setupRecipeList(itemstack);
          }
  
diff --git a/patches/unapplied/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 85%
rename from patches/unapplied/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index c4d04af351..555a1d4a24 100644
--- a/patches/unapplied/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 911dcfb9b34d94e38db71c17022b8a8c1e707eb7..e3322e8897f361b3fbf8d7188207271906a84c46 100644
+index 9a4bcbfde22ea3c7761099152db8f793c01aedb5..f592bee9f71580ec248e4b7485c938f3b83aeb9d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3797,7 +3797,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3808,7 +3808,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          Entity entity = this.getVehicle();
  
          super.stopRiding(suppressCancellation); // Paper - Force entity dismount during teleportation
diff --git a/patches/unapplied/server/0379-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0378-Fix-arrows-never-despawning-MC-125757.patch
similarity index 85%
rename from patches/unapplied/server/0379-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0378-Fix-arrows-never-despawning-MC-125757.patch
index 4831b2e07c..5f3fad60eb 100644
--- a/patches/unapplied/server/0379-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0378-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,10 +9,10 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 94fdfaa209406c23fc292982d1221c3ee82eea27..220c687a9543b84d994c4f238757737c9337227a 100644
+index a05fc651a952b57a8a2fcb32d26d024875037d38..52765e1b9f5a026e7108ff5a7d97681cdb2870e9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -242,6 +242,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -244,6 +244,7 @@ public abstract class AbstractArrow extends Projectile {
              }
  
          } else {
diff --git a/patches/unapplied/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0379-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/unapplied/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0379-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/unapplied/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0380-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 96%
rename from patches/unapplied/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0380-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index bd520de151..769befb013 100644
--- a/patches/unapplied/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0380-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
@@ -5,10 +5,10 @@ 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 a9dadd106ff0ac0f788c16048a73dfc3320b4944..f6020adb0e72b129be154a905941af923c5aadd0 100644
+index 577140660c96da69f68ec27ad5ab7da2c836974b..57032ca3e14cd1c64c6436d8b7bca54bfbcee5a9 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -167,8 +167,17 @@ public class Main {
+@@ -169,8 +169,17 @@ public class Main {
                  return;
              }
  
diff --git a/patches/unapplied/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0381-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 85%
rename from patches/unapplied/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0381-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 0bd1007497..7b65f71eac 100644
--- a/patches/unapplied/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0381-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
@@ -5,10 +5,10 @@ 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 f6020adb0e72b129be154a905941af923c5aadd0..59d623dd45c395552ffd99e6fa744c0f71d94998 100644
+index 57032ca3e14cd1c64c6436d8b7bca54bfbcee5a9..da61f3a4ec9bb9726d9d45552b8eada3f87d9e58 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -167,6 +167,7 @@ public class Main {
+@@ -169,6 +169,7 @@ public class Main {
                  return;
              }
  
diff --git a/patches/unapplied/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0382-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/unapplied/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0382-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/unapplied/server/0384-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0383-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/unapplied/server/0384-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0383-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/unapplied/server/0385-Fix-some-rails-connecting-improperly.patch b/patches/server/0384-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/unapplied/server/0385-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0384-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/unapplied/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0385-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/unapplied/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0385-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/unapplied/server/0387-Brand-support.patch b/patches/server/0386-Brand-support.patch
similarity index 93%
rename from patches/unapplied/server/0387-Brand-support.patch
rename to patches/server/0386-Brand-support.patch
index 5421dd59d3..7fe7a24ff5 100644
--- a/patches/unapplied/server/0387-Brand-support.patch
+++ b/patches/server/0386-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8c80a852ed00c2bf79bb68da9d535af425893deb..02ad5331783097d97473ef2a1f2e28b07baae8e4 100644
+index 07b1bc1a06ac1fec83ba76a73b3cc1bd8f560208..475ad396d842617b53ccf59fd07bfe1682852e50 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -322,6 +322,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -320,6 +320,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
@@ -57,10 +57,10 @@ index b9fbaddcc8239bf737fdea51790f678306e511eb..9a8b08d4b70b8890961e4af7ce6e870a
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 574bcdd1d10c0341afc324822d9cd28af3fc2fdd..ee510171f58aca1ca18053fbd5a55cc2ab23a422 100644
+index 589c78cf8acc8868be686123ac893421b4848239..42ee772b76b7601ad59378c81277fe0c60e4438b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3156,6 +3156,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3141,6 +3141,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/unapplied/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0387-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 90%
rename from patches/unapplied/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0387-Add-playPickupItemAnimation-to-LivingEntity.patch
index 64c59dce17..5b48b5baca 100644
--- a/patches/unapplied/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0387-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 35130dc4e20ef644b5764091fcbccda2e4da780b..5beee554567d36f2a3b871cf6ec3ecb3d2353592 100644
+index 1873b5c22d3b351b6120cb832c6ff045d9ad38f0..0aa3fd9dce0cf90b1f74551c864e9ebf326eb1f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1009,4 +1009,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied/server/0389-Don-t-require-FACING-data.patch b/patches/server/0388-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/unapplied/server/0389-Don-t-require-FACING-data.patch
rename to patches/server/0388-Don-t-require-FACING-data.patch
diff --git a/patches/unapplied/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 90%
rename from patches/unapplied/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 640371d615..b89249bc58 100644
--- a/patches/unapplied/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0389-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 161b556e5c5f3719b5623e71876a2250abc7f391..9a6a9508673edcb2eda8b3e4802fd9502a7514d5 100644
+index eb65b1768c46f3cc3f490b06c2215044aebab178..f01fe053888f7f5124c6b157044dfd46ea98ae23 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1705,7 +1705,9 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1711,7 +1711,9 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          float f1 = this.levelData.getSpawnAngle();
  
          if (!blockposition1.equals(pos) || f1 != angle) {
@@ -19,7 +19,7 @@ index 161b556e5c5f3719b5623e71876a2250abc7f391..9a6a9508673edcb2eda8b3e4802fd950
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a42e7a70accff20aa5a7142e8cb136fec9d05236..8d2d5cae4de522676cc4764f8b36f93744f3c890 100644
+index 031c46e8cf1c49c4db2887dc32cbad75532f8faa..b877904bd18c96a4a7e49fb3e1aba2b6109f15cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -243,12 +243,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/unapplied/server/0391-Add-moon-phase-API.patch b/patches/server/0390-Add-moon-phase-API.patch
similarity index 100%
rename from patches/unapplied/server/0391-Add-moon-phase-API.patch
rename to patches/server/0390-Add-moon-phase-API.patch
diff --git a/patches/unapplied/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0391-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/unapplied/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0391-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/unapplied/server/0393-Prevent-headless-pistons-from-being-created.patch b/patches/server/0392-Prevent-headless-pistons-from-being-created.patch
similarity index 95%
rename from patches/unapplied/server/0393-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0392-Prevent-headless-pistons-from-being-created.patch
index 1cbd0b1c6c..788473f265 100644
--- a/patches/unapplied/server/0393-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0392-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java
-index d3d74a7f306d88b0d5cd83893b3ee5e750fd4caf..86656de31b1e33381eddd3ef210122118b31e620 100644
+index 290fd9d57c5de2c92afe23babfcdc3d110a35b9e..dfb7cb134d1f9bce3d8d17fbf50d9b3309f76078 100644
 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java
 +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java
 @@ -164,6 +164,15 @@ public class ServerExplosion implements Explosion {
diff --git a/patches/unapplied/server/0394-Add-BellRingEvent.patch b/patches/server/0393-Add-BellRingEvent.patch
similarity index 100%
rename from patches/unapplied/server/0394-Add-BellRingEvent.patch
rename to patches/server/0393-Add-BellRingEvent.patch
diff --git a/patches/unapplied/server/0395-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0394-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/unapplied/server/0395-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0394-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/unapplied/server/0396-Buffer-joins-to-world.patch b/patches/server/0395-Buffer-joins-to-world.patch
similarity index 95%
rename from patches/unapplied/server/0396-Buffer-joins-to-world.patch
rename to patches/server/0395-Buffer-joins-to-world.patch
index 2e31ea4385..217062d3c5 100644
--- a/patches/unapplied/server/0396-Buffer-joins-to-world.patch
+++ b/patches/server/0395-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ 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 38947f40864f3661df2eb4baa0aef5740b82f9d9..134810ac91d828d67759cd1ed56f11b71e292917 100644
+index e9429b3b1db612aa552237fe5d0c37727501ff8d..f9158826f16e45c81714c2e0a284828bc5bb95c8 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -445,12 +445,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/unapplied/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0396-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/unapplied/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0396-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/unapplied/server/0398-Add-more-Evoker-API.patch b/patches/server/0397-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/unapplied/server/0398-Add-more-Evoker-API.patch
rename to patches/server/0397-Add-more-Evoker-API.patch
diff --git a/patches/unapplied/server/0399-Add-methods-to-get-translation-keys.patch b/patches/server/0398-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/unapplied/server/0399-Add-methods-to-get-translation-keys.patch
rename to patches/server/0398-Add-methods-to-get-translation-keys.patch
diff --git a/patches/unapplied/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0399-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 94%
rename from patches/unapplied/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0399-Create-HoverEvent-from-ItemStack-Entity.patch
index 66d23bfd33..d487492e0c 100644
--- a/patches/unapplied/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0399-Create-HoverEvent-from-ItemStack-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index b407968b111ff9cb9f428319d211e5d9c4c99138..cab7a3d21699605cb7fc480830d7529f70e69e88 100644
+index 77150a80d3523a923e2c9ccadda4887d6d960799..68798c90f2a116d82f6f25e920c54c929df6fca9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -249,4 +249,44 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -251,4 +251,44 @@ public final class CraftItemFactory implements ItemFactory {
          return nms != null ? nms.getItem().getName(nms).getString() : null;
      }
      // Paper end - add getI18NDisplayName
diff --git a/patches/unapplied/server/0401-Cache-block-data-strings.patch b/patches/server/0400-Cache-block-data-strings.patch
similarity index 93%
rename from patches/unapplied/server/0401-Cache-block-data-strings.patch
rename to patches/server/0400-Cache-block-data-strings.patch
index 2e9678dd02..89a3e25bc6 100644
--- a/patches/unapplied/server/0401-Cache-block-data-strings.patch
+++ b/patches/server/0400-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 74515a58cd698ebca3ee98bd89a8f9de477736e7..19708fe528c2c2794bc26f4c789dd32dbb3ba32b 100644
+index 83848e30eeff52ccad591deb0d9e3a8ba1a122ed..6292256864aa0a265a73c0ef2af642d4ab387ccc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2184,6 +2184,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 74515a58cd698ebca3ee98bd89a8f9de477736e7..19708fe528c2c2794bc26f4c789dd32d
  
          if (this.isSameThread()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index b472cd2d8ca0885ca5f2c42787d796f3e27ec413..628f26e98449bf508306265d569376cae6279284 100644
+index 82816ad68da8b034b46904f9eb82e7ecd9fc8dbf..22b8603a0eb7e981ca3483b37d3b7af28f300dfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -156,7 +156,7 @@ public class CraftBlockData implements BlockData {
@@ -29,7 +29,7 @@ index b472cd2d8ca0885ca5f2c42787d796f3e27ec413..628f26e98449bf508306265d569376ca
  
      /**
       * Convert an NMS Enum (usually a BlockStateEnum) to its appropriate Bukkit
-@@ -547,7 +547,38 @@ public class CraftBlockData implements BlockData {
+@@ -548,7 +548,38 @@ public class CraftBlockData implements BlockData {
          Preconditions.checkState(CraftBlockData.MAP.put(nms, bukkit) == null, "Duplicate mapping %s->%s", nms, bukkit);
      }
  
diff --git a/patches/unapplied/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 94%
rename from patches/unapplied/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 4ced839378..fa6d3ee774 100644
--- a/patches/unapplied/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,10 +9,10 @@ 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 00ce20359f6d73acf3f1016806e5f4f3b6d01bcd..1754e413dc1b7a18b3fc0b981eae11283b2106e5 100644
+index 417930ad0ffe395e9211a6bf1e6c192af659471b..6f96f1522ae552940cf279194bd84630c3e4853c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -685,7 +685,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -680,7 +680,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  return;
              }
  
@@ -22,7 +22,7 @@ index 00ce20359f6d73acf3f1016806e5f4f3b6d01bcd..1754e413dc1b7a18b3fc0b981eae1128
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9833c1876a6fdce15326f10ff9a44ab3587eaf32..e56ee4ee930bb788fb7b0e254798308571802ab4 100644
+index 54650ee682cc307a515e558cc2bd8041aeed01f0..65a7d4f564cd608af3829d09c1739eb933024691 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -180,6 +180,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -33,7 +33,7 @@ index 9833c1876a6fdce15326f10ff9a44ab3587eaf32..e56ee4ee930bb788fb7b0e2547983085
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1944,6 +1945,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1967,6 +1968,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
@@ -85,7 +85,7 @@ index ec122fa4e443290ff973797740172e07f8e736ca..609c768ba4d22e346acbc9422ce41e3b
          this.entity.setYHeadRot(location.getYaw());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 5beee554567d36f2a3b871cf6ec3ecb3d2353592..db15382f35464de43a2fe0a41aca070a8c834777 100644
+index 0aa3fd9dce0cf90b1f74551c864e9ebf326eb1f3..e979681142bd08aeb00a98b79789a8f41b2a37af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -603,6 +603,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied/server/0403-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0402-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/server/0403-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0402-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/unapplied/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0403-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/unapplied/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0403-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/unapplied/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0404-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/unapplied/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0404-Extend-block-drop-capture-to-capture-all-items-added.patch
index 493fb97397..a483ce60ab 100644
--- a/patches/unapplied/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0404-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 9a6a9508673edcb2eda8b3e4802fd9502a7514d5..b2777f49f658914d2211edd29ac3661f57ef18e0 100644
+index f01fe053888f7f5124c6b157044dfd46ea98ae23..1ed0940d8bdc4210992a335b3691c1cd3a13580a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1198,6 +1198,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1199,6 +1199,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // 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/unapplied/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 85%
rename from patches/unapplied/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index ace3484e57..f242388ac5 100644
--- a/patches/unapplied/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0405-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 e56ee4ee930bb788fb7b0e254798308571802ab4..8f103dc563110f04563487f90fe02de4288a99a7 100644
+index 65a7d4f564cd608af3829d09c1739eb933024691..1bf13cf7aff50f8e67bba579228e5b63ba234421 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4734,4 +4734,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4760,4 +4760,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
          void accept(Entity entity, double x, double y, double z);
      }
@@ -21,7 +21,7 @@ index e56ee4ee930bb788fb7b0e254798308571802ab4..8f103dc563110f04563487f90fe02de4
 +    // Paper end - Expose entity id counter
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b50d1ddfd23bf1af16d86e5edcb72196b4674868..09a6a0c06580aea9e7be8de2189673d1a476f411 100644
+index 1e41803952f2410c8f1e213d8be8d141773853d3..78bc460fff7d537109883f1469500f6f536c598e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -527,6 +527,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/unapplied/server/0407-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0406-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/unapplied/server/0407-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0406-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/unapplied/server/0408-Entity-isTicking.patch b/patches/server/0407-Entity-isTicking.patch
similarity index 90%
rename from patches/unapplied/server/0408-Entity-isTicking.patch
rename to patches/server/0407-Entity-isTicking.patch
index 8c21802ef0..bb0184cc69 100644
--- a/patches/unapplied/server/0408-Entity-isTicking.patch
+++ b/patches/server/0407-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 8f103dc563110f04563487f90fe02de4288a99a7..20289623062acd34afb0ca5fc7daaf032ec1f418 100644
+index 1bf13cf7aff50f8e67bba579228e5b63ba234421..6970e85853954c240bc89407e2aaafdd888bc334 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4739,5 +4739,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4765,5 +4765,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/unapplied/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0408-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 94%
rename from patches/unapplied/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0408-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 4c6974971b..70bf2759a9 100644
--- a/patches/unapplied/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0408-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 19708fe528c2c2794bc26f4c789dd32dbb3ba32b..8364a52db57b43ba503cb8109c35a261de347109 100644
+index 6292256864aa0a265a73c0ef2af642d4ab387ccc..c036c391172ffb4b14b7a5f77776a68e3670775c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2309,13 +2309,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0409-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/unapplied/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0409-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/unapplied/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0410-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/unapplied/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0410-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/unapplied/server/0412-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch
similarity index 84%
rename from patches/unapplied/server/0412-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch
index 82dc6a2eef..c2cff41458 100644
--- a/patches/unapplied/server/0412-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,23 +6,23 @@ 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 1754e413dc1b7a18b3fc0b981eae11283b2106e5..fc06281b6d37d72a0a333343fc800bd388713a5f 100644
+index 6f96f1522ae552940cf279194bd84630c3e4853c..bfcf0a27ab8d90742b83e9c200f2ec867e2424fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -497,9 +497,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -499,9 +499,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  float prevYaw = this.player.getYRot();
                  float prevPitch = this.player.getXRot();
                  // CraftBukkit end
 -                double d0 = entity.getX();
 -                double d1 = entity.getY();
 -                double d2 = entity.getZ();
-+                double d0 = entity.getX();final double fromX = d0; // Paper - OBFHELPER
-+                double d1 = entity.getY();final double fromY = d1; // Paper - OBFHELPER
-+                double d2 = entity.getZ();final double fromZ = d2; // Paper - OBFHELPER
-                 double d3 = ServerGamePacketListenerImpl.clampHorizontal(packet.getX()); final double toX = d3; // Paper - OBFHELPER
-                 double d4 = ServerGamePacketListenerImpl.clampVertical(packet.getY()); final double toY = d4; // Paper - OBFHELPER
-                 double d5 = ServerGamePacketListenerImpl.clampHorizontal(packet.getZ()); final double toZ = d5; // Paper - OBFHELPER
-@@ -509,7 +509,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
++                double d0 = entity.getX(); final double fromX = d0; // Paper - OBFHELPER
++                double d1 = entity.getY(); final double fromY = d1; // Paper - OBFHELPER
++                double d2 = entity.getZ(); final double fromZ = d2; // Paper - OBFHELPER
+                 double d3 = ServerGamePacketListenerImpl.clampHorizontal(packet.position().x()); final double toX = d3; // Paper - OBFHELPER
+                 double d4 = ServerGamePacketListenerImpl.clampVertical(packet.position().y()); final double toY = d4; // Paper - OBFHELPER
+                 double d5 = ServerGamePacketListenerImpl.clampHorizontal(packet.position().z()); final double toZ = d5; // Paper - OBFHELPER
+@@ -511,7 +511,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  double d7 = d4 - this.vehicleFirstGoodY;
                  double d8 = d5 - this.vehicleFirstGoodZ;
                  double d9 = entity.getDeltaMovement().lengthSqr();
@@ -40,12 +40,12 @@ index 1754e413dc1b7a18b3fc0b981eae11283b2106e5..fc06281b6d37d72a0a333343fc800bd3
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
                  this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
-@@ -555,9 +564,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -557,9 +566,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                  boolean flag = worldserver.noCollision(entity, entity.getBoundingBox().deflate(0.0625D));
  
 -                d6 = d3 - this.vehicleLastGoodX;
--                d7 = d4 - this.vehicleLastGoodY - 1.0E-6D;
+-                d7 = d4 - this.vehicleLastGoodY;
 -                d8 = d5 - this.vehicleLastGoodZ;
 +                d6 = d3 - this.vehicleLastGoodX; // Paper - diff on change, used for checking large move vectors above
 +                d7 = d4 - this.vehicleLastGoodY - 1.0E-6D; // Paper - diff on change, used for checking large move vectors above
@@ -53,7 +53,7 @@ index 1754e413dc1b7a18b3fc0b981eae11283b2106e5..fc06281b6d37d72a0a333343fc800bd3
                  boolean flag1 = entity.verticalCollisionBelow;
  
                  if (entity instanceof LivingEntity) {
-@@ -1264,7 +1273,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1318,7 +1327,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          double d7 = d1 - this.firstGoodY;
                          double d8 = d2 - this.firstGoodZ;
                          double d9 = this.player.getDeltaMovement().lengthSqr();
@@ -71,7 +71,7 @@ index 1754e413dc1b7a18b3fc0b981eae11283b2106e5..fc06281b6d37d72a0a333343fc800bd3
  
                          if (this.player.isSleeping()) {
                              if (d10 > 1.0D) {
-@@ -1320,9 +1338,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1374,9 +1392,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                              AABB axisalignedbb = this.player.getBoundingBox();
  
diff --git a/patches/unapplied/server/0413-Optimise-getType-calls.patch b/patches/server/0412-Optimise-getType-calls.patch
similarity index 98%
rename from patches/unapplied/server/0413-Optimise-getType-calls.patch
rename to patches/server/0412-Optimise-getType-calls.patch
index 2edc8fa421..da94b3a7b4 100644
--- a/patches/unapplied/server/0413-Optimise-getType-calls.patch
+++ b/patches/server/0412-Optimise-getType-calls.patch
@@ -66,7 +66,7 @@ index fabdec2d66cc6d676ed58fa570e2c318ab0927e2..1002123cd0c6f57cecc4e80f5f21cc6f
  
      public void setFlag(int flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 628f26e98449bf508306265d569376cae6279284..cabf3146b0dd5790536cb9995de6a876d7ab3f50 100644
+index 22b8603a0eb7e981ca3483b37d3b7af28f300dfd..4982950b13cdf1668c0a662b80faf9f700ed584b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -63,7 +63,7 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/unapplied/server/0414-Villager-resetOffers.patch b/patches/server/0413-Villager-resetOffers.patch
similarity index 94%
rename from patches/unapplied/server/0414-Villager-resetOffers.patch
rename to patches/server/0413-Villager-resetOffers.patch
index 2b919a8646..1c9cac618a 100644
--- a/patches/unapplied/server/0414-Villager-resetOffers.patch
+++ b/patches/server/0413-Villager-resetOffers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 3cdd48c35d50fa3107e0f2bf439e75b7f306b3d1..c8231e421e6c3f1cf8a5aaf8cc64741abe868f41 100644
+index e5ce76abb09c91b881dee732c5985c53db552dfc..deac9d6389493213e2b0cc8e2b6ae0c9f055c011 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -114,6 +114,13 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
diff --git a/patches/unapplied/server/0415-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0414-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 89%
rename from patches/unapplied/server/0415-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0414-Retain-block-place-order-when-capturing-blockstates.patch
index 6da68ddaf2..8816366bcc 100644
--- a/patches/unapplied/server/0415-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0414-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,10 +10,10 @@ 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 1e22ee380237a33c506316e3cfe3f6efb7f9ae4a..71e9c1504d4b85ffb695401974748d56fefb66e6 100644
+index 36d183d6b52185405f3dbf67d09bc21631e86870..2f82f77ba6530dcdb98037aa627ef3cead758b2e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -153,7 +153,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -154,7 +154,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
      public Map<BlockPos, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
diff --git a/patches/unapplied/server/0416-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0415-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/unapplied/server/0416-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0415-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/unapplied/server/0417-Fix-bell-block-entity-memory-leak.patch b/patches/server/0416-Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/unapplied/server/0417-Fix-bell-block-entity-memory-leak.patch
rename to patches/server/0416-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/unapplied/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0417-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 97%
rename from patches/unapplied/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0417-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 67b54defca..8498d60497 100644
--- a/patches/unapplied/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0417-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
@@ -8,7 +8,7 @@ This can realistically only happen if there's custom loot active on fishing
 which can return 0 items. This would disconnect the player who's fishing.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 9d24d4c3802c525546dae92530c9c5b3cf77924e..536196a740f607adda2a5ae7f644981ac26bef98 100644
+index d0c7dc98ead5c9c52e9d24afe59874b8c512a165..966ba1a9c2e7923a970ce3799a5e2ef6ca36bf84 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 @@ -511,9 +511,15 @@ public class FishingHook extends Projectile {
diff --git a/patches/unapplied/server/0419-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0418-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/unapplied/server/0419-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0418-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/unapplied/server/0420-Add-ignore-discounts-API.patch b/patches/server/0419-Add-ignore-discounts-API.patch
similarity index 99%
rename from patches/unapplied/server/0420-Add-ignore-discounts-API.patch
rename to patches/server/0419-Add-ignore-discounts-API.patch
index 84103c5a2e..a25e1bf557 100644
--- a/patches/unapplied/server/0420-Add-ignore-discounts-API.patch
+++ b/patches/server/0419-Add-ignore-discounts-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ignore discounts API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 82ed0ce824e84ea09ea963caa61fbb75f6ce6fe7..f51078e4b9e6267fa43795d009f5d149b86acb5a 100644
+index 77c8c09b3d74b0dd88321bdfdf19d0f089d4e432..27db2878073d1d77813574adfc54d1d686fc7088 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -490,6 +490,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/unapplied/server/0421-Toggle-for-removing-existing-dragon.patch b/patches/server/0420-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/unapplied/server/0421-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0420-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/unapplied/server/0422-Fix-client-lag-on-advancement-loading.patch b/patches/server/0421-Fix-client-lag-on-advancement-loading.patch
similarity index 95%
rename from patches/unapplied/server/0422-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0421-Fix-client-lag-on-advancement-loading.patch
index c7284e1f8b..4866bbae4b 100644
--- a/patches/unapplied/server/0422-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0421-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 09a6a0c06580aea9e7be8de2189673d1a476f411..e88b384e3d640dd77e419611f3c0e588fbf4f406 100644
+index 78bc460fff7d537109883f1469500f6f536c598e..5f0fd1d4fe419435ac7293106c0ebb5382d64074 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -318,7 +318,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/unapplied/server/0423-Item-no-age-no-player-pickup.patch b/patches/server/0422-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/unapplied/server/0423-Item-no-age-no-player-pickup.patch
rename to patches/server/0422-Item-no-age-no-player-pickup.patch
diff --git a/patches/unapplied/server/0424-Beacon-API-custom-effect-ranges.patch b/patches/server/0423-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/unapplied/server/0424-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0423-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/unapplied/server/0425-Add-API-for-quit-reason.patch b/patches/server/0424-Add-API-for-quit-reason.patch
similarity index 95%
rename from patches/unapplied/server/0425-Add-API-for-quit-reason.patch
rename to patches/server/0424-Add-API-for-quit-reason.patch
index c4ca4510d4..858ecc745a 100644
--- a/patches/unapplied/server/0425-Add-API-for-quit-reason.patch
+++ b/patches/server/0424-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 134810ac91d828d67759cd1ed56f11b71e292917..ba41646a5edb57c4d9766df08bbc57016e2de189 100644
+index f9158826f16e45c81714c2e0a284828bc5bb95c8..448bde861b4190a678a8ccb63cade43c4a3d6ad9 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -167,8 +167,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -28,10 +28,10 @@ index 134810ac91d828d67759cd1ed56f11b71e292917..ba41646a5edb57c4d9766df08bbc5701
                          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 02ad5331783097d97473ef2a1f2e28b07baae8e4..46de03e961438faaf44b8bd39aed7535daef1bf9 100644
+index 475ad396d842617b53ccf59fd07bfe1682852e50..6344947f445e1da19d21de67a51b88de65eceb7a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -323,6 +323,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -321,6 +321,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      public boolean isRealPlayer; // Paper
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
diff --git a/patches/unapplied/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0425-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/unapplied/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0425-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/unapplied/server/0427-Add-Destroy-Speed-API.patch b/patches/server/0426-Add-Destroy-Speed-API.patch
similarity index 98%
rename from patches/unapplied/server/0427-Add-Destroy-Speed-API.patch
rename to patches/server/0426-Add-Destroy-Speed-API.patch
index d7c93744a0..251968d61c 100644
--- a/patches/unapplied/server/0427-Add-Destroy-Speed-API.patch
+++ b/patches/server/0426-Add-Destroy-Speed-API.patch
@@ -35,10 +35,10 @@ index a2fe7149a837040cf9f23eb426d398a5f90be394..27a7852a5d3f8c8960f098646ff5587c
  
      private Collection<AttributeModifier> getModifiersOrEmpty(AttributeModifier.Operation operation) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index cabf3146b0dd5790536cb9995de6a876d7ab3f50..0cf033e1b559506bd902a2159adef2b279c18798 100644
+index 4982950b13cdf1668c0a662b80faf9f700ed584b..78071859e9b745b2497fec7761888b4e65a208a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -729,4 +729,35 @@ public class CraftBlockData implements BlockData {
+@@ -730,4 +730,35 @@ public class CraftBlockData implements BlockData {
      public BlockState createBlockState() {
          return CraftBlockStates.getBlockState(this.state, null);
      }
diff --git a/patches/unapplied/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0427-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 68%
rename from patches/unapplied/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0427-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index fbc3a45203..92b41a4864 100644
--- a/patches/unapplied/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0427-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,15 +5,15 @@ 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 ee510171f58aca1ca18053fbd5a55cc2ab23a422..0ec00d64947359c08d2315ebaebd76aee548b512 100644
+index 42ee772b76b7601ad59378c81277fe0c60e4438b..0aaea6091c5828782ed606d250423f3d75b9b27f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2724,7 +2724,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2709,7 +2709,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @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) {
--        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), force, (float) x, (float) y, (float) z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count);
-+        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), force, x, y, z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); // Paper - fix x/y/z precision loss
+-        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), false, force, (float) x, (float) y, (float) z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count);
++        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), false, force, x, y, z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); // Paper - fix x/y/z precision loss
          this.getHandle().connection.send(packetplayoutworldparticles);
      }
  
diff --git a/patches/unapplied/server/0429-Add-LivingEntity-clearActiveItem.patch b/patches/server/0428-Add-LivingEntity-clearActiveItem.patch
similarity index 90%
rename from patches/unapplied/server/0429-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0428-Add-LivingEntity-clearActiveItem.patch
index 3c6621ccfa..f470d50f88 100644
--- a/patches/unapplied/server/0429-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0428-Add-LivingEntity-clearActiveItem.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index db15382f35464de43a2fe0a41aca070a8c834777..de41ee2cc1be6ef412ec15c79a65cbca653b35d3 100644
+index e979681142bd08aeb00a98b79789a8f41b2a37af..c19694876007f711dfdcf58ef435a839b1e31d72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -967,6 +967,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied/server/0430-Add-PlayerItemCooldownEvent.patch b/patches/server/0429-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/unapplied/server/0430-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0429-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/unapplied/server/0431-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0430-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/unapplied/server/0431-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0430-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/unapplied/server/0432-More-lightning-API.patch b/patches/server/0431-More-lightning-API.patch
similarity index 100%
rename from patches/unapplied/server/0432-More-lightning-API.patch
rename to patches/server/0431-More-lightning-API.patch
diff --git a/patches/unapplied/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0432-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 92%
rename from patches/unapplied/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0432-Climbing-should-not-bypass-cramming-gamerule.patch
index f1a1607dd7..b79a107f9e 100644
--- a/patches/unapplied/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0432-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 20289623062acd34afb0ca5fc7daaf032ec1f418..7a4aaa56f8d547ebc537657855d5fcdb4ef21e36 100644
+index 6970e85853954c240bc89407e2aaafdd888bc334..b30bc225fe971aed01c7552f66e0c231cfc35d8c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2196,6 +2196,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2219,6 +2219,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean isPushable() {
@@ -44,10 +44,10 @@ index b8d57e25851dd7da905100dfd4022e4b99fd7f02..721321a19ce056f82de2bef44a8791dc
              } else if (entity1 instanceof Player && entity instanceof Player && !io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) { // Paper - Configurable player collision
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e3322e8897f361b3fbf8d7188207271906a84c46..b725bd297ed40aa8ccf3ad77f8652b39980efcf2 100644
+index f592bee9f71580ec248e4b7485c938f3b83aeb9d..d7e5c2d5935a86bab9987c36df8e1b957fe90ba0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3711,7 +3711,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3722,7 +3722,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  return;
              }
              // Paper end - don't run getEntities if we're not going to use its result
@@ -56,7 +56,7 @@ index e3322e8897f361b3fbf8d7188207271906a84c46..b725bd297ed40aa8ccf3ad77f8652b39
  
              if (!list.isEmpty()) {
                  // Paper - don't run getEntities if we're not going to use its result; moved up
-@@ -3916,9 +3916,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3923,9 +3923,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return !this.isRemoved() && this.collides; // CraftBukkit
      }
  
@@ -88,10 +88,10 @@ index d8a2fbb33f4b77ffb1b3c928a369c2824ad815d7..60c2868f255d372226e0c1389caaa547
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 9a187b9b20e4e5ee4cdb7df31629faee9d3ebb60..8883894da73c7d5975a8826d23ee7f542db98b0b 100644
+index e9219921fe63a05bee4b6e18d5c1558cbcd88220..a2f0b79599799ad2aa85aff821d8ac76a8e650bd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -364,8 +364,8 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -362,8 +362,8 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
      }
  
      @Override
@@ -129,7 +129,7 @@ index 59fbfe8de2dc5ec020dd61a5e446b0b6f67d76e4..2bb2b36f793d25b6e49d1a72bb665cfa
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
-index b0373df16a3e6910fb5f4a2ab7ca2523ced84a22..a9661ab34bc98c19d525eb4b60b1f0d05d73241e 100644
+index 0e6e707935c6567b1fbad1d01ca48ac7eb3259ce..e2bbb4b519010cbabc0796c5b2f749b4fac32bb7 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
 @@ -144,7 +144,7 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
diff --git a/patches/unapplied/server/0434-Add-missing-default-perms-for-commands.patch b/patches/server/0433-Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/unapplied/server/0434-Add-missing-default-perms-for-commands.patch
rename to patches/server/0433-Add-missing-default-perms-for-commands.patch
diff --git a/patches/unapplied/server/0435-Add-PlayerShearBlockEvent.patch b/patches/server/0434-Add-PlayerShearBlockEvent.patch
similarity index 98%
rename from patches/unapplied/server/0435-Add-PlayerShearBlockEvent.patch
rename to patches/server/0434-Add-PlayerShearBlockEvent.patch
index db7c1ccc71..dc2dd37c19 100644
--- a/patches/unapplied/server/0435-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0434-Add-PlayerShearBlockEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerShearBlockEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
-index 7e2a39a1ee092b46ab46caec0214255d9c333536..20f705c90a0a96321cfe29c0cf564013dcccd18f 100644
+index c913d45704e4eb3a0aa322d3f5f83eec6c147051..4ec03b15bb8a82d92fcb2b7fef70e3c7087a9b68 100644
 --- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
 @@ -141,7 +141,7 @@ public class BeehiveBlock extends BaseEntityBlock {
diff --git a/patches/unapplied/server/0436-Limit-recipe-packets.patch b/patches/server/0435-Limit-recipe-packets.patch
similarity index 90%
rename from patches/unapplied/server/0436-Limit-recipe-packets.patch
rename to patches/server/0435-Limit-recipe-packets.patch
index 5b0badbbe1..66c9b8f393 100644
--- a/patches/unapplied/server/0436-Limit-recipe-packets.patch
+++ b/patches/server/0435-Limit-recipe-packets.patch
@@ -5,10 +5,10 @@ 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 fc06281b6d37d72a0a333343fc800bd388713a5f..f2c1893677004b1699beb16ebfcbe9816aad2a78 100644
+index bfcf0a27ab8d90742b83e9c200f2ec867e2424fe..65bc724ba824e4b65005f0886de768506a9b4160 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -277,6 +277,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -279,6 +279,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private final TickThrottler chatSpamThrottler = new TickThrottler(20, 200);
      private final TickThrottler tabSpamThrottler = new TickThrottler(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement, io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit); // Paper - configurable tab spam limits
      private final TickThrottler dropSpamThrottler = new TickThrottler(20, 1480);
@@ -16,7 +16,7 @@ index fc06281b6d37d72a0a333343fc800bd388713a5f..f2c1893677004b1699beb16ebfcbe981
      private double firstGoodX;
      private double firstGoodY;
      private double firstGoodZ;
-@@ -393,6 +394,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -395,6 +396,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.keepConnectionAlive();
          this.chatSpamThrottler.tick();
          this.tabSpamThrottler.tick(); // Paper - configurable tab spam limits
@@ -24,7 +24,7 @@ index fc06281b6d37d72a0a333343fc800bd388713a5f..f2c1893677004b1699beb16ebfcbe981
          this.dropSpamThrottler.tick();
          if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L) {
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
-@@ -3088,6 +3090,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3155,6 +3157,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
diff --git a/patches/unapplied/server/0437-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0436-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/unapplied/server/0437-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0436-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/unapplied/server/0438-Player-Chunk-Load-Unload-Events.patch b/patches/server/0437-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/unapplied/server/0438-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0437-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/unapplied/server/0439-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0438-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/unapplied/server/0439-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0438-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/unapplied/server/0440-Expose-LivingEntity-hurt-direction.patch b/patches/server/0439-Expose-LivingEntity-hurt-direction.patch
similarity index 90%
rename from patches/unapplied/server/0440-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0439-Expose-LivingEntity-hurt-direction.patch
index 604bb654f0..3720327ae5 100644
--- a/patches/unapplied/server/0440-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0439-Expose-LivingEntity-hurt-direction.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 917ac21794f1aabc6e95ab2fff2ea7547b9778a8..78bb666dbc5ccd84820e1c7b382249510dd5795c 100644
+index c23b8f00d7ce3a46f9d104ffae5e4c6124a111ce..136a6b8e2065c7bada396e0f54f91c841a85c3d8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -188,7 +188,7 @@ public abstract class Player extends LivingEntity {
+@@ -191,7 +191,7 @@ public abstract class Player extends LivingEntity {
      private Optional<GlobalPos> lastDeathLocation;
      @Nullable
      public FishingHook fishing;
@@ -36,7 +36,7 @@ index 8012ee71e1ce9f174eb5c4ac9eb8372b81e0a78c..42c41cd4b280839a35f77e04d0dc6a06
      public int getSleepTicks() {
          return this.getHandle().sleepCounter;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index de41ee2cc1be6ef412ec15c79a65cbca653b35d3..ff3b53eff8f5fc1e02e7b30d59ff27dfe8f5d431 100644
+index c19694876007f711dfdcf58ef435a839b1e31d72..1ca252f36500322d56c0c12b6ec80c069214c0e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1024,4 +1024,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/unapplied/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0440-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/unapplied/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0440-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/unapplied/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0441-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 93%
rename from patches/unapplied/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/0441-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 8c0b0c171b..3122449eed 100644
--- a/patches/unapplied/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0441-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix crash from invalid ingredient lists in
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index c8231e421e6c3f1cf8a5aaf8cc64741abe868f41..39cb40b077e9c07471437d5bec16ba9a7e6bce52 100644
+index deac9d6389493213e2b0cc8e2b6ae0c9f055c011..5ea56c6048a356d84472ef0e744af41fe063ccc7 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -273,7 +273,11 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
diff --git a/patches/unapplied/server/0443-Add-TargetHitEvent.patch b/patches/server/0442-Add-TargetHitEvent.patch
similarity index 100%
rename from patches/unapplied/server/0443-Add-TargetHitEvent.patch
rename to patches/server/0442-Add-TargetHitEvent.patch
diff --git a/patches/unapplied/server/0444-MC-4-Fix-item-position-desync.patch b/patches/server/0443-MC-4-Fix-item-position-desync.patch
similarity index 93%
rename from patches/unapplied/server/0444-MC-4-Fix-item-position-desync.patch
rename to patches/server/0443-MC-4-Fix-item-position-desync.patch
index a4ce339757..d954756c7a 100644
--- a/patches/unapplied/server/0444-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0443-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 488ebd443903af812913437f1ade3002093f2470..a043ac10834562d357ef0b5aded2e916
  
      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 7a4aaa56f8d547ebc537657855d5fcdb4ef21e36..e08d20b65fdea46be94228b4b10ba1cb7b3beeb6 100644
+index b30bc225fe971aed01c7552f66e0c231cfc35d8c..341cfedfb06ac0a18b8cca1df5aa4f72b1455737 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4479,6 +4479,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4505,6 +4505,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              return;
          }
          // Paper end - Block invalid positions and bounding box
diff --git a/patches/unapplied/server/0445-Additional-Block-Material-API.patch b/patches/server/0444-Additional-Block-Material-API.patch
similarity index 100%
rename from patches/unapplied/server/0445-Additional-Block-Material-API.patch
rename to patches/server/0444-Additional-Block-Material-API.patch
diff --git a/patches/unapplied/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0445-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/unapplied/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/server/0445-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/unapplied/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch
deleted file mode 100644
index 6b1b7c3df3..0000000000
--- a/patches/unapplied/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 2 May 2020 03:09:46 -0400
-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 8a58c1bdda065edd7b8560cd43e805de3fe0b178..59c12f6d5d96835b4b37ed5a761f25f8f147c54a 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -906,7 +906,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     @Override
-     public void handlePickItem(ServerboundPickItemPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
--        this.player.getInventory().pickSlot(packet.getSlot());
-+        // 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());
-+            this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)"));
-+            return;
-+        }
-+        this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed
-+        // Paper end - validate pick item position
-         int i = this.player.getInventory().selected;
- 
-         this.player.connection.send(this.player.getInventory().createInventoryUpdatePacket(i));