From d5f1ffc2e6928a6728f91ab2ad2e020b105eab7f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 19 Dec 2022 11:46:55 +0100
Subject: [PATCH] Remove somewhat broken patch With the new chunk system it
 doesn't hurt too much to (temporarily) remove this until implemented in a
 safer manner

---
 ...Load-Chunks-for-Login-Asynchronously.patch | 280 ------------------
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   0
 ...layerAttackEntityCooldownResetEvent.patch} |   2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   0
 ...-duplication-issues-and-teleport-is.patch} |   2 +-
 ...patch => 0390-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   4 +-
 ...n.patch => 0392-Expose-game-version.patch} |   2 +-
 ...> 0393-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   2 +-
 ....patch => 0395-misc-debugging-dumps.patch} |   4 +-
 ...6-Prevent-teleporting-dead-entities.patch} |   4 +-
 ...traces-in-log-messages-crash-report.patch} |   8 +-
 ...atch => 0398-Implement-Mob-Goal-API.patch} |   2 +-
 ...=> 0399-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   0
 ...tch => 0401-ExperienceOrbMergeEvent.patch} |   0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   0
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0404-Potential-bed-API.patch} |   0
 ...ait-for-Async-Tasks-during-shutdown.patch} |   2 +-
 ...er-respects-game-and-entity-rules-f.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   0
 ...leInt-allocations-from-light-engine.patch} |   0
 ...location-of-Vec3D-by-entity-tracker.patch} |   2 +-
 ...> 0410-Ensure-safe-gateway-teleport.patch} |   0
 ...-for-console-having-all-permissions.patch} |   0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |   6 +-
 ...ance-map-to-optimise-entity-tracker.patch} |   2 +-
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0415-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |   0
 ...ton-physics-inconsistency-MC-188840.patch} |   0
 ...uping.patch => 0419-Fix-sand-duping.patch} |   0
 ...sing-chunks-due-to-integer-overflow.patch} |   0
 ...desync-in-playerconnection-causing-.patch} |   4 +-
 ...older-method-without-block-snapshot.patch} |   0
 ...API.patch => 0423-Improve-Arrow-API.patch} |   0
 ...mplement-PlayerRecipeBookClickEvent.patch} |   4 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |   0
 ...6-Add-permission-for-command-blocks.patch} |   6 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |   0
 ...d-Difficulty-Remembering-Difficulty.patch} |  12 +-
 ...atch => 0429-Paper-dumpitem-command.patch} |   0
 ...Legacy-Component-serialization-size.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |   4 +-
 ...incremental-chunk-and-player-saving.patch} |  14 +-
 ...e-operations-for-updating-light-dat.patch} |   0
 ...435-Support-old-UUID-format-for-NBT.patch} |   0
 ...p-duplicated-GameProfile-Properties.patch} |   0
 ...vert-legacy-attributes-in-Item-Meta.patch} |   2 +-
 ...Remove-some-streams-from-structures.patch} |   0
 ...rom-classes-related-villager-gossip.patch} |   0
 ...0440-Support-components-in-ItemMeta.patch} |   2 +-
 ...e-fix-EntityTargetLivingEntityEvent.patch} |   0
 ...patch => 0442-Add-entity-liquid-API.patch} |   0
 ...date-itemstack-legacy-name-and-lore.patch} |   0
 ...wn-player-in-correct-world-on-login.patch} |   6 +-
 ...atch => 0445-Add-PrepareResultEvent.patch} |   0
 ...-for-portal-on-world-gen-entity-add.patch} |   2 +-
 ...e-NetworkManager-Exception-Handling.patch} |   0
 ...ncement-data-player-iteration-to-be.patch} |   0
 ...x-arrows-never-despawning-MC-125757.patch} |   0
 ...Vanilla-Command-permission-checking.patch} |   0
 ...-5989.patch => 0451-Fix-SPIGOT-5989.patch} |  10 +-
 ...-Bukkit-world-container-is-not-used.patch} |   0
 ...5885-Unable-to-disable-advancements.patch} |   0
 ...taPlayer-leak-due-from-quitting-ear.patch} |   0
 ...eLighting-call-to-World-spigot-stri.patch} |   0
 ...ix-some-rails-connecting-improperly.patch} |   0
 ...stake-in-CB-NBT-int-deserialization.patch} |   0
 ...rver-load-chunks-from-newer-version.patch} |   0
 ...support.patch => 0459-Brand-support.patch} |   8 +-
 ...patch => 0460-Add-setMaxPlayers-API.patch} |   6 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |   0
 ...h => 0462-Don-t-require-FACING-data.patch} |   0
 ...eEvent-not-firing-for-all-use-cases.patch} |   4 +-
 ...PI.patch => 0464-Add-moon-phase-API.patch} |   0
 ...headless-pistons-from-being-created.patch} |   0
 ...ent.patch => 0466-Add-BellRingEvent.patch} |   0
 ...dd-zombie-targets-turtle-egg-config.patch} |   0
 ...patch => 0468-Buffer-joins-to-world.patch} |   0
 ...-Eigencraft-redstone-implementation.patch} |   0
 ...s-not-working-in-some-kick-messages.patch} |   2 +-
 ...reateEvent-needs-to-know-its-entity.patch} |   0
 ...ch => 0472-Fix-CraftTeam-null-check.patch} |   0
 ...I.patch => 0473-Add-more-Evoker-API.patch} |   0
 ...Add-methods-to-get-translation-keys.patch} |   0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |   0
 ...ch => 0476-Cache-block-data-strings.patch} |   0
 ...rtation-and-cancel-velocity-if-tele.patch} |   6 +-
 ...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} |   0
 ...track-plugin-scoreboards-by-default.patch} |   0
 ...king.patch => 0483-Entity-isTicking.patch} |   0
 ...non-whitelisted-player-when-white-l.patch} |   0
 ...-Concurrency-issue-in-ShufflingList.patch} |   0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |   0
 ...-large-move-vectors-crashing-server.patch} |  12 +-
 ...atch => 0488-Optimise-getType-calls.patch} |   2 +-
 ....patch => 0489-Villager-resetOffers.patch} |   0
 ...ce-order-when-capturing-blockstates.patch} |   0
 ...lockpos-allocation-from-pathfinding.patch} |   0
 ...em-locations-dropped-from-campfires.patch} |   0
 ...tch => 0493-Player-elytra-boost-API.patch} |   2 +-
 ...94-Fixed-TileEntityBell-memory-leak.patch} |   0
 ...ing-up-when-item-stack-is-empty-in-.patch} |   0
 ...Add-getOfflinePlayerIfCached-String.patch} |   2 +-
 ...ch => 0497-Add-ignore-discounts-API.patch} |   0
 ...Toggle-for-removing-existing-dragon.patch} |   0
 ...x-client-lag-on-advancement-loading.patch} |   0
 ...> 0500-Item-no-age-no-player-pickup.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...502-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0503-Add-API-for-quit-reason.patch} |  14 +-
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...ch => 0505-Expose-world-spawn-angle.patch} |   4 +-
 ...patch => 0506-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   2 +-
 ...08-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0509-Add-PlayerItemCooldownEvent.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...PI.patch => 0511-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   2 +-
 ...-missing-default-perms-for-commands.patch} |   0
 ...h => 0514-Add-PlayerShearBlockEvent.patch} |   0
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0516-Limit-recipe-packets.patch} |   6 +-
 ...-CraftSound-backwards-compatibility.patch} |   0
 ...518-Player-Chunk-Load-Unload-Events.patch} |   4 +-
 ...9-Optimize-Dynamic-get-Missing-Keys.patch} |   0
 ...-Expose-LivingEntity-hurt-direction.patch} |   0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |   0
 ...-invalid-ingredient-lists-in-Villag.patch} |   0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |   0
 ...ch => 0524-Implement-TargetHitEvent.patch} |   0
 ... 0525-MC-4-Fix-item-position-desync.patch} |   0
 ...526-Additional-Block-Material-API-s.patch} |   2 +-
 ...tch => 0527-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0529-Cache-burn-durations.patch} |   0
 ...ob-spawner-spawn-egg-transformation.patch} |   0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |   0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |   0
 ...event-not-being-called-in-adventure.patch} |   6 +-
 ...h => 0534-Zombie-API-breaking-doors.patch} |   0
 ...535-Fix-nerfed-slime-when-splitting.patch} |   0
 ...=> 0536-Add-EntityLoadCrossbowEvent.patch} |   0
 ...0537-Added-WorldGameRuleChangeEvent.patch} |   0
 ...-Added-ServerResourcesReloadedEvent.patch} |   0
 ...d-settings-for-mobs-picking-up-loot.patch} |   0
 ...mplemented-BlockFailedDispenseEvent.patch} |   0
 ...-Added-PlayerLecternPageChangeEvent.patch} |   0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |   0
 ...nfigurable-door-breaking-difficulty.patch} |   0
 ...ty-commands-shall-not-be-dispatched.patch} |   0
 ...I-to-expose-exact-interaction-point.patch} |   0
 ...OIs.patch => 0546-Remove-stale-POIs.patch} |   4 +-
 ...h => 0547-Fix-villager-boat-exploit.patch} |   4 +-
 ...I.patch => 0548-Add-sendOpLevel-API.patch} |   8 +-
 ...try.patch => 0549-Add-PaperRegistry.patch} |   0
 ...h => 0550-Add-StructuresLocateEvent.patch} |   0
 ...-for-requiring-a-player-participant.patch} |   0
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...554-Make-schedule-command-per-world.patch} |   0
 ...555-Configurable-max-leash-distance.patch} |   0
 ...556-Implement-BlockPreDispenseEvent.patch} |   0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |   0
 ...e-for-always-placing-the-dragon-egg.patch} |   0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |   0
 ...eash-variable-to-EntityUnleashEvent.patch} |   0
 ...shield-blocking-on-dimension-change.patch} |   4 +-
 ...atch => 0562-add-DragonEggFormEvent.patch} |   0
 ...Event.patch => 0563-EntityMoveEvent.patch} |   6 +-
 ...isable-pathfinding-updates-on-block.patch} |   6 +-
 ... 0565-Inline-shift-direction-fields.patch} |   0
 ...-adding-items-to-BlockDropItemEvent.patch} |   0
 ...inThreadExecutor-to-BukkitScheduler.patch} |   0
 ...entity-allow-attribute-registration.patch} |   0
 ...ix-dead-slime-setSize-invincibility.patch} |   0
 ...pes-should-return-an-immutable-list.patch} |   0
 ...port-for-hex-color-codes-in-console.patch} |   0
 ...atch => 0572-Expose-Tracked-Players.patch} |   0
 ...3-Remove-streams-from-SensorNearest.patch} |   0
 ...er-exception-on-empty-JsonList-file.patch} |   0
 ...GUI.patch => 0575-Improve-ServerGUI.patch} |   0
 ...ure-plate-EntityInteractEvent-for-i.patch} |   0
 ...577-fix-converting-txt-to-json-file.patch} |   4 +-
 ...atch => 0578-Add-worldborder-events.patch} |   0
 ...=> 0579-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0581-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0582-Add-Block-isValidTool.patch} |   0
 ...using-signs-inside-spawn-protection.patch} |   4 +-
 ....patch => 0584-Expand-world-key-API.patch} |   2 +-
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0586-Item-Rarity-API.patch} |   0
 ...py-TESign-isEditable-from-snapshots.patch} |   0
 ...d-item-when-player-has-disconnected.patch} |   4 +-
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   4 +-
 ...91-Entity-load-save-limit-per-chunk.patch} |   0
 ...tch => 0592-Expose-protocol-version.patch} |   0
 ...ab-completions-for-brigadier-comman.patch} |   0
 ...temConsumeEvent-cancelling-properly.patch} |   2 +-
 ...patch => 0595-Add-bypass-host-check.patch} |   0
 ...0596-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...-checkReach-check-for-Shulker-boxes.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   4 +-
 ... => 0603-Added-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0604-More-World-API.patch} |   0
 ... 0605-Added-PlayerBedFailEnterEvent.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   8 +-
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  10 +-
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0612-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   2 +-
 ...close.patch => 0616-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...=> 0618-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0619-Add-basic-Datapack-API.patch} |   2 +-
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  14 +-
 ... => 0622-ItemStack-repair-check-API.patch} |   0
 ....patch => 0623-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   4 +-
 ...-and-optimise-world-force-upgrading.patch} |   2 +-
 ...PI.patch => 0626-Add-Mob-lookAt-API.patch} |   0
 ...0627-Add-Unix-domain-socket-support.patch} |   0
 ... => 0628-Add-EntityInsideBlockEvent.patch} |   0
 ...29-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   8 +-
 ...patch => 0631-More-Lidded-Block-API.patch} |   0
 ...32-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0633-Add-PlayerKickEvent-causes.patch} |  78 ++---
 ...0634-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ThreadingDe.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0638-Add-BellRevealRaiderEvent.patch} |   0
 ... 0639-Fix-invulnerable-end-crystals.patch} |   0
 ...40-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0641-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...patch => 0644-Line-Of-Sight-Changes.patch} |   0
 ... => 0645-add-per-world-spawn-limits.patch} |   0
 ...h => 0646-Fix-potions-splash-events.patch} |   0
 ... => 0647-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   4 +-
 ...=> 0649-Missing-Entity-Behavior-API.patch} |   0
 ...ect-for-book-edit-is-called-on-main.patch} |   4 +-
 ...of-Block-applyBoneMeal-always-being.patch} |   0
 ...tChunkIfLoadedImmediately-in-places.patch} |   4 +-
 ...rom-signs-not-firing-command-events.patch} |   0
 ...ch => 0654-Adds-PlayerArmSwingEvent.patch} |   4 +-
 ...-event-leave-message-not-being-sent.patch} |  24 +-
 ...-for-mobs-immune-to-default-effects.patch} |   2 +-
 ...correct-message-for-outdated-client.patch} |   0
 ...-t-apply-cramming-damage-to-players.patch} |   4 +-
 ...d-timings-for-sensors-and-behaviors.patch} |   0
 ...-bunch-of-missing-forceDrop-toggles.patch} |   0
 ...inger-API.patch => 0661-Stinger-API.patch} |   0
 ...cy-issue-with-empty-map-items-in-CB.patch} |   0
 ... => 0663-Add-System.out-err-catcher.patch} |   2 +-
 ... => 0664-Fix-test-not-bootstrapping.patch} |   0
 ...-to-contain-the-source-jars-in-stac.patch} |   0
 ...-Improve-boat-collision-performance.patch} |   2 +-
 ...AFK-kick-while-watching-end-credits.patch} |   4 +-
 ...iting-of-comments-to-server.propert.patch} |   0
 ...tch => 0669-Add-PlayerSetSpawnEvent.patch} |  14 +-
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...=> 0673-Added-EntityDamageItemEvent.patch} |   0
 ...timize-indirect-passenger-iteration.patch} |   0
 ...osition-losing-precision-millions-o.patch} |   0
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...678-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0680-Add-BlockBreakBlockEvent.patch} |   0
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0682-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0684-Add-back-EntityPortalExitEvent.patch} |   0
 ...-find-targets-for-lightning-strikes.patch} |   6 +-
 ... 0686-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0687-Left-handed-API.patch} |   0
 ...ch => 0688-Add-more-advancement-API.patch} |   0
 ...689-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0690-Add-critical-damage-API.patch} |   0
 ...0691-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   0
 ...-ram-API.patch => 0693-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...5-Add-Raw-Byte-Entity-Serialization.patch} |   0
 ...96-Vanilla-command-permission-fixes.patch} |   0
 ...logic-for-inventories-on-chunk-unlo.patch} |   8 +-
 ...98-Fix-GameProfileCache-concurrency.patch} |   0
 ...g-when-the-async-catcher-is-tripped.patch} |   0
 ...per-mobcaps-and-paper-playermobcaps.patch} |   2 +-
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...rolled-flushing-for-network-manager.patch} |   0
 ...=> 0703-Optimise-general-POI-access.patch} |   0
 ... 0704-Optimise-chunk-tick-iteration.patch} |   0
 ...> 0705-Execute-chunk-tasks-mid-tick.patch} |   8 +-
 ...ulate-regionfile-header-if-it-is-co.patch} |   0
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...-more-information-in-watchdog-dumps.patch} |   6 +-
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ... 0710-Distance-manager-tick-timings.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   0
 ...h => 0713-Add-packet-limiter-config.patch} |   0
 ...our-chunk-data-off-disk-when-conver.patch} |   0
 ...sh-calls-for-entity-tracker-packets.patch} |   0
 ...-lookup-fluid-state-when-raytracing.patch} |   0
 ...atch => 0717-Time-scoreboard-search.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...9-Do-not-run-raytrace-logic-for-AIR.patch} |   0
 ...rimise-map-impl-for-tracked-players.patch} |   0
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ... 0722-Optimise-random-block-ticking.patch} |  10 +-
 ...3-Optimise-non-flush-packet-sending.patch} |   0
 ...0724-Optimise-nearby-player-lookups.patch} |   8 +-
 ...0725-Remove-streams-for-villager-AI.patch} |   0
 ...city-compression-and-cipher-natives.patch} |   2 +-
 ...hread-worker-count-for-low-core-cou.patch} |   0
 ...ifications-to-critical-entity-state.patch} |   0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   4 +-
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   4 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0734-Ensure-valid-vehicle-status.patch} |   4 +-
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0739-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   0
 ...unintended-light-block-manipulation.patch} |   0
 ...0742-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ...ion-for-logging-player-ip-addresses.patch} |  12 +-
 ... => 0745-Configurable-feature-seeds.patch} |   0
 ...pper-didnt-account-for-entity-sende.patch} |   0
 ... 0747-Add-root-admin-user-detection.patch} |   0
 ...ays-allow-item-changing-in-Fireball.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   0
 ...ive-velocity-through-repeated-crits.patch} |   2 +-
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...ochunk-light-sources-unless-it-is-m.patch} |   0
 ...emoving-recipes-from-RecipeIterator.patch} |   0
 ...versized-item-data-in-equipment-and.patch} |   2 +-
 ...e-unnecessary-itemmeta-from-clients.patch} |   6 +-
 ...=> 0756-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0758-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...> 0759-Add-player-health-update-API.patch} |   2 +-
 ...tch => 0760-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   2 +-
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  10 +-
 ...n-checking-in-player-move-packet-ha.patch} |  20 +-
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   0
 ...patch => 0765-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   0
 ...67-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   0
 ... => 0769-Improve-scoreboard-entries.patch} |   0
 ...ch => 0770-Entity-powdered-snow-API.patch} |   0
 ...0771-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...plifiers-greater-than-127-correctly.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...=> 0777-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0778-Bucketable-API.patch} |   0
 ...es.patch => 0779-Validate-usernames.patch} |   6 +-
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   2 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...load-to-PersistentDataContainer-has.patch} |   0
 ...4-Multiple-Entries-with-Scoreboards.patch} |   0
 ...785-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |   2 +-
 ...0788-Fix-xp-reward-for-baby-zombies.patch} |   0
 ... 0789-Kick-on-main-for-illegal-chat.patch} |   8 +-
 ...lti-Block-Change-API-Implementation.patch} |   2 +-
 ...ent.patch => 0791-Fix-NotePlayEvent.patch} |   0
 ....patch => 0792-Freeze-Tick-Lock-API.patch} |   2 +-
 ...lphin-API.patch => 0793-Dolphin-API.patch} |   0
 ...h => 0794-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   2 +-
 ...-missing-structure-set-seed-configs.patch} |   0
 ...h => 0798-Implement-regenerateChunk.patch} |   0
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   2 +-
 ...gs.patch => 0801-Add-GameEvent-tags.patch} |   2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0803-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   0
 ...-worldlist-before-initing-the-world.patch} |   2 +-
 ... => 0808-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0809-Custom-Potion-Mixes.patch} |   2 +-
 ...0810-Fix-Fluid-tags-isTagged-method.patch} |   0
 ...11-Force-close-world-loading-screen.patch} |   4 +-
 ...812-Fix-falling-block-spawn-methods.patch} |   0
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0815-More-Projectile-API.patch} |   0
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   4 +-
 ...0818-Implement-getComputedBiome-API.patch} |   0
 ...> 0819-Make-some-itemstacks-nonnull.patch} |   0
 ...820-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0821-Fix-saving-in-unloadWorld.patch} |   2 +-
 ...h => 0822-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0823-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   4 +-
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...rd-against-invalid-entity-positions.patch} |   0
 ...s.patch => 0828-cache-resource-keys.patch} |   0
 ...ange-the-podium-for-the-EnderDragon.patch} |   0
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   4 +-
 ...ead-of-display-name-in-PlayerList-g.patch} |   4 +-
 ...s-not-spawning-outside-slime-chunks.patch} |   0
 ...-ServerLevel-for-gamerule-callbacks.patch} |   4 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0837-WorldCreator-keepSpawnLoaded.patch} |   2 +-
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |   0
 ...destroyed-trigger-in-the-correct-pl.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0843-Add-PlayerStopUsingItemEvent.patch} |   2 +-
 ...44-FallingBlock-auto-expire-setting.patch} |   0
 ...rs.patch => 0845-Don-t-tick-markers.patch} |   4 +-
 ...-not-accept-invalid-client-settings.patch} |   4 +-
 ...0847-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0850-Sanitize-Sent-BlockEntity-NBT.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...-on-world-create-while-being-ticked.patch} |   2 +-
 ...ate-Current-redstone-implementation.patch} |   6 +-
 ...55-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0856-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   4 +-
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0859-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   2 +-
 ...pty-items-from-being-added-to-world.patch} |   4 +-
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...nent-in-resource-pack-rejection-mes.patch} |   4 +-
 ...atch => 0864-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   0
 ...debug-information-to-chat-packet-er.patch} |   4 +-
 ...PE.patch => 0868-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   4 +-
 ...API.patch => 0870-More-Teleport-API.patch} |   6 +-
 ... => 0871-Add-EntityPortalReadyEvent.patch} |   0
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   4 +-
 ...on-plugins-accessing-faraway-chunks.patch} |   0
 ...tom-Chat-Completion-Suggestions-API.patch} |   2 +-
 ...=> 0876-Add-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0877-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...-invalid-signature-login-stacktrace.patch} |   4 +-
 ...-to-PlayerConnection-internalTelepo.patch} |   4 +-
 ...API.patch => 0881-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   4 +-
 ...andom-in-ServerLoginPacketListenerI.patch} |   2 +-
 ...884-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...und-for-client-lag-spikes-MC-162253.patch} |   0
 ...ok-changes-from-crashing-the-server.patch} |   2 +-
 ...estroyerIdentity-to-sendBlockDamage.patch} |   2 +-
 ...t-killed-statuses-should-be-false-f.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0891-Missing-eating-regain-reason.patch} |   0
 ....patch => 0892-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...5-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0896-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ...re-player-sending-on-dimension-chan.patch} |   4 +-
 ... 0899-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ...lockState-and-isPreferredTool-to-Bl.patch} |   0
 ...=> 0902-Fix-a-bunch-of-vanilla-bugs.patch} |   2 +-
 ...y-onTrackingStart-during-navigation.patch} |   6 +-
 ... 0904-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0905-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   4 +-
 ... 0908-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0910-Add-entity-knockback-API.patch} |   0
 ....patch => 0911-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...3-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0914-Added-EntityToggleSitEvent.patch} |   0
 ... => 0915-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0916-Add-Moving-Piston-API.patch} |   0
 ...> 0917-Ignore-impossible-spawn-tick.patch} |   0
 ...source-for-fireworks-from-dispenser.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   0
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0922-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ...mage-source-entity-for-explosion-to.patch} |   0
 ... 0926-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...928-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   6 +-
 ...sync-entity-add-due-to-fungus-trees.patch} |   0
 ....patch => 0931-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0932-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0934-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0935-Sync-offhand-slot-in-menus.patch} |   4 +-
 ... 0936-Player-Entity-Tracking-Events.patch} |   0
 ...tch => 0937-Limit-pet-look-distance.patch} |   0
 ...ch => 0938-Properly-resend-entities.patch} |   8 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0940-fix-Instruments.patch} |   2 +-
 ...941-Fix-chunk-snapshot-biome-getter.patch} |   0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...-MapLike-Codec-missing-key-selector.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ... => 0945-Improve-logging-and-errors.patch} |   0
 ...-explosion-yield-with-new-gamerules.patch} |   0
 ...tch => 0947-Add-BlockLockCheckEvent.patch} |   0
 ... 0948-Add-Sneaking-API-for-Entities.patch} |   0
 ....patch => 0949-Improve-PortalEvents.patch} |   0
 566 files changed, 366 insertions(+), 646 deletions(-)
 delete mode 100644 patches/server/0385-Load-Chunks-for-Login-Asynchronously.patch
 rename patches/server/{0386-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0387-Add-PlayerAttackEntityCooldownResetEvent.patch => 0386-Add-PlayerAttackEntityCooldownResetEvent.patch} (95%)
 rename patches/server/{0388-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0387-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0389-Add-phantom-creative-and-insomniac-controls.patch => 0388-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0390-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (99%)
 rename patches/server/{0391-Villager-Restocks-API.patch => 0390-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0392-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0391-Validate-PickItem-Packet-and-kick-for-invalid.patch} (91%)
 rename patches/server/{0393-Expose-game-version.patch => 0392-Expose-game-version.patch} (89%)
 rename patches/server/{0394-Optimize-Voxel-Shape-Merging.patch => 0393-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0395-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename patches/server/{0396-misc-debugging-dumps.patch => 0395-misc-debugging-dumps.patch} (96%)
 rename patches/server/{0397-Prevent-teleporting-dead-entities.patch => 0396-Prevent-teleporting-dead-entities.patch} (88%)
 rename patches/server/{0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0399-Implement-Mob-Goal-API.patch => 0398-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0400-Add-villager-reputation-API.patch => 0399-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0401-Option-for-maximum-exp-value-when-merging-orbs.patch => 0400-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0402-ExperienceOrbMergeEvent.patch => 0401-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0403-Fix-PotionEffect-ignores-icon-flag.patch => 0402-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0404-Optimize-brigadier-child-sorting-performance.patch => 0403-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0405-Potential-bed-API.patch => 0404-Potential-bed-API.patch} (100%)
 rename patches/server/{0406-Wait-for-Async-Tasks-during-shutdown.patch => 0405-Wait-for-Async-Tasks-during-shutdown.patch} (96%)
 rename patches/server/{0407-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0408-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{0409-Reduce-MutableInt-allocations-from-light-engine.patch => 0408-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0410-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (97%)
 rename patches/server/{0411-Ensure-safe-gateway-teleport.patch => 0410-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0412-Add-option-for-console-having-all-permissions.patch => 0411-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0413-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (98%)
 rename patches/server/{0414-Use-distance-map-to-optimise-entity-tracker.patch => 0413-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename patches/server/{0415-Fix-villager-trading-demand-MC-163962.patch => 0414-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0416-Maps-shouldn-t-load-chunks.patch => 0415-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0417-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0418-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0419-Fix-piston-physics-inconsistency-MC-188840.patch => 0418-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0420-Fix-sand-duping.patch => 0419-Fix-sand-duping.patch} (100%)
 rename patches/server/{0421-Fix-missing-chunks-due-to-integer-overflow.patch => 0420-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0422-Prevent-position-desync-in-playerconnection-causing-.patch => 0421-Prevent-position-desync-in-playerconnection-causing-.patch} (91%)
 rename patches/server/{0423-Inventory-getHolder-method-without-block-snapshot.patch => 0422-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0424-Improve-Arrow-API.patch => 0423-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0425-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0424-Add-and-implement-PlayerRecipeBookClickEvent.patch} (92%)
 rename patches/server/{0426-Hide-sync-chunk-writes-behind-flag.patch => 0425-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0427-Add-permission-for-command-blocks.patch => 0426-Add-permission-for-command-blocks.patch} (96%)
 rename patches/server/{0428-Ensure-Entity-AABB-s-are-never-invalid.patch => 0427-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0429-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (94%)
 rename patches/server/{0430-Paper-dumpitem-command.patch => 0429-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0431-Improve-Legacy-Component-serialization-size.patch => 0430-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0432-Optimize-Bit-Operations-by-inlining.patch => 0431-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0433-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (97%)
 rename patches/server/{0434-incremental-chunk-and-player-saving.patch => 0433-incremental-chunk-and-player-saving.patch} (91%)
 rename patches/server/{0435-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0434-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0436-Support-old-UUID-format-for-NBT.patch => 0435-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0437-Clean-up-duplicated-GameProfile-Properties.patch => 0436-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0438-Convert-legacy-attributes-in-Item-Meta.patch => 0437-Convert-legacy-attributes-in-Item-Meta.patch} (97%)
 rename patches/server/{0439-Remove-some-streams-from-structures.patch => 0438-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0440-Remove-streams-from-classes-related-villager-gossip.patch => 0439-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0441-Support-components-in-ItemMeta.patch => 0440-Support-components-in-ItemMeta.patch} (97%)
 rename patches/server/{0442-Improve-fix-EntityTargetLivingEntityEvent.patch => 0441-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0443-Add-entity-liquid-API.patch => 0442-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0444-Update-itemstack-legacy-name-and-lore.patch => 0443-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0445-Spawn-player-in-correct-world-on-login.patch => 0444-Spawn-player-in-correct-world-on-login.patch} (88%)
 rename patches/server/{0446-Add-PrepareResultEvent.patch => 0445-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0447-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (90%)
 rename patches/server/{0448-Optimize-NetworkManager-Exception-Handling.patch => 0447-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0449-Optimize-the-advancement-data-player-iteration-to-be.patch => 0448-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0450-Fix-arrows-never-despawning-MC-125757.patch => 0449-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0451-Thread-Safe-Vanilla-Command-permission-checking.patch => 0450-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0452-Fix-SPIGOT-5989.patch => 0451-Fix-SPIGOT-5989.patch} (90%)
 rename patches/server/{0453-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0454-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0455-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0456-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0457-Fix-some-rails-connecting-improperly.patch => 0456-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0458-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0459-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0458-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0460-Brand-support.patch => 0459-Brand-support.patch} (92%)
 rename patches/server/{0461-Add-setMaxPlayers-API.patch => 0460-Add-setMaxPlayers-API.patch} (86%)
 rename patches/server/{0462-Add-playPickupItemAnimation-to-LivingEntity.patch => 0461-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0463-Don-t-require-FACING-data.patch => 0462-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0464-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (93%)
 rename patches/server/{0465-Add-moon-phase-API.patch => 0464-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0466-Prevent-headless-pistons-from-being-created.patch => 0465-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0467-Add-BellRingEvent.patch => 0466-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0468-Add-zombie-targets-turtle-egg-config.patch => 0467-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0469-Buffer-joins-to-world.patch => 0468-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0470-Eigencraft-redstone-implementation.patch => 0469-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0471-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0470-Fix-hex-colors-not-working-in-some-kick-messages.patch} (97%)
 rename patches/server/{0472-PortalCreateEvent-needs-to-know-its-entity.patch => 0471-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0473-Fix-CraftTeam-null-check.patch => 0472-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0474-Add-more-Evoker-API.patch => 0473-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0475-Add-methods-to-get-translation-keys.patch => 0474-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0476-Create-HoverEvent-from-ItemStack-Entity.patch => 0475-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0477-Cache-block-data-strings.patch => 0476-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (95%)
 rename patches/server/{0479-Add-additional-open-container-api-to-HumanEntity.patch => 0478-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0480-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0481-Extend-block-drop-capture-to-capture-all-items-added.patch => 0480-Extend-block-drop-capture-to-capture-all-items-added.patch} (94%)
 rename patches/server/{0482-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0483-Lazily-track-plugin-scoreboards-by-default.patch => 0482-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0484-Entity-isTicking.patch => 0483-Entity-isTicking.patch} (100%)
 rename patches/server/{0485-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0486-Fix-Concurrency-issue-in-ShufflingList.patch => 0485-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0487-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0488-Fix-for-large-move-vectors-crashing-server.patch => 0487-Fix-for-large-move-vectors-crashing-server.patch} (93%)
 rename patches/server/{0489-Optimise-getType-calls.patch => 0488-Optimise-getType-calls.patch} (98%)
 rename patches/server/{0490-Villager-resetOffers.patch => 0489-Villager-resetOffers.patch} (100%)
 rename patches/server/{0491-Retain-block-place-order-when-capturing-blockstates.patch => 0490-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0492-Reduce-blockpos-allocation-from-pathfinding.patch => 0491-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0493-Fix-item-locations-dropped-from-campfires.patch => 0492-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0494-Player-elytra-boost-API.patch => 0493-Player-elytra-boost-API.patch} (94%)
 rename patches/server/{0495-Fixed-TileEntityBell-memory-leak.patch => 0494-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0496-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0497-Add-getOfflinePlayerIfCached-String.patch => 0496-Add-getOfflinePlayerIfCached-String.patch} (93%)
 rename patches/server/{0498-Add-ignore-discounts-API.patch => 0497-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0499-Toggle-for-removing-existing-dragon.patch => 0498-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0500-Fix-client-lag-on-advancement-loading.patch => 0499-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0501-Item-no-age-no-player-pickup.patch => 0500-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0502-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0503-Beacon-API-custom-effect-ranges.patch => 0502-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0504-Add-API-for-quit-reason.patch => 0503-Add-API-for-quit-reason.patch} (88%)
 rename patches/server/{0505-Add-Wandering-Trader-spawn-rate-config-options.patch => 0504-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0506-Expose-world-spawn-angle.patch => 0505-Expose-world-spawn-angle.patch} (89%)
 rename patches/server/{0507-Add-Destroy-Speed-API.patch => 0506-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (93%)
 rename patches/server/{0509-Add-LivingEntity-clearActiveItem.patch => 0508-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0510-Add-PlayerItemCooldownEvent.patch => 0509-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0511-Significantly-improve-performance-of-the-end-generat.patch => 0510-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0512-More-lightning-API.patch => 0511-More-lightning-API.patch} (100%)
 rename patches/server/{0513-Climbing-should-not-bypass-cramming-gamerule.patch => 0512-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0514-Added-missing-default-perms-for-commands.patch => 0513-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0515-Add-PlayerShearBlockEvent.patch => 0514-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0516-Fix-curing-zombie-villager-discount-exploit.patch => 0515-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0517-Limit-recipe-packets.patch => 0516-Limit-recipe-packets.patch} (92%)
 rename patches/server/{0518-Fix-CraftSound-backwards-compatibility.patch => 0517-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0519-Player-Chunk-Load-Unload-Events.patch => 0518-Player-Chunk-Load-Unload-Events.patch} (90%)
 rename patches/server/{0520-Optimize-Dynamic-get-Missing-Keys.patch => 0519-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0521-Expose-LivingEntity-hurt-direction.patch => 0520-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0522-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0523-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0524-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0525-Implement-TargetHitEvent.patch => 0524-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0526-MC-4-Fix-item-position-desync.patch => 0525-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0527-Additional-Block-Material-API-s.patch => 0526-Additional-Block-Material-API-s.patch} (93%)
 rename patches/server/{0528-Fix-harming-potion-dupe.patch => 0527-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0529-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0530-Cache-burn-durations.patch => 0529-Cache-burn-durations.patch} (100%)
 rename patches/server/{0531-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0532-Fix-Not-a-string-Map-Conversion-spam.patch => 0531-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0533-Implement-PlayerFlowerPotManipulateEvent.patch => 0532-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0534-Fix-interact-event-not-being-called-in-adventure.patch => 0533-Fix-interact-event-not-being-called-in-adventure.patch} (90%)
 rename patches/server/{0535-Zombie-API-breaking-doors.patch => 0534-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0536-Fix-nerfed-slime-when-splitting.patch => 0535-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0537-Add-EntityLoadCrossbowEvent.patch => 0536-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0538-Added-WorldGameRuleChangeEvent.patch => 0537-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0539-Added-ServerResourcesReloadedEvent.patch => 0538-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0540-Added-world-settings-for-mobs-picking-up-loot.patch => 0539-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0541-Implemented-BlockFailedDispenseEvent.patch => 0540-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0542-Added-PlayerLecternPageChangeEvent.patch => 0541-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0543-Added-PlayerLoomPatternSelectEvent.patch => 0542-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0544-Configurable-door-breaking-difficulty.patch => 0543-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0545-Empty-commands-shall-not-be-dispatched.patch => 0544-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0546-Implement-API-to-expose-exact-interaction-point.patch => 0545-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0547-Remove-stale-POIs.patch => 0546-Remove-stale-POIs.patch} (86%)
 rename patches/server/{0548-Fix-villager-boat-exploit.patch => 0547-Fix-villager-boat-exploit.patch} (88%)
 rename patches/server/{0549-Add-sendOpLevel-API.patch => 0548-Add-sendOpLevel-API.patch} (86%)
 rename patches/server/{0550-Add-PaperRegistry.patch => 0549-Add-PaperRegistry.patch} (100%)
 rename patches/server/{0551-Add-StructuresLocateEvent.patch => 0550-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0552-Collision-option-for-requiring-a-player-participant.patch => 0551-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0552-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0554-Return-chat-component-with-empty-text-instead-of-thr.patch => 0553-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0555-Make-schedule-command-per-world.patch => 0554-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0556-Configurable-max-leash-distance.patch => 0555-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0557-Implement-BlockPreDispenseEvent.patch => 0556-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0557-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0559-Add-toggle-for-always-placing-the-dragon-egg.patch => 0558-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0560-Added-PlayerStonecutterRecipeSelectEvent.patch => 0559-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0562-Reset-shield-blocking-on-dimension-change.patch => 0561-Reset-shield-blocking-on-dimension-change.patch} (83%)
 rename patches/server/{0563-add-DragonEggFormEvent.patch => 0562-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0564-EntityMoveEvent.patch => 0563-EntityMoveEvent.patch} (93%)
 rename patches/server/{0565-added-option-to-disable-pathfinding-updates-on-block.patch => 0564-added-option-to-disable-pathfinding-updates-on-block.patch} (80%)
 rename patches/server/{0566-Inline-shift-direction-fields.patch => 0565-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0567-Allow-adding-items-to-BlockDropItemEvent.patch => 0566-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0567-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0569-living-entity-allow-attribute-registration.patch => 0568-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0570-fix-dead-slime-setSize-invincibility.patch => 0569-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0571-Merchant-getRecipes-should-return-an-immutable-list.patch => 0570-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0572-Add-support-for-hex-color-codes-in-console.patch => 0571-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0573-Expose-Tracked-Players.patch => 0572-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0574-Remove-streams-from-SensorNearest.patch => 0573-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0575-Throw-proper-exception-on-empty-JsonList-file.patch => 0574-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0576-Improve-ServerGUI.patch => 0575-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0576-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0578-fix-converting-txt-to-json-file.patch => 0577-fix-converting-txt-to-json-file.patch} (95%)
 rename patches/server/{0579-Add-worldborder-events.patch => 0578-Add-worldborder-events.patch} (100%)
 rename patches/server/{0580-added-PlayerNameEntityEvent.patch => 0579-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0581-Prevent-grindstones-from-overstacking-items.patch => 0580-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0582-Add-recipe-to-cook-events.patch => 0581-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0583-Add-Block-isValidTool.patch => 0582-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0584-Allow-using-signs-inside-spawn-protection.patch => 0583-Allow-using-signs-inside-spawn-protection.patch} (91%)
 rename patches/server/{0585-Expand-world-key-API.patch => 0584-Expand-world-key-API.patch} (97%)
 rename patches/server/{0586-Add-fast-alternative-constructor-for-Rotations.patch => 0585-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0587-Item-Rarity-API.patch => 0586-Item-Rarity-API.patch} (100%)
 rename patches/server/{0588-copy-TESign-isEditable-from-snapshots.patch => 0587-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0589-Drop-carried-item-when-player-has-disconnected.patch => 0588-Drop-carried-item-when-player-has-disconnected.patch} (88%)
 rename patches/server/{0590-forced-whitelist-use-configurable-kick-message.patch => 0589-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (86%)
 rename patches/server/{0592-Entity-load-save-limit-per-chunk.patch => 0591-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0593-Expose-protocol-version.patch => 0592-Expose-protocol-version.patch} (100%)
 rename patches/server/{0594-Enhance-console-tab-completions-for-brigadier-comman.patch => 0593-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (92%)
 rename patches/server/{0596-Add-bypass-host-check.patch => 0595-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0597-Set-area-affect-cloud-rotation.patch => 0596-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0598-add-isDeeplySleeping-to-HumanEntity.patch => 0597-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0599-add-consumeFuel-to-FurnaceBurnEvent.patch => 0598-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0600-add-get-set-drop-chance-to-EntityEquipment.patch => 0599-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0601-fix-PigZombieAngerEvent-cancellation.patch => 0600-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0602-Fix-checkReach-check-for-Shulker-boxes.patch => 0601-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0603-fix-PlayerItemHeldEvent-firing-twice.patch => 0602-fix-PlayerItemHeldEvent-firing-twice.patch} (88%)
 rename patches/server/{0604-Added-PlayerDeepSleepEvent.patch => 0603-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0605-More-World-API.patch => 0604-More-World-API.patch} (100%)
 rename patches/server/{0606-Added-PlayerBedFailEnterEvent.patch => 0605-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0607-Implement-methods-to-convert-between-Component-and-B.patch => 0606-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (86%)
 rename patches/server/{0609-Introduce-beacon-activation-deactivation-events.patch => 0608-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0610-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0609-add-RespawnFlags-to-PlayerRespawnEvent.patch} (89%)
 rename patches/server/{0611-Add-Channel-initialization-listeners.patch => 0610-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0612-Send-empty-commands-if-tab-completion-is-disabled.patch => 0611-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0613-Add-more-WanderingTrader-API.patch => 0612-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0614-Add-EntityBlockStorage-clearEntities.patch => 0613-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0614-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (95%)
 rename patches/server/{0617-Inventory-close.patch => 0616-Inventory-close.patch} (100%)
 rename patches/server/{0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0617-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0619-Fix-CraftPotionBrewer-cache.patch => 0618-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0620-Add-basic-Datapack-API.patch => 0619-Add-basic-Datapack-API.patch} (98%)
 rename patches/server/{0621-Add-environment-variable-to-disable-server-gui.patch => 0620-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0622-additions-to-PlayerGameModeChangeEvent.patch => 0621-additions-to-PlayerGameModeChangeEvent.patch} (94%)
 rename patches/server/{0623-ItemStack-repair-check-API.patch => 0622-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0624-More-Enchantment-API.patch => 0623-More-Enchantment-API.patch} (100%)
 rename patches/server/{0625-Move-range-check-for-block-placing-up.patch => 0624-Move-range-check-for-block-placing-up.patch} (87%)
 rename patches/server/{0626-Fix-and-optimise-world-force-upgrading.patch => 0625-Fix-and-optimise-world-force-upgrading.patch} (99%)
 rename patches/server/{0627-Add-Mob-lookAt-API.patch => 0626-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0628-Add-Unix-domain-socket-support.patch => 0627-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0629-Add-EntityInsideBlockEvent.patch => 0628-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0630-Attributes-API-for-item-defaults.patch => 0629-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0631-Add-cause-to-Weather-ThunderChangeEvents.patch => 0630-Add-cause-to-Weather-ThunderChangeEvents.patch} (95%)
 rename patches/server/{0632-More-Lidded-Block-API.patch => 0631-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0633-Limit-item-frame-cursors-on-maps.patch => 0632-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0634-Add-PlayerKickEvent-causes.patch => 0633-Add-PlayerKickEvent-causes.patch} (93%)
 rename patches/server/{0635-Add-PufferFishStateChangeEvent.patch => 0634-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0635-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0636-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0638-Add-option-to-fix-items-merging-through-walls.patch => 0637-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0639-Add-BellRevealRaiderEvent.patch => 0638-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0640-Fix-invulnerable-end-crystals.patch => 0639-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0641-Add-ElderGuardianAppearanceEvent.patch => 0640-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0642-Fix-dangerous-end-portal-logic.patch => 0641-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0642-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0644-Make-item-validations-configurable.patch => 0643-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0645-Line-Of-Sight-Changes.patch => 0644-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0646-add-per-world-spawn-limits.patch => 0645-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0647-Fix-potions-splash-events.patch => 0646-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0648-Add-more-LimitedRegion-API.patch => 0647-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0649-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0648-Fix-PlayerDropItemEvent-using-wrong-item.patch} (91%)
 rename patches/server/{0650-Missing-Entity-Behavior-API.patch => 0649-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (88%)
 rename patches/server/{0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0651-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0653-Use-getChunkIfLoadedImmediately-in-places.patch => 0652-Use-getChunkIfLoadedImmediately-in-places.patch} (95%)
 rename patches/server/{0654-Fix-commands-from-signs-not-firing-command-events.patch => 0653-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0655-Adds-PlayerArmSwingEvent.patch => 0654-Adds-PlayerArmSwingEvent.patch} (88%)
 rename patches/server/{0656-Fixes-kick-event-leave-message-not-being-sent.patch => 0655-Fixes-kick-event-leave-message-not-being-sent.patch} (84%)
 rename patches/server/{0657-Add-config-for-mobs-immune-to-default-effects.patch => 0656-Add-config-for-mobs-immune-to-default-effects.patch} (97%)
 rename patches/server/{0658-Fix-incorrect-message-for-outdated-client.patch => 0657-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0659-Don-t-apply-cramming-damage-to-players.patch => 0658-Don-t-apply-cramming-damage-to-players.patch} (89%)
 rename patches/server/{0660-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0659-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0661-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0660-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0662-Stinger-API.patch => 0661-Stinger-API.patch} (100%)
 rename patches/server/{0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0662-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0664-Add-System.out-err-catcher.patch => 0663-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0665-Fix-test-not-bootstrapping.patch => 0664-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0665-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0667-Improve-boat-collision-performance.patch => 0666-Improve-boat-collision-performance.patch} (97%)
 rename patches/server/{0668-Prevent-AFK-kick-while-watching-end-credits.patch => 0667-Prevent-AFK-kick-while-watching-end-credits.patch} (89%)
 rename patches/server/{0669-Allow-skipping-writing-of-comments-to-server.propert.patch => 0668-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0670-Add-PlayerSetSpawnEvent.patch => 0669-Add-PlayerSetSpawnEvent.patch} (94%)
 rename patches/server/{0671-Make-hoppers-respect-inventory-max-stack-size.patch => 0670-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0672-Optimize-entity-tracker-passenger-checks.patch => 0671-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0673-Config-option-for-Piglins-guarding-chests.patch => 0672-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0674-Added-EntityDamageItemEvent.patch => 0673-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0675-Optimize-indirect-passenger-iteration.patch => 0674-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0676-Fix-block-drops-position-losing-precision-millions-o.patch => 0675-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0677-Configurable-item-frame-map-cursor-update-interval.patch => 0676-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0678-Make-EntityUnleashEvent-cancellable.patch => 0677-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0679-Clear-bucket-NBT-after-dispense.patch => 0678-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0680-Change-EnderEye-target-without-changing-other-things.patch => 0679-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0681-Add-BlockBreakBlockEvent.patch => 0680-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0681-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0683-More-CommandBlock-API.patch => 0682-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0684-Add-missing-team-sidebar-display-slots.patch => 0683-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0685-Add-back-EntityPortalExitEvent.patch => 0684-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0686-Add-methods-to-find-targets-for-lightning-strikes.patch => 0685-Add-methods-to-find-targets-for-lightning-strikes.patch} (92%)
 rename patches/server/{0687-Get-entity-default-attributes.patch => 0686-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0688-Left-handed-API.patch => 0687-Left-handed-API.patch} (100%)
 rename patches/server/{0689-Add-more-advancement-API.patch => 0688-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0690-Add-ItemFactory-getSpawnEgg-API.patch => 0689-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0691-Add-critical-damage-API.patch => 0690-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0692-Fix-issues-with-mob-conversion.patch => 0691-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0693-Add-isCollidable-methods-to-various-places.patch => 0692-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0694-Goat-ram-API.patch => 0693-Goat-ram-API.patch} (100%)
 rename patches/server/{0695-Add-API-for-resetting-a-single-score.patch => 0694-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0696-Add-Raw-Byte-Entity-Serialization.patch => 0695-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0697-Vanilla-command-permission-fixes.patch => 0696-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (92%)
 rename patches/server/{0699-Fix-GameProfileCache-concurrency.patch => 0698-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0700-Log-when-the-async-catcher-is-tripped.patch => 0699-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0701-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0700-Add-paper-mobcaps-and-paper-playermobcaps.patch} (99%)
 rename patches/server/{0702-Sanitize-ResourceLocation-error-logging.patch => 0701-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0703-Allow-controlled-flushing-for-network-manager.patch => 0702-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0704-Optimise-general-POI-access.patch => 0703-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0705-Optimise-chunk-tick-iteration.patch => 0704-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0706-Execute-chunk-tasks-mid-tick.patch => 0705-Execute-chunk-tasks-mid-tick.patch} (96%)
 rename patches/server/{0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0706-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0708-Custom-table-implementation-for-blockstate-state-loo.patch => 0707-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0709-Detail-more-information-in-watchdog-dumps.patch => 0708-Detail-more-information-in-watchdog-dumps.patch} (98%)
 rename patches/server/{0710-Manually-inline-methods-in-BlockPosition.patch => 0709-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0711-Distance-manager-tick-timings.patch => 0710-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0712-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0711-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0712-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0714-Add-packet-limiter-config.patch => 0713-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0714-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0716-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0715-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0717-Don-t-lookup-fluid-state-when-raytracing.patch => 0716-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0718-Time-scoreboard-search.patch => 0717-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0719-Send-full-pos-packets-for-hard-colliding-entities.patch => 0718-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0720-Do-not-run-raytrace-logic-for-AIR.patch => 0719-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0721-Oprimise-map-impl-for-tracked-players.patch => 0720-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0722-Optimise-BlockSoil-nearby-water-lookup.patch => 0721-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0723-Optimise-random-block-ticking.patch => 0722-Optimise-random-block-ticking.patch} (98%)
 rename patches/server/{0724-Optimise-non-flush-packet-sending.patch => 0723-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0725-Optimise-nearby-player-lookups.patch => 0724-Optimise-nearby-player-lookups.patch} (98%)
 rename patches/server/{0726-Remove-streams-for-villager-AI.patch => 0725-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0727-Use-Velocity-compression-and-cipher-natives.patch => 0726-Use-Velocity-compression-and-cipher-natives.patch} (99%)
 rename patches/server/{0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0727-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0729-Async-catch-modifications-to-critical-entity-state.patch => 0728-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0730-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0729-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (90%)
 rename patches/server/{0732-Check-requirement-before-suggesting-root-nodes.patch => 0731-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (87%)
 rename patches/server/{0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0733-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0735-Ensure-valid-vehicle-status.patch => 0734-Ensure-valid-vehicle-status.patch} (84%)
 rename patches/server/{0736-Prevent-softlocked-end-exit-portal-generation.patch => 0735-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0736-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0738-Don-t-log-debug-logging-being-disabled.patch => 0737-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0739-fix-various-menus-with-empty-level-accesses.patch => 0738-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0740-Preserve-overstacked-loot.patch => 0739-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0741-Update-head-rotation-in-missing-places.patch => 0740-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0742-prevent-unintended-light-block-manipulation.patch => 0741-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0743-Fix-CraftCriteria-defaults-map.patch => 0742-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0744-Fix-upstreams-block-state-factories.patch => 0743-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0745-Add-config-option-for-logging-player-ip-addresses.patch => 0744-Add-config-option-for-logging-player-ip-addresses.patch} (94%)
 rename patches/server/{0746-Configurable-feature-seeds.patch => 0745-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0746-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0748-Add-root-admin-user-detection.patch => 0747-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0749-Always-allow-item-changing-in-Fireball.patch => 0748-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0750-don-t-attempt-to-teleport-dead-entities.patch => 0749-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0751-Prevent-excessive-velocity-through-repeated-crits.patch => 0750-Prevent-excessive-velocity-through-repeated-crits.patch} (94%)
 rename patches/server/{0752-Remove-client-side-code-using-deprecated-for-removal.patch => 0751-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0752-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0754-Fix-removing-recipes-from-RecipeIterator.patch => 0753-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0755-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0754-Prevent-sending-oversized-item-data-in-equipment-and.patch} (97%)
 rename patches/server/{0756-Hide-unnecessary-itemmeta-from-clients.patch => 0755-Hide-unnecessary-itemmeta-from-clients.patch} (96%)
 rename patches/server/{0757-Fix-Spigot-growth-modifiers.patch => 0756-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0757-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0759-Add-PlayerItemFrameChangeEvent.patch => 0758-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0760-Add-player-health-update-API.patch => 0759-Add-player-health-update-API.patch} (95%)
 rename patches/server/{0761-Optimize-HashMapPalette.patch => 0760-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0762-Allow-delegation-to-vanilla-chunk-gen.patch => 0761-Allow-delegation-to-vanilla-chunk-gen.patch} (98%)
 rename patches/server/{0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0764-Optimise-collision-checking-in-player-move-packet-ha.patch => 0763-Optimise-collision-checking-in-player-move-packet-ha.patch} (94%)
 rename patches/server/{0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0764-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0766-Add-more-Campfire-API.patch => 0765-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0766-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0768-Fix-tripwire-state-inconsistency.patch => 0767-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0769-Forward-CraftEntity-in-teleport-command.patch => 0768-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0770-Improve-scoreboard-entries.patch => 0769-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0771-Entity-powdered-snow-API.patch => 0770-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0772-Add-API-for-item-entity-health.patch => 0771-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0773-Fix-entity-type-tags-suggestions-in-selectors.patch => 0772-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0774-Configurable-max-block-light-for-monster-spawning.patch => 0773-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0775-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0774-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0776-Load-effect-amplifiers-greater-than-127-correctly.patch => 0775-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0777-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0776-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0778-Fix-bees-aging-inside-hives.patch => 0777-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0779-Bucketable-API.patch => 0778-Bucketable-API.patch} (100%)
 rename patches/server/{0780-Validate-usernames.patch => 0779-Validate-usernames.patch} (93%)
 rename patches/server/{0781-Make-water-animal-spawn-height-configurable.patch => 0780-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (98%)
 rename patches/server/{0783-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0782-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0784-Add-new-overload-to-PersistentDataContainer-has.patch => 0783-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0785-Multiple-Entries-with-Scoreboards.patch => 0784-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0786-Reset-placed-block-on-exception.patch => 0785-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0787-Add-configurable-height-for-slime-spawn.patch => 0786-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0788-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (94%)
 rename patches/server/{0789-Fix-xp-reward-for-baby-zombies.patch => 0788-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0790-Kick-on-main-for-illegal-chat.patch => 0789-Kick-on-main-for-illegal-chat.patch} (91%)
 rename patches/server/{0791-Multi-Block-Change-API-Implementation.patch => 0790-Multi-Block-Change-API-Implementation.patch} (97%)
 rename patches/server/{0792-Fix-NotePlayEvent.patch => 0791-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0793-Freeze-Tick-Lock-API.patch => 0792-Freeze-Tick-Lock-API.patch} (97%)
 rename patches/server/{0794-Dolphin-API.patch => 0793-Dolphin-API.patch} (100%)
 rename patches/server/{0795-More-PotionEffectType-API.patch => 0794-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0796-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0795-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0797-API-for-creating-command-sender-which-forwards-feedb.patch => 0796-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0798-Add-missing-structure-set-seed-configs.patch => 0797-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0799-Implement-regenerateChunk.patch => 0798-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0800-Fix-cancelled-powdered-snow-bucket-placement.patch => 0799-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (91%)
 rename patches/server/{0802-Add-GameEvent-tags.patch => 0801-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0802-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0804-Furnace-RecipesUsed-API.patch => 0803-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0805-Configurable-sculk-sensor-listener-range.patch => 0804-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0806-Add-missing-block-data-mins-and-maxes.patch => 0805-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0806-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0808-Put-world-into-worldlist-before-initing-the-world.patch => 0807-Put-world-into-worldlist-before-initing-the-world.patch} (95%)
 rename patches/server/{0809-Fix-Entity-Position-Desync.patch => 0808-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0810-Custom-Potion-Mixes.patch => 0809-Custom-Potion-Mixes.patch} (99%)
 rename patches/server/{0811-Fix-Fluid-tags-isTagged-method.patch => 0810-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0812-Force-close-world-loading-screen.patch => 0811-Force-close-world-loading-screen.patch} (92%)
 rename patches/server/{0813-Fix-falling-block-spawn-methods.patch => 0812-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0814-Expose-furnace-minecart-push-values.patch => 0813-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0816-More-Projectile-API.patch => 0815-More-Projectile-API.patch} (100%)
 rename patches/server/{0817-Fix-swamp-hut-cat-generation-deadlock.patch => 0816-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (88%)
 rename patches/server/{0819-Implement-getComputedBiome-API.patch => 0818-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0820-Make-some-itemstacks-nonnull.patch => 0819-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0821-Implement-enchantWithLevels-API.patch => 0820-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0822-Fix-saving-in-unloadWorld.patch => 0821-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0823-Buffer-OOB-setBlock-calls.patch => 0822-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0824-Add-TameableDeathMessageEvent.patch => 0823-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0825-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0824-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0826-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0825-fix-player-loottables-running-when-mob-loot-gamerule.patch} (87%)
 rename patches/server/{0827-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0826-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0828-Guard-against-invalid-entity-positions.patch => 0827-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0829-cache-resource-keys.patch => 0828-cache-resource-keys.patch} (100%)
 rename patches/server/{0830-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0829-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0831-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0830-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0832-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0831-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0833-Prevent-tile-entity-copies-loading-chunks.patch => 0832-Prevent-tile-entity-copies-loading-chunks.patch} (89%)
 rename patches/server/{0834-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0833-Use-username-instead-of-display-name-in-PlayerList-g.patch} (87%)
 rename patches/server/{0835-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0834-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0836-Pass-ServerLevel-for-gamerule-callbacks.patch => 0835-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0837-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0838-WorldCreator-keepSpawnLoaded.patch => 0837-WorldCreator-keepSpawnLoaded.patch} (91%)
 rename patches/server/{0839-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0838-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0840-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0839-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0841-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0840-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0842-Fire-CauldronLevelChange-on-initial-fill.patch => 0841-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0843-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0842-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0844-Add-PlayerStopUsingItemEvent.patch => 0843-Add-PlayerStopUsingItemEvent.patch} (91%)
 rename patches/server/{0845-FallingBlock-auto-expire-setting.patch => 0844-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0846-Don-t-tick-markers.patch => 0845-Don-t-tick-markers.patch} (94%)
 rename patches/server/{0847-Do-not-accept-invalid-client-settings.patch => 0846-Do-not-accept-invalid-client-settings.patch} (88%)
 rename patches/server/{0848-Add-support-for-Proxy-Protocol.patch => 0847-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0849-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0848-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0850-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0849-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0851-Sanitize-Sent-BlockEntity-NBT.patch => 0850-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0852-Prevent-entity-loading-causing-async-lookups.patch => 0851-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0853-Disable-component-selector-resolving-in-books-by-def.patch => 0852-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0854-Throw-exception-on-world-create-while-being-ticked.patch => 0853-Throw-exception-on-world-create-while-being-ticked.patch} (97%)
 rename patches/server/{0855-Add-Alternate-Current-redstone-implementation.patch => 0854-Add-Alternate-Current-redstone-implementation.patch} (99%)
 rename patches/server/{0856-Dont-resent-entity-on-art-update.patch => 0855-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0857-Add-WardenAngerChangeEvent.patch => 0856-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0858-Add-option-for-strict-advancement-dimension-checks.patch => 0857-Add-option-for-strict-advancement-dimension-checks.patch} (90%)
 rename patches/server/{0859-Add-missing-important-BlockStateListPopulator-method.patch => 0858-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0860-Nameable-Banner-API.patch => 0859-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0861-Don-t-broadcast-messages-to-command-blocks.patch => 0860-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0862-Prevent-empty-items-from-being-added-to-world.patch => 0861-Prevent-empty-items-from-being-added-to-world.patch} (94%)
 rename patches/server/{0863-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0862-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0864-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0863-Don-t-print-component-in-resource-pack-rejection-mes.patch} (90%)
 rename patches/server/{0865-Add-Player-getFishHook.patch => 0864-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0866-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0865-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0867-Add-various-missing-EntityDropItemEvent-calls.patch => 0866-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0868-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0867-Add-some-minimal-debug-information-to-chat-packet-er.patch} (90%)
 rename patches/server/{0869-Fix-Bee-flower-NPE.patch => 0868-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0870-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (87%)
 rename patches/server/{0871-More-Teleport-API.patch => 0870-More-Teleport-API.patch} (97%)
 rename patches/server/{0872-Add-EntityPortalReadyEvent.patch => 0871-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0873-Don-t-use-level-random-in-entity-constructors.patch => 0872-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0874-Send-block-entities-after-destroy-prediction.patch => 0873-Send-block-entities-after-destroy-prediction.patch} (97%)
 rename patches/server/{0875-Warn-on-plugins-accessing-faraway-chunks.patch => 0874-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0876-Custom-Chat-Completion-Suggestions-API.patch => 0875-Custom-Chat-Completion-Suggestions-API.patch} (94%)
 rename patches/server/{0877-Add-missing-BlockFadeEvents.patch => 0876-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0878-Collision-API.patch => 0877-Collision-API.patch} (100%)
 rename patches/server/{0879-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0878-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0880-Remove-invalid-signature-login-stacktrace.patch => 0879-Remove-invalid-signature-login-stacktrace.patch} (88%)
 rename patches/server/{0881-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (86%)
 rename patches/server/{0882-Block-Ticking-API.patch => 0881-Block-Ticking-API.patch} (100%)
 rename patches/server/{0883-Add-Velocity-IP-Forwarding-Support.patch => 0882-Add-Velocity-IP-Forwarding-Support.patch} (98%)
 rename patches/server/{0884-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (92%)
 rename patches/server/{0885-Add-NamespacedKey-biome-methods.patch => 0884-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0886-Fix-plugin-loggers-on-server-shutdown.patch => 0885-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0887-Workaround-for-client-lag-spikes-MC-162253.patch => 0886-Workaround-for-client-lag-spikes-MC-162253.patch} (100%)
 rename patches/server/{0888-Stop-large-look-changes-from-crashing-the-server.patch => 0887-Stop-large-look-changes-from-crashing-the-server.patch} (96%)
 rename patches/server/{0889-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (94%)
 rename patches/server/{0890-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0889-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0891-Fire-EntityChangeBlockEvent-in-more-places.patch => 0890-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0892-Missing-eating-regain-reason.patch => 0891-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0893-Missing-effect-cause.patch => 0892-Missing-effect-cause.patch} (100%)
 rename patches/server/{0894-Added-byte-array-serialization-deserialization-for-P.patch => 0893-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0895-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0894-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0896-Call-BlockPhysicsEvent-more-often.patch => 0895-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0897-Configurable-chat-thread-limit.patch => 0896-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0898-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0899-Set-position-before-player-sending-on-dimension-chan.patch => 0898-Set-position-before-player-sending-on-dimension-chan.patch} (87%)
 rename patches/server/{0900-fix-Jigsaw-block-kicking-user.patch => 0899-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0901-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0900-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0902-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0901-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0903-Fix-a-bunch-of-vanilla-bugs.patch => 0902-Fix-a-bunch-of-vanilla-bugs.patch} (99%)
 rename patches/server/{0904-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0903-Remove-unnecessary-onTrackingStart-during-navigation.patch} (87%)
 rename patches/server/{0905-Fix-custom-piglin-loved-items.patch => 0904-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0906-EntityPickupItemEvent-fixes.patch => 0905-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0907-Correctly-handle-interactions-with-items-on-cooldown.patch => 0906-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0908-Add-PlayerInventorySlotChangeEvent.patch => 0907-Add-PlayerInventorySlotChangeEvent.patch} (95%)
 rename patches/server/{0909-Elder-Guardian-appearance-API.patch => 0908-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0910-Allow-changing-bed-s-occupied-property.patch => 0909-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0911-Add-entity-knockback-API.patch => 0910-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0912-Detect-headless-JREs.patch => 0911-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0913-fixed-entity-vehicle-collision-event-not-called.patch => 0912-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0914-optimized-dirt-and-snow-spreading.patch => 0913-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0915-Added-EntityToggleSitEvent.patch => 0914-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0916-Add-fire-tick-delay-option.patch => 0915-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0917-Add-Moving-Piston-API.patch => 0916-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0918-Ignore-impossible-spawn-tick.patch => 0917-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0919-Track-projectile-source-for-fireworks-from-dispenser.patch => 0918-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0920-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0919-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0921-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0920-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0922-Prevent-compass-from-loading-chunks.patch => 0921-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0923-Add-PrePlayerAttackEntityEvent.patch => 0922-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0924-ensure-reset-EnderDragon-boss-event-name.patch => 0923-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0925-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0924-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0926-Reorder-bukkit-damage-source-entity-for-explosion-to.patch => 0925-Reorder-bukkit-damage-source-entity-for-explosion-to.patch} (100%)
 rename patches/server/{0927-Add-Player-Warden-Warning-API.patch => 0926-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0928-More-vanilla-friendly-methods-to-update-trades.patch => 0927-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0929-Add-paper-dumplisteners-command.patch => 0928-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0930-check-global-player-list-where-appropriate.patch => 0929-check-global-player-list-where-appropriate.patch} (95%)
 rename patches/server/{0931-Fix-async-entity-add-due-to-fungus-trees.patch => 0930-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0932-ItemStack-damage-API.patch => 0931-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0933-Friction-API.patch => 0932-Friction-API.patch} (100%)
 rename patches/server/{0934-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0933-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0935-Fix-player-kick-on-shutdown.patch => 0934-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0936-Sync-offhand-slot-in-menus.patch => 0935-Sync-offhand-slot-in-menus.patch} (95%)
 rename patches/server/{0937-Player-Entity-Tracking-Events.patch => 0936-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0938-Limit-pet-look-distance.patch => 0937-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0939-Properly-resend-entities.patch => 0938-Properly-resend-entities.patch} (95%)
 rename patches/server/{0940-Fixes-and-additions-to-the-SpawnReason-API.patch => 0939-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0941-fix-Instruments.patch => 0940-fix-Instruments.patch} (97%)
 rename patches/server/{0942-Fix-chunk-snapshot-biome-getter.patch => 0941-Fix-chunk-snapshot-biome-getter.patch} (100%)
 rename patches/server/{0943-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0942-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0944-Fix-MapLike-Codec-missing-key-selector.patch => 0943-Fix-MapLike-Codec-missing-key-selector.patch} (100%)
 rename patches/server/{0945-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0944-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0946-Improve-logging-and-errors.patch => 0945-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0947-Fix-explosion-yield-with-new-gamerules.patch => 0946-Fix-explosion-yield-with-new-gamerules.patch} (100%)
 rename patches/server/{0948-Add-BlockLockCheckEvent.patch => 0947-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0949-Add-Sneaking-API-for-Entities.patch => 0948-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0950-Improve-PortalEvents.patch => 0949-Improve-PortalEvents.patch} (100%)

diff --git a/patches/server/0385-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0385-Load-Chunks-for-Login-Asynchronously.patch
deleted file mode 100644
index a59396d512..0000000000
--- a/patches/server/0385-Load-Chunks-for-Login-Asynchronously.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 19 Apr 2020 04:28:29 -0400
-Subject: [PATCH] Load Chunks for Login Asynchronously
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 62f1f568bba5fbcb68e49640adb79c9384619bc6..49ab59485e61f784701cf75b623ad2127e9fbe20 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -173,6 +173,7 @@ import org.bukkit.event.world.GenericGameEvent;
- import org.bukkit.event.world.TimeSkipEvent;
- // CraftBukkit end
- import it.unimi.dsi.fastutil.ints.IntArrayList; // Paper
-+import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper
- 
- public class ServerLevel extends Level implements WorldGenLevel {
- 
-@@ -439,6 +440,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         return player != null && player.level == this ? player : null;
-     }
-     // Paper end
-+    public final ReferenceOpenHashSet<ServerPlayer> pendingLogin = new ReferenceOpenHashSet<>(); // Paper
- 
-     // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
-     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 78913368d8fa74273126a1245d2faf55242fccdd..d6200e09e0ca6fab8ecbfa5f21c52009b9959b77 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -184,6 +184,7 @@ public class ServerPlayer extends Player {
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
-     public ServerGamePacketListenerImpl connection;
-+    public net.minecraft.network.Connection networkManager; // Paper
-     public final MinecraftServer server;
-     public final ServerPlayerGameMode gameMode;
-     private final PlayerAdvancements advancements;
-@@ -260,6 +261,7 @@ public class ServerPlayer extends Player {
-     public boolean joining = true;
-     public boolean sentListPacket = false;
-     public boolean supressTrackerForLogin = false; // Paper
-+    public boolean didPlayerJoinEvent = false; // Paper
-     public Integer clientViewDistance;
-     public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
-     // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/server/level/TicketType.java b/src/main/java/net/minecraft/server/level/TicketType.java
-index 97d1ff2af23bac14e67bca5896843325aaa5bfc1..e9bc61590d33dc341074371859ceec54599e6c47 100644
---- a/src/main/java/net/minecraft/server/level/TicketType.java
-+++ b/src/main/java/net/minecraft/server/level/TicketType.java
-@@ -23,6 +23,7 @@ public class TicketType<T> {
-     public static final TicketType<ChunkPos> FORCED = TicketType.create("forced", Comparator.comparingLong(ChunkPos::toLong));
-     public static final TicketType<ChunkPos> LIGHT = TicketType.create("light", Comparator.comparingLong(ChunkPos::toLong));
-     public static final TicketType<BlockPos> PORTAL = TicketType.create("portal", Vec3i::compareTo, 300);
-+    public static final TicketType<Long> LOGIN = create("login", Long::compareTo, 100); // Paper
-     public static final TicketType<Integer> POST_TELEPORT = TicketType.create("post_teleport", Integer::compareTo, 5);
-     public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1);
-     public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b42ef07a2653b62cf6ba44172e5a919be3de964f..6decd63fb773eab4ee06fe4bc0bc2659a1fa5388 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -339,6 +339,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-     @Override
-     public void tick() {
-+        // Paper start - login async
-+        // Don't tick if not valid (dead), otherwise we load chunks below
-+        if (this.player.valid) {
-+        // Paper end
-         if (this.ackBlockChangesUpTo > -1) {
-             this.send(new ClientboundBlockChangedAckPacket(this.ackBlockChangesUpTo));
-             this.ackBlockChangesUpTo = -1;
-@@ -385,7 +389,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-             this.lastVehicle = null;
-             this.clientVehicleIsFloating = false;
-             this.aboveGroundVehicleTickCount = 0;
--        }
-+        }} // Paper - end if (valid)
- 
-         this.server.getProfiler().push("keepAlive");
-         // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 203786383387765d1f5a2d2ccce79d792fd5b187..82f2872cf32638a0df82fe751af4b634d8691c9c 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -84,7 +84,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-             }
-             // Paper end
-         } else if (this.state == ServerLoginPacketListenerImpl.State.DELAY_ACCEPT) {
--            ServerPlayer entityplayer = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
-+            ServerPlayer entityplayer = this.server.getPlayerList().getActivePlayer(this.gameProfile.getId()); // Paper
- 
-             if (entityplayer == null) {
-                 this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
-@@ -169,7 +169,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-             }
- 
-             this.connection.send(new ClientboundGameProfilePacket(this.gameProfile));
--            ServerPlayer entityplayer = this.server.getPlayerList().getPlayer(this.gameProfile.getId());
-+            ServerPlayer entityplayer = this.server.getPlayerList().getActivePlayer(this.gameProfile.getId()); // Paper
- 
-             try {
-                 ServerPlayer entityplayer1 = this.server.getPlayerList().getPlayerForLogin(this.gameProfile, s); // CraftBukkit - add player reference
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cfc497822e4e1dfc21807ec93bcfabb215cdbb95..2c0e45b3d0f5a1178ccecc851a110e5dc6f2023c 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -143,6 +143,7 @@ public abstract class PlayerList {
-     private final IpBanList ipBans;
-     private final ServerOpList ops;
-     private final UserWhiteList whitelist;
-+    private final Map<UUID, ServerPlayer> pendingPlayers = Maps.newHashMap(); // Paper
-     // CraftBukkit start
-     // private final Map<UUID, ServerStatisticManager> stats;
-     // private final Map<UUID, AdvancementDataPlayer> advancements;
-@@ -186,6 +187,13 @@ public abstract class PlayerList {
-     public void placeNewPlayer(Connection connection, ServerPlayer player) {
-         player.isRealPlayer = true; // Paper
-         player.loginTime = System.currentTimeMillis(); // Paper
-+        // Paper start
-+        ServerPlayer prev = pendingPlayers.put(player.getUUID(), player);
-+        if (prev != null) {
-+            disconnectPendingPlayer(prev);
-+        }
-+        player.networkManager = connection;
-+        // Paper end
-         GameProfile gameprofile = player.getGameProfile();
-         GameProfileCache usercache = this.server.getProfileCache();
-         Optional<GameProfile> optional = usercache.get(gameprofile.getId());
-@@ -198,7 +206,7 @@ public abstract class PlayerList {
-         if (nbttagcompound != null && nbttagcompound.contains("bukkit")) {
-             CompoundTag bukkit = nbttagcompound.getCompound("bukkit");
-             s = bukkit.contains("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s;
--        }
-+        }String lastKnownName = s; // Paper
-         // CraftBukkit end
- 
-         if (nbttagcompound != null) {
-@@ -225,11 +233,15 @@ public abstract class PlayerList {
-         if (nbttagcompound == null) player.fudgeSpawnLocation(worldserver1); // Paper - only move to spawn on first login, otherwise, stay where you are....
- 
-         player.setLevel(worldserver1);
--        String s1 = "local";
-+        // Paper start - make s1 final
-+        final String s1;
- 
-         if (connection.getRemoteAddress() != null) {
-             s1 = connection.getRemoteAddress().toString();
-+        } else {
-+            s1 = "local";
-         }
-+        // Paper end
- 
-         // Spigot start - spawn location event
-         Player spawnPlayer = player.getBukkitEntity();
-@@ -272,6 +284,56 @@ public abstract class PlayerList {
-         player.getRecipeBook().sendInitialRecipeBook(player);
-         this.updateEntireScoreboard(worldserver1.getScoreboard(), player);
-         this.server.invalidateStatus();
-+        // Paper start - async load spawn in chunk
-+        ServerLevel finalWorldserver = worldserver1;
-+        finalWorldserver.pendingLogin.add(player);
-+        int chunkX = loc.getBlockX() >> 4;
-+        int chunkZ = loc.getBlockZ() >> 4;
-+        final net.minecraft.world.level.ChunkPos pos = new net.minecraft.world.level.ChunkPos(chunkX, chunkZ);
-+        net.minecraft.server.level.ChunkMap playerChunkMap = worldserver1.getChunkSource().chunkMap;
-+        net.minecraft.server.level.DistanceManager distanceManager = playerChunkMap.distanceManager;
-+        io.papermc.paper.chunk.system.ChunkSystem.scheduleTickingState(
-+            worldserver1, chunkX, chunkZ, net.minecraft.server.level.ChunkHolder.FullChunkStatus.ENTITY_TICKING, true,
-+            ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGHEST,
-+            (chunk) -> {
-+                MinecraftServer.getServer().scheduleOnMain(() -> {
-+                    try {
-+                        if (!playerconnection.connection.isConnected()) {
-+                            return;
-+                        }
-+                        PlayerList.this.postChunkLoadJoin(
-+                            player, finalWorldserver, connection, playerconnection,
-+                            nbttagcompound, s1, lastKnownName
-+                        );
-+                        distanceManager.addTicket(net.minecraft.server.level.TicketType.LOGIN, pos, 31, pos.toLong());
-+                    } finally {
-+                        finalWorldserver.pendingLogin.remove(player);
-+                    }
-+                });
-+            }
-+        );
-+    }
-+
-+    public ServerPlayer getActivePlayer(UUID uuid) {
-+        ServerPlayer player = this.playersByUUID.get(uuid);
-+        return player != null ? player : pendingPlayers.get(uuid);
-+    }
-+
-+    void disconnectPendingPlayer(ServerPlayer entityplayer) {
-+        Component msg = Component.translatable("multiplayer.disconnect.duplicate_login");
-+        entityplayer.networkManager.send(new net.minecraft.network.protocol.game.ClientboundDisconnectPacket(msg), net.minecraft.network.PacketSendListener.thenRun(() -> {
-+            entityplayer.networkManager.disconnect(msg);
-+            entityplayer.networkManager = null;
-+        }));
-+    }
-+
-+    private void postChunkLoadJoin(ServerPlayer player, ServerLevel worldserver1, Connection networkmanager, ServerGamePacketListenerImpl playerconnection, CompoundTag nbttagcompound, String s1, String s) {
-+        pendingPlayers.remove(player.getUUID(), player);
-+        if (!networkmanager.isConnected()) {
-+            return;
-+        }
-+        player.didPlayerJoinEvent = true;
-+        // Paper end
-         MutableComponent ichatmutablecomponent;
- 
-         if (player.getGameProfile().getName().equalsIgnoreCase(s)) {
-@@ -514,6 +576,7 @@ public abstract class PlayerList {
- 
-     protected void save(ServerPlayer player) {
-         if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
-+        if (!player.didPlayerJoinEvent) return; // Paper - If we never fired PJE, we disconnected during login. Data has not changed, and additionally, our saved vehicle is not loaded! If we save now, we will lose our vehicle (CraftBukkit bug)
-         this.playerIo.save(player);
-         ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
- 
-@@ -541,7 +604,7 @@ public abstract class PlayerList {
-         }
- 
-         PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())));
--        this.cserver.getPluginManager().callEvent(playerQuitEvent);
-+        if (entityplayer.didPlayerJoinEvent) this.cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
-         entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
- 
-         if (server.isSameThread()) entityplayer.doTick(); // SPIGOT-924 // Paper - don't tick during emergency shutdowns (Watchdog)
-@@ -586,6 +649,13 @@ public abstract class PlayerList {
-             // this.advancements.remove(uuid);
-             // CraftBukkit end
-         }
-+        // Paper start
-+        entityplayer1 = pendingPlayers.get(uuid);
-+        if (entityplayer1 == entityplayer) {
-+            pendingPlayers.remove(uuid);
-+        }
-+        entityplayer.networkManager = null;
-+        // Paper end
- 
-         // CraftBukkit start
-         // this.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID())));
-@@ -603,7 +673,7 @@ public abstract class PlayerList {
-         this.cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
-         // CraftBukkit end
- 
--        return playerQuitEvent.quitMessage(); // Paper - Adventure
-+        return entityplayer.didPlayerJoinEvent ? playerQuitEvent.quitMessage() : null; // CraftBukkit // Paper - Adventure // Paper - don't print quit if we never printed join
-     }
- 
-     // CraftBukkit start - Whole method, SocketAddress to LoginListener, added hostname to signature, return EntityPlayer
-@@ -622,6 +692,13 @@ public abstract class PlayerList {
-                 list.add(entityplayer);
-             }
-         }
-+        // Paper start - check pending players too
-+        entityplayer = pendingPlayers.get(uuid);
-+        if (entityplayer != null) {
-+            this.pendingPlayers.remove(uuid);
-+            disconnectPendingPlayer(entityplayer);
-+        }
-+        // Paper end
- 
-         Iterator iterator = list.iterator();
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ba07a7ba5300ac2b087c563355b4795ae33e27e..82e8d9e5a1a635926789b2fb9872bcfc3483217a 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1246,7 +1246,7 @@ public final class CraftServer implements Server {
-             return false;
-         }
- 
--        if (handle.players().size() > 0) {
-+        if (handle.players().size() > 0 || handle.pendingLogin.size() > 0) { // Paper
-             return false;
-         }
- 
diff --git a/patches/server/0386-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0386-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0387-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0387-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch
index 50898b6c98..bcaa5ef25b 100644
--- a/patches/server/0387-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c5a11e22c44d5adb55844bde964ca43acbc03fdf..632119d31b2c2821ef4871abf4fd6916668b0de7 100644
+index a49717ebf2b2d961b7f57dade57105bc9f16639c..e118a4a41c4c11c53b5a1783113f096bdb4a9f2d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2128,7 +2128,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0388-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0388-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0389-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0389-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0390-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 99%
rename from patches/server/0390-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index c63af1f5e3..0b1460f775 100644
--- a/patches/server/0390-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -80,7 +80,7 @@ index 0a07a99e67e087db87c493d7c2b8b0c94d5b3771..19218e993052d44a830f825f9a0eb695
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 632119d31b2c2821ef4871abf4fd6916668b0de7..b6741c72216378368392e65aad3ff75a3191d0ce 100644
+index e118a4a41c4c11c53b5a1783113f096bdb4a9f2d..f0c37129240fadac40fec607afda1ccef446caa0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1647,9 +1647,9 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0391-Villager-Restocks-API.patch b/patches/server/0390-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0391-Villager-Restocks-API.patch
rename to patches/server/0390-Villager-Restocks-API.patch
diff --git a/patches/server/0392-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 91%
rename from patches/server/0392-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch
index c4875638df..11fa856076 100644
--- a/patches/server/0392-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a4a2e560304def17ab0943a2d876f6e8e521809b..f9c84bc2018391670d4e2dd97d0fca224cd1a728 100644
+index b42ef07a2653b62cf6ba44172e5a919be3de964f..792fdd57c0d31e5de4f5819d40677a53a84773d1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -959,7 +959,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -955,7 +955,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handlePickItem(ServerboundPickItemPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
diff --git a/patches/server/0393-Expose-game-version.patch b/patches/server/0392-Expose-game-version.patch
similarity index 89%
rename from patches/server/0393-Expose-game-version.patch
rename to patches/server/0392-Expose-game-version.patch
index 279c93291f..ce846dd3ce 100644
--- a/patches/server/0393-Expose-game-version.patch
+++ b/patches/server/0392-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e28b973efe4f107d0a0d18dd2492f03ce2b424e9..c2e018cc05d6c6aaa615150ab4b62b85acfe1d05 100644
+index 3ba07a7ba5300ac2b087c563355b4795ae33e27e..760f42c620033aef43e4a7765dd7ba0b743a6ad4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -592,6 +592,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0394-Optimize-Voxel-Shape-Merging.patch b/patches/server/0393-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0394-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0393-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0395-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0395-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 27ef65dc80..bcdd9a4e15 100644
--- a/patches/server/0395-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0394-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 8fbc14fb4b38bb73439b0b5d31d29c69f1f229b2..6a9485f1c3743562700779930282285c6ad1067a 100644
+index 2451084f0d0bad43b7cf5c89f5590098f89b32a5..1176f77c79c2cbd727f1f6867e956fb698936349 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -28,6 +28,7 @@ public class Main {
diff --git a/patches/server/0396-misc-debugging-dumps.patch b/patches/server/0395-misc-debugging-dumps.patch
similarity index 96%
rename from patches/server/0396-misc-debugging-dumps.patch
rename to patches/server/0395-misc-debugging-dumps.patch
index bb3cdeaff7..e40916f2df 100644
--- a/patches/server/0396-misc-debugging-dumps.patch
+++ b/patches/server/0395-misc-debugging-dumps.patch
@@ -58,7 +58,7 @@ index d406df9626d29ee257b8eedcbea2af09ed4b6baf..366959f9841eb0ef3669b3b3b069d767
          this.running = false;
          if (waitForShutdown) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 82f2872cf32638a0df82fe751af4b634d8691c9c..8cb9606cf791d6f0e241cc92baa87988414d94e0 100644
+index 203786383387765d1f5a2d2ccce79d792fd5b187..8044885a91b316b2e5e92dd6260b8e515dcea5a9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -183,6 +183,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -74,7 +74,7 @@ index 82f2872cf32638a0df82fe751af4b634d8691c9c..8cb9606cf791d6f0e241cc92baa87988
                  this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent));
                  this.connection.disconnect(ichatmutablecomponent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c2e018cc05d6c6aaa615150ab4b62b85acfe1d05..718126fbd5829ec6030d5fb2a75f6c8ce76059d7 100644
+index 760f42c620033aef43e4a7765dd7ba0b743a6ad4..ae5d775c00b377aa5be383874b4af61a5951186b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1015,6 +1015,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0397-Prevent-teleporting-dead-entities.patch b/patches/server/0396-Prevent-teleporting-dead-entities.patch
similarity index 88%
rename from patches/server/0397-Prevent-teleporting-dead-entities.patch
rename to patches/server/0396-Prevent-teleporting-dead-entities.patch
index be4e449b14..8eea504603 100644
--- a/patches/server/0397-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0396-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 f9c84bc2018391670d4e2dd97d0fca224cd1a728..6936e9b671915fbc5d849adefa473906ed29ab95 100644
+index 792fdd57c0d31e5de4f5819d40677a53a84773d1..c5d1fc2e7c8090ed91cb6ca24135c5aaa2172fa9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1625,6 +1625,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1621,6 +1621,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
  
      public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<ClientboundPlayerPositionPacket.RelativeArgument> set, boolean flag) {
diff --git a/patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index f126d9bc9f..f0e3104e62 100644
--- a/patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -515,10 +515,10 @@ index 549ea8e0fe702615eefcbfd1cd6a30e05b7b3fd5..771677c0e1cd7bfe089b9a5bb9095650
          paperConfigurations.initializeWorldDefaultsConfiguration();
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 49ab59485e61f784701cf75b623ad2127e9fbe20..8d20f8beb9fd2da36a6cf8c16b1ad0315c321fc9 100644
+index 62f1f568bba5fbcb68e49640adb79c9384619bc6..44ca46e7dff19ae99ff6cf0d82269c5f7ad7274a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -221,7 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -220,7 +220,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper
      public static Throwable getAddToWorldStackTrace(Entity entity) {
@@ -529,7 +529,7 @@ index 49ab59485e61f784701cf75b623ad2127e9fbe20..8d20f8beb9fd2da36a6cf8c16b1ad031
      }
  
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-@@ -1329,7 +1331,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1327,7 +1329,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity.isRemoved()) {
              // Paper start
              if (DEBUG_ENTITIES) {
@@ -556,7 +556,7 @@ index a24ef433d0c9d06b86fd612978cfd6d877036791..1b38326c9a709536dc4cccf9af93aede
      final MinecraftServer server;
      public volatile boolean running;
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 8cb9606cf791d6f0e241cc92baa87988414d94e0..d92aaec3a4535d3683e842f9a712ba06c03014ef 100644
+index 8044885a91b316b2e5e92dd6260b8e515dcea5a9..75a32d33518023cb24ba639751631bfad3563bd5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -185,7 +185,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0399-Implement-Mob-Goal-API.patch b/patches/server/0398-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0399-Implement-Mob-Goal-API.patch
rename to patches/server/0398-Implement-Mob-Goal-API.patch
index 98e3ff619b..a42997ed42 100644
--- a/patches/server/0399-Implement-Mob-Goal-API.patch
+++ b/patches/server/0398-Implement-Mob-Goal-API.patch
@@ -791,7 +791,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 889833bc7994973e1c5fb408b40ade69b445f8af..1ca964776e150b15270cf314ea6ed642f737641e 100644
+index ae5d775c00b377aa5be383874b4af61a5951186b..73bcba84979ba2d8f3ab2f2aa1d4294fe792f53a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2718,5 +2718,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0400-Add-villager-reputation-API.patch b/patches/server/0399-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0400-Add-villager-reputation-API.patch
rename to patches/server/0399-Add-villager-reputation-API.patch
diff --git a/patches/server/0401-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0401-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0402-ExperienceOrbMergeEvent.patch b/patches/server/0401-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0402-ExperienceOrbMergeEvent.patch
rename to patches/server/0401-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0403-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0403-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0404-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0403-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0404-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0403-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0405-Potential-bed-API.patch b/patches/server/0404-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0405-Potential-bed-API.patch
rename to patches/server/0404-Potential-bed-API.patch
diff --git a/patches/server/0406-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from patches/server/0406-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch
index 642acd32bc..94329ef3ff 100644
--- a/patches/server/0406-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index 366959f9841eb0ef3669b3b3b069d7670f0ba7e6..93c1a1bf602af1e73202590e78dac833
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3e48976a9f0317b02241ed9e313fbce1d373efe3..77d798a2c1a6fc7c171c07c103b54939e1aca497 100644
+index 73bcba84979ba2d8f3ab2f2aa1d4294fe792f53a..f6bc55e326f9076ac5df9decd7e501bee9346f67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1024,6 +1024,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0407-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0407-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0408-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0408-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0409-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0409-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0410-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0410-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 07f5514032..e0cf385668 100644
--- a/patches/server/0410-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,7 +18,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..5ca3ad7b3d7606accd0a58b3c708fadb
      @VisibleForTesting
      static long encode(double value) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index eb08e086ee57a41de550dbae130a7d68562e1728..1da687083a52b97b6245185eb2e73380da5ae8fd 100644
+index 11a4ba46869e3073375d85820426f0662bd2caf7..69ac6b4fbdf4cebbaa36234e17e2d51c732de8af 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1337,9 +1337,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0411-Ensure-safe-gateway-teleport.patch b/patches/server/0410-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0411-Ensure-safe-gateway-teleport.patch
rename to patches/server/0410-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0412-Add-option-for-console-having-all-permissions.patch b/patches/server/0411-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0412-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0411-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0413-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 98%
rename from patches/server/0413-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index e78ad78821..6bf9ef4965 100644
--- a/patches/server/0413-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -42,7 +42,7 @@ index 2ba3bb4e5670ece798a8882801a856d82851c00a..a61f55ed1fbe5aac5289014cb95cb695
          this.newChunkHolder = newChunkHolder; // Paper - rewrite chunk system
          this.chunkToSaveHistory = null;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f18df9d9e569bda32865a05e85a843f0422e17cf..d17a5b8d6f1b61ac1894e642d70704881c343f25 100644
+index 69ac6b4fbdf4cebbaa36234e17e2d51c732de8af..e87ade8697a33b9ea23dce59838a9ccd02ab09f6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -156,12 +156,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -333,10 +333,10 @@ index 665e088cb0b73f6a0c62f29c56da462bab7c927e..298e4468f7b5346733257f7117f76c66
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 55705fca6dba1bebe0cb444a68c130f8f2785ae3..924969d5cb52e5361b6bf383a8ba6f63508dad6d 100644
+index 78913368d8fa74273126a1245d2faf55242fccdd..3fecc0c587de51c683a362a1a44fe3d5eed60979 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -266,6 +266,7 @@ public class ServerPlayer extends Player {
+@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
diff --git a/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
index 732a0f1143..bcc36d1ae5 100644
--- a/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index eb3b54b5e01528e3801e9f15733bd5f3db56f17f..d1091b6b87534a3f9c2b8df74f40facc82679d80 100644
+index e87ade8697a33b9ea23dce59838a9ccd02ab09f6..81870f23ae70db3a1290428df6a47d76baa9a722 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -68,6 +68,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
diff --git a/patches/server/0415-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0414-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0415-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0414-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0416-Maps-shouldn-t-load-chunks.patch b/patches/server/0415-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0416-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0415-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0417-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0417-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0418-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0418-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0419-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0419-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0420-Fix-sand-duping.patch b/patches/server/0419-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0420-Fix-sand-duping.patch
rename to patches/server/0419-Fix-sand-duping.patch
diff --git a/patches/server/0421-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0421-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0422-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 91%
rename from patches/server/0422-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch
index 6d235ab41b..e424ed2736 100644
--- a/patches/server/0422-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,10 +14,10 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6936e9b671915fbc5d849adefa473906ed29ab95..dc10d5add00e77a2da761e806019785eb83d2bc6 100644
+index c5d1fc2e7c8090ed91cb6ca24135c5aaa2172fa9..fd3e8c2d3a415a6a3370784ec3c0d46d3c1122b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1438,6 +1438,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1434,6 +1434,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                              this.player.move(MoverType.PLAYER, new Vec3(d7, d8, d9));
                              this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
diff --git a/patches/server/0423-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0423-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0424-Improve-Arrow-API.patch b/patches/server/0423-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0424-Improve-Arrow-API.patch
rename to patches/server/0423-Improve-Arrow-API.patch
diff --git a/patches/server/0425-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 92%
rename from patches/server/0425-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 5dd9eca9a1..7b71283491 100644
--- a/patches/server/0425-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dc10d5add00e77a2da761e806019785eb83d2bc6..8f6ab03ade0e54f91d55dc54103f89425802aa42 100644
+index fd3e8c2d3a415a6a3370784ec3c0d46d3c1122b7..8d8a42003ac6de567db8c2e052d43d698879b535 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3096,9 +3096,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3092,9 +3092,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              if (!this.player.containerMenu.stillValid(this.player)) {
                  ServerGamePacketListenerImpl.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
              } else {
diff --git a/patches/server/0426-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0426-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0427-Add-permission-for-command-blocks.patch b/patches/server/0426-Add-permission-for-command-blocks.patch
similarity index 96%
rename from patches/server/0427-Add-permission-for-command-blocks.patch
rename to patches/server/0426-Add-permission-for-command-blocks.patch
index f7152f071e..0b1fec8754 100644
--- a/patches/server/0427-Add-permission-for-command-blocks.patch
+++ b/patches/server/0426-Add-permission-for-command-blocks.patch
@@ -18,10 +18,10 @@ index aee5144bdc5bd9f7b07ce3b72331bcfd42663ec9..a98254e38076e82f94db7b2f2112500e
                  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 8f6ab03ade0e54f91d55dc54103f89425802aa42..9f095be14d7bb8495b09a10cad4d81dbcb7c3138 100644
+index 8d8a42003ac6de567db8c2e052d43d698879b535..30bb23dc4d190c00ced761ed3c8ab1e2620d3a0a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -870,7 +870,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -866,7 +866,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
@@ -30,7 +30,7 @@ index 8f6ab03ade0e54f91d55dc54103f89425802aa42..9f095be14d7bb8495b09a10cad4d81db
              this.player.sendSystemMessage(Component.translatable("advMode.notAllowed"));
          } else {
              BaseCommandBlock commandblocklistenerabstract = null;
-@@ -937,7 +937,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -933,7 +933,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
diff --git a/patches/server/0428-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0428-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0429-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 94%
rename from patches/server/0429-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 21cba7bb0c..417848e469 100644
--- a/patches/server/0429-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -76,10 +76,10 @@ index 771677c0e1cd7bfe089b9a5bb9095650216ff588..520cd1a6b347687b2ec6d13f034be391
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 924969d5cb52e5361b6bf383a8ba6f63508dad6d..39c3c4a5239c177ef81b13be1139300bb9af1dea 100644
+index 3fecc0c587de51c683a362a1a44fe3d5eed60979..ca08f04aed8296437eafee93093f96c03c1d418f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1151,7 +1151,7 @@ public class ServerPlayer extends Player {
+@@ -1149,7 +1149,7 @@ public class ServerPlayer extends Player {
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
                  this.connection.send(new ClientboundRespawnPacket(worldserver.dimensionTypeId(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), (byte) 3, this.getLastDeathLocation()));
@@ -89,10 +89,10 @@ index 924969d5cb52e5361b6bf383a8ba6f63508dad6d..39c3c4a5239c177ef81b13be1139300b
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9f095be14d7bb8495b09a10cad4d81dbcb7c3138..f440d9446d738429e33ed1fa9fa495af67f6427a 100644
+index 30bb23dc4d190c00ced761ed3c8ab1e2620d3a0a..f07b584d1d7a97e242c7699fa277d0c642da1857 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3371,7 +3371,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3367,7 +3367,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) {
@@ -102,7 +102,7 @@ index 9f095be14d7bb8495b09a10cad4d81dbcb7c3138..f440d9446d738429e33ed1fa9fa495af
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 77d798a2c1a6fc7c171c07c103b54939e1aca497..69cf645d88756c4b11942e07bdc41d56b6732825 100644
+index f6bc55e326f9076ac5df9decd7e501bee9346f67..a67e158bad42086aec237a822ec252fd26f80e3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -964,8 +964,8 @@ public final class CraftServer implements Server {
@@ -117,7 +117,7 @@ index 77d798a2c1a6fc7c171c07c103b54939e1aca497..69cf645d88756c4b11942e07bdc41d56
              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 3f7b277cd931a60d348802114ee2a1af02c479e0..72721a229f1febc23575ed994261efb1192a99d2 100644
+index caacf6dbe6c4fd461624ea421d08a18222fc2a6e..bc083d58f670f2a0c6e621da5e2258f7be5680b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1146,7 +1146,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0430-Paper-dumpitem-command.patch b/patches/server/0429-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0430-Paper-dumpitem-command.patch
rename to patches/server/0429-Paper-dumpitem-command.patch
diff --git a/patches/server/0431-Improve-Legacy-Component-serialization-size.patch b/patches/server/0430-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0431-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0430-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0432-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0431-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0432-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0431-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0433-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 97%
rename from patches/server/0433-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index de66f3b939..53ea7da82f 100644
--- a/patches/server/0433-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 69cf645d88756c4b11942e07bdc41d56b6732825..0b6f9567aaad080ff2a21be9e17a93d2d24fd010 100644
+index a67e158bad42086aec237a822ec252fd26f80e3c..829105771a06deca2a85e2f27b68d96c28c1218b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -373,7 +373,7 @@ public final class CraftServer implements Server {
@@ -44,7 +44,7 @@ index 69cf645d88756c4b11942e07bdc41d56b6732825..0b6f9567aaad080ff2a21be9e17a93d2
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 72721a229f1febc23575ed994261efb1192a99d2..f3723a8219881d55959e7231e230d28bfb521dcd 100644
+index bc083d58f670f2a0c6e621da5e2258f7be5680b8..f22457cf9dd5ceb6630c1f96a2050c350c4fbbc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -281,8 +281,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0434-incremental-chunk-and-player-saving.patch b/patches/server/0433-incremental-chunk-and-player-saving.patch
similarity index 91%
rename from patches/server/0434-incremental-chunk-and-player-saving.patch
rename to patches/server/0433-incremental-chunk-and-player-saving.patch
index 0f05d3a9aa..3b5d3070b2 100644
--- a/patches/server/0434-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0433-incremental-chunk-and-player-saving.patch
@@ -73,10 +73,10 @@ index 298e4468f7b5346733257f7117f76c66e9a1d8f0..d1652c237b2b272f0dfe80f774cff160
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8d20f8beb9fd2da36a6cf8c16b1ad0315c321fc9..629f7fb76fc0382235ca5c7f87121bf0092ec279 100644
+index 44ca46e7dff19ae99ff6cf0d82269c5f7ad7274a..95c53189e32aec6aca254fa3b157df7bc68d4d1a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1143,6 +1143,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1141,6 +1141,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
@@ -115,7 +115,7 @@ index 8d20f8beb9fd2da36a6cf8c16b1ad0315c321fc9..629f7fb76fc0382235ca5c7f87121bf0
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1277eb92d5ed041d014e9b5bd5e2a1edbb73addf..b291903888b33eeae7347841f12a8ca49439c736 100644
+index ca08f04aed8296437eafee93093f96c03c1d418f..bb939f3312eb5a5740b445cfd268f1902955d4e8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -181,6 +181,7 @@ import org.bukkit.inventory.MainHand;
@@ -127,18 +127,18 @@ index 1277eb92d5ed041d014e9b5bd5e2a1edbb73addf..b291903888b33eeae7347841f12a8ca4
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2c0e45b3d0f5a1178ccecc851a110e5dc6f2023c..b4e9462cbeec9ec8bd25b79839fde7d92410057f 100644
+index cfc497822e4e1dfc21807ec93bcfabb215cdbb95..c6b76049c70bf42c216d833b6dc33254c24b2253 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -577,6 +577,7 @@ public abstract class PlayerList {
+@@ -514,6 +514,7 @@ public abstract class PlayerList {
+ 
      protected void save(ServerPlayer player) {
          if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
-         if (!player.didPlayerJoinEvent) return; // Paper - If we never fired PJE, we disconnected during login. Data has not changed, and additionally, our saved vehicle is not loaded! If we save now, we will lose our vehicle (CraftBukkit bug)
 +        player.lastSave = MinecraftServer.currentTick; // Paper
          this.playerIo.save(player);
          ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
  
-@@ -1181,10 +1182,22 @@ public abstract class PlayerList {
+@@ -1104,10 +1105,22 @@ public abstract class PlayerList {
      }
  
      public void saveAll() {
diff --git a/patches/server/0435-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0435-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0436-Support-old-UUID-format-for-NBT.patch b/patches/server/0435-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0436-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0435-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0437-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0437-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0438-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 97%
rename from patches/server/0438-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch
index 030693cdcd..00aa7794f6 100644
--- a/patches/server/0438-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index fac4097be2ee3d0bffbc92fb217f98831e78d6b3..233e372ba5d785352c9ac12dac37395b
      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 4304ee35a9bd912c2ae4058febf22f0eea25adbd..4a91da3561d16995e8cfe04ebbc104da009a2503 100644
+index faa0d91713fb19820ca744f8c9449f79f44a55cb..d83ac28bd9147e33a838cf6250070fa0841f74b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -480,7 +480,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0439-Remove-some-streams-from-structures.patch b/patches/server/0438-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0439-Remove-some-streams-from-structures.patch
rename to patches/server/0438-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0440-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0440-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0441-Support-components-in-ItemMeta.patch b/patches/server/0440-Support-components-in-ItemMeta.patch
similarity index 97%
rename from patches/server/0441-Support-components-in-ItemMeta.patch
rename to patches/server/0440-Support-components-in-ItemMeta.patch
index 05ab3c1898..5c9b119e28 100644
--- a/patches/server/0441-Support-components-in-ItemMeta.patch
+++ b/patches/server/0440-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 4a91da3561d16995e8cfe04ebbc104da009a2503..c475ddea1c995df1dfcaf4f491f341761a5f8802 100644
+index d83ac28bd9147e33a838cf6250070fa0841f74b2..71434a6778ab85e347d33a7c35cba7c0d7830d1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -874,11 +874,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0442-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0442-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0443-Add-entity-liquid-API.patch b/patches/server/0442-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0443-Add-entity-liquid-API.patch
rename to patches/server/0442-Add-entity-liquid-API.patch
diff --git a/patches/server/0444-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0443-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0444-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0443-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0445-Spawn-player-in-correct-world-on-login.patch b/patches/server/0444-Spawn-player-in-correct-world-on-login.patch
similarity index 88%
rename from patches/server/0445-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0444-Spawn-player-in-correct-world-on-login.patch
index 0616e9ed5b..a07a3e270c 100644
--- a/patches/server/0445-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0444-Spawn-player-in-correct-world-on-login.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b4e9462cbeec9ec8bd25b79839fde7d92410057f..b4ee231092c0e7a9e4a6ee978d9d8de320ac1cad 100644
+index c6b76049c70bf42c216d833b6dc33254c24b2253..b6bdbe4033b0252d61e8a0affd011475e700cb59 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -209,7 +209,18 @@ public abstract class PlayerList {
-         }String lastKnownName = s; // Paper
+@@ -201,7 +201,18 @@ public abstract class PlayerList {
+         }
          // CraftBukkit end
  
 -        if (nbttagcompound != null) {
diff --git a/patches/server/0446-Add-PrepareResultEvent.patch b/patches/server/0445-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0446-Add-PrepareResultEvent.patch
rename to patches/server/0445-Add-PrepareResultEvent.patch
diff --git a/patches/server/0447-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 90%
rename from patches/server/0447-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 49d43cc8e8..5e3cb7002a 100644
--- a/patches/server/0447-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b6741c72216378368392e65aad3ff75a3191d0ce..b96a783e4df3a5ce1115d05e00e1ae2e0cd6378d 100644
+index f0c37129240fadac40fec607afda1ccef446caa0..745797f1110db582cdac83c423b4cae78928ffe2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3471,7 +3471,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0448-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0448-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0449-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0449-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0450-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0450-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0451-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0451-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0452-Fix-SPIGOT-5989.patch b/patches/server/0451-Fix-SPIGOT-5989.patch
similarity index 90%
rename from patches/server/0452-Fix-SPIGOT-5989.patch
rename to patches/server/0451-Fix-SPIGOT-5989.patch
index 3b842f1c77..0af182680c 100644
--- a/patches/server/0452-Fix-SPIGOT-5989.patch
+++ b/patches/server/0451-Fix-SPIGOT-5989.patch
@@ -10,10 +10,10 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b4ee231092c0e7a9e4a6ee978d9d8de320ac1cad..62fe8133e10ca4e04670b504bf18db9f5e7512e0 100644
+index b6bdbe4033b0252d61e8a0affd011475e700cb59..c618388599c5b56320c526e71613f8434a0e2c47 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -850,6 +850,7 @@ public abstract class PlayerList {
+@@ -773,6 +773,7 @@ public abstract class PlayerList {
          // Paper start
          boolean isBedSpawn = false;
          boolean isRespawn = false;
@@ -21,7 +21,7 @@ index b4ee231092c0e7a9e4a6ee978d9d8de320ac1cad..62fe8133e10ca4e04670b504bf18db9f
          // Paper end
  
          // CraftBukkit start - fire PlayerRespawnEvent
-@@ -860,7 +861,7 @@ public abstract class PlayerList {
+@@ -783,7 +784,7 @@ public abstract class PlayerList {
                  Optional optional;
  
                  if (blockposition != null) {
@@ -30,7 +30,7 @@ index b4ee231092c0e7a9e4a6ee978d9d8de320ac1cad..62fe8133e10ca4e04670b504bf18db9f
                  } else {
                      optional = Optional.empty();
                  }
-@@ -904,7 +905,12 @@ public abstract class PlayerList {
+@@ -827,7 +828,12 @@ public abstract class PlayerList {
              }
              // Spigot End
  
@@ -44,7 +44,7 @@ index b4ee231092c0e7a9e4a6ee978d9d8de320ac1cad..62fe8133e10ca4e04670b504bf18db9f
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper
          } else {
-@@ -944,8 +950,12 @@ public abstract class PlayerList {
+@@ -867,8 +873,12 @@ public abstract class PlayerList {
          }
          // entityplayer1.initInventoryMenu();
          entityplayer1.setHealth(entityplayer1.getHealth());
diff --git a/patches/server/0453-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0453-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0454-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0454-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0455-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0455-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0456-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0456-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0457-Fix-some-rails-connecting-improperly.patch b/patches/server/0456-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0457-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0456-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0458-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0458-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0459-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0458-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0459-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0458-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0460-Brand-support.patch b/patches/server/0459-Brand-support.patch
similarity index 92%
rename from patches/server/0460-Brand-support.patch
rename to patches/server/0459-Brand-support.patch
index 385e2d6d34..da35073674 100644
--- a/patches/server/0460-Brand-support.patch
+++ b/patches/server/0459-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c88e6ca7ee28ebaf235e11bbe70b13c90508924e..39fe98d65f3029efa2f54c2b6dbf1e53c1957b6e 100644
+index f07b584d1d7a97e242c7699fa277d0c642da1857..d06d1e00b42dd9474ec834e0bafa94329b90cb75 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -298,6 +298,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -17,7 +17,7 @@ index c88e6ca7ee28ebaf235e11bbe70b13c90508924e..39fe98d65f3029efa2f54c2b6dbf1e53
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
          this.lastChatTimeStamp = new AtomicReference(Instant.EPOCH);
          this.lastSeenMessages = new LastSeenMessagesValidator(20);
-@@ -3326,6 +3328,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3322,6 +3324,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register");
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
@@ -26,7 +26,7 @@ index c88e6ca7ee28ebaf235e11bbe70b13c90508924e..39fe98d65f3029efa2f54c2b6dbf1e53
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -3353,6 +3357,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3349,6 +3353,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
@@ -42,7 +42,7 @@ index c88e6ca7ee28ebaf235e11bbe70b13c90508924e..39fe98d65f3029efa2f54c2b6dbf1e53
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -3362,6 +3375,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3358,6 +3371,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      }
  
diff --git a/patches/server/0461-Add-setMaxPlayers-API.patch b/patches/server/0460-Add-setMaxPlayers-API.patch
similarity index 86%
rename from patches/server/0461-Add-setMaxPlayers-API.patch
rename to patches/server/0460-Add-setMaxPlayers-API.patch
index b50b6e7382..9c8b74fe17 100644
--- a/patches/server/0461-Add-setMaxPlayers-API.patch
+++ b/patches/server/0460-Add-setMaxPlayers-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 62fe8133e10ca4e04670b504bf18db9f5e7512e0..4b2862c6c5397ebec7cc22938b76ed0d24d7125f 100644
+index c618388599c5b56320c526e71613f8434a0e2c47..f36019234a85c177d3d863979bbc653f89384cd4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -152,7 +152,7 @@ public abstract class PlayerList {
+@@ -151,7 +151,7 @@ public abstract class PlayerList {
      private boolean doWhiteList;
      private final LayeredRegistryAccess<RegistryLayer> registries;
      private final RegistryAccess.Frozen synchronizedRegistries;
@@ -18,7 +18,7 @@ index 62fe8133e10ca4e04670b504bf18db9f5e7512e0..4b2862c6c5397ebec7cc22938b76ed0d
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a8bd9f368182395962b63b52c9107debcb6ab6b9..d296f5c970dc4c242fc18fb82e6db583eefef8d8 100644
+index 829105771a06deca2a85e2f27b68d96c28c1218b..3eac1b8e1fa4ce5fb30321498a0fa9c10d62c579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -687,6 +687,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0462-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0461-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0462-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0461-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0463-Don-t-require-FACING-data.patch b/patches/server/0462-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0463-Don-t-require-FACING-data.patch
rename to patches/server/0462-Don-t-require-FACING-data.patch
diff --git a/patches/server/0464-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 93%
rename from patches/server/0464-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 26cba4d2ce..8df2fdf21b 100644
--- a/patches/server/0464-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0463-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 629f7fb76fc0382235ca5c7f87121bf0092ec279..b4f299a61b9c02d1dc679a0eff2b039c984bef37 100644
+index 95c53189e32aec6aca254fa3b157df7bc68d4d1a..0637fd424e98175f864f15c8bfa8bf696ed47fe7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1868,6 +1868,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1866,6 +1866,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          //ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c()));
  
          this.levelData.setSpawn(pos, angle);
diff --git a/patches/server/0465-Add-moon-phase-API.patch b/patches/server/0464-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0465-Add-moon-phase-API.patch
rename to patches/server/0464-Add-moon-phase-API.patch
diff --git a/patches/server/0466-Prevent-headless-pistons-from-being-created.patch b/patches/server/0465-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0466-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0465-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0467-Add-BellRingEvent.patch b/patches/server/0466-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0467-Add-BellRingEvent.patch
rename to patches/server/0466-Add-BellRingEvent.patch
diff --git a/patches/server/0468-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0467-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0468-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0467-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0469-Buffer-joins-to-world.patch b/patches/server/0468-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0469-Buffer-joins-to-world.patch
rename to patches/server/0468-Buffer-joins-to-world.patch
diff --git a/patches/server/0470-Eigencraft-redstone-implementation.patch b/patches/server/0469-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0470-Eigencraft-redstone-implementation.patch
rename to patches/server/0469-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0471-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 97%
rename from patches/server/0471-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch
index e98bdf2747..fdffdb9433 100644
--- a/patches/server/0471-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -25,7 +25,7 @@ index 34e4d00ede62be50808a2782e54da987cc62c9af..e12c67bdfa326b3f52f6a4973063cef4
  
                      this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index d92aaec3a4535d3683e842f9a712ba06c03014ef..3042af47778f5d6c878a7a734a8eb92e952c01a8 100644
+index 75a32d33518023cb24ba639751631bfad3563bd5..0869a7d6807815879aa9ded0d8b9baee82d535a9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -102,7 +102,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0472-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0472-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0473-Fix-CraftTeam-null-check.patch b/patches/server/0472-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0473-Fix-CraftTeam-null-check.patch
rename to patches/server/0472-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0474-Add-more-Evoker-API.patch b/patches/server/0473-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0474-Add-more-Evoker-API.patch
rename to patches/server/0473-Add-more-Evoker-API.patch
diff --git a/patches/server/0475-Add-methods-to-get-translation-keys.patch b/patches/server/0474-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0475-Add-methods-to-get-translation-keys.patch
rename to patches/server/0474-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0476-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0476-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0477-Cache-block-data-strings.patch b/patches/server/0476-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0477-Cache-block-data-strings.patch
rename to patches/server/0476-Cache-block-data-strings.patch
diff --git a/patches/server/0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 95%
rename from patches/server/0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 2e1404436f..ea7c704f76 100644
--- a/patches/server/0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0477-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 40423a24eac6675c8b9ddb843c910e324709ebe4..040972c62b8d6005a47ccb81a3fda1b4f98f8838 100644
+index d06d1e00b42dd9474ec834e0bafa94329b90cb75..15b16d37928eca9f8da026df0c76a1f7cd43ba70 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -752,7 +752,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -748,7 +748,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  return;
              }
  
@@ -21,7 +21,7 @@ index 40423a24eac6675c8b9ddb843c910e324709ebe4..040972c62b8d6005a47ccb81a3fda1b4
              this.lastGoodX = this.awaitingPositionFromClient.x;
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
-@@ -1669,7 +1669,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1665,7 +1665,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit end
  
          this.awaitingTeleportTime = this.tickCount;
diff --git a/patches/server/0479-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0478-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0479-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0478-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0480-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0480-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0481-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/server/0481-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch
index b2465b0a6c..371ab800cf 100644
--- a/patches/server/0481-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0480-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 b4f299a61b9c02d1dc679a0eff2b039c984bef37..8c32f34a3bf03f4e95bf961f33e6e98368e7e961 100644
+index 0637fd424e98175f864f15c8bfa8bf696ed47fe7..8866507da8474e4eee767fdf6f83b95c92fb5767 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1369,6 +1369,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1367,6 +1367,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0482-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0482-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0483-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0482-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0483-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0482-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0484-Entity-isTicking.patch b/patches/server/0483-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0484-Entity-isTicking.patch
rename to patches/server/0483-Entity-isTicking.patch
diff --git a/patches/server/0485-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0485-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0486-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0485-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0486-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0485-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0487-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0487-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0488-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch
similarity index 93%
rename from patches/server/0488-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch
index a2b44af249..ce95a77747 100644
--- a/patches/server/0488-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,10 +6,10 @@ 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 040972c62b8d6005a47ccb81a3fda1b4f98f8838..5a17bd9435b612d2586a6bcd7fc89609f9010713 100644
+index 15b16d37928eca9f8da026df0c76a1f7cd43ba70..ebce5372a4961b8518b3c5ee1f727705c8b68152 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -567,9 +567,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -563,9 +563,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
              if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
                  ServerLevel worldserver = this.player.getLevel();
@@ -22,7 +22,7 @@ index 040972c62b8d6005a47ccb81a3fda1b4f98f8838..5a17bd9435b612d2586a6bcd7fc89609
                  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
-@@ -579,8 +579,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -575,8 +575,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  double d7 = d4 - this.vehicleFirstGoodY;
                  double d8 = d5 - this.vehicleFirstGoodZ;
                  double d9 = entity.getDeltaMovement().lengthSqr();
@@ -44,7 +44,7 @@ index 040972c62b8d6005a47ccb81a3fda1b4f98f8838..5a17bd9435b612d2586a6bcd7fc89609
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
                  this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
-@@ -626,9 +637,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -622,9 +633,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                  boolean flag = worldserver.noCollision(entity, entity.getBoundingBox().deflate(0.0625D));
  
@@ -57,7 +57,7 @@ index 040972c62b8d6005a47ccb81a3fda1b4f98f8838..5a17bd9435b612d2586a6bcd7fc89609
                  boolean flag1 = entity.verticalCollisionBelow;
  
                  entity.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
-@@ -1348,7 +1359,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1344,7 +1355,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                          double d8 = d1 - this.firstGoodY;
                          double d9 = d2 - this.firstGoodZ;
                          double d10 = this.player.getDeltaMovement().lengthSqr();
@@ -77,7 +77,7 @@ index 040972c62b8d6005a47ccb81a3fda1b4f98f8838..5a17bd9435b612d2586a6bcd7fc89609
  
                          if (this.player.isSleeping()) {
                              if (d11 > 1.0D) {
-@@ -1400,9 +1422,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1396,9 +1418,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                              AABB axisalignedbb = this.player.getBoundingBox();
  
diff --git a/patches/server/0489-Optimise-getType-calls.patch b/patches/server/0488-Optimise-getType-calls.patch
similarity index 98%
rename from patches/server/0489-Optimise-getType-calls.patch
rename to patches/server/0488-Optimise-getType-calls.patch
index 62b5e4fd6c..aed2530314 100644
--- a/patches/server/0489-Optimise-getType-calls.patch
+++ b/patches/server/0488-Optimise-getType-calls.patch
@@ -41,7 +41,7 @@ index 0511ac55c4e6d9736ec12e94c9899eb04d5cd2e3..75193684a71d694736087d1a368b8fb6
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 89b8abc3e7e946aae2ab3d2c870f2d2c95f9671d..6d9cddb20a069cada6d20e5f61a2ca2ab2c308a0 100644
+index eba015c33dcf63ff85569eb7ee7e6b3def2b05ac..01827f2398cec6e18ab490e664360beed9dbca83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -226,7 +226,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0490-Villager-resetOffers.patch b/patches/server/0489-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0490-Villager-resetOffers.patch
rename to patches/server/0489-Villager-resetOffers.patch
diff --git a/patches/server/0491-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0490-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0491-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0490-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0492-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0491-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0492-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0491-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0493-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0492-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0493-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0492-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0494-Player-elytra-boost-API.patch b/patches/server/0493-Player-elytra-boost-API.patch
similarity index 94%
rename from patches/server/0494-Player-elytra-boost-API.patch
rename to patches/server/0493-Player-elytra-boost-API.patch
index cb478778cd..4ce8f6a2d3 100644
--- a/patches/server/0494-Player-elytra-boost-API.patch
+++ b/patches/server/0493-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca12956fe9eb0ade9f78980210ec7421266ba554..025886ef9fc2d992cffb94b172a44ec123432e60 100644
+index e807cfbeecce04e87d30652a58e9eba372b9d8aa..d1d4b656ec2decef8ce4ab5344af75b59c62a0e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -639,6 +639,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0495-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0494-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0495-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0494-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0496-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0496-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0496-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0497-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0496-Add-getOfflinePlayerIfCached-String.patch
index 4306ec8a20..915b2363b0 100644
--- a/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0496-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 080987796064e7f35a1fd8b1b8190262882b5d4c..24ed5fa253b18705ad0f5d5d676f75233aa55363 100644
+index 3eac1b8e1fa4ce5fb30321498a0fa9c10d62c579..6c2ea3e0cf385d6893faf5430b29dbe2589786b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1830,6 +1830,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0498-Add-ignore-discounts-API.patch b/patches/server/0497-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0498-Add-ignore-discounts-API.patch
rename to patches/server/0497-Add-ignore-discounts-API.patch
diff --git a/patches/server/0499-Toggle-for-removing-existing-dragon.patch b/patches/server/0498-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0499-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0498-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0500-Fix-client-lag-on-advancement-loading.patch b/patches/server/0499-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0500-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0499-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0501-Item-no-age-no-player-pickup.patch b/patches/server/0500-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0501-Item-no-age-no-player-pickup.patch
rename to patches/server/0500-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0502-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0502-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0503-Beacon-API-custom-effect-ranges.patch b/patches/server/0502-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0503-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0502-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0504-Add-API-for-quit-reason.patch b/patches/server/0503-Add-API-for-quit-reason.patch
similarity index 88%
rename from patches/server/0504-Add-API-for-quit-reason.patch
rename to patches/server/0503-Add-API-for-quit-reason.patch
index e4685e3d13..6ebf5bb2cd 100644
--- a/patches/server/0504-Add-API-for-quit-reason.patch
+++ b/patches/server/0503-Add-API-for-quit-reason.patch
@@ -25,10 +25,10 @@ index 4487b4329cf09a6538e272c44207dda492ceb099..43fd36b2ed8e58a2e6213d749a8612a9
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          ConnectionProtocol enumprotocol = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b291903888b33eeae7347841f12a8ca49439c736..6dc93cbcd3a5140a286d027f2ad03851b9c078f4 100644
+index bb939f3312eb5a5740b445cfd268f1902955d4e8..da380d88953cd1fc289f972813187a0ddedd9d36 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
+@@ -268,6 +268,7 @@ public class ServerPlayer extends Player {
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
@@ -37,10 +37,10 @@ index b291903888b33eeae7347841f12a8ca49439c736..6dc93cbcd3a5140a286d027f2ad03851
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5a17bd9435b612d2586a6bcd7fc89609f9010713..eeb69e4155f2b568a51529a39416248780fae886 100644
+index ebce5372a4961b8518b3c5ee1f727705c8b68152..4e9ae442a838e685e96d436e0f14ff2d1f5e81f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -507,6 +507,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -503,6 +503,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          final Component ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
          // CraftBukkit end
  
@@ -49,15 +49,15 @@ index 5a17bd9435b612d2586a6bcd7fc89609f9010713..eeb69e4155f2b568a51529a394162487
              this.connection.disconnect(ichatbasecomponent);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4b2862c6c5397ebec7cc22938b76ed0d24d7125f..c12f8b3744273865eb9b1a3618e0fc0daa6bdeaf 100644
+index f36019234a85c177d3d863979bbc653f89384cd4..a9f61042c961dc4ffc12b9e8ff66001205e41511 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -615,7 +615,7 @@ public abstract class PlayerList {
+@@ -552,7 +552,7 @@ public abstract class PlayerList {
              entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
          }
  
 -        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())));
 +        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())), entityplayer.quitReason); // Paper - quit reason
-         if (entityplayer.didPlayerJoinEvent) this.cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
+         this.cserver.getPluginManager().callEvent(playerQuitEvent);
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
diff --git a/patches/server/0505-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0504-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0505-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0504-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0506-Expose-world-spawn-angle.patch b/patches/server/0505-Expose-world-spawn-angle.patch
similarity index 89%
rename from patches/server/0506-Expose-world-spawn-angle.patch
rename to patches/server/0505-Expose-world-spawn-angle.patch
index ec97301839..39967eda38 100644
--- a/patches/server/0506-Expose-world-spawn-angle.patch
+++ b/patches/server/0505-Expose-world-spawn-angle.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c12f8b3744273865eb9b1a3618e0fc0daa6bdeaf..a4338683d7d2a0d98121ee9e5b57a08883cc69a0 100644
+index a9f61042c961dc4ffc12b9e8ff66001205e41511..4e28eca701b91d1533b5eeffc96b66c4e71da1db 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -893,7 +893,7 @@ public abstract class PlayerList {
+@@ -816,7 +816,7 @@ public abstract class PlayerList {
              if (location == null) {
                  worldserver1 = this.server.getLevel(Level.OVERWORLD);
                  blockposition = entityplayer1.getSpawnPoint(worldserver1);
diff --git a/patches/server/0507-Add-Destroy-Speed-API.patch b/patches/server/0506-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0507-Add-Destroy-Speed-API.patch
rename to patches/server/0506-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 93%
rename from patches/server/0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 9f59331dbe..ba6264a3b8 100644
--- a/patches/server/0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ 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 2cbce5cd4656f3dd38c0d35e43f17a29451f7248..a101756ee42c920aa8b13f263dc4a63ad5b08701 100644
+index d1d4b656ec2decef8ce4ab5344af75b59c62a0e7..a70f67b791218f9460acb7e0f42b64905e8deb99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2349,7 +2349,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0509-Add-LivingEntity-clearActiveItem.patch b/patches/server/0508-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0509-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0508-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0510-Add-PlayerItemCooldownEvent.patch b/patches/server/0509-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0510-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0509-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0511-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0510-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0511-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0510-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0512-More-lightning-API.patch b/patches/server/0511-More-lightning-API.patch
similarity index 100%
rename from patches/server/0512-More-lightning-API.patch
rename to patches/server/0511-More-lightning-API.patch
diff --git a/patches/server/0513-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0513-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch
index f0be0411d9..111a964e5e 100644
--- a/patches/server/0513-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -45,7 +45,7 @@ index 302676ef78ed5b3b7fc1b04851447ca72eed10c0..a00c3d96f2fc7131d1f4afa7af4e41ac
              } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b96a783e4df3a5ce1115d05e00e1ae2e0cd6378d..abf18757ed70bcbe9eecb88b18670089153b2a0a 100644
+index 745797f1110db582cdac83c423b4cae78928ffe2..425d831bb2b0f4fc5722f18dc9d265e24965c86d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3392,7 +3392,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0514-Added-missing-default-perms-for-commands.patch b/patches/server/0513-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0514-Added-missing-default-perms-for-commands.patch
rename to patches/server/0513-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0515-Add-PlayerShearBlockEvent.patch b/patches/server/0514-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0515-Add-PlayerShearBlockEvent.patch
rename to patches/server/0514-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0516-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0515-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0516-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0515-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0517-Limit-recipe-packets.patch b/patches/server/0516-Limit-recipe-packets.patch
similarity index 92%
rename from patches/server/0517-Limit-recipe-packets.patch
rename to patches/server/0516-Limit-recipe-packets.patch
index 44b44ddc3b..fb517d7de6 100644
--- a/patches/server/0517-Limit-recipe-packets.patch
+++ b/patches/server/0516-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eeb69e4155f2b568a51529a39416248780fae886..dbe3cab9dfd86081aab876488fda576810ce2105 100644
+index 4e9ae442a838e685e96d436e0f14ff2d1f5e81f4..ba07a2c243f833aa4e0370993cac25bdd13d53d4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -262,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -16,7 +16,7 @@ index eeb69e4155f2b568a51529a39416248780fae886..dbe3cab9dfd86081aab876488fda5768
      // CraftBukkit end
      private int dropSpamTickCount;
      private double firstGoodX;
-@@ -418,6 +419,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -414,6 +415,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
          if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable
@@ -24,7 +24,7 @@ index eeb69e4155f2b568a51529a39416248780fae886..dbe3cab9dfd86081aab876488fda5768
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -3115,6 +3117,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3111,6 +3113,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
diff --git a/patches/server/0518-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0517-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0518-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0517-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0519-Player-Chunk-Load-Unload-Events.patch b/patches/server/0518-Player-Chunk-Load-Unload-Events.patch
similarity index 90%
rename from patches/server/0519-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0518-Player-Chunk-Load-Unload-Events.patch
index 0e2897de41..19258dae5c 100644
--- a/patches/server/0519-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0518-Player-Chunk-Load-Unload-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6dc93cbcd3a5140a286d027f2ad03851b9c078f4..514b5f4762dcd11160ac3b4da1bb44911e6e62b2 100644
+index da380d88953cd1fc289f972813187a0ddedd9d36..de10fe199af11525116081618609f7bfbc7b1006 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2166,11 +2166,21 @@ public class ServerPlayer extends Player {
+@@ -2164,11 +2164,21 @@ public class ServerPlayer extends Player {
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
          this.connection.send(chunkDataPacket);
diff --git a/patches/server/0520-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0519-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0520-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0519-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0521-Expose-LivingEntity-hurt-direction.patch b/patches/server/0520-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0521-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0520-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0522-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0522-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0523-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0523-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0524-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0524-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0525-Implement-TargetHitEvent.patch b/patches/server/0524-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0525-Implement-TargetHitEvent.patch
rename to patches/server/0524-Implement-TargetHitEvent.patch
diff --git a/patches/server/0526-MC-4-Fix-item-position-desync.patch b/patches/server/0525-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0526-MC-4-Fix-item-position-desync.patch
rename to patches/server/0525-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0527-Additional-Block-Material-API-s.patch b/patches/server/0526-Additional-Block-Material-API-s.patch
similarity index 93%
rename from patches/server/0527-Additional-Block-Material-API-s.patch
rename to patches/server/0526-Additional-Block-Material-API-s.patch
index 1061932b3c..0d852337ea 100644
--- a/patches/server/0527-Additional-Block-Material-API-s.patch
+++ b/patches/server/0526-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 9a191f16a4d80cde2b2801526fe386abba6e5302..1def5d8c61d78c1d9ccacafdbf8a16072cf75c6a 100644
+index ac831b22930ad02951186b6326b0c542de4c9881..30b5a78a93405f3a03624ed1331670770aaa3765 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -465,6 +465,25 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0528-Fix-harming-potion-dupe.patch b/patches/server/0527-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0528-Fix-harming-potion-dupe.patch
rename to patches/server/0527-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0529-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0529-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0530-Cache-burn-durations.patch b/patches/server/0529-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0530-Cache-burn-durations.patch
rename to patches/server/0529-Cache-burn-durations.patch
diff --git a/patches/server/0531-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0531-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0532-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0531-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0532-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0531-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0533-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0532-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0533-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0532-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0534-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 90%
rename from patches/server/0534-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch
index ba849b98ba..193208a872 100644
--- a/patches/server/0534-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fd5d2c17471229df9f9f0fb21a9407657231c9af..ee3966cd5df09fda88a269105de8fe11736b55b3 100644
+index ba07a2c243f833aa4e0370993cac25bdd13d53d4..23560d8fac37296dd1194996bc1f4b3babcde9cc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1847,7 +1847,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1843,7 +1843,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                                  MutableComponent ichatmutablecomponent = Component.translatable("build.tooHigh", i - 1).withStyle(ChatFormatting.RED);
  
                                  this.player.sendSystemMessage(ichatmutablecomponent, true);
@@ -18,7 +18,7 @@ index fd5d2c17471229df9f9f0fb21a9407657231c9af..ee3966cd5df09fda88a269105de8fe11
                                  this.player.swing(enumhand, true);
                              }
                          }
-@@ -2473,7 +2473,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2469,7 +2469,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // SPIGOT-5607: Only call interact event if no block or entity is being clicked. Use bukkit ray trace method, because it handles blocks and entities at the same time
          org.bukkit.util.RayTraceResult result = this.player.level.getWorld().rayTrace(origin, origin.getDirection(), d3, org.bukkit.FluidCollisionMode.NEVER, false, 0.1, entity -> entity != this.player.getBukkitEntity() && this.player.getBukkitEntity().canSee(entity));
  
diff --git a/patches/server/0535-Zombie-API-breaking-doors.patch b/patches/server/0534-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0535-Zombie-API-breaking-doors.patch
rename to patches/server/0534-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0536-Fix-nerfed-slime-when-splitting.patch b/patches/server/0535-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0536-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0535-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0537-Add-EntityLoadCrossbowEvent.patch b/patches/server/0536-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0537-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0536-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0538-Added-WorldGameRuleChangeEvent.patch b/patches/server/0537-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0538-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0537-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0539-Added-ServerResourcesReloadedEvent.patch b/patches/server/0538-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0539-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0538-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0540-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0539-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0540-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0539-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0541-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0540-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0541-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0540-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0542-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0541-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0542-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0541-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0543-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0542-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0543-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0542-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0544-Configurable-door-breaking-difficulty.patch b/patches/server/0543-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0544-Configurable-door-breaking-difficulty.patch
rename to patches/server/0543-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0545-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0544-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0545-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0544-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0546-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0545-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0546-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0545-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0547-Remove-stale-POIs.patch b/patches/server/0546-Remove-stale-POIs.patch
similarity index 86%
rename from patches/server/0547-Remove-stale-POIs.patch
rename to patches/server/0546-Remove-stale-POIs.patch
index 68b06f554e..c6433680df 100644
--- a/patches/server/0547-Remove-stale-POIs.patch
+++ b/patches/server/0546-Remove-stale-POIs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8c32f34a3bf03f4e95bf961f33e6e98368e7e961..cd791e727bf66ff32ffeeae68e5c110502fbdd37 100644
+index 8866507da8474e4eee767fdf6f83b95c92fb5767..f8832ebb35ceb7f70e12d6c11f435308de4ae33d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1933,6 +1933,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1931,6 +1931,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              });
              optional1.ifPresent((holder) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0548-Fix-villager-boat-exploit.patch b/patches/server/0547-Fix-villager-boat-exploit.patch
similarity index 88%
rename from patches/server/0548-Fix-villager-boat-exploit.patch
rename to patches/server/0547-Fix-villager-boat-exploit.patch
index 1ec2e0e395..f4b9edc9da 100644
--- a/patches/server/0548-Fix-villager-boat-exploit.patch
+++ b/patches/server/0547-Fix-villager-boat-exploit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a4338683d7d2a0d98121ee9e5b57a08883cc69a0..cd456e403fbeb9337c5c151b5c0333d14102cd2d 100644
+index 4e28eca701b91d1533b5eeffc96b66c4e71da1db..310f14b440697c8a32660592acf05b50be43c445 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -640,6 +640,14 @@ public abstract class PlayerList {
+@@ -577,6 +577,14 @@ public abstract class PlayerList {
                  PlayerList.LOGGER.debug("Removing player mount");
                  entityplayer.stopRiding();
                  entity.getPassengersAndSelf().forEach((entity1) -> {
diff --git a/patches/server/0549-Add-sendOpLevel-API.patch b/patches/server/0548-Add-sendOpLevel-API.patch
similarity index 86%
rename from patches/server/0549-Add-sendOpLevel-API.patch
rename to patches/server/0548-Add-sendOpLevel-API.patch
index 5878d6e7f1..47ac10053a 100644
--- a/patches/server/0549-Add-sendOpLevel-API.patch
+++ b/patches/server/0548-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cd456e403fbeb9337c5c151b5c0333d14102cd2d..7f2e71d10006642297086806067b6e9c7cf21783 100644
+index 310f14b440697c8a32660592acf05b50be43c445..a5936f9c836520b26eb1abf05e90fc5d0bc1a32b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1140,6 +1140,11 @@ public abstract class PlayerList {
+@@ -1063,6 +1063,11 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -20,7 +20,7 @@ index cd456e403fbeb9337c5c151b5c0333d14102cd2d..7f2e71d10006642297086806067b6e9c
          if (player.connection != null) {
              byte b0;
  
-@@ -1154,8 +1159,10 @@ public abstract class PlayerList {
+@@ -1077,8 +1082,10 @@ public abstract class PlayerList {
              player.connection.send(new ClientboundEntityEventPacket(player, b0));
          }
  
@@ -32,7 +32,7 @@ index cd456e403fbeb9337c5c151b5c0333d14102cd2d..7f2e71d10006642297086806067b6e9c
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6a342a897893355160d9f064236d775452e9b752..0c25992fe12be2c1259b706ccdf9af37da149908 100644
+index a70f67b791218f9460acb7e0f42b64905e8deb99..55c206d2bff70fd7febd5f635ea0d7a5e779a058 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -653,6 +653,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0550-Add-PaperRegistry.patch b/patches/server/0549-Add-PaperRegistry.patch
similarity index 100%
rename from patches/server/0550-Add-PaperRegistry.patch
rename to patches/server/0549-Add-PaperRegistry.patch
diff --git a/patches/server/0551-Add-StructuresLocateEvent.patch b/patches/server/0550-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0551-Add-StructuresLocateEvent.patch
rename to patches/server/0550-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0552-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0551-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0552-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0551-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0552-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0552-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0554-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0553-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0554-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0553-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0555-Make-schedule-command-per-world.patch b/patches/server/0554-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0555-Make-schedule-command-per-world.patch
rename to patches/server/0554-Make-schedule-command-per-world.patch
diff --git a/patches/server/0556-Configurable-max-leash-distance.patch b/patches/server/0555-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0556-Configurable-max-leash-distance.patch
rename to patches/server/0555-Configurable-max-leash-distance.patch
diff --git a/patches/server/0557-Implement-BlockPreDispenseEvent.patch b/patches/server/0556-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0557-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0556-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0557-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0557-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0559-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0558-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0559-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0558-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0560-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0559-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0560-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0559-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0562-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0561-Reset-shield-blocking-on-dimension-change.patch
similarity index 83%
rename from patches/server/0562-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0561-Reset-shield-blocking-on-dimension-change.patch
index 5ecfc2dabf..63623c4968 100644
--- a/patches/server/0562-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0561-Reset-shield-blocking-on-dimension-change.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 514b5f4762dcd11160ac3b4da1bb44911e6e62b2..58f1ed2771fa85e755c95f981bdb23b0321a5603 100644
+index de10fe199af11525116081618609f7bfbc7b1006..5cc7edca158fed862d0dd18c6d2754de6df0ec4c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1188,6 +1188,11 @@ public class ServerPlayer extends Player {
+@@ -1186,6 +1186,11 @@ public class ServerPlayer extends Player {
                  this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }
diff --git a/patches/server/0563-add-DragonEggFormEvent.patch b/patches/server/0562-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0563-add-DragonEggFormEvent.patch
rename to patches/server/0562-add-DragonEggFormEvent.patch
diff --git a/patches/server/0564-EntityMoveEvent.patch b/patches/server/0563-EntityMoveEvent.patch
similarity index 93%
rename from patches/server/0564-EntityMoveEvent.patch
rename to patches/server/0563-EntityMoveEvent.patch
index bd74637eaa..a38db63193 100644
--- a/patches/server/0564-EntityMoveEvent.patch
+++ b/patches/server/0563-EntityMoveEvent.patch
@@ -17,10 +17,10 @@ index 9b1bde95e8303e5d4adfe92f09240df8e6323dac..c22db75f87424e9b1dd2ae017619c0e2
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cd791e727bf66ff32ffeeae68e5c110502fbdd37..af355382878d49c3265c372405615b73d87dd647 100644
+index f8832ebb35ceb7f70e12d6c11f435308de4ae33d..abc909031b676c91b621a2c9a8beb0b1a76e3cdc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -219,6 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final LevelStorageSource.LevelStorageAccess convertable;
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper
@@ -29,7 +29,7 @@ index cd791e727bf66ff32ffeeae68e5c110502fbdd37..af355382878d49c3265c372405615b73
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index abf18757ed70bcbe9eecb88b18670089153b2a0a..53c2643136ef8902205c2fb2463f8bde6aeb8159 100644
+index 425d831bb2b0f4fc5722f18dc9d265e24965c86d..464da8e64626358238a6d872f0474e12310a0fdf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3327,6 +3327,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0564-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 80%
rename from patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0564-added-option-to-disable-pathfinding-updates-on-block.patch
index 207bd4a029..b35b6475c0 100644
--- a/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0564-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index af355382878d49c3265c372405615b73d87dd647..5e1448c900b8569344f5c7d219c0d7ce92ccd5b4 100644
+index abc909031b676c91b621a2c9a8beb0b1a76e3cdc..b9208d28c3bfb40679fb15546b47628b879e4e7d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1514,6 +1514,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1512,6 +1512,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          this.getChunkSource().blockChanged(pos);
@@ -16,7 +16,7 @@ index af355382878d49c3265c372405615b73d87dd647..5e1448c900b8569344f5c7d219c0d7ce
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
  
-@@ -1555,6 +1556,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1553,6 +1554,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
          }
diff --git a/patches/server/0566-Inline-shift-direction-fields.patch b/patches/server/0565-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0566-Inline-shift-direction-fields.patch
rename to patches/server/0565-Inline-shift-direction-fields.patch
diff --git a/patches/server/0567-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0566-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0567-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0566-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0567-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0567-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0569-living-entity-allow-attribute-registration.patch b/patches/server/0568-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0569-living-entity-allow-attribute-registration.patch
rename to patches/server/0568-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0570-fix-dead-slime-setSize-invincibility.patch b/patches/server/0569-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0570-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0569-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0571-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0570-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0571-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0570-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0572-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0571-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0572-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0571-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0573-Expose-Tracked-Players.patch b/patches/server/0572-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0573-Expose-Tracked-Players.patch
rename to patches/server/0572-Expose-Tracked-Players.patch
diff --git a/patches/server/0574-Remove-streams-from-SensorNearest.patch b/patches/server/0573-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0574-Remove-streams-from-SensorNearest.patch
rename to patches/server/0573-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0575-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0574-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0575-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0574-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0576-Improve-ServerGUI.patch b/patches/server/0575-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0576-Improve-ServerGUI.patch
rename to patches/server/0575-Improve-ServerGUI.patch
diff --git a/patches/server/0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0576-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0576-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0578-fix-converting-txt-to-json-file.patch b/patches/server/0577-fix-converting-txt-to-json-file.patch
similarity index 95%
rename from patches/server/0578-fix-converting-txt-to-json-file.patch
rename to patches/server/0577-fix-converting-txt-to-json-file.patch
index a65dc21ac2..c2f364d23f 100644
--- a/patches/server/0578-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0577-fix-converting-txt-to-json-file.patch
@@ -48,10 +48,10 @@ index 520cd1a6b347687b2ec6d13f034be391d1a1af85..cc885fd0eb19516d3864a43c2e4ae785
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7f2e71d10006642297086806067b6e9c7cf21783..cb995a9492cbc9702804d7b62a711ea0b7618deb 100644
+index a5936f9c836520b26eb1abf05e90fc5d0bc1a32b..1254ab553e0d2c8e1a0fd93b602dd339da05dabb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -183,6 +183,7 @@ public abstract class PlayerList {
+@@ -182,6 +182,7 @@ public abstract class PlayerList {
          this.maxPlayers = maxPlayers;
          this.playerIo = saveHandler;
      }
diff --git a/patches/server/0579-Add-worldborder-events.patch b/patches/server/0578-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0579-Add-worldborder-events.patch
rename to patches/server/0578-Add-worldborder-events.patch
diff --git a/patches/server/0580-added-PlayerNameEntityEvent.patch b/patches/server/0579-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0580-added-PlayerNameEntityEvent.patch
rename to patches/server/0579-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0581-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0580-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0581-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0580-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0582-Add-recipe-to-cook-events.patch b/patches/server/0581-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0582-Add-recipe-to-cook-events.patch
rename to patches/server/0581-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0583-Add-Block-isValidTool.patch b/patches/server/0582-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0583-Add-Block-isValidTool.patch
rename to patches/server/0582-Add-Block-isValidTool.patch
diff --git a/patches/server/0584-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0583-Allow-using-signs-inside-spawn-protection.patch
similarity index 91%
rename from patches/server/0584-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0583-Allow-using-signs-inside-spawn-protection.patch
index 72811dc8ea..59bf996fdf 100644
--- a/patches/server/0584-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0583-Allow-using-signs-inside-spawn-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ee3966cd5df09fda88a269105de8fe11736b55b3..ae50b297bc43a4092395640ec53bbfbba5fee0d7 100644
+index 23560d8fac37296dd1194996bc1f4b3babcde9cc..a089c23c8df93eaf10d21d550ab5129a43ad38ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1839,7 +1839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1835,7 +1835,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      int i = this.player.level.getMaxBuildHeight();
  
                      if (blockposition.getY() < i) {
diff --git a/patches/server/0585-Expand-world-key-API.patch b/patches/server/0584-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0585-Expand-world-key-API.patch
rename to patches/server/0584-Expand-world-key-API.patch
index 4f1bac0a63..6efd9a1d20 100644
--- a/patches/server/0585-Expand-world-key-API.patch
+++ b/patches/server/0584-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index 3e4ac4020c9f51e634eadd43243d34267bea4b22..ce52ae980309ecddf597e14b759b77ea
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 24ed5fa253b18705ad0f5d5d676f75233aa55363..bcb40a419febfe2b031afe77a4ee5ccb97374240 100644
+index 6c2ea3e0cf385d6893faf5430b29dbe2589786b0..2dbfd750088dbf7a15fc147d9f215c19e505c96b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1156,9 +1156,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0586-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0585-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0586-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0585-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0587-Item-Rarity-API.patch b/patches/server/0586-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0587-Item-Rarity-API.patch
rename to patches/server/0586-Item-Rarity-API.patch
diff --git a/patches/server/0588-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0587-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0588-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0587-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0588-Drop-carried-item-when-player-has-disconnected.patch
similarity index 88%
rename from patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0588-Drop-carried-item-when-player-has-disconnected.patch
index 51269f0aed..a29b66b0e6 100644
--- a/patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0588-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,10 +7,10 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cb995a9492cbc9702804d7b62a711ea0b7618deb..8e4dcdfbbd6be8a571f1e1a2a5b452108db2ac12 100644
+index 1254ab553e0d2c8e1a0fd93b602dd339da05dabb..42f4c3dee830f0aa65392319a3c505d044e4c17c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -633,6 +633,14 @@ public abstract class PlayerList {
+@@ -570,6 +570,14 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0590-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0589-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0590-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0589-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 86%
rename from patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 5119b8e1b5..e985a81464 100644
--- a/patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae50b297bc43a4092395640ec53bbfbba5fee0d7..c9e3bc224427d91269624622cf646de752adf74b 100644
+index a089c23c8df93eaf10d21d550ab5129a43ad38ea..b40a95dbc6b06998e3fb6f675a6ac3d5b7a9c2a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1286,7 +1286,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1282,7 +1282,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
  
          itemstack.addTagElement("pages", nbttaglist);
diff --git a/patches/server/0592-Entity-load-save-limit-per-chunk.patch b/patches/server/0591-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0592-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0591-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0593-Expose-protocol-version.patch b/patches/server/0592-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0593-Expose-protocol-version.patch
rename to patches/server/0592-Expose-protocol-version.patch
diff --git a/patches/server/0594-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0593-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0594-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0593-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 92%
rename from patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 183d69e2a8..31a395f4c9 100644
--- a/patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 53c2643136ef8902205c2fb2463f8bde6aeb8159..5690e6447209f0a74806ce1193dfa36b21042c9f 100644
+index 464da8e64626358238a6d872f0474e12310a0fdf..485888bc3e85054c4452c7abd70c65f997b26479 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3814,6 +3814,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0596-Add-bypass-host-check.patch b/patches/server/0595-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0596-Add-bypass-host-check.patch
rename to patches/server/0595-Add-bypass-host-check.patch
diff --git a/patches/server/0597-Set-area-affect-cloud-rotation.patch b/patches/server/0596-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0597-Set-area-affect-cloud-rotation.patch
rename to patches/server/0596-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0598-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0597-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0598-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0597-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0599-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0598-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0599-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0598-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0600-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0599-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0600-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0599-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0601-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0600-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0601-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0600-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0602-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0601-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0602-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0601-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0602-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 88%
rename from patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0602-fix-PlayerItemHeldEvent-firing-twice.patch
index ce78db7dff..909f0b488f 100644
--- a/patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0602-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9e3bc224427d91269624622cf646de752adf74b..4c041d94a408698cc54f5036a2bf245334edbe7e 100644
+index b40a95dbc6b06998e3fb6f675a6ac3d5b7a9c2a4..b25509b00569ae8b612841b94ab243be194cb08a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2051,6 +2051,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2047,6 +2047,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
          if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
diff --git a/patches/server/0604-Added-PlayerDeepSleepEvent.patch b/patches/server/0603-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0604-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0603-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0605-More-World-API.patch b/patches/server/0604-More-World-API.patch
similarity index 100%
rename from patches/server/0605-More-World-API.patch
rename to patches/server/0604-More-World-API.patch
diff --git a/patches/server/0606-Added-PlayerBedFailEnterEvent.patch b/patches/server/0605-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0606-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0605-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0607-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0606-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0607-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0606-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 86%
rename from patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 4de652cecf..2d165ae8dc 100644
--- a/patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8e4dcdfbbd6be8a571f1e1a2a5b452108db2ac12..866f68e95a51ea3beabac2d5fa29bc249106e9d4 100644
+index 42f4c3dee830f0aa65392319a3c505d044e4c17c..a87ea8b0922ccf724e6e7d410601ba88a6e84338 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -866,6 +866,7 @@ public abstract class PlayerList {
+@@ -789,6 +789,7 @@ public abstract class PlayerList {
  
          // Paper start
          boolean isBedSpawn = false;
@@ -17,7 +17,7 @@ index 8e4dcdfbbd6be8a571f1e1a2a5b452108db2ac12..866f68e95a51ea3beabac2d5fa29bc24
          boolean isRespawn = false;
          boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
          // Paper end
-@@ -886,6 +887,7 @@ public abstract class PlayerList {
+@@ -809,6 +810,7 @@ public abstract class PlayerList {
                  if (optional.isPresent()) {
                      BlockState iblockdata = worldserver1.getBlockState(blockposition);
                      boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
@@ -25,7 +25,7 @@ index 8e4dcdfbbd6be8a571f1e1a2a5b452108db2ac12..866f68e95a51ea3beabac2d5fa29bc24
                      Vec3 vec3d = (Vec3) optional.get();
                      float f1;
  
-@@ -914,7 +916,7 @@ public abstract class PlayerList {
+@@ -837,7 +839,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0609-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0608-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0609-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0608-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0609-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 89%
rename from patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0609-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 9936fda961..6bd78b3d75 100644
--- a/patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0609-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4c041d94a408698cc54f5036a2bf245334edbe7e..4e71a80a6cc163d72001804de6ed3ba8167101b4 100644
+index b25509b00569ae8b612841b94ab243be194cb08a..7dd27fc7a539ab0cbf06936ba4daa37ea607845d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2762,7 +2762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2758,7 +2758,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              case PERFORM_RESPAWN:
                  if (this.player.wonGame) {
                      this.player.wonGame = false;
@@ -18,10 +18,10 @@ index 4c041d94a408698cc54f5036a2bf245334edbe7e..4e71a80a6cc163d72001804de6ed3ba8
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 866f68e95a51ea3beabac2d5fa29bc249106e9d4..16210f30249ecc83c92e0374f7821693a9fd27c1 100644
+index a87ea8b0922ccf724e6e7d410601ba88a6e84338..4eaabbf73d1449a28b36b99162cfc898bd42ccfa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -825,6 +825,12 @@ public abstract class PlayerList {
+@@ -748,6 +748,12 @@ public abstract class PlayerList {
      }
  
      public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) {
@@ -34,7 +34,7 @@ index 866f68e95a51ea3beabac2d5fa29bc249106e9d4..16210f30249ecc83c92e0374f7821693
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -916,7 +922,7 @@ public abstract class PlayerList {
+@@ -839,7 +845,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0611-Add-Channel-initialization-listeners.patch b/patches/server/0610-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0611-Add-Channel-initialization-listeners.patch
rename to patches/server/0610-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0612-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0611-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0612-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0611-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0613-Add-more-WanderingTrader-API.patch b/patches/server/0612-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0613-Add-more-WanderingTrader-API.patch
rename to patches/server/0612-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0614-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0613-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0614-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0613-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0614-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0614-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 95%
rename from patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 8a369c8efc..a5283c32e5 100644
--- a/patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 3042af47778f5d6c878a7a734a8eb92e952c01a8..7661f248c1c0b8de3b15793f45bf239ab561083b 100644
+index 0869a7d6807815879aa9ded0d8b9baee82d535a9..703a6daf4af2459ea3acf7569cbc92c4e017aad1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -331,12 +331,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0617-Inventory-close.patch b/patches/server/0616-Inventory-close.patch
similarity index 100%
rename from patches/server/0617-Inventory-close.patch
rename to patches/server/0616-Inventory-close.patch
diff --git a/patches/server/0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0617-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0617-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0619-Fix-CraftPotionBrewer-cache.patch b/patches/server/0618-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0619-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0618-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0620-Add-basic-Datapack-API.patch b/patches/server/0619-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0620-Add-basic-Datapack-API.patch
rename to patches/server/0619-Add-basic-Datapack-API.patch
index 6323b4aae5..cbb3458c60 100644
--- a/patches/server/0620-Add-basic-Datapack-API.patch
+++ b/patches/server/0619-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bcb40a419febfe2b031afe77a4ee5ccb97374240..7fb8287fcb0a050290ee56205f9e763396530e4b 100644
+index 2dbfd750088dbf7a15fc147d9f215c19e505c96b..f28e588489088e948e70f87951e07728e600f737 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -295,6 +295,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0621-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0620-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0621-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0620-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0621-additions-to-PlayerGameModeChangeEvent.patch
similarity index 94%
rename from patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0621-additions-to-PlayerGameModeChangeEvent.patch
index d96192efce..98aefb6b29 100644
--- a/patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0621-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,10 +45,10 @@ index d47f3d255eddd652fedb4aa55286b756fe962995..27c0aaf123c3e945eb24e8a3892bd8ac
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 58f1ed2771fa85e755c95f981bdb23b0321a5603..dca9772075dda6f00d42adf10f19528739108bd6 100644
+index 5cc7edca158fed862d0dd18c6d2754de6df0ec4c..5428a5ee4097e29922d48564714998604ba07dbb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1828,8 +1828,15 @@ public class ServerPlayer extends Player {
+@@ -1826,8 +1826,15 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -66,7 +66,7 @@ index 58f1ed2771fa85e755c95f981bdb23b0321a5603..dca9772075dda6f00d42adf10f195287
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1841,7 +1848,7 @@ public class ServerPlayer extends Player {
+@@ -1839,7 +1846,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -75,7 +75,7 @@ index 58f1ed2771fa85e755c95f981bdb23b0321a5603..dca9772075dda6f00d42adf10f195287
          }
      }
  
-@@ -2251,6 +2258,16 @@ public class ServerPlayer extends Player {
+@@ -2249,6 +2256,16 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
@@ -129,10 +129,10 @@ index 645a226c2e3f6dcf1c25187d006d425038b4545d..17c313b9cb45c8158cab751ffc4e0dc3
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4e71a80a6cc163d72001804de6ed3ba8167101b4..d056dbdf89284b120e28002bcca463c60fb22f4b 100644
+index 7dd27fc7a539ab0cbf06936ba4daa37ea607845d..69780a4a69048291b4898c2d0ecc57ce518ffd93 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2771,7 +2771,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2767,7 +2767,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                      this.player = this.server.getPlayerList().respawn(this.player, false);
                      if (this.server.isHardcore()) {
@@ -142,7 +142,7 @@ index 4e71a80a6cc163d72001804de6ed3ba8167101b4..d056dbdf89284b120e28002bcca463c6
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8ea298852fd39cfb0110250cb4330fd88b2ef451..f1fd1cc8ec08f81e2e58052154ede76c3a7c134f 100644
+index 55c206d2bff70fd7febd5f635ea0d7a5e779a058..e225ef6eb6f061c3bdeebf824aa884611f79020e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1472,7 +1472,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0623-ItemStack-repair-check-API.patch b/patches/server/0622-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0623-ItemStack-repair-check-API.patch
rename to patches/server/0622-ItemStack-repair-check-API.patch
diff --git a/patches/server/0624-More-Enchantment-API.patch b/patches/server/0623-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0624-More-Enchantment-API.patch
rename to patches/server/0623-More-Enchantment-API.patch
diff --git a/patches/server/0625-Move-range-check-for-block-placing-up.patch b/patches/server/0624-Move-range-check-for-block-placing-up.patch
similarity index 87%
rename from patches/server/0625-Move-range-check-for-block-placing-up.patch
rename to patches/server/0624-Move-range-check-for-block-placing-up.patch
index b6fa7601ad..65b239289c 100644
--- a/patches/server/0625-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0624-Move-range-check-for-block-placing-up.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d056dbdf89284b120e28002bcca463c60fb22f4b..f8b170b2842cc388463858d2c2815aedd14ceec7 100644
+index 69780a4a69048291b4898c2d0ecc57ce518ffd93..68b9c257f98617fe9e9e0492129bdbb3d22e6e0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1825,6 +1825,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1821,6 +1821,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (itemstack.isItemEnabled(worldserver.enabledFeatures())) {
              BlockHitResult movingobjectpositionblock = packet.getHitResult();
              Vec3 vec3d = movingobjectpositionblock.getLocation();
diff --git a/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0625-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0626-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0625-Fix-and-optimise-world-force-upgrading.patch
index a4d4d11d28..fea31cc874 100644
--- a/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0625-Fix-and-optimise-world-force-upgrading.patch
@@ -359,7 +359,7 @@ index b294ef87fb93e7f4651dc04128124f297575860d..65fd57609e45ccd49ebfc1ba80d25243
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7fb8287fcb0a050290ee56205f9e763396530e4b..a44409160d236604d62c3fdacce6dae8a1c8d646 100644
+index f28e588489088e948e70f87951e07728e600f737..e8f7b418b942a6a36e615dbcaf9bb18257c34ee4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1232,12 +1232,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0627-Add-Mob-lookAt-API.patch b/patches/server/0626-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0627-Add-Mob-lookAt-API.patch
rename to patches/server/0626-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0628-Add-Unix-domain-socket-support.patch b/patches/server/0627-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0628-Add-Unix-domain-socket-support.patch
rename to patches/server/0627-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0629-Add-EntityInsideBlockEvent.patch b/patches/server/0628-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0629-Add-EntityInsideBlockEvent.patch
rename to patches/server/0628-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0630-Attributes-API-for-item-defaults.patch b/patches/server/0629-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0630-Attributes-API-for-item-defaults.patch
rename to patches/server/0629-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0630-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 95%
rename from patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0630-Add-cause-to-Weather-ThunderChangeEvents.patch
index 93f155aab2..e452b5db02 100644
--- a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0630-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5e1448c900b8569344f5c7d219c0d7ce92ccd5b4..307c451c7fb8e783440f805bf2623ba7fa8c300a 100644
+index b9208d28c3bfb40679fb15546b47628b879e4e7d..a2966939613594d5a6fcc3ef1f1d6f398c4c0523 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -533,8 +533,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -531,8 +531,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.serverLevelData.setClearWeatherTime(clearDuration);
          this.serverLevelData.setRainTime(rainDuration);
          this.serverLevelData.setThunderTime(rainDuration);
@@ -19,7 +19,7 @@ index 5e1448c900b8569344f5c7d219c0d7ce92ccd5b4..307c451c7fb8e783440f805bf2623ba7
      }
  
      @Override
-@@ -947,8 +947,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -945,8 +945,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  this.serverLevelData.setThunderTime(j);
                  this.serverLevelData.setRainTime(k);
                  this.serverLevelData.setClearWeatherTime(i);
@@ -30,7 +30,7 @@ index 5e1448c900b8569344f5c7d219c0d7ce92ccd5b4..307c451c7fb8e783440f805bf2623ba7
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -1014,14 +1014,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1012,14 +1012,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private void resetWeatherCycle() {
          // CraftBukkit start
diff --git a/patches/server/0632-More-Lidded-Block-API.patch b/patches/server/0631-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0632-More-Lidded-Block-API.patch
rename to patches/server/0631-More-Lidded-Block-API.patch
diff --git a/patches/server/0633-Limit-item-frame-cursors-on-maps.patch b/patches/server/0632-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0633-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0632-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0634-Add-PlayerKickEvent-causes.patch b/patches/server/0633-Add-PlayerKickEvent-causes.patch
similarity index 93%
rename from patches/server/0634-Add-PlayerKickEvent-causes.patch
rename to patches/server/0633-Add-PlayerKickEvent-causes.patch
index 90a4b3da11..1868e10fd4 100644
--- a/patches/server/0634-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0633-Add-PlayerKickEvent-causes.patch
@@ -88,10 +88,10 @@ index 65637a33ba171a4b598f70cd943d24b0ee44a69f..57a9146bf2dee7a60aab16716e25348f
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b05bb61fbc 100644
+index 68b9c257f98617fe9e9e0492129bdbb3d22e6e0d..7c0ef92a9bad6f66a5f7f466c47f76953e0d2e8d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -358,7 +358,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (this.clientIsFloating && !this.player.isSleeping() && !this.player.isPassenger()) {
              if (++this.aboveGroundTickCount > 80) {
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString());
@@ -100,7 +100,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                  return;
              }
          } else {
-@@ -381,7 +381,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -377,7 +377,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              if (this.clientVehicleIsFloating && this.player.getRootVehicle().getControllingPassenger() == this.player) {
                  if (++this.aboveGroundVehicleTickCount > 80) {
                      ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName().getString());
@@ -109,7 +109,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                      return;
                  }
              } else {
-@@ -403,7 +403,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -399,7 +399,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -118,7 +118,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
          } else {
              if (elapsedTime >= 15000L) { // 15 seconds
-@@ -433,7 +433,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -429,7 +429,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
          if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) (this.server.getPlayerIdleTimeout() * 1000 * 60)) {
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
@@ -127,7 +127,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          }
  
      }
-@@ -456,16 +456,26 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -452,16 +452,26 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          return this.server.isSingleplayerOwner(this.player.getGameProfile());
      }
  
@@ -157,7 +157,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          // Paper end
          // CraftBukkit start - fire PlayerKickEvent
          if (this.processedDisconnect) {
-@@ -475,7 +485,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -471,7 +481,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              Waitable waitable = new Waitable() {
                  @Override
                  protected Object evaluate() {
@@ -166,7 +166,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                      return null;
                  }
              };
-@@ -494,7 +504,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -490,7 +500,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
          net.kyori.adventure.text.Component leaveMessage = net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? this.player.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(this.player.getScoreboardName())); // Paper - Adventure
  
@@ -175,7 +175,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
  
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
-@@ -564,7 +574,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -560,7 +570,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleMoveVehicle(ServerboundMoveVehiclePacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(), packet.getY(), packet.getZ(), packet.getYRot(), packet.getXRot())) {
@@ -184,7 +184,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          } else {
              Entity entity = this.player.getRootVehicle();
  
-@@ -762,7 +772,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -758,7 +768,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (packet.getId() == this.awaitingTeleport) {
              if (this.awaitingPositionFromClient == null) {
@@ -193,7 +193,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                  return;
              }
  
-@@ -819,13 +829,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -815,13 +825,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
          // CraftBukkit start
          if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -209,7 +209,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              return;
          }
          // Paper end
-@@ -978,7 +988,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -974,7 +984,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // 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());
@@ -218,7 +218,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              return;
          }
          this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed
-@@ -1165,7 +1175,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1161,7 +1171,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
                      ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
@@ -227,7 +227,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                      return;
                  }
                  byteTotal += byteLength;
-@@ -1188,14 +1198,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1184,14 +1194,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
@@ -244,7 +244,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              return;
          }
          this.lastBookTick = MinecraftServer.currentTick;
-@@ -1319,7 +1329,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1315,7 +1325,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(0.0D), packet.getY(0.0D), packet.getZ(0.0D), packet.getYRot(0.0F), packet.getXRot(0.0F))) {
@@ -253,7 +253,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          } else {
              ServerLevel worldserver = this.player.getLevel();
  
-@@ -1747,7 +1757,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1743,7 +1753,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                          this.dropCount++;
                          if (this.dropCount >= 20) {
                              ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " dropped their items too quickly!");
@@ -262,7 +262,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                              return;
                          }
                      }
-@@ -1959,7 +1969,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1955,7 +1965,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
              ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
@@ -271,7 +271,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          }
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()];
-@@ -2073,7 +2083,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2069,7 +2079,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              this.player.resetLastActionTime();
          } else {
              ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
@@ -280,7 +280,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          }
      }
  
-@@ -2086,7 +2096,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2082,7 +2092,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
          // CraftBukkit end
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) {
@@ -289,7 +289,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2120,7 +2130,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2116,7 +2126,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleChatCommand(ServerboundChatCommandPacket packet) {
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
@@ -298,7 +298,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2169,7 +2179,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2165,7 +2175,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {
          if (exception.shouldDisconnect()) {
@@ -307,7 +307,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          } else {
              this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED));
          }
-@@ -2200,7 +2210,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2196,7 +2206,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message);
@@ -316,7 +316,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              return Optional.empty();
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
-@@ -2221,7 +2231,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2217,7 +2227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
              if (optional.isEmpty()) {
                  ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
@@ -325,7 +325,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
  
              return optional;
-@@ -2444,7 +2454,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2440,7 +2450,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // this.chatSpamTickCount += 20;
          if (this.chatSpamTickCount.addAndGet(20) > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
              // CraftBukkit end
@@ -334,7 +334,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
          }
  
      }
-@@ -2456,7 +2466,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2452,7 +2462,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          synchronized (this.lastSeenMessages) {
              if (!this.lastSeenMessages.applyOffset(packet.offset())) {
                  ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
@@ -343,7 +343,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
  
          }
-@@ -2597,7 +2607,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2593,7 +2603,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              }
  
              if (i > 4096) {
@@ -352,7 +352,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
  
          }
-@@ -2621,7 +2631,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2617,7 +2627,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Spigot Start
          if ( entity == this.player && !this.player.isSpectator() )
          {
@@ -361,7 +361,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              return;
          }
          // Spigot End
-@@ -2718,7 +2728,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2714,7 +2724,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                                  // CraftBukkit end
                              }
                          } else {
@@ -370,7 +370,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                              ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", ServerGamePacketListenerImpl.this.player.getName().getString());
                          }
                      }
-@@ -3126,7 +3136,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3122,7 +3132,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -379,7 +379,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
                  return;
              }
          }
-@@ -3334,7 +3344,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3330,7 +3340,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          } else if (!this.isSingleplayerOwner()) {
              // Paper start - This needs to be handled on the main thread for plugins
              server.submit(() -> {
@@ -388,7 +388,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              });
              // Paper end
          }
-@@ -3380,7 +3390,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3376,7 +3386,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  }
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
@@ -397,7 +397,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
          } else if (packet.identifier.equals(CUSTOM_UNREGISTER)) {
              try {
-@@ -3390,7 +3400,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3386,7 +3396,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  }
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
@@ -406,7 +406,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
          } else {
              try {
-@@ -3408,7 +3418,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3404,7 +3414,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
@@ -415,7 +415,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              }
          }
  
-@@ -3450,7 +3460,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3446,7 +3456,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
          if (!Objects.equals(profilepublickey_a, profilepublickey_a1)) {
              if (profilepublickey_a != null && profilepublickey_a1.expiresAt().isBefore(profilepublickey_a.expiresAt())) {
@@ -424,7 +424,7 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
              } else {
                  try {
                      SignatureValidator signaturevalidator = this.server.getServiceSignatureValidator();
-@@ -3458,7 +3468,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3454,7 +3464,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
                      ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
@@ -434,10 +434,10 @@ index f8b170b2842cc388463858d2c2815aedd14ceec7..8e8c1117246cbe574f8c096629d0b8b0
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 16210f30249ecc83c92e0374f7821693a9fd27c1..20598ef01293d8889145921cb3c5a9c7287b6b23 100644
+index 4eaabbf73d1449a28b36b99162cfc898bd42ccfa..7bd0cfd60b983bbf3cb370f92aa5f2827c2572f8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -734,7 +734,7 @@ public abstract class PlayerList {
+@@ -657,7 +657,7 @@ public abstract class PlayerList {
          while (iterator.hasNext()) {
              entityplayer = (ServerPlayer) iterator.next();
              this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
@@ -446,7 +446,7 @@ index 16210f30249ecc83c92e0374f7821693a9fd27c1..20598ef01293d8889145921cb3c5a9c7
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -1367,8 +1367,8 @@ public abstract class PlayerList {
+@@ -1290,8 +1290,8 @@ public abstract class PlayerList {
          // Paper end
          // CraftBukkit start - disconnect safely
          for (ServerPlayer player : this.players) {
@@ -491,7 +491,7 @@ index a24e7a66d52eddbdad8db71cf5e45f1a458c389f..e1c13ac7b11fb0080435fc34502208c8
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3ae87757f4a3bf865514055d1d6fcb6fff38354d..a5516f18c4bf4cfe745551d889053d7c49e81210 100644
+index e225ef6eb6f061c3bdeebf824aa884611f79020e..f425ba131dffd03d19ffb5c58373d19f097c75de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -599,7 +599,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0635-Add-PufferFishStateChangeEvent.patch b/patches/server/0634-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0635-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0634-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0635-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0635-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0636-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0636-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0638-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0637-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0638-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0637-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0639-Add-BellRevealRaiderEvent.patch b/patches/server/0638-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0639-Add-BellRevealRaiderEvent.patch
rename to patches/server/0638-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0640-Fix-invulnerable-end-crystals.patch b/patches/server/0639-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0640-Fix-invulnerable-end-crystals.patch
rename to patches/server/0639-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0641-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0640-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0641-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0640-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0642-Fix-dangerous-end-portal-logic.patch b/patches/server/0641-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0642-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0641-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0642-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0642-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0644-Make-item-validations-configurable.patch b/patches/server/0643-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0644-Make-item-validations-configurable.patch
rename to patches/server/0643-Make-item-validations-configurable.patch
diff --git a/patches/server/0645-Line-Of-Sight-Changes.patch b/patches/server/0644-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0645-Line-Of-Sight-Changes.patch
rename to patches/server/0644-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0646-add-per-world-spawn-limits.patch b/patches/server/0645-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0646-add-per-world-spawn-limits.patch
rename to patches/server/0645-add-per-world-spawn-limits.patch
diff --git a/patches/server/0647-Fix-potions-splash-events.patch b/patches/server/0646-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0647-Fix-potions-splash-events.patch
rename to patches/server/0646-Fix-potions-splash-events.patch
diff --git a/patches/server/0648-Add-more-LimitedRegion-API.patch b/patches/server/0647-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0648-Add-more-LimitedRegion-API.patch
rename to patches/server/0647-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0648-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 91%
rename from patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0648-Fix-PlayerDropItemEvent-using-wrong-item.patch
index abb97779ef..9d86741f11 100644
--- a/patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0648-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dca9772075dda6f00d42adf10f19528739108bd6..31aab0affbedf89108d5809ba25e64adde071bc7 100644
+index 5428a5ee4097e29922d48564714998604ba07dbb..77a3fa81d94005de4c5b7c130e893487fe7adc77 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2227,7 +2227,7 @@ public class ServerPlayer extends Player {
+@@ -2225,7 +2225,7 @@ public class ServerPlayer extends Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {
diff --git a/patches/server/0650-Missing-Entity-Behavior-API.patch b/patches/server/0649-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0650-Missing-Entity-Behavior-API.patch
rename to patches/server/0649-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 88%
rename from patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 8d80d71692..a5f5253327 100644
--- a/patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8e8c1117246cbe574f8c096629d0b8b05bb61fbc..693b23c4c4fe35197685709cbb3600e4de2ca9c1 100644
+index 7c0ef92a9bad6f66a5f7f466c47f76953e0d2e8d..ecabbf88fa8fc568eede8d083e9456c22613c2bd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1205,7 +1205,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1201,7 +1201,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper end
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
diff --git a/patches/server/0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0651-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0651-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0652-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 95%
rename from patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0652-Use-getChunkIfLoadedImmediately-in-places.patch
index 18b12f06cf..1aaf2906ad 100644
--- a/patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0652-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,10 +8,10 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 307c451c7fb8e783440f805bf2623ba7fa8c300a..e14c8dfb8238b4afed2085e68beaf746463f7846 100644
+index a2966939613594d5a6fcc3ef1f1d6f398c4c0523..17e77f727b0cd3da788bf5593762f2930e98a609 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -227,7 +227,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
diff --git a/patches/server/0654-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0653-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0654-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0653-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0655-Adds-PlayerArmSwingEvent.patch b/patches/server/0654-Adds-PlayerArmSwingEvent.patch
similarity index 88%
rename from patches/server/0655-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0654-Adds-PlayerArmSwingEvent.patch
index 05fe6c3be6..d7a802a46b 100644
--- a/patches/server/0655-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0654-Adds-PlayerArmSwingEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 693b23c4c4fe35197685709cbb3600e4de2ca9c1..d7b46b05be29b5671ee03d9308c784c11beea549 100644
+index ecabbf88fa8fc568eede8d083e9456c22613c2bd..1d84ee2afa76ecc1c7c07bf0a21c3d1ee7213515 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2494,7 +2494,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2490,7 +2490,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
  
          // Arm swing animation
diff --git a/patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0655-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 84%
rename from patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0655-Fixes-kick-event-leave-message-not-being-sent.patch
index 53eca4b91a..54c8e057df 100644
--- a/patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0655-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 31aab0affbedf89108d5809ba25e64adde071bc7..dda5b7f7ead6821b4212f79fcbf55636816ec4a7 100644
+index 77a3fa81d94005de4c5b7c130e893487fe7adc77..80aaa260c69598a403b8a364dc39caff2193ec0f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -264,7 +264,6 @@ public class ServerPlayer extends Player {
+@@ -262,7 +262,6 @@ public class ServerPlayer extends Player {
+     public boolean sentListPacket = false;
      public boolean supressTrackerForLogin = false; // Paper
-     public boolean didPlayerJoinEvent = false; // Paper
      public Integer clientViewDistance;
 -    public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d7b46b05be29b5671ee03d9308c784c11beea549..b1e5b912fc428942850e279a8cdec00763ef6cac 100644
+index 1d84ee2afa76ecc1c7c07bf0a21c3d1ee7213515..3ccb8f290a842487da80ed24d04d55192ed317f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -510,7 +510,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              // Do not kick the player
              return;
          }
@@ -28,7 +28,7 @@ index d7b46b05be29b5671ee03d9308c784c11beea549..b1e5b912fc428942850e279a8cdec007
          // Send the possibly modified leave message
          final Component ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
          // CraftBukkit end
-@@ -523,7 +522,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -519,7 +518,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), PacketSendListener.thenRun(() -> {
              this.connection.disconnect(ichatbasecomponent);
          }));
@@ -37,7 +37,7 @@ index d7b46b05be29b5671ee03d9308c784c11beea549..b1e5b912fc428942850e279a8cdec007
          this.connection.setReadOnly();
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
-@@ -1994,6 +1993,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1990,6 +1989,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void onDisconnect(Component reason) {
@@ -49,7 +49,7 @@ index d7b46b05be29b5671ee03d9308c784c11beea549..b1e5b912fc428942850e279a8cdec007
          // CraftBukkit start - Rarely it would send a disconnect line twice
          if (this.processedDisconnect) {
              return;
-@@ -2011,7 +2015,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2007,7 +2011,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
          this.player.disconnect();
          // Paper start - Adventure
@@ -59,10 +59,10 @@ index d7b46b05be29b5671ee03d9308c784c11beea549..b1e5b912fc428942850e279a8cdec007
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 20598ef01293d8889145921cb3c5a9c7287b6b23..20ba3b4fc4781205b04eab3670989b7634143e03 100644
+index 7bd0cfd60b983bbf3cb370f92aa5f2827c2572f8..8273055be92fbe96187721c95e5ff74c9e5daafe 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -606,6 +606,11 @@ public abstract class PlayerList {
+@@ -543,6 +543,11 @@ public abstract class PlayerList {
      }
  
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer) { // Paper - return Component
@@ -74,12 +74,12 @@ index 20598ef01293d8889145921cb3c5a9c7287b6b23..20ba3b4fc4781205b04eab3670989b76
          ServerLevel worldserver = entityplayer.getLevel();
  
          entityplayer.awardStat(Stats.LEAVE_GAME);
-@@ -616,7 +621,7 @@ public abstract class PlayerList {
+@@ -553,7 +558,7 @@ public abstract class PlayerList {
              entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
          }
  
 -        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())), entityplayer.quitReason); // Paper - quit reason
 +        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), leaveMessage, entityplayer.quitReason); // Paper - quit reason
-         if (entityplayer.didPlayerJoinEvent) this.cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
+         this.cserver.getPluginManager().callEvent(playerQuitEvent);
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
diff --git a/patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0656-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0656-Add-config-for-mobs-immune-to-default-effects.patch
index 390f37c70e..d10db04bef 100644
--- a/patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0656-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 97e8d9568f21888bc6b92fe7a8544372c8d0db71..36d27f64a837630d5056b0cf5a0b1b009d1d4f0f 100644
+index 8e8906679c3d814e62740f0a31bc756eb8b634fc..bb148172250cfa1db0feb4073c0cc7954bc11876 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1152,7 +1152,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0658-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0657-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0658-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0657-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0659-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0658-Don-t-apply-cramming-damage-to-players.patch
similarity index 89%
rename from patches/server/0659-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0658-Don-t-apply-cramming-damage-to-players.patch
index d46d58115d..bab43b293f 100644
--- a/patches/server/0659-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0658-Don-t-apply-cramming-damage-to-players.patch
@@ -11,10 +11,10 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dda5b7f7ead6821b4212f79fcbf55636816ec4a7..6ddff26d6d26f0fcba9960bede9259a421cb2546 100644
+index 80aaa260c69598a403b8a364dc39caff2193ec0f..ad110326b3086137a6762ef73d04ea796b3dbf39 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1455,7 +1455,7 @@ public class ServerPlayer extends Player {
+@@ -1453,7 +1453,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {
diff --git a/patches/server/0660-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0659-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0660-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0659-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0661-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0660-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0661-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0660-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0662-Stinger-API.patch b/patches/server/0661-Stinger-API.patch
similarity index 100%
rename from patches/server/0662-Stinger-API.patch
rename to patches/server/0661-Stinger-API.patch
diff --git a/patches/server/0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0662-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0662-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0664-Add-System.out-err-catcher.patch b/patches/server/0663-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0664-Add-System.out-err-catcher.patch
rename to patches/server/0663-Add-System.out-err-catcher.patch
index 776a38a445..91abcbaf67 100644
--- a/patches/server/0664-Add-System.out-err-catcher.patch
+++ b/patches/server/0663-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 613d77a51c249b5a516df7aedc8a08b9f1a14b81..6aec9535f73a79439c6325095c8adf140891035a 100644
+index e8f7b418b942a6a36e615dbcaf9bb18257c34ee4..caa9885dd942fc5b82ba6b820d89f1b1a7ffda20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -297,6 +297,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0665-Fix-test-not-bootstrapping.patch b/patches/server/0664-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0665-Fix-test-not-bootstrapping.patch
rename to patches/server/0664-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0665-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0665-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0667-Improve-boat-collision-performance.patch b/patches/server/0666-Improve-boat-collision-performance.patch
similarity index 97%
rename from patches/server/0667-Improve-boat-collision-performance.patch
rename to patches/server/0666-Improve-boat-collision-performance.patch
index a30069b762..06c36a9d49 100644
--- a/patches/server/0667-Improve-boat-collision-performance.patch
+++ b/patches/server/0666-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 8120739e2a7c4c86ecb7058f08bd8179d3a943b8..439ae035d8b2787916e017e2636115b5
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 36d27f64a837630d5056b0cf5a0b1b009d1d4f0f..00726cca55d45043003032e32b045d84e74cf1d2 100644
+index bb148172250cfa1db0feb4073c0cc7954bc11876..5c7cd39135ddf89a7f9ed60d4e59bfa4957461a9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1340,7 +1340,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0667-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 89%
rename from patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0667-Prevent-AFK-kick-while-watching-end-credits.patch
index 231b3670c7..f6be3e59ad 100644
--- a/patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0667-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b1e5b912fc428942850e279a8cdec00763ef6cac..4974dc18ee0dd401268b2daaadf53bf1f70e8daf 100644
+index 3ccb8f290a842487da80ed24d04d55192ed317f4..69d67c7c4fcdb8cbdae1a75d2a0f79987e48a581 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -427,7 +427,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              --this.dropSpamTickCount;
          }
  
diff --git a/patches/server/0669-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0668-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0669-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0668-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0670-Add-PlayerSetSpawnEvent.patch b/patches/server/0669-Add-PlayerSetSpawnEvent.patch
similarity index 94%
rename from patches/server/0670-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0669-Add-PlayerSetSpawnEvent.patch
index 17961b0800..e0d2c52a34 100644
--- a/patches/server/0670-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0669-Add-PlayerSetSpawnEvent.patch
@@ -32,10 +32,10 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2
          String string = resourceKey.location().toString();
          if (targets.size() == 1) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ddff26d6d26f0fcba9960bede9259a421cb2546..5f9ca49dc90b20883b52948318125e4d510b485f 100644
+index ad110326b3086137a6762ef73d04ea796b3dbf39..36330e5a2b59cf4d5eb45b3d0840440a2991fc5e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1296,7 +1296,7 @@ public class ServerPlayer extends Player {
+@@ -1294,7 +1294,7 @@ public class ServerPlayer extends Player {
              } else if (this.bedBlocked(blockposition, enumdirection)) {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
@@ -44,7 +44,7 @@ index 6ddff26d6d26f0fcba9960bede9259a421cb2546..5f9ca49dc90b20883b52948318125e4d
                  if (this.level.isDay()) {
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2154,12 +2154,33 @@ public class ServerPlayer extends Player {
+@@ -2152,12 +2152,33 @@ public class ServerPlayer extends Player {
          return this.respawnForced;
      }
  
@@ -80,7 +80,7 @@ index 6ddff26d6d26f0fcba9960bede9259a421cb2546..5f9ca49dc90b20883b52948318125e4d
              }
  
              this.respawnPosition = pos;
-@@ -2173,6 +2194,7 @@ public class ServerPlayer extends Player {
+@@ -2171,6 +2192,7 @@ public class ServerPlayer extends Player {
              this.respawnForced = false;
          }
  
@@ -89,10 +89,10 @@ index 6ddff26d6d26f0fcba9960bede9259a421cb2546..5f9ca49dc90b20883b52948318125e4d
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 20ba3b4fc4781205b04eab3670989b7634143e03..f734c7ea8c6ce468882ea758a358a8f19a16dcdb 100644
+index 8273055be92fbe96187721c95e5ff74c9e5daafe..8f32292900f7c446e874bad4b1768be841bfa963 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -910,13 +910,13 @@ public abstract class PlayerList {
+@@ -833,13 +833,13 @@ public abstract class PlayerList {
                          f1 = (float) Mth.wrapDegrees(Mth.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
                      }
  
@@ -129,7 +129,7 @@ index 37e111589134d80fdfd7a04d624b8c1d58a2d664..53b35f003034e7f4c9dd8ccfaf773891
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5e980ea6e076698eb52ce9e3b08e420e368fe825..67ed1ef8f19d208a407add3f4808dd0e0ff69e0d 100644
+index f425ba131dffd03d19ffb5c58373d19f097c75de..3dbd458caf6098c57ca654fd17783e231abcfd43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1292,9 +1292,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0671-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0670-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0671-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0670-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0672-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0671-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0672-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0671-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0673-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0672-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0673-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0672-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0674-Added-EntityDamageItemEvent.patch b/patches/server/0673-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0674-Added-EntityDamageItemEvent.patch
rename to patches/server/0673-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0675-Optimize-indirect-passenger-iteration.patch b/patches/server/0674-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0675-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0674-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0676-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0675-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0676-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0675-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0677-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0676-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0677-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0676-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0678-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0677-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0678-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0677-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0679-Clear-bucket-NBT-after-dispense.patch b/patches/server/0678-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0679-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0678-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0680-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0679-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0680-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0679-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0681-Add-BlockBreakBlockEvent.patch b/patches/server/0680-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0681-Add-BlockBreakBlockEvent.patch
rename to patches/server/0680-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0681-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0681-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0683-More-CommandBlock-API.patch b/patches/server/0682-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0683-More-CommandBlock-API.patch
rename to patches/server/0682-More-CommandBlock-API.patch
diff --git a/patches/server/0684-Add-missing-team-sidebar-display-slots.patch b/patches/server/0683-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0684-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0683-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0685-Add-back-EntityPortalExitEvent.patch b/patches/server/0684-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0685-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0684-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0685-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 92%
rename from patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0685-Add-methods-to-find-targets-for-lightning-strikes.patch
index 63dba48d87..1647f1b5a5 100644
--- a/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0685-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e14c8dfb8238b4afed2085e68beaf746463f7846..e875ae882652b7c2c8cc85fade6ecfa2327eaf64 100644
+index 17e77f727b0cd3da788bf5593762f2930e98a609..2de60a2f3da7f8d30295def7045cd7535f84e37f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -836,6 +836,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -834,6 +834,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      protected BlockPos findLightningTargetAround(BlockPos pos) {
@@ -22,7 +22,7 @@ index e14c8dfb8238b4afed2085e68beaf746463f7846..e875ae882652b7c2c8cc85fade6ecfa2
          BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
          Optional<BlockPos> optional = this.findLightningRod(blockposition1);
  
-@@ -850,6 +855,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -848,6 +853,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (!list.isEmpty()) {
                  return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
              } else {
diff --git a/patches/server/0687-Get-entity-default-attributes.patch b/patches/server/0686-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0687-Get-entity-default-attributes.patch
rename to patches/server/0686-Get-entity-default-attributes.patch
diff --git a/patches/server/0688-Left-handed-API.patch b/patches/server/0687-Left-handed-API.patch
similarity index 100%
rename from patches/server/0688-Left-handed-API.patch
rename to patches/server/0687-Left-handed-API.patch
diff --git a/patches/server/0689-Add-more-advancement-API.patch b/patches/server/0688-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0689-Add-more-advancement-API.patch
rename to patches/server/0688-Add-more-advancement-API.patch
diff --git a/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0689-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0689-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0691-Add-critical-damage-API.patch b/patches/server/0690-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0691-Add-critical-damage-API.patch
rename to patches/server/0690-Add-critical-damage-API.patch
diff --git a/patches/server/0692-Fix-issues-with-mob-conversion.patch b/patches/server/0691-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0692-Fix-issues-with-mob-conversion.patch
rename to patches/server/0691-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0693-Add-isCollidable-methods-to-various-places.patch b/patches/server/0692-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0693-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0692-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0694-Goat-ram-API.patch b/patches/server/0693-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0694-Goat-ram-API.patch
rename to patches/server/0693-Goat-ram-API.patch
diff --git a/patches/server/0695-Add-API-for-resetting-a-single-score.patch b/patches/server/0694-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0695-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0694-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0695-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0695-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0697-Vanilla-command-permission-fixes.patch b/patches/server/0696-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0697-Vanilla-command-permission-fixes.patch
rename to patches/server/0696-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 92%
rename from patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 570472151c..b87a0a5c5a 100644
--- a/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,10 +9,10 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e875ae882652b7c2c8cc85fade6ecfa2327eaf64..3df252848b7d3420fdc65e255fe842fc578f0638 100644
+index 2de60a2f3da7f8d30295def7045cd7535f84e37f..d984a4304e8ebbcc3147e34bd3e35a7f0f95a83b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1415,9 +1415,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1413,9 +1413,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Spigot Start
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
@@ -28,10 +28,10 @@ index e875ae882652b7c2c8cc85fade6ecfa2327eaf64..3df252848b7d3420fdc65e255fe842fc
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5f9ca49dc90b20883b52948318125e4d510b485f..0007cf65767e304e27588bf2133579c5e06cc54a 100644
+index 36330e5a2b59cf4d5eb45b3d0840440a2991fc5e..5015076ff1ac2b13203588db4566b9cf6d934a28 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1597,6 +1597,18 @@ public class ServerPlayer extends Player {
+@@ -1595,6 +1595,18 @@ public class ServerPlayer extends Player {
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }
diff --git a/patches/server/0699-Fix-GameProfileCache-concurrency.patch b/patches/server/0698-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0699-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0698-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0700-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0699-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0700-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0699-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0700-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0700-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 2563a008fb..5fe111ce94 100644
--- a/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0700-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -286,7 +286,7 @@ index bf3fb416d36a19958033cdbf5cc313556fa0201b..0a49769bfa83d0b9c435e3ab4bba8597
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb990b96f8690b93813b8b1cb81cd883575f0596..47fa4dbe21d19596a6249c46b69fe925be2d820d 100644
+index caa9885dd942fc5b82ba6b820d89f1b1a7ffda20..9ab3f3a490e55211670e2847f03bd4f8229162da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2183,6 +2183,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0702-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0701-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0702-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0701-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0703-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0702-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0703-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0702-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0704-Optimise-general-POI-access.patch b/patches/server/0703-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0704-Optimise-general-POI-access.patch
rename to patches/server/0703-Optimise-general-POI-access.patch
diff --git a/patches/server/0705-Optimise-chunk-tick-iteration.patch b/patches/server/0704-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0705-Optimise-chunk-tick-iteration.patch
rename to patches/server/0704-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0706-Execute-chunk-tasks-mid-tick.patch b/patches/server/0705-Execute-chunk-tasks-mid-tick.patch
similarity index 96%
rename from patches/server/0706-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0705-Execute-chunk-tasks-mid-tick.patch
index 62db069d93..3cdb498efc 100644
--- a/patches/server/0706-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0705-Execute-chunk-tasks-mid-tick.patch
@@ -126,10 +126,10 @@ index b768767b92bf7691a6e57627c69818a1f5fd82c8..ebd0da4f87c74f12d702e1ae4f320688
                  }
                  // Paper start - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3df252848b7d3420fdc65e255fe842fc578f0638..4b8130bdf5139e72e7f7d16af7fe1dcaeb3387b5 100644
+index d984a4304e8ebbcc3147e34bd3e35a7f0f95a83b..ef6aabd65651fe2eabe319908e6adfe9f97ee467 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -214,6 +214,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      private final StructureManager structureManager;
      private final StructureCheck structureCheck;
      private final boolean tickTime;
@@ -137,7 +137,7 @@ index 3df252848b7d3420fdc65e255fe842fc578f0638..4b8130bdf5139e72e7f7d16af7fe1dca
  
      // CraftBukkit start
      public final LevelStorageSource.LevelStorageAccess convertable;
-@@ -1047,6 +1048,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1045,6 +1046,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (fluid1.is(fluid)) {
              fluid1.tick(this, pos);
          }
@@ -145,7 +145,7 @@ index 3df252848b7d3420fdc65e255fe842fc578f0638..4b8130bdf5139e72e7f7d16af7fe1dca
  
      }
  
-@@ -1056,6 +1058,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1054,6 +1056,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (iblockdata.is(block)) {
              iblockdata.tick(this, pos, this.random);
          }
diff --git a/patches/server/0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0706-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0706-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0708-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0707-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0708-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0707-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0708-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/0709-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0708-Detail-more-information-in-watchdog-dumps.patch
index 59edad5ba3..30398718ce 100644
--- a/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0708-Detail-more-information-in-watchdog-dumps.patch
@@ -78,10 +78,10 @@ index acfa1907bfc9c29d261cfccc00d65bad9ad1a002..d6f3869f5725c7f081efb7f486f74dbb
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4b8130bdf5139e72e7f7d16af7fe1dcaeb3387b5..4dec1619002cd922c25f27cc771cf8672092a341 100644
+index ef6aabd65651fe2eabe319908e6adfe9f97ee467..380733b27c4e091c9376b779701e8e39d1c1ac0e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1062,7 +1062,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1060,7 +1060,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      }
  
@@ -108,7 +108,7 @@ index 4b8130bdf5139e72e7f7d16af7fe1dcaeb3387b5..4dec1619002cd922c25f27cc771cf867
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
-@@ -1102,7 +1121,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1100,7 +1119,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.tickPassenger(entity, entity1);
          }
          // } finally { timer.stopTiming(); } // Paper - timings - move up
diff --git a/patches/server/0710-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0709-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0710-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0709-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0711-Distance-manager-tick-timings.patch b/patches/server/0710-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0711-Distance-manager-tick-timings.patch
rename to patches/server/0710-Distance-manager-tick-timings.patch
diff --git a/patches/server/0712-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0711-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0712-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0711-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0712-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0712-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0714-Add-packet-limiter-config.patch b/patches/server/0713-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0714-Add-packet-limiter-config.patch
rename to patches/server/0713-Add-packet-limiter-config.patch
diff --git a/patches/server/0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0714-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0714-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0716-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0715-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0716-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0715-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0717-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0716-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0717-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0716-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0718-Time-scoreboard-search.patch b/patches/server/0717-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0718-Time-scoreboard-search.patch
rename to patches/server/0717-Time-scoreboard-search.patch
diff --git a/patches/server/0719-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0718-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0719-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0718-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0720-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0719-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0720-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0719-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0721-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0720-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0721-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0720-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0722-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0721-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0722-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0721-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0723-Optimise-random-block-ticking.patch b/patches/server/0722-Optimise-random-block-ticking.patch
similarity index 98%
rename from patches/server/0723-Optimise-random-block-ticking.patch
rename to patches/server/0722-Optimise-random-block-ticking.patch
index 56a3a1964c..a7e214978d 100644
--- a/patches/server/0723-Optimise-random-block-ticking.patch
+++ b/patches/server/0722-Optimise-random-block-ticking.patch
@@ -90,10 +90,10 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4dec1619002cd922c25f27cc771cf8672092a341..46464111ce908eaa44def90167c50a442e0ae640 100644
+index 380733b27c4e091c9376b779701e8e39d1c1ac0e..81a82ab392dba78ff20bb86140986f6bf72c8a77 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -706,6 +706,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -704,6 +704,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entityplayer.stopSleepInBed(false, false);
          });
      }
@@ -104,7 +104,7 @@ index 4dec1619002cd922c25f27cc771cf8672092a341..46464111ce908eaa44def90167c50a44
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
-@@ -715,10 +719,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -713,10 +717,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -117,7 +117,7 @@ index 4dec1619002cd922c25f27cc771cf8672092a341..46464111ce908eaa44def90167c50a44
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
-@@ -748,18 +752,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -746,18 +750,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
          int l;
  
          if (!this.paperConfig().environment.disableIceAndSnow && this.random.nextInt(16) == 0) { // Paper - Disable ice and snow
@@ -148,7 +148,7 @@ index 4dec1619002cd922c25f27cc771cf8672092a341..46464111ce908eaa44def90167c50a44
                  if (i1 > 0 && biomebase.shouldSnow(this, blockposition)) {
                      iblockdata = this.getBlockState(blockposition);
                      if (iblockdata.is(Blocks.SNOW)) {
-@@ -774,52 +786,55 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -772,52 +784,55 @@ public class ServerLevel extends Level implements WorldGenLevel {
                          org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.defaultBlockState(), null); // CraftBukkit
                      }
                  }
diff --git a/patches/server/0724-Optimise-non-flush-packet-sending.patch b/patches/server/0723-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0724-Optimise-non-flush-packet-sending.patch
rename to patches/server/0723-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0725-Optimise-nearby-player-lookups.patch b/patches/server/0724-Optimise-nearby-player-lookups.patch
similarity index 98%
rename from patches/server/0725-Optimise-nearby-player-lookups.patch
rename to patches/server/0724-Optimise-nearby-player-lookups.patch
index 6c4a1edd4d..86dd23a36a 100644
--- a/patches/server/0725-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0724-Optimise-nearby-player-lookups.patch
@@ -104,12 +104,12 @@ index 57e13cb9d1460be34fe06f7c7e14330f60f0a51a..7f68b05b4d0789c308b5f90a5d626a63
  
      protected ChunkGenerator generator() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 46464111ce908eaa44def90167c50a442e0ae640..5053b714df6110df6bf5c97ededc542ef6927f98 100644
+index 81a82ab392dba78ff20bb86140986f6bf72c8a77..c8e0531dccd7cff093c304b25c62476dbcb10ff9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -446,6 +446,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -444,6 +444,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
+     }
      // Paper end
-     public final ReferenceOpenHashSet<ServerPlayer> pendingLogin = new ReferenceOpenHashSet<>(); // Paper
  
 +    // Paper start - optimise checkDespawn
 +    public final List<ServerPlayer> playersAffectingSpawning = new java.util.ArrayList<>();
@@ -192,7 +192,7 @@ index 46464111ce908eaa44def90167c50a442e0ae640..5053b714df6110df6bf5c97ededc542e
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
-@@ -548,6 +626,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -546,6 +624,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void tick(BooleanSupplier shouldKeepTicking) {
diff --git a/patches/server/0726-Remove-streams-for-villager-AI.patch b/patches/server/0725-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0726-Remove-streams-for-villager-AI.patch
rename to patches/server/0725-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0726-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0726-Use-Velocity-compression-and-cipher-natives.patch
index a0af75ee26..8172c62e70 100644
--- a/patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0726-Use-Velocity-compression-and-cipher-natives.patch
@@ -341,7 +341,7 @@ index b80aedd2002959b4026c27ce76b3ed17f0acfb5b..2985271132c9ae822dcb0d7a7e6f0c26
                  protected void initChannel(Channel channel) {
                      try {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 7661f248c1c0b8de3b15793f45bf239ab561083b..721de6bb83603be91e28ff13271697f9434d9f87 100644
+index 703a6daf4af2459ea3acf7569cbc92c4e017aad1..35c857f037e94baca3bb2c1cb44cd7f32017dd20 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -265,12 +265,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0727-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0727-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0729-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0728-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0729-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0728-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0730-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0729-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0730-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0729-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 90%
rename from patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index fd3d81ccce..3d3484e969 100644
--- a/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5053b714df6110df6bf5c97ededc542ef6927f98..84b1c2e26b20426a11aad25efe2804ee992989f3 100644
+index c8e0531dccd7cff093c304b25c62476dbcb10ff9..b91a199f2e426b49ddc72c8e9d0224c05d8a7acd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2589,6 +2589,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2587,6 +2587,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0732-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0731-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0732-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0731-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 87%
rename from patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index f47dff8a7b..f321f26513 100644
--- a/patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4974dc18ee0dd401268b2daaadf53bf1f70e8daf..5136e33f3c7360dfef7c992dcbde804f4f3eb184 100644
+index 69d67c7c4fcdb8cbdae1a75d2a0f79987e48a581..2b7abf42c08672194cc460e6e74e6f8e5f3c7443 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -839,6 +839,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -835,6 +835,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
          // Paper end
          // CraftBukkit end
diff --git a/patches/server/0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0733-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0733-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0735-Ensure-valid-vehicle-status.patch b/patches/server/0734-Ensure-valid-vehicle-status.patch
similarity index 84%
rename from patches/server/0735-Ensure-valid-vehicle-status.patch
rename to patches/server/0734-Ensure-valid-vehicle-status.patch
index 839f7e897b..2746c8e4a0 100644
--- a/patches/server/0735-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0734-Ensure-valid-vehicle-status.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0007cf65767e304e27588bf2133579c5e06cc54a..6c053e759b6758f2dc464483193213be22af623a 100644
+index 5015076ff1ac2b13203588db4566b9cf6d934a28..e1b59a1e6fd957b45f0a73eb51487e44108af34c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -520,7 +520,7 @@ public class ServerPlayer extends Player {
+@@ -518,7 +518,7 @@ public class ServerPlayer extends Player {
              }
          }
  
diff --git a/patches/server/0736-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0735-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0736-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0735-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0736-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0736-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0738-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0737-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0738-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0737-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0739-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0738-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0739-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0738-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0740-Preserve-overstacked-loot.patch b/patches/server/0739-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0740-Preserve-overstacked-loot.patch
rename to patches/server/0739-Preserve-overstacked-loot.patch
diff --git a/patches/server/0741-Update-head-rotation-in-missing-places.patch b/patches/server/0740-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0741-Update-head-rotation-in-missing-places.patch
rename to patches/server/0740-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0742-prevent-unintended-light-block-manipulation.patch b/patches/server/0741-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0742-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0741-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0743-Fix-CraftCriteria-defaults-map.patch b/patches/server/0742-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0743-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0742-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0744-Fix-upstreams-block-state-factories.patch b/patches/server/0743-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0744-Fix-upstreams-block-state-factories.patch
rename to patches/server/0743-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0744-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 94%
rename from patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0744-Add-config-option-for-logging-player-ip-addresses.patch
index 278ac88f37..a438fb9d91 100644
--- a/patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0744-Add-config-option-for-logging-player-ip-addresses.patch
@@ -49,7 +49,7 @@ index 2985271132c9ae822dcb0d7a7e6f0c268d1736cc..cfdbcd024de6ad0f9d4e83b2f912b36e
  
                              networkmanager.send(new ClientboundDisconnectPacket(ichatmutablecomponent), PacketSendListener.thenRun(() -> {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 721de6bb83603be91e28ff13271697f9434d9f87..1a88f9f49aea58321d1c1d4d720944c565c00968 100644
+index 35c857f037e94baca3bb2c1cb44cd7f32017dd20..00e2692dd5e2b6a17c0f5c9e149b90977afc1237 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -206,7 +206,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -65,15 +65,15 @@ index 721de6bb83603be91e28ff13271697f9434d9f87..1a88f9f49aea58321d1c1d4d720944c5
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f734c7ea8c6ce468882ea758a358a8f19a16dcdb..c4e5e2b6283bd3163711a09d6a647c516ed8a1c3 100644
+index 8f32292900f7c446e874bad4b1768be841bfa963..6c7d68f910d3be55ed0b3124bfc861d5446c1388 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -249,7 +249,7 @@ public abstract class PlayerList {
-         final String s1;
+@@ -240,7 +240,7 @@ public abstract class PlayerList {
+         String s1 = "local";
  
          if (connection.getRemoteAddress() != null) {
 -            s1 = connection.getRemoteAddress().toString();
 +            s1 = io.papermc.paper.configuration.GlobalConfiguration.get().logging.logPlayerIpAddresses ? connection.getRemoteAddress().toString() : "<ip address withheld>"; // Paper
-         } else {
-             s1 = "local";
          }
+ 
+         // Spigot start - spawn location event
diff --git a/patches/server/0746-Configurable-feature-seeds.patch b/patches/server/0745-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0746-Configurable-feature-seeds.patch
rename to patches/server/0745-Configurable-feature-seeds.patch
diff --git a/patches/server/0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0746-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0746-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0748-Add-root-admin-user-detection.patch b/patches/server/0747-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0748-Add-root-admin-user-detection.patch
rename to patches/server/0747-Add-root-admin-user-detection.patch
diff --git a/patches/server/0749-Always-allow-item-changing-in-Fireball.patch b/patches/server/0748-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0749-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0748-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0750-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0749-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0750-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0749-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0750-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 94%
rename from patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0750-Prevent-excessive-velocity-through-repeated-crits.patch
index aaee953a4c..85acc1d328 100644
--- a/patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0750-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 00726cca55d45043003032e32b045d84e74cf1d2..bd392ff909a217d069a81b2026ab3ce4c38662f3 100644
+index 5c7cd39135ddf89a7f9ed60d4e59bfa4957461a9..e912fc1b9201058f2d6a7dfe949c3bbe0397d5ee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2672,14 +2672,27 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0752-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0751-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0752-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0751-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0752-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0752-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0754-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0753-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0754-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0753-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0754-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 97%
rename from patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0754-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 0aac85f08d..fca9e2a9bb 100644
--- a/patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0754-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index 64683e218c9c43cfd30514800cfa8da42e37563e..d2fed123ed56eaf550ac2c7a3fcc1678
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bd392ff909a217d069a81b2026ab3ce4c38662f3..4842442f4fd97ed72d1cc67334f976ea771ebb0c 100644
+index e912fc1b9201058f2d6a7dfe949c3bbe0397d5ee..b9552b24c41913be638aea08e06f43d0122c895a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3158,7 +3158,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0755-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 96%
rename from patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0755-Hide-unnecessary-itemmeta-from-clients.patch
index 7e0e4e22bb..0cef3acc09 100644
--- a/patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0755-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,10 +18,10 @@ index d2fed123ed56eaf550ac2c7a3fcc1678a127bba3..77443525e68fab0211ff48af12020ff0
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5136e33f3c7360dfef7c992dcbde804f4f3eb184..fea98677f907ccc8a9c400669331698efafc84eb 100644
+index 2b7abf42c08672194cc460e6e74e6f8e5f3c7443..ef8ce274f4085a76b4a7dc4ab37a110069f83537 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2681,8 +2681,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2677,8 +2677,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                                  // Refresh the current entity metadata
                                  entity.getEntityData().refresh(player);
                                  // SPIGOT-7136 - Allays
@@ -33,7 +33,7 @@ index 5136e33f3c7360dfef7c992dcbde804f4f3eb184..fea98677f907ccc8a9c400669331698e
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4842442f4fd97ed72d1cc67334f976ea771ebb0c..3d221fd0cec95799763c687222d5d5a917c2171d 100644
+index b9552b24c41913be638aea08e06f43d0122c895a..b50204dda517611e0774727139ea69ca085dfcb5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3160,7 +3160,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0757-Fix-Spigot-growth-modifiers.patch b/patches/server/0756-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0757-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0756-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0757-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0757-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0759-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0758-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0759-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0758-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0760-Add-player-health-update-API.patch b/patches/server/0759-Add-player-health-update-API.patch
similarity index 95%
rename from patches/server/0760-Add-player-health-update-API.patch
rename to patches/server/0759-Add-player-health-update-API.patch
index e4fc60710f..012de4570c 100644
--- a/patches/server/0760-Add-player-health-update-API.patch
+++ b/patches/server/0759-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 67ed1ef8f19d208a407add3f4808dd0e0ff69e0d..c8ae6651cc66aea77a5ab5236e4d4a33b5b60b2f 100644
+index 3dbd458caf6098c57ca654fd17783e231abcfd43..9b3d37e408522cad6eb3cca280b7078a73794f1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2228,9 +2228,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0761-Optimize-HashMapPalette.patch b/patches/server/0760-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0761-Optimize-HashMapPalette.patch
rename to patches/server/0760-Optimize-HashMapPalette.patch
diff --git a/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0761-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0761-Allow-delegation-to-vanilla-chunk-gen.patch
index 7a29a8cb5e..c8c346c8fd 100644
--- a/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0761-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 47fa4dbe21d19596a6249c46b69fe925be2d820d..fccd8b4e94c7db26f63e20830da8cbda4a724a5e 100644
+index 9ab3f3a490e55211670e2847f03bd4f8229162da..74c2bb3de8b5bfc3b285a19a322cfe308a9b88f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2356,6 +2356,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 3eba82a675..bdec7f8aff 100644
--- a/patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,10 +1180,10 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6c053e759b6758f2dc464483193213be22af623a..6de32e9e2f626eaa60b58bdeef8c6c194cbe918c 100644
+index e1b59a1e6fd957b45f0a73eb51487e44108af34c..2e3d5b38ace99ce99a8107e750c5eeaf281c8552 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -413,7 +413,7 @@ public class ServerPlayer extends Player {
+@@ -411,7 +411,7 @@ public class ServerPlayer extends Player {
  
                  if (blockposition1 != null) {
                      this.moveTo(blockposition1, 0.0F, 0.0F);
@@ -1192,7 +1192,7 @@ index 6c053e759b6758f2dc464483193213be22af623a..6de32e9e2f626eaa60b58bdeef8c6c19
                          break;
                      }
                  }
-@@ -421,7 +421,7 @@ public class ServerPlayer extends Player {
+@@ -419,7 +419,7 @@ public class ServerPlayer extends Player {
          } else {
              this.moveTo(blockposition, 0.0F, 0.0F);
  
@@ -1202,10 +1202,10 @@ index 6c053e759b6758f2dc464483193213be22af623a..6de32e9e2f626eaa60b58bdeef8c6c19
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c4e5e2b6283bd3163711a09d6a647c516ed8a1c3..0d9a50fd3e0d97f49c35e2fd743f9e54eaa3b6f0 100644
+index 6c7d68f910d3be55ed0b3124bfc861d5446c1388..88e9c5faca16eeb5cafcedb811a3d9d4dba6e9ce 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -951,7 +951,7 @@ public abstract class PlayerList {
+@@ -874,7 +874,7 @@ public abstract class PlayerList {
          // CraftBukkit end
  
          worldserver1.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(location.getBlockX() >> 4, location.getBlockZ() >> 4), 1, entityplayer.getId()); // Paper
diff --git a/patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0763-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 94%
rename from patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0763-Optimise-collision-checking-in-player-move-packet-ha.patch
index 8ff40181fb..577d48217f 100644
--- a/patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0763-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20aa900e83b 100644
+index ef8ce274f4085a76b4a7dc4ab37a110069f83537..60024e98de6a910e4db6d45d6be427a0dea6f568 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -643,7 +643,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      return;
                  }
  
@@ -18,7 +18,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
  
                  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
-@@ -655,6 +655,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -651,6 +651,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  boolean flag1 = entity.verticalCollisionBelow;
  
                  entity.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
@@ -26,7 +26,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
                  double d11 = d7;
  
                  d6 = d3 - entity.getX();
-@@ -668,16 +669,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -664,16 +665,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  boolean flag2 = false;
  
                  if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
@@ -54,7 +54,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
                      entity.absMoveTo(d0, d1, d2, f, f1);
                      this.player.absMoveTo(d0, d1, d2, this.player.getYRot(), this.player.getXRot()); // CraftBukkit
                      this.connection.send(new ClientboundMoveVehiclePacket(entity));
-@@ -763,7 +772,32 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -759,7 +768,32 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
  
      private boolean noBlocksAround(Entity entity) {
@@ -88,7 +88,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
      }
  
      @Override
-@@ -1343,7 +1377,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1339,7 +1373,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  }
  
                  if (this.awaitingPositionFromClient != null) {
@@ -97,7 +97,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
                          this.awaitingTeleportTime = this.tickCount;
                          this.teleport(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.getYRot(), this.player.getXRot());
                      }
-@@ -1437,7 +1471,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1433,7 +1467,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                                  }
                              }
  
@@ -106,7 +106,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
  
                              d7 = d0 - this.lastGoodX; // Paper - diff on change, used for checking large move vectors above
                              d8 = d1 - this.lastGoodY; // Paper - diff on change, used for checking large move vectors above
-@@ -1478,6 +1512,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1474,6 +1508,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                              boolean flag1 = this.player.verticalCollisionBelow;
  
                              this.player.move(MoverType.PLAYER, new Vec3(d7, d8, d9));
@@ -114,7 +114,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
                              this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
                              // Paper start - prevent position desync
                              if (this.awaitingPositionFromClient != null) {
-@@ -1497,12 +1532,23 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1493,12 +1528,23 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                              boolean flag2 = false;
  
                              if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
@@ -140,7 +140,7 @@ index fea98677f907ccc8a9c400669331698efafc84eb..6d64870e3142c5114166f9e27206a20a
                                  this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                                  this.player.doCheckFallDamage(this.player.getY() - d6, packet.isOnGround());
                              } else {
-@@ -1589,6 +1635,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1585,6 +1631,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
      }
  
diff --git a/patches/server/0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0764-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0764-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0766-Add-more-Campfire-API.patch b/patches/server/0765-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0766-Add-more-Campfire-API.patch
rename to patches/server/0765-Add-more-Campfire-API.patch
diff --git a/patches/server/0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0766-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0766-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0768-Fix-tripwire-state-inconsistency.patch b/patches/server/0767-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0768-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0767-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0769-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0768-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0769-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0768-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0770-Improve-scoreboard-entries.patch b/patches/server/0769-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0770-Improve-scoreboard-entries.patch
rename to patches/server/0769-Improve-scoreboard-entries.patch
diff --git a/patches/server/0771-Entity-powdered-snow-API.patch b/patches/server/0770-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0771-Entity-powdered-snow-API.patch
rename to patches/server/0770-Entity-powdered-snow-API.patch
diff --git a/patches/server/0772-Add-API-for-item-entity-health.patch b/patches/server/0771-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0772-Add-API-for-item-entity-health.patch
rename to patches/server/0771-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0773-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0772-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0773-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0772-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0774-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0773-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0774-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0773-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0775-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0774-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0775-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0774-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0776-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0775-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0776-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0775-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0777-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0776-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0777-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0776-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0778-Fix-bees-aging-inside-hives.patch b/patches/server/0777-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0778-Fix-bees-aging-inside-hives.patch
rename to patches/server/0777-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0779-Bucketable-API.patch b/patches/server/0778-Bucketable-API.patch
similarity index 100%
rename from patches/server/0779-Bucketable-API.patch
rename to patches/server/0778-Bucketable-API.patch
diff --git a/patches/server/0780-Validate-usernames.patch b/patches/server/0779-Validate-usernames.patch
similarity index 93%
rename from patches/server/0780-Validate-usernames.patch
rename to patches/server/0779-Validate-usernames.patch
index 693a4046cb..a1c6756470 100644
--- a/patches/server/0780-Validate-usernames.patch
+++ b/patches/server/0779-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1a88f9f49aea58321d1c1d4d720944c565c00968..b1648a1cfcc64b77c7bbec19f77d2c968b063fa3 100644
+index 00e2692dd5e2b6a17c0f5c9e149b90977afc1237..3911daf2a51da1c39adbe8486ecc8fa16093f898 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -60,6 +60,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -56,10 +56,10 @@ index 1a88f9f49aea58321d1c1d4d720944c565c00968..b1648a1cfcc64b77c7bbec19f77d2c96
  
          if (gameprofile != null && packet.name().equalsIgnoreCase(gameprofile.getName())) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0d9a50fd3e0d97f49c35e2fd743f9e54eaa3b6f0..a12c3c5c9f7733f3e84a676cd4e58b95e9ad49bf 100644
+index 88e9c5faca16eeb5cafcedb811a3d9d4dba6e9ce..01404600dcf4eefe1e62e7c62edb5b0980298583 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -722,7 +722,7 @@ public abstract class PlayerList {
+@@ -652,7 +652,7 @@ public abstract class PlayerList {
  
          for (int i = 0; i < this.players.size(); ++i) {
              entityplayer = (ServerPlayer) this.players.get(i);
diff --git a/patches/server/0781-Make-water-animal-spawn-height-configurable.patch b/patches/server/0780-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0781-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0780-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 5cc0345b20..ffa965a726 100644
--- a/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,7 +18,7 @@ index 0868805c78d991c602d8f1d1b5aeb5c790c13384..6986d5475b090bca60b5ae892512fd5e
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fccd8b4e94c7db26f63e20830da8cbda4a724a5e..2d7b861189d871eadf1e9ba29092112e638a4053 100644
+index 74c2bb3de8b5bfc3b285a19a322cfe308a9b88f2..9d8b856132f20d94b928d4e343ede2e027e122b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1239,7 +1239,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0783-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0782-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0783-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0782-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0784-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0783-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0784-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0783-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0785-Multiple-Entries-with-Scoreboards.patch b/patches/server/0784-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0785-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0784-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0786-Reset-placed-block-on-exception.patch b/patches/server/0785-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0786-Reset-placed-block-on-exception.patch
rename to patches/server/0785-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0787-Add-configurable-height-for-slime-spawn.patch b/patches/server/0786-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0787-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0786-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0788-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 94%
rename from patches/server/0788-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 16fc153d07..5b253ada97 100644
--- a/patches/server/0788-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b1648a1cfcc64b77c7bbec19f77d2c968b063fa3..d2cba3fb9eb0d344b71c79387d1d160596b1dc62 100644
+index 3911daf2a51da1c39adbe8486ecc8fa16093f898..a571d1e4b5407090f60c97326f8703d270a3314d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -371,7 +371,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0789-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0788-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0789-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0788-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0790-Kick-on-main-for-illegal-chat.patch b/patches/server/0789-Kick-on-main-for-illegal-chat.patch
similarity index 91%
rename from patches/server/0790-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0789-Kick-on-main-for-illegal-chat.patch
index 713e5f9cf8..0edc1567db 100644
--- a/patches/server/0790-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0789-Kick-on-main-for-illegal-chat.patch
@@ -7,10 +7,10 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6d64870e3142c5114166f9e27206a20aa900e83b..d5bb89bd4948f1aff24c4725def980e6bcbdae84 100644
+index 60024e98de6a910e4db6d45d6be427a0dea6f568..c50ac593ad5db6b65015151bcc26a9b8ed510ba5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2172,7 +2172,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2168,7 +2168,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
          // CraftBukkit end
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) {
@@ -20,7 +20,7 @@ index 6d64870e3142c5114166f9e27206a20aa900e83b..d5bb89bd4948f1aff24c4725def980e6
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2206,7 +2208,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2202,7 +2204,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleChatCommand(ServerboundChatCommandPacket packet) {
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
@@ -30,7 +30,7 @@ index 6d64870e3142c5114166f9e27206a20aa900e83b..d5bb89bd4948f1aff24c4725def980e6
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2286,7 +2290,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2282,7 +2286,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message);
diff --git a/patches/server/0791-Multi-Block-Change-API-Implementation.patch b/patches/server/0790-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0791-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0790-Multi-Block-Change-API-Implementation.patch
index 0a99b53297..bd09f7eab0 100644
--- a/patches/server/0791-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0790-Multi-Block-Change-API-Implementation.patch
@@ -25,7 +25,7 @@ index 0d851e197e65ec79386ad1f981f6d1d38b65124a..24c677e80af652952263253409c05064
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c8ae6651cc66aea77a5ab5236e4d4a33b5b60b2f..737f9530fc88d84b8833c1701dd22b88c49f5e25 100644
+index 9b3d37e408522cad6eb3cca280b7078a73794f1f..1ca03597ce9ca9b47017979d919f9082c21cdd45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -930,6 +930,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0792-Fix-NotePlayEvent.patch b/patches/server/0791-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0792-Fix-NotePlayEvent.patch
rename to patches/server/0791-Fix-NotePlayEvent.patch
diff --git a/patches/server/0793-Freeze-Tick-Lock-API.patch b/patches/server/0792-Freeze-Tick-Lock-API.patch
similarity index 97%
rename from patches/server/0793-Freeze-Tick-Lock-API.patch
rename to patches/server/0792-Freeze-Tick-Lock-API.patch
index 803cdc9818..890d79f2bf 100644
--- a/patches/server/0793-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0792-Freeze-Tick-Lock-API.patch
@@ -46,7 +46,7 @@ index 12a032f265a4a5aaac248599cc263896279b54bb..9c9251f9f8ac83dddef87561af1d3ea2
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3d221fd0cec95799763c687222d5d5a917c2171d..2ee07665521804157e4c0a3f6f09455b14b2867f 100644
+index b50204dda517611e0774727139ea69ca085dfcb5..19a9aaaf842d021bcd0f1bc5decf559a683448b1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3411,7 +3411,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0794-Dolphin-API.patch b/patches/server/0793-Dolphin-API.patch
similarity index 100%
rename from patches/server/0794-Dolphin-API.patch
rename to patches/server/0793-Dolphin-API.patch
diff --git a/patches/server/0795-More-PotionEffectType-API.patch b/patches/server/0794-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0795-More-PotionEffectType-API.patch
rename to patches/server/0794-More-PotionEffectType-API.patch
diff --git a/patches/server/0796-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0795-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0796-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0795-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0796-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0796-API-for-creating-command-sender-which-forwards-feedb.patch
index 1b53140931..3e52cb21e5 100644
--- a/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0796-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2d7b861189d871eadf1e9ba29092112e638a4053..59d31a6aa22e317c026b576f878deeebcd4b59ed 100644
+index 9d8b856132f20d94b928d4e343ede2e027e122b0..a03bb7341d07c39d2a8740823e4cf341b294236e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2017,6 +2017,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0798-Add-missing-structure-set-seed-configs.patch b/patches/server/0797-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0798-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0797-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0799-Implement-regenerateChunk.patch b/patches/server/0798-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0799-Implement-regenerateChunk.patch
rename to patches/server/0798-Implement-regenerateChunk.patch
diff --git a/patches/server/0800-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0799-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0800-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0799-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 9fbf4e1c4a..4de2c32cbb 100644
--- a/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59d31a6aa22e317c026b576f878deeebcd4b59ed..f1b201cfe3796fd0ae0e3ce4ad72f971c191d936 100644
+index a03bb7341d07c39d2a8740823e4cf341b294236e..40e2a38317403d19ab53cb623aa1ba2502d6a4a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2191,6 +2191,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0802-Add-GameEvent-tags.patch b/patches/server/0801-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0802-Add-GameEvent-tags.patch
rename to patches/server/0801-Add-GameEvent-tags.patch
index 07c56b9977..0fedca5942 100644
--- a/patches/server/0802-Add-GameEvent-tags.patch
+++ b/patches/server/0801-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1b201cfe3796fd0ae0e3ce4ad72f971c191d936..6869f80f87e97a366e773421995e3daea9a01c91 100644
+index 40e2a38317403d19ab53cb623aa1ba2502d6a4a7..42ca82adacc079044c50106c7490d341f16bbbbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2602,6 +2602,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0802-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0802-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0804-Furnace-RecipesUsed-API.patch b/patches/server/0803-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0804-Furnace-RecipesUsed-API.patch
rename to patches/server/0803-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0805-Configurable-sculk-sensor-listener-range.patch b/patches/server/0804-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0805-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0804-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0806-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0805-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0806-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0805-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0806-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0806-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0807-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 95%
rename from patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0807-Put-world-into-worldlist-before-initing-the-world.patch
index 1634c5bbe6..84ba26d468 100644
--- a/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0807-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index d2409599c9d9765a2e1dc7418339923049abc416..f42d7d9e11542370489fcc8dc42ea6ec
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6869f80f87e97a366e773421995e3daea9a01c91..4b236b3cf47f045e423237eb3d1ee085b0a0dc3a 100644
+index 42ca82adacc079044c50106c7490d341f16bbbbc..0aab988ca42d0acdce003c3c69396737181e7104 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1268,10 +1268,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0809-Fix-Entity-Position-Desync.patch b/patches/server/0808-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0809-Fix-Entity-Position-Desync.patch
rename to patches/server/0808-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0810-Custom-Potion-Mixes.patch b/patches/server/0809-Custom-Potion-Mixes.patch
similarity index 99%
rename from patches/server/0810-Custom-Potion-Mixes.patch
rename to patches/server/0809-Custom-Potion-Mixes.patch
index 9ee08fa443..f9e77e980d 100644
--- a/patches/server/0810-Custom-Potion-Mixes.patch
+++ b/patches/server/0809-Custom-Potion-Mixes.patch
@@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b236b3cf47f045e423237eb3d1ee085b0a0dc3a..9b79c6e91c6526f902fb78102fa454027315fbf6 100644
+index 0aab988ca42d0acdce003c3c69396737181e7104..5eb52dce4ab8cf970dc5b4cddf7a38fbef689df1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -298,6 +298,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0811-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0810-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0811-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0810-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0812-Force-close-world-loading-screen.patch b/patches/server/0811-Force-close-world-loading-screen.patch
similarity index 92%
rename from patches/server/0812-Force-close-world-loading-screen.patch
rename to patches/server/0811-Force-close-world-loading-screen.patch
index bcfc6dc4ff..f0a197cad4 100644
--- a/patches/server/0812-Force-close-world-loading-screen.patch
+++ b/patches/server/0811-Force-close-world-loading-screen.patch
@@ -10,10 +10,10 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a12c3c5c9f7733f3e84a676cd4e58b95e9ad49bf..e8d07180ce69602895b4e584932c4322d3791c27 100644
+index 01404600dcf4eefe1e62e7c62edb5b0980298583..e706e94b2f85830dd82dd30b4451243f540bd3f8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -437,6 +437,16 @@ public abstract class PlayerList {
+@@ -375,6 +375,16 @@ public abstract class PlayerList {
  
          // Paper start - move vehicle into method so it can be called above - short circuit around that code
          onPlayerJoinFinish(player, worldserver1, s1);
diff --git a/patches/server/0813-Fix-falling-block-spawn-methods.patch b/patches/server/0812-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0813-Fix-falling-block-spawn-methods.patch
rename to patches/server/0812-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0814-Expose-furnace-minecart-push-values.patch b/patches/server/0813-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0814-Expose-furnace-minecart-push-values.patch
rename to patches/server/0813-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0816-More-Projectile-API.patch b/patches/server/0815-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0816-More-Projectile-API.patch
rename to patches/server/0815-More-Projectile-API.patch
diff --git a/patches/server/0817-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0816-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0817-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0816-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 88%
rename from patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index e3a7190b21..8f564ae01f 100644
--- a/patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,10 +7,10 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d5bb89bd4948f1aff24c4725def980e6bcbdae84..f4a7ca4a525c4c573992b3ec38f5ad77a9cc04a5 100644
+index c50ac593ad5db6b65015151bcc26a9b8ed510ba5..d3f002da6875ce46977c12e48c2a786135e40601 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -577,6 +577,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -573,6 +573,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          } else {
              Entity entity = this.player.getRootVehicle();
  
diff --git a/patches/server/0819-Implement-getComputedBiome-API.patch b/patches/server/0818-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0819-Implement-getComputedBiome-API.patch
rename to patches/server/0818-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0820-Make-some-itemstacks-nonnull.patch b/patches/server/0819-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0820-Make-some-itemstacks-nonnull.patch
rename to patches/server/0819-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0821-Implement-enchantWithLevels-API.patch b/patches/server/0820-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0821-Implement-enchantWithLevels-API.patch
rename to patches/server/0820-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0822-Fix-saving-in-unloadWorld.patch b/patches/server/0821-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0822-Fix-saving-in-unloadWorld.patch
rename to patches/server/0821-Fix-saving-in-unloadWorld.patch
index fdf8cdf39b..839307504c 100644
--- a/patches/server/0822-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0821-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9b79c6e91c6526f902fb78102fa454027315fbf6..2534536d3ffcc4ac17d723e0d37c55a4bb5d0ec9 100644
+index 5eb52dce4ab8cf970dc5b4cddf7a38fbef689df1..63e90208c094345a25746448ff86fb7d3eb21580 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1316,7 +1316,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0823-Buffer-OOB-setBlock-calls.patch b/patches/server/0822-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0823-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0822-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0824-Add-TameableDeathMessageEvent.patch b/patches/server/0823-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0824-Add-TameableDeathMessageEvent.patch
rename to patches/server/0823-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0825-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0824-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0825-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0824-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0826-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0825-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 87%
rename from patches/server/0826-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0825-fix-player-loottables-running-when-mob-loot-gamerule.patch
index d2cc48f6fd..4b828e77e2 100644
--- a/patches/server/0826-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0825-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6de32e9e2f626eaa60b58bdeef8c6c194cbe918c..d44e5445cc9ea0346a1f6fc7f9c3f0b5a1ee8b4e 100644
+index 2e3d5b38ace99ce99a8107e750c5eeaf281c8552..a2a7e6813101e0218224701fefc423dca2e6f0f0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -868,12 +868,14 @@ public class ServerPlayer extends Player {
+@@ -866,12 +866,14 @@ public class ServerPlayer extends Player {
                  }
              }
          }
diff --git a/patches/server/0827-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0826-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0827-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0826-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0828-Guard-against-invalid-entity-positions.patch b/patches/server/0827-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0828-Guard-against-invalid-entity-positions.patch
rename to patches/server/0827-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0829-cache-resource-keys.patch b/patches/server/0828-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0829-cache-resource-keys.patch
rename to patches/server/0828-cache-resource-keys.patch
diff --git a/patches/server/0830-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0829-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0830-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0829-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0831-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0830-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0831-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0830-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0832-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0831-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0832-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0831-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0833-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0832-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 89%
rename from patches/server/0833-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0832-Prevent-tile-entity-copies-loading-chunks.patch
index 345c65a5aa..2df5b37380 100644
--- a/patches/server/0833-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0832-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4a7ca4a525c4c573992b3ec38f5ad77a9cc04a5..84ec466ee96c7ad68f48109e816314827102d7b1 100644
+index d3f002da6875ce46977c12e48c2a786135e40601..39581df4ebbe554b89bf5e21d70580aa74a1d679 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3284,7 +3284,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3280,7 +3280,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
  
                  if (this.player.level.isLoaded(blockposition)) {
diff --git a/patches/server/0834-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0833-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 87%
rename from patches/server/0834-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0833-Use-username-instead-of-display-name-in-PlayerList-g.patch
index a1f15a6b99..3372ee9e39 100644
--- a/patches/server/0834-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0833-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e8d07180ce69602895b4e584932c4322d3791c27..809ddbfcf873b4695257f599b882803f7fcc34fa 100644
+index e706e94b2f85830dd82dd30b4451243f540bd3f8..69688ab86346c3712a61ae0f09ec22d1b6ab8744 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1474,7 +1474,7 @@ public abstract class PlayerList {
+@@ -1397,7 +1397,7 @@ public abstract class PlayerList {
      // CraftBukkit start
      public ServerStatsCounter getPlayerStats(ServerPlayer entityhuman) {
          ServerStatsCounter serverstatisticmanager = entityhuman.getStats();
diff --git a/patches/server/0835-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0834-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0835-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0834-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0836-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0835-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0836-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0835-Pass-ServerLevel-for-gamerule-callbacks.patch
index cd94fa55f3..54ab0ce0a5 100644
--- a/patches/server/0836-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0835-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,10 +18,10 @@ index 5b46cabf4f2e2a1f7feaad378dd98d64aeef8671..51b3db0b6c2cede95b584268e035c0fb
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 84ec466ee96c7ad68f48109e816314827102d7b1..f63e29b0783d53a30e0fa16ff2566020c057e4bb 100644
+index 39581df4ebbe554b89bf5e21d70580aa74a1d679..aaaf45586fd5b4336e4affa04bb45eb62a879de8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2875,7 +2875,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2871,7 +2871,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      this.player = this.server.getPlayerList().respawn(this.player, false);
                      if (this.server.isHardcore()) {
                          this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
diff --git a/patches/server/0837-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0837-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0838-WorldCreator-keepSpawnLoaded.patch b/patches/server/0837-WorldCreator-keepSpawnLoaded.patch
similarity index 91%
rename from patches/server/0838-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0837-WorldCreator-keepSpawnLoaded.patch
index f94c503b94..c1bc70c683 100644
--- a/patches/server/0838-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0837-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2534536d3ffcc4ac17d723e0d37c55a4bb5d0ec9..3aa0bd14a6773288cf0a846c8be45ddd567a4e7c 100644
+index 63e90208c094345a25746448ff86fb7d3eb21580..3e00f74b43b5459e8e1b6dff1e25d38933dde3dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1275,6 +1275,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0839-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0838-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0839-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0838-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0840-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0839-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0840-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0839-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0841-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0840-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0841-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0840-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0842-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0841-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0842-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0841-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0843-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0842-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0843-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0842-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0844-Add-PlayerStopUsingItemEvent.patch b/patches/server/0843-Add-PlayerStopUsingItemEvent.patch
similarity index 91%
rename from patches/server/0844-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0843-Add-PlayerStopUsingItemEvent.patch
index efdc15d74d..7b71cb5818 100644
--- a/patches/server/0844-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0843-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2ee07665521804157e4c0a3f6f09455b14b2867f..efe719de95fb38b6770b9ce9c93590d7c1522ea3 100644
+index 19a9aaaf842d021bcd0f1bc5decf559a683448b1..5c1fc7ae7e92426491bf95a249763c789a4c54cd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3974,6 +3974,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0845-FallingBlock-auto-expire-setting.patch b/patches/server/0844-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0845-FallingBlock-auto-expire-setting.patch
rename to patches/server/0844-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0846-Don-t-tick-markers.patch b/patches/server/0845-Don-t-tick-markers.patch
similarity index 94%
rename from patches/server/0846-Don-t-tick-markers.patch
rename to patches/server/0845-Don-t-tick-markers.patch
index 2fa6522fbb..09a066dd65 100644
--- a/patches/server/0846-Don-t-tick-markers.patch
+++ b/patches/server/0845-Don-t-tick-markers.patch
@@ -22,10 +22,10 @@ index 9e51b3d1217ad6dc5c0c11d2febac7144e5721af..a38a0c11c9e12aeff73d792368e1a69a
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 84b1c2e26b20426a11aad25efe2804ee992989f3..000d0963fb9551a38690da7f14c9a9d0c8bd93d2 100644
+index b91a199f2e426b49ddc72c8e9d0224c05d8a7acd..d0a19d8e04e92a39d5db19e9eb23aa44a7691567 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2499,6 +2499,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2497,6 +2497,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          public void onTickingStart(Entity entity) {
diff --git a/patches/server/0847-Do-not-accept-invalid-client-settings.patch b/patches/server/0846-Do-not-accept-invalid-client-settings.patch
similarity index 88%
rename from patches/server/0847-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0846-Do-not-accept-invalid-client-settings.patch
index 5aaa5f3578..38ba6cef9a 100644
--- a/patches/server/0847-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0846-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 f63e29b0783d53a30e0fa16ff2566020c057e4bb..b0b4c53cea08153f4d64da848fecced46424fea6 100644
+index aaaf45586fd5b4336e4affa04bb45eb62a879de8..6b25bfcc686f4ef52f005d794dd070958b03cd23 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3463,6 +3463,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3459,6 +3459,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleClientInformation(ServerboundClientInformationPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
diff --git a/patches/server/0848-Add-support-for-Proxy-Protocol.patch b/patches/server/0847-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0848-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0847-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0849-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0848-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0849-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0848-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0850-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0849-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0850-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0849-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0851-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0850-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0851-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0850-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0852-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0851-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0852-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0851-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0853-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0852-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0853-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0852-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0853-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 97%
rename from patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0853-Throw-exception-on-world-create-while-being-ticked.patch
index 66365de5f6..3428f78332 100644
--- a/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0853-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index a8b3f0e8be414c4ea92cc85c9811ecd42e5ce9c1..0e04083ff0598451c66731b1518b2eb6
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3aa0bd14a6773288cf0a846c8be45ddd567a4e7c..aa713ea0a44f578b80e194353519ec24a8a0c8f8 100644
+index 3e00f74b43b5459e8e1b6dff1e25d38933dde3dc..22b30f8ae67bad1b8fb50be835c134ec275e14f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -868,6 +868,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0855-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0854-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0855-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0854-Add-Alternate-Current-redstone-implementation.patch
index c1325a9eb8..2c2f1e5d0c 100644
--- a/patches/server/0855-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0854-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,10 +2008,10 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 000d0963fb9551a38690da7f14c9a9d0c8bd93d2..8cb87b4b11beef91ad32c08c579c4b27aa943e08 100644
+index d0a19d8e04e92a39d5db19e9eb23aa44a7691567..4029f898b16205bf6779ee3b38dd2223d01ee27e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -221,6 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper
      public boolean hasEntityMoveEvent = false; // Paper
@@ -2019,7 +2019,7 @@ index 000d0963fb9551a38690da7f14c9a9d0c8bd93d2..8cb87b4b11beef91ad32c08c579c4b27
      public static Throwable getAddToWorldStackTrace(Entity entity) {
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
-@@ -2488,6 +2489,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2486,6 +2487,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return this.server.getWorldData().enabledFeatures();
      }
  
diff --git a/patches/server/0856-Dont-resent-entity-on-art-update.patch b/patches/server/0855-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0856-Dont-resent-entity-on-art-update.patch
rename to patches/server/0855-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0857-Add-WardenAngerChangeEvent.patch b/patches/server/0856-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0857-Add-WardenAngerChangeEvent.patch
rename to patches/server/0856-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0858-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0857-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 90%
rename from patches/server/0858-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0857-Add-option-for-strict-advancement-dimension-checks.patch
index 337eb5d601..ae89578d9c 100644
--- a/patches/server/0858-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0857-Add-option-for-strict-advancement-dimension-checks.patch
@@ -11,10 +11,10 @@ distance trigger. This adds a config option to ignore that
 and use the exact dimension key of the worlds involved.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d44e5445cc9ea0346a1f6fc7f9c3f0b5a1ee8b4e..e235037de74c9d0a3ba136902a599b06d24a134d 100644
+index a2a7e6813101e0218224701fefc423dca2e6f0f0..9ec0ae8fd404a595f4a659b10c5107421db8f1f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1260,6 +1260,12 @@ public class ServerPlayer extends Player {
+@@ -1258,6 +1258,12 @@ public class ServerPlayer extends Player {
          // CraftBukkit start
          ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
          ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level);
diff --git a/patches/server/0859-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0858-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0859-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0858-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0860-Nameable-Banner-API.patch b/patches/server/0859-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0860-Nameable-Banner-API.patch
rename to patches/server/0859-Nameable-Banner-API.patch
diff --git a/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0860-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0860-Don-t-broadcast-messages-to-command-blocks.patch
index 6c30ca9f59..b09d0677d4 100644
--- a/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0860-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aa713ea0a44f578b80e194353519ec24a8a0c8f8..a940aead1076b44d8da1d5b84da8b297a0ebab8e 100644
+index 22b30f8ae67bad1b8fb50be835c134ec275e14f9..4585fe9467c1866ad6746e44b45f77d614be8201 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1790,7 +1790,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0862-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0861-Prevent-empty-items-from-being-added-to-world.patch
similarity index 94%
rename from patches/server/0862-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0861-Prevent-empty-items-from-being-added-to-world.patch
index 6f37c2ce2e..0e99e8b3bb 100644
--- a/patches/server/0862-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0861-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,10 +7,10 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8cb87b4b11beef91ad32c08c579c4b27aa943e08..e902673328fa9ec371c99a03214fbe4db91b5e7d 100644
+index 4029f898b16205bf6779ee3b38dd2223d01ee27e..02c8e154b424b7bfae9ff28b6acfc0362721d2e8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1506,6 +1506,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1504,6 +1504,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0863-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0862-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0863-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0862-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0864-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0863-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 90%
rename from patches/server/0864-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0863-Don-t-print-component-in-resource-pack-rejection-mes.patch
index b1e570ae49..3fec1a0323 100644
--- a/patches/server/0864-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0863-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0b4c53cea08153f4d64da848fecced46424fea6..9f416f1bb9b8233cf5ce19d5165981741bdc2c47 100644
+index 6b25bfcc686f4ef52f005d794dd070958b03cd23..edfe4ce54c34eca1cd3b7289df74994560e5cb24 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2045,7 +2045,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2041,7 +2041,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
diff --git a/patches/server/0865-Add-Player-getFishHook.patch b/patches/server/0864-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0865-Add-Player-getFishHook.patch
rename to patches/server/0864-Add-Player-getFishHook.patch
diff --git a/patches/server/0866-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0865-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0866-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0865-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0867-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0866-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0867-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0866-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0868-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0867-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 90%
rename from patches/server/0868-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0867-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 837b057e39..3236b05f6d 100644
--- a/patches/server/0868-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0867-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9f416f1bb9b8233cf5ce19d5165981741bdc2c47..194ec47011185c4ef8af2d8dc0f3bb6368490cde 100644
+index edfe4ce54c34eca1cd3b7289df74994560e5cb24..b0611e3876b125c1b79e893f0de62ebca0095ac0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2295,7 +2295,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2291,7 +2291,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
diff --git a/patches/server/0869-Fix-Bee-flower-NPE.patch b/patches/server/0868-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0869-Fix-Bee-flower-NPE.patch
rename to patches/server/0868-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0870-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 87%
rename from patches/server/0870-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 026a671200..1605ccc33d 100644
--- a/patches/server/0870-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 194ec47011185c4ef8af2d8dc0f3bb6368490cde..28ea0332f9ac492fcbaa07812d0ebd2baf738e43 100644
+index b0611e3876b125c1b79e893f0de62ebca0095ac0..cccf4885385412e799215092bfbe04f2f2455fc8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2540,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2536,7 +2536,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          }
          // Spigot end
          // this.chatSpamTickCount += 20;
diff --git a/patches/server/0871-More-Teleport-API.patch b/patches/server/0870-More-Teleport-API.patch
similarity index 97%
rename from patches/server/0871-More-Teleport-API.patch
rename to patches/server/0870-More-Teleport-API.patch
index cf6cdde173..97ec340118 100644
--- a/patches/server/0871-More-Teleport-API.patch
+++ b/patches/server/0870-More-Teleport-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 28ea0332f9ac492fcbaa07812d0ebd2baf738e43..a00c686f0ffdc77f590e2451d531bc40e7a1d508 100644
+index cccf4885385412e799215092bfbe04f2f2455fc8..189d1aa21e2fc0c9d4e73e199f56e0be1bcabc9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1722,11 +1722,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1718,11 +1718,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              return false; // CraftBukkit - Return event status
          }
  
@@ -71,7 +71,7 @@ index 32b9816283c8c1de929d5664733553277cf6bf3c..32c724060a532e551f0ab4e7277831bb
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 737f9530fc88d84b8833c1701dd22b88c49f5e25..f1a77e2f6172f419eb14c01d894e5851f568d68d 100644
+index 1ca03597ce9ca9b47017979d919f9082c21cdd45..2f184121d1b6e037c5dd7f30eb075e6fe01c1973 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1185,13 +1185,92 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0872-Add-EntityPortalReadyEvent.patch b/patches/server/0871-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0872-Add-EntityPortalReadyEvent.patch
rename to patches/server/0871-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0873-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0872-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0873-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0872-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0874-Send-block-entities-after-destroy-prediction.patch b/patches/server/0873-Send-block-entities-after-destroy-prediction.patch
similarity index 97%
rename from patches/server/0874-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0873-Send-block-entities-after-destroy-prediction.patch
index 6e1204f798..0895e311c8 100644
--- a/patches/server/0874-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0873-Send-block-entities-after-destroy-prediction.patch
@@ -57,10 +57,10 @@ index 796d17f51496974cfdfed2593753b8c09b5c81c1..13031576c20bda3bb12c926f6cd938fa
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a00c686f0ffdc77f590e2451d531bc40e7a1d508..f31b1419762e5d41051a6ee76280357e73d8ff13 100644
+index 189d1aa21e2fc0c9d4e73e199f56e0be1bcabc9e..da2a074d8dc048351d90ca484d33f55f79c49dc1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1867,8 +1867,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1863,8 +1863,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      return;
                  }
                  // Paper end - Don't allow digging in unloaded chunks
diff --git a/patches/server/0875-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0874-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0875-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0874-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0876-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0875-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0876-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0875-Custom-Chat-Completion-Suggestions-API.patch
index e383aeb798..146c452af0 100644
--- a/patches/server/0876-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0875-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4d3d6ecada4d8d7202498f4b3c68c35546d3f1df..81d986eeb355087dc1ff45c2c44b9d34b04f02f1 100644
+index 2f184121d1b6e037c5dd7f30eb075e6fe01c1973..a96a3e459e27a6b5c84f0e4550241e66df0505c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -665,6 +665,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0877-Add-missing-BlockFadeEvents.patch b/patches/server/0876-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0877-Add-missing-BlockFadeEvents.patch
rename to patches/server/0876-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0878-Collision-API.patch b/patches/server/0877-Collision-API.patch
similarity index 100%
rename from patches/server/0878-Collision-API.patch
rename to patches/server/0877-Collision-API.patch
diff --git a/patches/server/0879-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0878-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0879-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0878-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0880-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0879-Remove-invalid-signature-login-stacktrace.patch
similarity index 88%
rename from patches/server/0880-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0879-Remove-invalid-signature-login-stacktrace.patch
index 5ce447af88..dca56b5a89 100644
--- a/patches/server/0880-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0879-Remove-invalid-signature-login-stacktrace.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f31b1419762e5d41051a6ee76280357e73d8ff13..9eaf25aa2100559dd9c9c92917dccafa9f976686 100644
+index da2a074d8dc048351d90ca484d33f55f79c49dc1..eed16d8124d6256e3e259263b26cba2cbb3582d4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3593,7 +3593,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3589,7 +3589,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
diff --git a/patches/server/0881-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 86%
rename from patches/server/0881-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 74b8885c99..d154b92207 100644
--- a/patches/server/0881-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9eaf25aa2100559dd9c9c92917dccafa9f976686..d0e964b59643a3f793a6a62ebb1c6eebe2e61377 100644
+index eed16d8124d6256e3e259263b26cba2cbb3582d4..50c1d6dedcb7579ce5e83599b47016e4fc8d9d9a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1750,6 +1750,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1746,6 +1746,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
  
      public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<ClientboundPlayerPositionPacket.RelativeArgument> set, boolean flag) {
diff --git a/patches/server/0882-Block-Ticking-API.patch b/patches/server/0881-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0882-Block-Ticking-API.patch
rename to patches/server/0881-Block-Ticking-API.patch
diff --git a/patches/server/0883-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0882-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0883-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0882-Add-Velocity-IP-Forwarding-Support.patch
index 6e8402caf0..a04943245c 100644
--- a/patches/server/0883-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0882-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..c4934979b1ed85bfc4f8d9e6f8848b2b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index d2cba3fb9eb0d344b71c79387d1d160596b1dc62..56210ac6b9525b025b1091a4b42df0f0e99bd859 100644
+index a571d1e4b5407090f60c97326f8703d270a3314d..2bae7c5494ed4f144d094a26471fa5f9e45e9918 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -61,6 +61,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -185,7 +185,7 @@ index d2cba3fb9eb0d344b71c79387d1d160596b1dc62..56210ac6b9525b025b1091a4b42df0f0
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index afadd1b5dd7c46c1b8f46e222ed16489dcc10e79..47df6f4268a63118da8187f4102c876bd37d1680 100644
+index 4585fe9467c1866ad6746e44b45f77d614be8201..bfc4ee36befb925ab4eb6b96f5c1aa6c76bf711f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -797,7 +797,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0884-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 92%
rename from patches/server/0884-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 2f16b2a224..484b3ab4b3 100644
--- a/patches/server/0884-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 56210ac6b9525b025b1091a4b42df0f0e99bd859..f3b340fc6be9878d677a76673450aac3e0b73d4b 100644
+index 2bae7c5494ed4f144d094a26471fa5f9e45e9918..3f7fab2f80ded9a7a720bd623f1ef028a4d0dca6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -49,7 +49,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0885-Add-NamespacedKey-biome-methods.patch b/patches/server/0884-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0885-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0884-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0886-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0885-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0886-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0885-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0887-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0886-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0887-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0886-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0888-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0887-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 96%
rename from patches/server/0888-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0887-Stop-large-look-changes-from-crashing-the-server.patch
index 6831fe665f..07871e307d 100644
--- a/patches/server/0888-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0887-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index efe719de95fb38b6770b9ce9c93590d7c1522ea3..6d682a78c6fe4cbf44cd20449cfe89d530e1d28c 100644
+index 5c1fc7ae7e92426491bf95a249763c789a4c54cd..a3cd6e3d0d1fc01d47d08fead7990af1dce66c85 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3028,37 +3028,15 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0889-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 94%
rename from patches/server/0889-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index 55c89b9ae5..3013d553e5 100644
--- a/patches/server/0889-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/server/0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3200bd56923af252e3e6cfb2c88bc4563230cd05..f872f0e955b11cc50c239f98e02dfac47908d8c7 100644
+index a96a3e459e27a6b5c84f0e4550241e66df0505c5..cd439593d050fb157fae3575207a285a48d71783 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1015,13 +1015,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0890-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0889-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0890-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0889-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0891-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0890-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0891-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0890-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0892-Missing-eating-regain-reason.patch b/patches/server/0891-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0892-Missing-eating-regain-reason.patch
rename to patches/server/0891-Missing-eating-regain-reason.patch
diff --git a/patches/server/0893-Missing-effect-cause.patch b/patches/server/0892-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0893-Missing-effect-cause.patch
rename to patches/server/0892-Missing-effect-cause.patch
diff --git a/patches/server/0894-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0893-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0894-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0893-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0895-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0894-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0895-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0894-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0896-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0895-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0896-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0895-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0897-Configurable-chat-thread-limit.patch b/patches/server/0896-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0897-Configurable-chat-thread-limit.patch
rename to patches/server/0896-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0898-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0898-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0899-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0898-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 87%
rename from patches/server/0899-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0898-Set-position-before-player-sending-on-dimension-chan.patch
index 7525923f3e..d25f138b09 100644
--- a/patches/server/0899-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/server/0898-Set-position-before-player-sending-on-dimension-chan.patch
@@ -7,10 +7,10 @@ This causes a moment where the player entity is sent with the previous location,
 teleport packet which is sent shortly after is meant to correct that.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e235037de74c9d0a3ba136902a599b06d24a134d..95841722fd6a87f0bdea650f44535a717bb7f867 100644
+index 9ec0ae8fd404a595f4a659b10c5107421db8f1f8..40229b0dc295bcca956d8cc3c32834c6f1748bbc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1163,6 +1163,7 @@ public class ServerPlayer extends Player {
+@@ -1161,6 +1161,7 @@ public class ServerPlayer extends Player {
  
                  // CraftBukkit end
                  this.setLevel(worldserver);
diff --git a/patches/server/0900-fix-Jigsaw-block-kicking-user.patch b/patches/server/0899-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0900-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0899-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0901-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0900-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0901-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0900-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0902-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0901-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0902-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0901-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0903-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0902-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0903-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0902-Fix-a-bunch-of-vanilla-bugs.patch
index 2302f07af8..306784518d 100644
--- a/patches/server/0903-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0902-Fix-a-bunch-of-vanilla-bugs.patch
@@ -83,7 +83,7 @@ index 43e77cef0fce75f59aeb05e161668bebb8fca229..ef50fbf8cb3f008827850b5ed3342200
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6d682a78c6fe4cbf44cd20449cfe89d530e1d28c..cd57fde197f622e5315c4a63936a9b66f5f05916 100644
+index a3cd6e3d0d1fc01d47d08fead7990af1dce66c85..e3567f8526e289d306cfa8196e60a97a7c1e1266 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2207,8 +2207,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0904-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0903-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 87%
rename from patches/server/0904-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0903-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 6b0ab827df..fa4754bb37 100644
--- a/patches/server/0904-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0903-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e902673328fa9ec371c99a03214fbe4db91b5e7d..e55ef41da88062b54533953bd74c3cdfce7ea933 100644
+index 02c8e154b424b7bfae9ff28b6acfc0362721d2e8..3af3dd8f151793dbcca46e110bf7fcdaabd847a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2535,7 +2535,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2533,7 +2533,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (entity instanceof Mob) {
                  Mob entityinsentient = (Mob) entity;
  
@@ -17,7 +17,7 @@ index e902673328fa9ec371c99a03214fbe4db91b5e7d..e55ef41da88062b54533953bd74c3cdf
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2620,7 +2620,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2618,7 +2618,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (entity instanceof Mob) {
                  Mob entityinsentient = (Mob) entity;
  
diff --git a/patches/server/0905-Fix-custom-piglin-loved-items.patch b/patches/server/0904-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0905-Fix-custom-piglin-loved-items.patch
rename to patches/server/0904-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0906-EntityPickupItemEvent-fixes.patch b/patches/server/0905-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0906-EntityPickupItemEvent-fixes.patch
rename to patches/server/0905-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0907-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0906-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0907-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0906-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0908-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0907-Add-PlayerInventorySlotChangeEvent.patch
similarity index 95%
rename from patches/server/0908-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0907-Add-PlayerInventorySlotChangeEvent.patch
index cebafba0b8..b1f2e86a94 100644
--- a/patches/server/0908-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0907-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 95841722fd6a87f0bdea650f44535a717bb7f867..cf80bafd928caf73ec766342f7b3cd89eb926fd2 100644
+index 40229b0dc295bcca956d8cc3c32834c6f1748bbc..85570b5c362033075114ed86746f23c24251827d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -323,6 +323,25 @@ public class ServerPlayer extends Player {
+@@ -321,6 +321,25 @@ public class ServerPlayer extends Player {
  
                  }
              }
diff --git a/patches/server/0909-Elder-Guardian-appearance-API.patch b/patches/server/0908-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0909-Elder-Guardian-appearance-API.patch
rename to patches/server/0908-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0910-Allow-changing-bed-s-occupied-property.patch b/patches/server/0909-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0910-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0909-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0911-Add-entity-knockback-API.patch b/patches/server/0910-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0911-Add-entity-knockback-API.patch
rename to patches/server/0910-Add-entity-knockback-API.patch
diff --git a/patches/server/0912-Detect-headless-JREs.patch b/patches/server/0911-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0912-Detect-headless-JREs.patch
rename to patches/server/0911-Detect-headless-JREs.patch
diff --git a/patches/server/0913-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0912-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0913-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0912-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0914-optimized-dirt-and-snow-spreading.patch b/patches/server/0913-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0914-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0913-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0915-Added-EntityToggleSitEvent.patch b/patches/server/0914-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0915-Added-EntityToggleSitEvent.patch
rename to patches/server/0914-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0916-Add-fire-tick-delay-option.patch b/patches/server/0915-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0916-Add-fire-tick-delay-option.patch
rename to patches/server/0915-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0917-Add-Moving-Piston-API.patch b/patches/server/0916-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0917-Add-Moving-Piston-API.patch
rename to patches/server/0916-Add-Moving-Piston-API.patch
diff --git a/patches/server/0918-Ignore-impossible-spawn-tick.patch b/patches/server/0917-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0918-Ignore-impossible-spawn-tick.patch
rename to patches/server/0917-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0919-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0918-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0919-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0918-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0920-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0919-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0920-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0919-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0921-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0920-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0921-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0920-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0922-Prevent-compass-from-loading-chunks.patch b/patches/server/0921-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0922-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0921-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0923-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0922-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0923-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0922-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0924-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0923-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0924-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0923-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0925-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0924-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0925-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0924-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0926-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/0925-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
similarity index 100%
rename from patches/server/0926-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
rename to patches/server/0925-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
diff --git a/patches/server/0927-Add-Player-Warden-Warning-API.patch b/patches/server/0926-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0927-Add-Player-Warden-Warning-API.patch
rename to patches/server/0926-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0928-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0927-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0928-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0927-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0929-Add-paper-dumplisteners-command.patch b/patches/server/0928-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0929-Add-paper-dumplisteners-command.patch
rename to patches/server/0928-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0930-check-global-player-list-where-appropriate.patch b/patches/server/0929-check-global-player-list-where-appropriate.patch
similarity index 95%
rename from patches/server/0930-check-global-player-list-where-appropriate.patch
rename to patches/server/0929-check-global-player-list-where-appropriate.patch
index 61c8afb1a1..c1b632ac97 100644
--- a/patches/server/0930-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0929-check-global-player-list-where-appropriate.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] check global player list where appropriate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e55ef41da88062b54533953bd74c3cdfce7ea933..f3a19d00f78e19aa98c57461efb90d79f656a992 100644
+index 3af3dd8f151793dbcca46e110bf7fcdaabd847a7..54c2b7fba83d6f06dba95b1bb5b487a02048d6e6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2657,4 +2657,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2655,4 +2655,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
@@ -22,7 +22,7 @@ index e55ef41da88062b54533953bd74c3cdfce7ea933..f3a19d00f78e19aa98c57461efb90d79
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cd57fde197f622e5315c4a63936a9b66f5f05916..cf0c087528fc6113a59e38b99fcf11406d1aa87c 100644
+index e3567f8526e289d306cfa8196e60a97a7c1e1266..1274b40a424371b77d8df70ea5f4b2b7300e2a83 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3609,7 +3609,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0931-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0930-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0931-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0930-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0932-ItemStack-damage-API.patch b/patches/server/0931-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0932-ItemStack-damage-API.patch
rename to patches/server/0931-ItemStack-damage-API.patch
diff --git a/patches/server/0933-Friction-API.patch b/patches/server/0932-Friction-API.patch
similarity index 100%
rename from patches/server/0933-Friction-API.patch
rename to patches/server/0932-Friction-API.patch
diff --git a/patches/server/0934-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0933-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0934-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0933-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0935-Fix-player-kick-on-shutdown.patch b/patches/server/0934-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0935-Fix-player-kick-on-shutdown.patch
rename to patches/server/0934-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0936-Sync-offhand-slot-in-menus.patch b/patches/server/0935-Sync-offhand-slot-in-menus.patch
similarity index 95%
rename from patches/server/0936-Sync-offhand-slot-in-menus.patch
rename to patches/server/0935-Sync-offhand-slot-in-menus.patch
index 271a6e11fc..a3d0b95a6a 100644
--- a/patches/server/0936-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0935-Sync-offhand-slot-in-menus.patch
@@ -8,10 +8,10 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cf80bafd928caf73ec766342f7b3cd89eb926fd2..c0b0a7fdb75266a7064d54bda6441953184ecc64 100644
+index 85570b5c362033075114ed86746f23c24251827d..7d6d3c8556033d289fdadc489e73fba478fce41a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -292,6 +292,13 @@ public class ServerPlayer extends Player {
+@@ -290,6 +290,13 @@ public class ServerPlayer extends Player {
  
              }
  
diff --git a/patches/server/0937-Player-Entity-Tracking-Events.patch b/patches/server/0936-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0937-Player-Entity-Tracking-Events.patch
rename to patches/server/0936-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0938-Limit-pet-look-distance.patch b/patches/server/0937-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0938-Limit-pet-look-distance.patch
rename to patches/server/0937-Limit-pet-look-distance.patch
diff --git a/patches/server/0939-Properly-resend-entities.patch b/patches/server/0938-Properly-resend-entities.patch
similarity index 95%
rename from patches/server/0939-Properly-resend-entities.patch
rename to patches/server/0938-Properly-resend-entities.patch
index a49fd461d4..7b05fbc428 100644
--- a/patches/server/0939-Properly-resend-entities.patch
+++ b/patches/server/0938-Properly-resend-entities.patch
@@ -66,10 +66,10 @@ index 755989780c955592e27cae2b4b5f0e90e13543b7..37e193f57938047c8b886ed7d2816411
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d0e964b59643a3f793a6a62ebb1c6eebe2e61377..57a62a5d6e05b6e05214b5aef96c5f2411e9f424 100644
+index 50c1d6dedcb7579ce5e83599b47016e4fc8d9d9a..08cb3db28f13c352a162009deeb28ee637e98d2a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2774,7 +2774,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2770,7 +2770,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                              // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
@@ -79,10 +79,10 @@ index d0e964b59643a3f793a6a62ebb1c6eebe2e61377..57a62a5d6e05b6e05214b5aef96c5f24
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 809ddbfcf873b4695257f599b882803f7fcc34fa..b348d33726b2b14ea2d12ce3430df2c0b94295f4 100644
+index 69688ab86346c3712a61ae0f09ec22d1b6ab8744..c0b599b1835d28ddda3690b29f29bd8c6f03e215 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -413,7 +413,7 @@ public abstract class PlayerList {
+@@ -351,7 +351,7 @@ public abstract class PlayerList {
          ((ServerLevel)player.level).getChunkSource().chunkMap.addEntity(player); // Paper - track entity now
          // CraftBukkit end
  
diff --git a/patches/server/0940-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0939-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0940-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0939-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0941-fix-Instruments.patch b/patches/server/0940-fix-Instruments.patch
similarity index 97%
rename from patches/server/0941-fix-Instruments.patch
rename to patches/server/0940-fix-Instruments.patch
index 6310b7a0c0..7d9a7d5a08 100644
--- a/patches/server/0941-fix-Instruments.patch
+++ b/patches/server/0940-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f8ba66e6711dfd83e28fff02ea8ca351fc29a25a..5b18b560d94a1f36bcb0b962a93ba81236f767ac 100644
+index d87b6ccc57be06739a0105805735feb1800ada69..99bf1485ddecb5fc88850242e9c32850781c4b36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -767,62 +767,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0942-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0941-Fix-chunk-snapshot-biome-getter.patch
similarity index 100%
rename from patches/server/0942-Fix-chunk-snapshot-biome-getter.patch
rename to patches/server/0941-Fix-chunk-snapshot-biome-getter.patch
diff --git a/patches/server/0943-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0942-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0943-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0942-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0944-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0943-Fix-MapLike-Codec-missing-key-selector.patch
similarity index 100%
rename from patches/server/0944-Fix-MapLike-Codec-missing-key-selector.patch
rename to patches/server/0943-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0945-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0944-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0945-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0944-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0946-Improve-logging-and-errors.patch b/patches/server/0945-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0946-Improve-logging-and-errors.patch
rename to patches/server/0945-Improve-logging-and-errors.patch
diff --git a/patches/server/0947-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0946-Fix-explosion-yield-with-new-gamerules.patch
similarity index 100%
rename from patches/server/0947-Fix-explosion-yield-with-new-gamerules.patch
rename to patches/server/0946-Fix-explosion-yield-with-new-gamerules.patch
diff --git a/patches/server/0948-Add-BlockLockCheckEvent.patch b/patches/server/0947-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0948-Add-BlockLockCheckEvent.patch
rename to patches/server/0947-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0949-Add-Sneaking-API-for-Entities.patch b/patches/server/0948-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0949-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0948-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0950-Improve-PortalEvents.patch b/patches/server/0949-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0950-Improve-PortalEvents.patch
rename to patches/server/0949-Improve-PortalEvents.patch