From c7e118b39425bd3aa817ad9bb5ed40db8266d785 Mon Sep 17 00:00:00 2001
From: "FivePB (Xer)" <admin@fivepb.me>
Date: Mon, 8 Aug 2022 15:25:41 +0000
Subject: [PATCH] Update modern forwarding to v3 (#8219)

---
 ...PI.patch => 0273-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...6-Reset-players-airTicks-on-respawn.patch} |  2 +-
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  2 +-
 ...=> 0279-Optimize-World-Time-Updates.patch} |  2 +-
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0281-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0282-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  2 +-
 ...ult-permission-message-configurable.patch} |  2 +-
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  2 +-
 ...ntity-dismount-during-teleportation.patch} |  2 +-
 ...I.patch => 0288-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0289-Book-Size-Limits.patch} |  2 +-
 ...0290-Add-PlayerConnectionCloseEvent.patch} |  2 +-
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  6 +--
 ...ehicle-tracking-issue-on-disconnect.patch} |  2 +-
 ...remove-from-being-called-on-Players.patch} |  2 +-
 ...ent.patch => 0295-BlockDestroyEvent.patch} |  0
 ... => 0296-Async-command-map-building.patch} |  0
 ...0297-Implement-Brigadier-Mojang-API.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ... 0299-Limit-Client-Sign-length-more.patch} |  0
 ...onvertSigns-boolean-every-sign-save.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  2 +-
 ...=> 0305-Entity-getEntitySpawnReason.patch} |  2 +-
 ...ty-Metadata-for-all-tracked-players.patch} |  0
 ...tch => 0307-Fire-event-on-GS4-query.patch} |  0
 ...08-Implement-PlayerPostRespawnEvent.patch} |  2 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0310-Server-Tick-Events.patch} |  0
 ...311-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0313-Add-Heightmap-API.patch} |  0
 ...> 0314-Mob-Spawner-API-Enhancements.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  2 +-
 ...0318-Implement-CraftBlockSoundGroup.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ....patch => 0320-ChunkMapDistance-CME.patch} |  0
 ...d.patch => 0321-Chunk-debug-command.patch} |  0
 ...22-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...23-Expose-the-internal-current-tick.patch} |  2 +-
 ...24-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  0
 ...urable-projectile-relative-velocity.patch} |  0
 ...h => 0328-offset-item-frame-ticking.patch} |  0
 ...-158900.patch => 0329-Fix-MC-158900.patch} |  2 +-
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ...1-Dont-send-unnecessary-sign-update.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  2 +-
 ...334-Flat-bedrock-generator-settings.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ... 0337-Duplicate-UUID-Resolve-Option.patch} |  0
 ...pers.patch => 0338-Optimize-Hoppers.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  0
 ...344-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0345-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0349-Entity-Activation-Range-2.0.patch} |  0
 ...h => 0350-Increase-Light-Queue-Size.patch} |  2 +-
 ...and.patch => 0351-Fix-Light-Command.patch} |  0
 ...3-Anti-Xray.patch => 0352-Anti-Xray.patch} |  4 +-
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...=> 0354-Tracking-Range-Improvements.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...0360-Add-debug-for-sync-chunk-loads.patch} |  0
 ...1-Remove-garbage-Java-version-check.patch} |  2 +-
 ...tch => 0362-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0363-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0365-Make-the-GUI-graph-fancier.patch} |  0
 ...66-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  0
 ...chance-of-villager-zombie-infection.patch} |  0
 ...tch => 0370-Optimise-Chunk-getFluid.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  2 +-
 ...73-Expose-MinecraftServer-isRunning.patch} |  2 +-
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  2 +-
 ...pawn-settings-and-per-player-option.patch} |  2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |  0
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  0
 ...tch => 0379-Don-t-tick-dead-players.patch} |  2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  2 +-
 ...ove-existing-players-to-world-spawn.patch} |  4 +-
 ...alSelector-Goal.Flag-Set-operations.patch} |  0
 ...h => 0384-Improved-Watchdog-Support.patch} |  2 +-
 ....patch => 0385-Optimize-Pathfinding.patch} |  0
 ...6-Reduce-Either-Optional-allocation.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  2 +-
 ...89-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  4 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...Chunk-Post-Processing-deadlock-risk.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  4 +-
 ...oad-Chunks-for-Login-Asynchronously.patch} |  8 ++--
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...patch => 0401-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  2 +-
 ...n.patch => 0403-Expose-game-version.patch} |  2 +-
 ...> 0404-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  2 +-
 ....patch => 0406-misc-debugging-dumps.patch} |  6 +--
 ...7-Prevent-teleporting-dead-entities.patch} |  2 +-
 ...traces-in-log-messages-crash-report.patch} |  2 +-
 ...atch => 0409-Implement-Mob-Goal-API.patch} |  2 +-
 ...=> 0410-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0412-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0415-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} |  0
 ...> 0421-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |  2 +-
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...Levels-chunk-level-checking-methods.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0428-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 => 0432-Fix-sand-duping.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  2 +-
 ...older-method-without-block-snapshot.patch} |  0
 ...API.patch => 0436-Improve-Arrow-API.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...9-Add-permission-for-command-blocks.patch} |  2 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  2 +-
 ...atch => 0442-Paper-dumpitem-command.patch} |  0
 ...43-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  2 +-
 ...incremental-chunk-and-player-saving.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...449-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0454-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0456-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0459-Add-PrepareResultEvent.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  6 +--
 ...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} |  2 +-
 ...-5989.patch => 0466-Fix-SPIGOT-5989.patch} |  2 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...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 => 0474-Brand-support.patch} |  2 +-
 ...patch => 0475-Add-setMaxPlayers-API.patch} |  4 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0477-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0479-Add-moon-phase-API.patch} |  0
 ...prove-Chunk-Status-Transition-Speed.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0482-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0484-Buffer-joins-to-world.patch} |  2 +-
 ...-Eigencraft-redstone-implementation.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  4 +-
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0488-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0489-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  2 +-
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0492-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  2 +-
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  2 +-
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0500-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} |  2 +-
 ...atch => 0505-Optimise-getType-calls.patch} |  0
 ....patch => 0506-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0511-Player-elytra-boost-API.patch} |  2 +-
 ...12-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  2 +-
 ...ch => 0515-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 ...> 0518-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...520-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0521-Add-API-for-quit-reason.patch} |  8 ++--
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...ch => 0523-Expose-world-spawn-angle.patch} |  2 +-
 ...patch => 0524-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  2 +-
 ...26-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0527-Add-PlayerItemCooldownEvent.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...PI.patch => 0529-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0532-Add-PlayerShearBlockEvent.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0534-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ...536-Player-Chunk-Load-Unload-Events.patch} |  2 +-
 ...7-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 => 0542-Implement-TargetHitEvent.patch} |  0
 ... 0543-MC-4-Fix-item-position-desync.patch} |  0
 ...544-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0545-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0547-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0552-Zombie-API-breaking-doors.patch} |  0
 ...553-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0554-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0555-Guardian-beam-workaround.patch} |  0
 ...0556-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 => 0565-Remove-stale-POIs.patch} |  0
 ...h => 0566-Fix-villager-boat-exploit.patch} |  2 +-
 ...I.patch => 0567-Add-sendOpLevel-API.patch} |  4 +-
 ...try.patch => 0568-Add-PaperRegistry.patch} |  0
 ...h => 0569-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
 ...573-Make-schedule-command-per-world.patch} |  0
 ...574-Configurable-max-leash-distance.patch} |  0
 ...575-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} |  2 +-
 ...atch => 0581-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0582-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0584-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 => 0591-Expose-Tracked-Players.patch} |  0
 ...2-Remove-streams-from-SensorNearest.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0594-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...596-fix-converting-txt-to-json-file.patch} |  2 +-
 ...atch => 0597-Add-worldborder-events.patch} |  0
 ...=> 0598-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0600-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0601-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  2 +-
 ....patch => 0603-Expand-world-key-API.patch} |  4 +-
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0605-Item-Rarity-API.patch} |  2 +-
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...py-TESign-isEditable-from-snapshots.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  2 +-
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  2 +-
 ...11-Entity-load-save-limit-per-chunk.patch} |  0
 ...tch => 0612-Expose-protocol-version.patch} |  2 +-
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0615-Add-bypass-host-check.patch} |  0
 ...0616-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} |  2 +-
 ... => 0623-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0624-More-World-API.patch} |  0
 ... 0625-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  2 +-
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  0
 ...dd-Channel-initialization-listeners.patch} |  2 +-
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0632-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  6 +--
 ...close.patch => 0636-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  2 +-
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0639-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0640-Add-basic-Datapack-API.patch} |  2 +-
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  2 +-
 ... => 0643-ItemStack-repair-check-API.patch} |  2 +-
 ....patch => 0644-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  2 +-
 ...-and-optimise-world-force-upgrading.patch} |  4 +-
 ...PI.patch => 0647-Add-Mob-lookAt-API.patch} |  0
 ...0648-Add-Unix-domain-socket-support.patch} |  2 +-
 ... => 0649-Add-EntityInsideBlockEvent.patch} |  0
 ...50-Attributes-API-for-item-defaults.patch} |  2 +-
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0652-More-Lidded-Block-API.patch} |  0
 ...53-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0654-Add-PlayerKickEvent-causes.patch} |  0
 ...0655-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0659-Add-BellRevealRaiderEvent.patch} |  0
 ... 0660-Fix-invulnerable-end-crystals.patch} |  0
 ...61-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0662-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0665-Line-Of-Sight-Changes.patch} |  0
 ... => 0666-add-per-world-spawn-limits.patch} |  0
 ...plashEvent-for-water-splash-potions.patch} |  0
 ... => 0668-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  2 +-
 ...=> 0670-Missing-Entity-Behavior-API.patch} |  0
 ...ect-for-book-edit-is-called-on-main.patch} |  2 +-
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0675-Adds-PlayerArmSwingEvent.patch} |  0
 ...-event-leave-message-not-being-sent.patch} |  6 +--
 ...-for-mobs-immune-to-default-effects.patch} |  0
 ...correct-message-for-outdated-client.patch} |  0
 ...-t-apply-cramming-damage-to-players.patch} |  2 +-
 ...d-timings-for-sensors-and-behaviors.patch} |  0
 ...-bunch-of-missing-forceDrop-toggles.patch} |  0
 ...inger-API.patch => 0682-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0684-Add-System.out-err-catcher.patch} |  2 +-
 ... => 0685-Fix-test-not-bootstrapping.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...-Improve-boat-collision-performance.patch} |  0
 ...AFK-kick-while-watching-end-credits.patch} |  2 +-
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0690-Add-PlayerSetSpawnEvent.patch} |  6 +--
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0694-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
 ...699-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0701-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0703-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0705-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  0
 ... 0707-Get-entity-default-attributes.patch} |  2 +-
 ...d-API.patch => 0708-Left-handed-API.patch} |  0
 ...=> 0709-Add-advancement-display-API.patch} |  0
 ...0-Add-ItemFactory-getMonsterEgg-API.patch} |  0
 ...tch => 0711-Add-critical-damage-API.patch} |  0
 ...0712-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  2 +-
 ...-ram-API.patch => 0714-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...6-Add-Raw-Byte-Entity-Serialization.patch} |  2 +-
 ...17-Vanilla-command-permission-fixes.patch} |  0
 ...-Make-CallbackExecutor-strict-again.patch} |  0
 ...server-to-unload-chunks-at-request-.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  2 +-
 ...e-recursion-for-chunkholder-updates.patch} |  0
 ...22-Fix-GameProfileCache-concurrency.patch} |  0
 ...hunks-refusing-to-unload-at-low-TPS.patch} |  0
 ...et-level-changes-while-unloading-pl.patch} |  0
 ...et-level-changes-when-updating-chun.patch} |  0
 ...g-when-the-async-catcher-is-tripped.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  2 +-
 ...lls-removing-tickets-for-sync-loads.patch} |  0
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  0
 ...=> 0731-Optimise-general-POI-access.patch} |  0
 ...tch => 0732-Add-more-async-catchers.patch} |  0
 ...te-entity-bounding-box-lookup-calls.patch} |  0
 ... 0734-Optimise-chunk-tick-iteration.patch} |  0
 ...> 0735-Execute-chunk-tasks-mid-tick.patch} |  0
 ... => 0736-Do-not-copy-visible-chunks.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  2 +-
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ... 0741-Distance-manager-tick-timings.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...h => 0744-Add-packet-limiter-config.patch} |  2 +-
 ...Stem-registry-when-loading-default-.patch} |  2 +-
 ...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 => 0749-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...1-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  0
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ...ition-of-entities-to-entity-ticklis.patch} |  0
 ... 0755-Optimise-random-block-ticking.patch} |  0
 ...6-Optimise-non-flush-packet-sending.patch} |  0
 ...0757-Optimise-nearby-player-lookups.patch} |  0
 ...=> 0758-Optimise-WorldServer-notify.patch} |  0
 ...0759-Remove-streams-for-villager-AI.patch} |  0
 ...> 0760-Rewrite-dataconverter-system.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  4 +-
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...tity-loads-in-CraftChunk-getEntitie.patch} |  0
 ...ifications-to-critical-entity-state.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  2 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0770-Ensure-valid-vehicle-status.patch} |  2 +-
 ...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
 ...-O-threads-with-chunk-data-while-fl.patch} |  0
 ...h => 0776-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...0779-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ...ion-for-logging-player-ip-addresses.patch} |  4 +-
 ... => 0782-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0784-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} |  0
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...ch => 0789-Rewrite-the-light-engine.patch} |  0
 ...ochunk-light-sources-unless-it-is-m.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...ier-changing-growth-for-other-crops.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0796-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0797-Add-player-health-update-API.patch} |  2 +-
 ...tch => 0798-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  2 +-
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  4 +-
 ...n-checking-in-player-move-packet-ha.patch} |  2 +-
 ...ch => 0802-Actually-unload-POI-data.patch} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...te-Log4j.patch => 0804-Update-Log4j.patch} |  0
 ...patch => 0805-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...07-Fix-tripwire-state-inconsistency.patch} |  0
 ...uid-logging-on-Block-breakNaturally.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0810-Improve-scoreboard-entries.patch} |  0
 ...ch => 0811-Entity-powdered-snow-API.patch} |  0
 ...0812-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} |  2 +-
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0818-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0819-Bucketable-API.patch} |  0
 ...layer-world-in-endPortalSoundRadius.patch} |  0
 ...es.patch => 0821-Validate-usernames.patch} |  8 ++--
 ...ing-configs-with-more-long-comments.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  4 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...7-Multiple-Entries-with-Scoreboards.patch} |  0
 ...828-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  4 +-
 ...0831-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0832-Kick-on-main-for-illegal-chat.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  2 +-
 ...ent.patch => 0834-Fix-NotePlayEvent.patch} |  0
 ....patch => 0835-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0836-Dolphin-API.patch} |  0
 ...h => 0837-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  2 +-
 ...0840-Add-config-for-stronghold-seed.patch} |  0
 ...h => 0841-Implement-regenerateChunk.patch} |  0
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  2 +-
 ...gs.patch => 0844-Add-GameEvent-tags.patch} |  2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...846-Replace-ticket-level-propagator.patch} |  0
 ...tch => 0847-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...fault-CustomSpawners-in-custom-worl.patch} |  2 +-
 ...-worldlist-before-initing-the-world.patch} |  4 +-
 ... => 0852-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0853-Custom-Potion-Mixes.patch} |  2 +-
 ...-Replace-player-chunk-loader-system.patch} |  8 ++--
 ...0855-Fix-Fluid-tags-isTagged-method.patch} |  2 +-
 ...56-Force-close-world-loading-screen.patch} |  2 +-
 ...857-Fix-falling-block-spawn-methods.patch} |  0
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  0
 ... 0860-Fix-save-problems-on-shutdown.patch} |  0
 ...I.patch => 0861-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  2 +-
 ...0864-Implement-getComputedBiome-API.patch} |  0
 ...> 0865-Make-some-itemstacks-nonnull.patch} |  0
 ...alid-GameProfiles-on-skull-blocks-i.patch} |  0
 ...867-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0868-Fix-saving-in-unloadWorld.patch} |  2 +-
 ...h => 0869-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0870-Add-TameableDeathMessageEvent.patch} |  0
 ...a-for-EntityChangeBlockEvent-when-s.patch} |  0
 ...bles-running-when-mob-loot-gamerule.patch} |  2 +-
 ...ssenger-world-matches-ridden-entity.patch} |  0
 ...rd-against-invalid-entity-positions.patch} |  0
 ...s.patch => 0875-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} |  0
 ...ead-of-display-name-in-PlayerList-g.patch} |  2 +-
 ...s-not-spawning-outside-slime-chunks.patch} |  0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0884-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
 ...> 0890-Add-PlayerStopUsingItemEvent.patch} |  0
 ...91-FallingBlock-auto-expire-setting.patch} |  0
 ...rs.patch => 0892-Don-t-tick-markers.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0894-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0897-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} |  0
 ...02-Dont-resent-entity-on-art-update.patch} |  0
 ...atch => 0903-Add-missing-spawn-eggs.patch} |  0
 ... => 0904-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  2 +-
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0907-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  2 +-
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...nent-in-resource-pack-rejection-mes.patch} |  2 +-
 ...atch => 0912-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} |  0
 ...PE.patch => 0916-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...on-to-Tadpoles-spawned-by-Frogspawn.patch} |  0
 ...API.patch => 0919-More-Teleport-API.patch} |  4 +-
 ... => 0920-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  2 +-
 ...on-plugins-accessing-faraway-chunks.patch} |  0
 ...tom-Chat-Completion-Suggestions-API.patch} |  2 +-
 ...=> 0925-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0926-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...ocess-cancelling-and-command-changi.patch} |  2 +-
 ...-invalid-signature-login-stacktrace.patch} |  4 +-
 ...-to-PlayerConnection-internalTelepo.patch} |  2 +-
 ...API.patch => 0931-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} | 41 +++++++++++--------
 660 files changed, 211 insertions(+), 204 deletions(-)
 rename patches/server/{0274-Add-more-Witch-API.patch => 0273-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0275-Check-Drowned-for-Villager-Aggression-Config.patch => 0274-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0276-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0275-Add-option-to-prevent-players-from-moving-into-unloa.patch} (98%)
 rename patches/server/{0277-Reset-players-airTicks-on-respawn.patch => 0276-Reset-players-airTicks-on-respawn.patch} (89%)
 rename patches/server/{0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (98%)
 rename patches/server/{0280-Optimize-World-Time-Updates.patch => 0279-Optimize-World-Time-Updates.patch} (96%)
 rename patches/server/{0281-Restore-custom-InventoryHolder-support.patch => 0280-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0282-Use-Vanilla-Minecart-Speeds.patch => 0281-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0283-Fix-SpongeAbsortEvent-handling.patch => 0282-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0284-Don-t-allow-digging-into-unloaded-chunks.patch => 0283-Don-t-allow-digging-into-unloaded-chunks.patch} (98%)
 rename patches/server/{0285-Make-the-default-permission-message-configurable.patch => 0284-Make-the-default-permission-message-configurable.patch} (95%)
 rename patches/server/{0286-Prevent-rayTrace-from-loading-chunks.patch => 0285-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0287-Handle-Large-Packets-disconnecting-client.patch => 0286-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename patches/server/{0288-force-entity-dismount-during-teleportation.patch => 0287-force-entity-dismount-during-teleportation.patch} (98%)
 rename patches/server/{0289-Add-more-Zombie-API.patch => 0288-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0290-Book-Size-Limits.patch => 0289-Book-Size-Limits.patch} (96%)
 rename patches/server/{0291-Add-PlayerConnectionCloseEvent.patch => 0290-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename patches/server/{0292-Prevent-Enderman-from-loading-chunks.patch => 0291-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (95%)
 rename patches/server/{0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (91%)
 rename patches/server/{0295-Block-Entity-remove-from-being-called-on-Players.patch => 0294-Block-Entity-remove-from-being-called-on-Players.patch} (94%)
 rename patches/server/{0296-BlockDestroyEvent.patch => 0295-BlockDestroyEvent.patch} (100%)
 rename patches/server/{0297-Async-command-map-building.patch => 0296-Async-command-map-building.patch} (100%)
 rename patches/server/{0298-Implement-Brigadier-Mojang-API.patch => 0297-Implement-Brigadier-Mojang-API.patch} (100%)
 rename patches/server/{0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0300-Limit-Client-Sign-length-more.patch => 0299-Limit-Client-Sign-length-more.patch} (100%)
 rename patches/server/{0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0303-Handle-Oversized-Tile-Entities-in-chunks.patch => 0302-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename patches/server/{0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (88%)
 rename patches/server/{0306-Entity-getEntitySpawnReason.patch => 0305-Entity-getEntitySpawnReason.patch} (98%)
 rename patches/server/{0307-Update-entity-Metadata-for-all-tracked-players.patch => 0306-Update-entity-Metadata-for-all-tracked-players.patch} (100%)
 rename patches/server/{0308-Fire-event-on-GS4-query.patch => 0307-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0309-Implement-PlayerPostRespawnEvent.patch => 0308-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename patches/server/{0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0311-Server-Tick-Events.patch => 0310-Server-Tick-Events.patch} (100%)
 rename patches/server/{0312-PlayerDeathEvent-getItemsToKeep.patch => 0311-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename patches/server/{0313-Optimize-Captured-TileEntity-Lookup.patch => 0312-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename patches/server/{0314-Add-Heightmap-API.patch => 0313-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0315-Mob-Spawner-API-Enhancements.patch => 0314-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0316-Fix-CB-call-to-changed-postToMainThread-method.patch => 0315-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename patches/server/{0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (95%)
 rename patches/server/{0319-Implement-CraftBlockSoundGroup.patch => 0318-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename patches/server/{0321-ChunkMapDistance-CME.patch => 0320-ChunkMapDistance-CME.patch} (100%)
 rename patches/server/{0322-Chunk-debug-command.patch => 0321-Chunk-debug-command.patch} (100%)
 rename patches/server/{0323-Allow-Saving-of-Oversized-Chunks.patch => 0322-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0324-Expose-the-internal-current-tick.patch => 0323-Expose-the-internal-current-tick.patch} (90%)
 rename patches/server/{0325-Fix-World-isChunkGenerated-calls.patch => 0324-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0326-Show-blockstate-location-if-we-failed-to-read-it.patch => 0325-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0328-Configurable-projectile-relative-velocity.patch => 0327-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0329-offset-item-frame-ticking.patch => 0328-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0330-Fix-MC-158900.patch => 0329-Fix-MC-158900.patch} (94%)
 rename patches/server/{0331-Prevent-consuming-the-wrong-itemstack.patch => 0330-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0332-Dont-send-unnecessary-sign-update.patch => 0331-Dont-send-unnecessary-sign-update.patch} (100%)
 rename patches/server/{0333-Add-option-to-disable-pillager-patrols.patch => 0332-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (92%)
 rename patches/server/{0335-Flat-bedrock-generator-settings.patch => 0334-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0337-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0336-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0338-Duplicate-UUID-Resolve-Option.patch => 0337-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename patches/server/{0339-Optimize-Hoppers.patch => 0338-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0340-PlayerDeathEvent-shouldDropExperience.patch => 0339-PlayerDeathEvent-shouldDropExperience.patch} (91%)
 rename patches/server/{0341-Prevent-bees-loading-chunks-checking-hive-position.patch => 0340-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0343-Guard-against-serializing-mismatching-chunk-coordina.patch => 0342-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0344-Optimise-IEntityAccess-getPlayerByUUID.patch => 0343-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename patches/server/{0345-Fix-items-not-falling-correctly.patch => 0344-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0346-Lag-compensate-eating.patch => 0345-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0347-Optimize-call-to-getFluid-for-explosions.patch => 0346-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0349-Add-effect-to-block-break-naturally.patch => 0348-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/server/{0350-Entity-Activation-Range-2.0.patch => 0349-Entity-Activation-Range-2.0.patch} (100%)
 rename patches/server/{0351-Increase-Light-Queue-Size.patch => 0350-Increase-Light-Queue-Size.patch} (93%)
 rename patches/server/{0352-Fix-Light-Command.patch => 0351-Fix-Light-Command.patch} (100%)
 rename patches/server/{0353-Anti-Xray.patch => 0352-Anti-Xray.patch} (99%)
 rename patches/server/{0354-Implement-alternative-item-despawn-rate.patch => 0353-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0355-Tracking-Range-Improvements.patch => 0354-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0356-Fix-items-vanishing-through-end-portal.patch => 0355-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename patches/server/{0357-implement-optional-per-player-mob-spawns.patch => 0356-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0358-Avoid-hopper-searches-if-there-are-no-items.patch => 0357-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename patches/server/{0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0361-Add-debug-for-sync-chunk-loads.patch => 0360-Add-debug-for-sync-chunk-loads.patch} (100%)
 rename patches/server/{0362-Remove-garbage-Java-version-check.patch => 0361-Remove-garbage-Java-version-check.patch} (91%)
 rename patches/server/{0363-Add-ThrownEggHatchEvent.patch => 0362-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0364-Entity-Jump-API.patch => 0363-Entity-Jump-API.patch} (100%)
 rename patches/server/{0365-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0364-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename patches/server/{0366-Make-the-GUI-graph-fancier.patch => 0365-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0367-add-hand-to-BlockMultiPlaceEvent.patch => 0366-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0368-Validate-tripwire-hook-placement-before-update.patch => 0367-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0370-Configurable-chance-of-villager-zombie-infection.patch => 0369-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0371-Optimise-Chunk-getFluid.patch => 0370-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0372-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0371-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0373-Add-tick-times-API-and-mspt-command.patch => 0372-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename patches/server/{0374-Expose-MinecraftServer-isRunning.patch => 0373-Expose-MinecraftServer-isRunning.patch} (90%)
 rename patches/server/{0375-Add-Raw-Byte-ItemStack-Serialization.patch => 0374-Add-Raw-Byte-ItemStack-Serialization.patch} (96%)
 rename patches/server/{0376-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0375-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename patches/server/{0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename patches/server/{0380-Don-t-tick-dead-players.patch => 0379-Don-t-tick-dead-players.patch} (91%)
 rename patches/server/{0381-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0380-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0382-Optimize-Collision-to-not-load-chunks.patch => 0381-Optimize-Collision-to-not-load-chunks.patch} (98%)
 rename patches/server/{0383-Don-t-move-existing-players-to-world-spawn.patch => 0382-Don-t-move-existing-players-to-world-spawn.patch} (92%)
 rename patches/server/{0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0385-Improved-Watchdog-Support.patch => 0384-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0386-Optimize-Pathfinding.patch => 0385-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0387-Reduce-Either-Optional-allocation.patch => 0386-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0388-Reduce-memory-footprint-of-NBTTagCompound.patch => 0387-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0389-Prevent-opening-inventories-when-frozen.patch => 0388-Prevent-opening-inventories-when-frozen.patch} (97%)
 rename patches/server/{0390-Optimise-ArraySetSorted-removeIf.patch => 0389-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0391-Don-t-run-entity-collision-code-if-not-needed.patch => 0390-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0392-Implement-Player-Client-Options-API.patch => 0391-Implement-Player-Client-Options-API.patch} (97%)
 rename patches/server/{0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0394-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0393-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename patches/server/{0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (96%)
 rename patches/server/{0396-Load-Chunks-for-Login-Asynchronously.patch => 0395-Load-Chunks-for-Login-Asynchronously.patch} (97%)
 rename patches/server/{0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0398-Add-PlayerAttackEntityCooldownResetEvent.patch => 0397-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0399-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0398-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0400-Add-phantom-creative-and-insomniac-controls.patch => 0399-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0402-Villager-Restocks-API.patch => 0401-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0403-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0402-Validate-PickItem-Packet-and-kick-for-invalid.patch} (95%)
 rename patches/server/{0404-Expose-game-version.patch => 0403-Expose-game-version.patch} (89%)
 rename patches/server/{0405-Optimize-Voxel-Shape-Merging.patch => 0404-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename patches/server/{0407-misc-debugging-dumps.patch => 0406-misc-debugging-dumps.patch} (94%)
 rename patches/server/{0408-Prevent-teleporting-dead-entities.patch => 0407-Prevent-teleporting-dead-entities.patch} (92%)
 rename patches/server/{0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0410-Implement-Mob-Goal-API.patch => 0409-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0411-Add-villager-reputation-API.patch => 0410-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0412-Option-for-maximum-exp-value-when-merging-orbs.patch => 0411-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0413-ExperienceOrbMergeEvent.patch => 0412-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0414-Fix-PotionEffect-ignores-icon-flag.patch => 0413-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0415-Optimize-brigadier-child-sorting-performance.patch => 0414-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0416-Potential-bed-API.patch => 0415-Potential-bed-API.patch} (100%)
 rename patches/server/{0417-Wait-for-Async-Tasks-during-shutdown.patch => 0416-Wait-for-Async-Tasks-during-shutdown.patch} (96%)
 rename patches/server/{0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{0420-Reduce-MutableInt-allocations-from-light-engine.patch => 0419-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0422-Ensure-safe-gateway-teleport.patch => 0421-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0423-Add-option-for-console-having-all-permissions.patch => 0422-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (99%)
 rename patches/server/{0425-Use-distance-map-to-optimise-entity-tracker.patch => 0424-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename patches/server/{0426-Optimize-ServerLevels-chunk-level-checking-methods.patch => 0425-Optimize-ServerLevels-chunk-level-checking-methods.patch} (100%)
 rename patches/server/{0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename patches/server/{0428-Fix-villager-trading-demand-MC-163962.patch => 0427-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0429-Maps-shouldn-t-load-chunks.patch => 0428-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0432-Fix-piston-physics-inconsistency-MC-188840.patch => 0431-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0433-Fix-sand-duping.patch => 0432-Fix-sand-duping.patch} (100%)
 rename patches/server/{0434-Fix-missing-chunks-due-to-integer-overflow.patch => 0433-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0435-Prevent-position-desync-in-playerconnection-causing-.patch => 0434-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename patches/server/{0436-Inventory-getHolder-method-without-block-snapshot.patch => 0435-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0437-Improve-Arrow-API.patch => 0436-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0438-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0437-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0439-Hide-sync-chunk-writes-behind-flag.patch => 0438-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0440-Add-permission-for-command-blocks.patch => 0439-Add-permission-for-command-blocks.patch} (98%)
 rename patches/server/{0441-Ensure-Entity-AABB-s-are-never-invalid.patch => 0440-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename patches/server/{0443-Paper-dumpitem-command.patch => 0442-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0444-Don-t-allow-null-UUID-s-for-chat.patch => 0443-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0445-Improve-Legacy-Component-serialization-size.patch => 0444-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0446-Optimize-Bit-Operations-by-inlining.patch => 0445-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (98%)
 rename patches/server/{0448-incremental-chunk-and-player-saving.patch => 0447-incremental-chunk-and-player-saving.patch} (100%)
 rename patches/server/{0449-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0448-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0450-Support-old-UUID-format-for-NBT.patch => 0449-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0451-Clean-up-duplicated-GameProfile-Properties.patch => 0450-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0452-Convert-legacy-attributes-in-Item-Meta.patch => 0451-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0453-Remove-some-streams-from-structures.patch => 0452-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0454-Remove-streams-from-classes-related-villager-gossip.patch => 0453-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0455-Support-components-in-ItemMeta.patch => 0454-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0457-Add-entity-liquid-API.patch => 0456-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0458-Update-itemstack-legacy-name-and-lore.patch => 0457-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0459-Spawn-player-in-correct-world-on-login.patch => 0458-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename patches/server/{0460-Add-PrepareResultEvent.patch => 0459-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename patches/server/{0463-Optimize-NetworkManager-Exception-Handling.patch => 0462-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0464-Optimize-the-advancement-data-player-iteration-to-be.patch => 0463-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0465-Fix-arrows-never-despawning-MC-125757.patch => 0464-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0466-Thread-Safe-Vanilla-Command-permission-checking.patch => 0465-Thread-Safe-Vanilla-Command-permission-checking.patch} (96%)
 rename patches/server/{0467-Fix-SPIGOT-5989.patch => 0466-Fix-SPIGOT-5989.patch} (97%)
 rename patches/server/{0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0472-Fix-some-rails-connecting-improperly.patch => 0471-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0474-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0473-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0475-Brand-support.patch => 0474-Brand-support.patch} (97%)
 rename patches/server/{0476-Add-setMaxPlayers-API.patch => 0475-Add-setMaxPlayers-API.patch} (89%)
 rename patches/server/{0477-Add-playPickupItemAnimation-to-LivingEntity.patch => 0476-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0478-Don-t-require-FACING-data.patch => 0477-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0480-Add-moon-phase-API.patch => 0479-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0481-Improve-Chunk-Status-Transition-Speed.patch => 0480-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename patches/server/{0482-Prevent-headless-pistons-from-being-created.patch => 0481-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0483-Add-BellRingEvent.patch => 0482-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0484-Add-zombie-targets-turtle-egg-config.patch => 0483-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0485-Buffer-joins-to-world.patch => 0484-Buffer-joins-to-world.patch} (95%)
 rename patches/server/{0486-Eigencraft-redstone-implementation.patch => 0485-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0487-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0486-Fix-hex-colors-not-working-in-some-kick-messages.patch} (95%)
 rename patches/server/{0488-PortalCreateEvent-needs-to-know-its-entity.patch => 0487-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0489-Fix-CraftTeam-null-check.patch => 0488-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0490-Add-more-Evoker-API.patch => 0489-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0491-Add-methods-to-get-translation-keys.patch => 0490-Add-methods-to-get-translation-keys.patch} (98%)
 rename patches/server/{0492-Create-HoverEvent-from-ItemStack-Entity.patch => 0491-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0493-Cache-block-data-strings.patch => 0492-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (98%)
 rename patches/server/{0495-Add-additional-open-container-api-to-HumanEntity.patch => 0494-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0497-Extend-block-drop-capture-to-capture-all-items-added.patch => 0496-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (94%)
 rename patches/server/{0500-Lazily-track-plugin-scoreboards-by-default.patch => 0499-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0501-Entity-isTicking.patch => 0500-Entity-isTicking.patch} (100%)
 rename patches/server/{0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0503-Fix-Concurrency-issue-in-ShufflingList.patch => 0502-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0505-Fix-for-large-move-vectors-crashing-server.patch => 0504-Fix-for-large-move-vectors-crashing-server.patch} (98%)
 rename patches/server/{0506-Optimise-getType-calls.patch => 0505-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0507-Villager-resetOffers.patch => 0506-Villager-resetOffers.patch} (100%)
 rename patches/server/{0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0509-Retain-block-place-order-when-capturing-blockstates.patch => 0508-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0510-Reduce-blockpos-allocation-from-pathfinding.patch => 0509-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0511-Fix-item-locations-dropped-from-campfires.patch => 0510-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0512-Player-elytra-boost-API.patch => 0511-Player-elytra-boost-API.patch} (94%)
 rename patches/server/{0513-Fixed-TileEntityBell-memory-leak.patch => 0512-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0515-Add-getOfflinePlayerIfCached-String.patch => 0514-Add-getOfflinePlayerIfCached-String.patch} (93%)
 rename patches/server/{0516-Add-ignore-discounts-API.patch => 0515-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0517-Toggle-for-removing-existing-dragon.patch => 0516-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0518-Fix-client-lag-on-advancement-loading.patch => 0517-Fix-client-lag-on-advancement-loading.patch} (95%)
 rename patches/server/{0519-Item-no-age-no-player-pickup.patch => 0518-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0521-Beacon-API-custom-effect-ranges.patch => 0520-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0522-Add-API-for-quit-reason.patch => 0521-Add-API-for-quit-reason.patch} (92%)
 rename patches/server/{0523-Add-Wandering-Trader-spawn-rate-config-options.patch => 0522-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0524-Expose-world-spawn-angle.patch => 0523-Expose-world-spawn-angle.patch} (93%)
 rename patches/server/{0525-Add-Destroy-Speed-API.patch => 0524-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (93%)
 rename patches/server/{0527-Add-LivingEntity-clearActiveItem.patch => 0526-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0528-Add-PlayerItemCooldownEvent.patch => 0527-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0529-Significantly-improve-performance-of-the-end-generat.patch => 0528-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0530-More-lightning-API.patch => 0529-More-lightning-API.patch} (100%)
 rename patches/server/{0531-Climbing-should-not-bypass-cramming-gamerule.patch => 0530-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0532-Added-missing-default-perms-for-commands.patch => 0531-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0533-Add-PlayerShearBlockEvent.patch => 0532-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0534-Fix-curing-zombie-villager-discount-exploit.patch => 0533-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0535-Limit-recipe-packets.patch => 0534-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0536-Fix-CraftSound-backwards-compatibility.patch => 0535-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0537-Player-Chunk-Load-Unload-Events.patch => 0536-Player-Chunk-Load-Unload-Events.patch} (94%)
 rename patches/server/{0538-Optimize-Dynamic-get-Missing-Keys.patch => 0537-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0539-Expose-LivingEntity-hurt-direction.patch => 0538-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0543-Implement-TargetHitEvent.patch => 0542-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0544-MC-4-Fix-item-position-desync.patch => 0543-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0545-Additional-Block-Material-API-s.patch => 0544-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0546-Fix-harming-potion-dupe.patch => 0545-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0548-Cache-burn-durations.patch => 0547-Cache-burn-durations.patch} (100%)
 rename patches/server/{0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0550-Fix-Not-a-string-Map-Conversion-spam.patch => 0549-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0551-Implement-PlayerFlowerPotManipulateEvent.patch => 0550-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0552-Fix-interact-event-not-being-called-in-adventure.patch => 0551-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0553-Zombie-API-breaking-doors.patch => 0552-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0554-Fix-nerfed-slime-when-splitting.patch => 0553-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0555-Add-EntityLoadCrossbowEvent.patch => 0554-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0556-Guardian-beam-workaround.patch => 0555-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0557-Added-WorldGameRuleChangeEvent.patch => 0556-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0558-Added-ServerResourcesReloadedEvent.patch => 0557-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0559-Added-world-settings-for-mobs-picking-up-loot.patch => 0558-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0560-Implemented-BlockFailedDispenseEvent.patch => 0559-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0561-Added-PlayerLecternPageChangeEvent.patch => 0560-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0562-Added-PlayerLoomPatternSelectEvent.patch => 0561-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0563-Configurable-door-breaking-difficulty.patch => 0562-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0564-Empty-commands-shall-not-be-dispatched.patch => 0563-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0565-Implement-API-to-expose-exact-interaction-point.patch => 0564-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0566-Remove-stale-POIs.patch => 0565-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0567-Fix-villager-boat-exploit.patch => 0566-Fix-villager-boat-exploit.patch} (93%)
 rename patches/server/{0568-Add-sendOpLevel-API.patch => 0567-Add-sendOpLevel-API.patch} (91%)
 rename patches/server/{0569-Add-PaperRegistry.patch => 0568-Add-PaperRegistry.patch} (100%)
 rename patches/server/{0570-Add-StructuresLocateEvent.patch => 0569-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0571-Collision-option-for-requiring-a-player-participant.patch => 0570-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0573-Return-chat-component-with-empty-text-instead-of-thr.patch => 0572-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0574-Make-schedule-command-per-world.patch => 0573-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0575-Configurable-max-leash-distance.patch => 0574-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0576-Implement-BlockPreDispenseEvent.patch => 0575-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0578-Add-toggle-for-always-placing-the-dragon-egg.patch => 0577-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0579-Added-PlayerStonecutterRecipeSelectEvent.patch => 0578-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0581-Reset-shield-blocking-on-dimension-change.patch => 0580-Reset-shield-blocking-on-dimension-change.patch} (89%)
 rename patches/server/{0582-add-DragonEggFormEvent.patch => 0581-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0583-EntityMoveEvent.patch => 0582-EntityMoveEvent.patch} (100%)
 rename patches/server/{0584-added-option-to-disable-pathfinding-updates-on-block.patch => 0583-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0585-Inline-shift-direction-fields.patch => 0584-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0586-Allow-adding-items-to-BlockDropItemEvent.patch => 0585-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0588-living-entity-allow-attribute-registration.patch => 0587-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0589-fix-dead-slime-setSize-invincibility.patch => 0588-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0590-Merchant-getRecipes-should-return-an-immutable-list.patch => 0589-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0591-Add-support-for-hex-color-codes-in-console.patch => 0590-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0592-Expose-Tracked-Players.patch => 0591-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0593-Remove-streams-from-SensorNearest.patch => 0592-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0594-Throw-proper-exception-on-empty-JsonList-file.patch => 0593-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0595-Improve-ServerGUI.patch => 0594-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0597-fix-converting-txt-to-json-file.patch => 0596-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0598-Add-worldborder-events.patch => 0597-Add-worldborder-events.patch} (100%)
 rename patches/server/{0599-added-PlayerNameEntityEvent.patch => 0598-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0600-Prevent-grindstones-from-overstacking-items.patch => 0599-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0601-Add-recipe-to-cook-events.patch => 0600-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0602-Add-Block-isValidTool.patch => 0601-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0603-Allow-using-signs-inside-spawn-protection.patch => 0602-Allow-using-signs-inside-spawn-protection.patch} (94%)
 rename patches/server/{0604-Expand-world-key-API.patch => 0603-Expand-world-key-API.patch} (95%)
 rename patches/server/{0605-Add-fast-alternative-constructor-for-Rotations.patch => 0604-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0606-Item-Rarity-API.patch => 0605-Item-Rarity-API.patch} (96%)
 rename patches/server/{0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0608-copy-TESign-isEditable-from-snapshots.patch => 0607-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0609-Drop-carried-item-when-player-has-disconnected.patch => 0608-Drop-carried-item-when-player-has-disconnected.patch} (92%)
 rename patches/server/{0610-forced-whitelist-use-configurable-kick-message.patch => 0609-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (91%)
 rename patches/server/{0612-Entity-load-save-limit-per-chunk.patch => 0611-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0613-Expose-protocol-version.patch => 0612-Expose-protocol-version.patch} (91%)
 rename patches/server/{0614-Enhance-console-tab-completions-for-brigadier-comman.patch => 0613-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0616-Add-bypass-host-check.patch => 0615-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0617-Set-area-affect-cloud-rotation.patch => 0616-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0618-add-isDeeplySleeping-to-HumanEntity.patch => 0617-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0619-add-consumeFuel-to-FurnaceBurnEvent.patch => 0618-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0620-add-get-set-drop-chance-to-EntityEquipment.patch => 0619-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0621-fix-PigZombieAngerEvent-cancellation.patch => 0620-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0622-Fix-checkReach-check-for-Shulker-boxes.patch => 0621-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0623-fix-PlayerItemHeldEvent-firing-twice.patch => 0622-fix-PlayerItemHeldEvent-firing-twice.patch} (93%)
 rename patches/server/{0624-Added-PlayerDeepSleepEvent.patch => 0623-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0625-More-World-API.patch => 0624-More-World-API.patch} (100%)
 rename patches/server/{0626-Added-PlayerBedFailEnterEvent.patch => 0625-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0627-Implement-methods-to-convert-between-Component-and-B.patch => 0626-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (95%)
 rename patches/server/{0629-Introduce-beacon-activation-deactivation-events.patch => 0628-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0630-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0629-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0631-Add-Channel-initialization-listeners.patch => 0630-Add-Channel-initialization-listeners.patch} (98%)
 rename patches/server/{0632-Send-empty-commands-if-tab-completion-is-disabled.patch => 0631-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0633-Add-more-WanderingTrader-API.patch => 0632-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0634-Add-EntityBlockStorage-clearEntities.patch => 0633-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (90%)
 rename patches/server/{0637-Inventory-close.patch => 0636-Inventory-close.patch} (100%)
 rename patches/server/{0638-call-PortalCreateEvent-players-and-end-platform.patch => 0637-call-PortalCreateEvent-players-and-end-platform.patch} (94%)
 rename patches/server/{0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0640-Fix-CraftPotionBrewer-cache.patch => 0639-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0641-Add-basic-Datapack-API.patch => 0640-Add-basic-Datapack-API.patch} (98%)
 rename patches/server/{0642-Add-environment-variable-to-disable-server-gui.patch => 0641-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0643-additions-to-PlayerGameModeChangeEvent.patch => 0642-additions-to-PlayerGameModeChangeEvent.patch} (98%)
 rename patches/server/{0644-ItemStack-repair-check-API.patch => 0643-ItemStack-repair-check-API.patch} (97%)
 rename patches/server/{0645-More-Enchantment-API.patch => 0644-More-Enchantment-API.patch} (100%)
 rename patches/server/{0646-Move-range-check-for-block-placing-up.patch => 0645-Move-range-check-for-block-placing-up.patch} (92%)
 rename patches/server/{0647-Fix-and-optimise-world-force-upgrading.patch => 0646-Fix-and-optimise-world-force-upgrading.patch} (99%)
 rename patches/server/{0648-Add-Mob-lookAt-API.patch => 0647-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0649-Add-Unix-domain-socket-support.patch => 0648-Add-Unix-domain-socket-support.patch} (98%)
 rename patches/server/{0650-Add-EntityInsideBlockEvent.patch => 0649-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0651-Attributes-API-for-item-defaults.patch => 0650-Attributes-API-for-item-defaults.patch} (94%)
 rename patches/server/{0652-Add-cause-to-Weather-ThunderChangeEvents.patch => 0651-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0653-More-Lidded-Block-API.patch => 0652-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0654-Limit-item-frame-cursors-on-maps.patch => 0653-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0655-Add-PlayerKickEvent-causes.patch => 0654-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0656-Add-PufferFishStateChangeEvent.patch => 0655-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0659-Add-option-to-fix-items-merging-through-walls.patch => 0658-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0660-Add-BellRevealRaiderEvent.patch => 0659-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0661-Fix-invulnerable-end-crystals.patch => 0660-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0662-Add-ElderGuardianAppearanceEvent.patch => 0661-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0663-Fix-dangerous-end-portal-logic.patch => 0662-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0665-Make-item-validations-configurable.patch => 0664-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0666-Line-Of-Sight-Changes.patch => 0665-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0667-add-per-world-spawn-limits.patch => 0666-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0668-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0667-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0669-Add-more-LimitedRegion-API.patch => 0668-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0670-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0669-Fix-PlayerDropItemEvent-using-wrong-item.patch} (94%)
 rename patches/server/{0671-Missing-Entity-Behavior-API.patch => 0670-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (92%)
 rename patches/server/{0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0674-Use-getChunkIfLoadedImmediately-in-places.patch => 0673-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0675-Fix-commands-from-signs-not-firing-command-events.patch => 0674-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0676-Adds-PlayerArmSwingEvent.patch => 0675-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0677-Fixes-kick-event-leave-message-not-being-sent.patch => 0676-Fixes-kick-event-leave-message-not-being-sent.patch} (95%)
 rename patches/server/{0678-Add-config-for-mobs-immune-to-default-effects.patch => 0677-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0679-Fix-incorrect-message-for-outdated-client.patch => 0678-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0680-Don-t-apply-cramming-damage-to-players.patch => 0679-Don-t-apply-cramming-damage-to-players.patch} (93%)
 rename patches/server/{0681-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0680-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0682-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0681-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0683-Stinger-API.patch => 0682-Stinger-API.patch} (100%)
 rename patches/server/{0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0685-Add-System.out-err-catcher.patch => 0684-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0686-Fix-test-not-bootstrapping.patch => 0685-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0688-Improve-boat-collision-performance.patch => 0687-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0689-Prevent-AFK-kick-while-watching-end-credits.patch => 0688-Prevent-AFK-kick-while-watching-end-credits.patch} (93%)
 rename patches/server/{0690-Allow-skipping-writing-of-comments-to-server.propert.patch => 0689-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0691-Add-PlayerSetSpawnEvent.patch => 0690-Add-PlayerSetSpawnEvent.patch} (97%)
 rename patches/server/{0692-Make-hoppers-respect-inventory-max-stack-size.patch => 0691-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0693-Optimize-entity-tracker-passenger-checks.patch => 0692-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0694-Config-option-for-Piglins-guarding-chests.patch => 0693-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0695-Added-EntityDamageItemEvent.patch => 0694-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0696-Optimize-indirect-passenger-iteration.patch => 0695-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0697-Fix-block-drops-position-losing-precision-millions-o.patch => 0696-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0698-Configurable-item-frame-map-cursor-update-interval.patch => 0697-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0699-Make-EntityUnleashEvent-cancellable.patch => 0698-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0700-Clear-bucket-NBT-after-dispense.patch => 0699-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0701-Change-EnderEye-target-without-changing-other-things.patch => 0700-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0702-Add-BlockBreakBlockEvent.patch => 0701-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0704-More-CommandBlock-API.patch => 0703-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0705-Add-missing-team-sidebar-display-slots.patch => 0704-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0706-Add-back-EntityPortalExitEvent.patch => 0705-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0707-Add-methods-to-find-targets-for-lightning-strikes.patch => 0706-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0708-Get-entity-default-attributes.patch => 0707-Get-entity-default-attributes.patch} (98%)
 rename patches/server/{0709-Left-handed-API.patch => 0708-Left-handed-API.patch} (100%)
 rename patches/server/{0710-Add-advancement-display-API.patch => 0709-Add-advancement-display-API.patch} (100%)
 rename patches/server/{0711-Add-ItemFactory-getMonsterEgg-API.patch => 0710-Add-ItemFactory-getMonsterEgg-API.patch} (100%)
 rename patches/server/{0712-Add-critical-damage-API.patch => 0711-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0713-Fix-issues-with-mob-conversion.patch => 0712-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0714-Add-isCollidable-methods-to-various-places.patch => 0713-Add-isCollidable-methods-to-various-places.patch} (96%)
 rename patches/server/{0715-Goat-ram-API.patch => 0714-Goat-ram-API.patch} (100%)
 rename patches/server/{0716-Add-API-for-resetting-a-single-score.patch => 0715-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0717-Add-Raw-Byte-Entity-Serialization.patch => 0716-Add-Raw-Byte-Entity-Serialization.patch} (97%)
 rename patches/server/{0718-Vanilla-command-permission-fixes.patch => 0717-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0719-Make-CallbackExecutor-strict-again.patch => 0718-Make-CallbackExecutor-strict-again.patch} (100%)
 rename patches/server/{0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch => 0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch} (100%)
 rename patches/server/{0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0722-Correctly-handle-recursion-for-chunkholder-updates.patch => 0721-Correctly-handle-recursion-for-chunkholder-updates.patch} (100%)
 rename patches/server/{0723-Fix-GameProfileCache-concurrency.patch => 0722-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch => 0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch} (100%)
 rename patches/server/{0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch => 0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch} (100%)
 rename patches/server/{0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch => 0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch} (100%)
 rename patches/server/{0727-Log-when-the-async-catcher-is-tripped.patch => 0726-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0728-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0727-Add-paper-mobcaps-and-paper-playermobcaps.patch} (99%)
 rename patches/server/{0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch => 0728-Prevent-unload-calls-removing-tickets-for-sync-loads.patch} (100%)
 rename patches/server/{0730-Sanitize-ResourceLocation-error-logging.patch => 0729-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0731-Allow-controlled-flushing-for-network-manager.patch => 0730-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0732-Optimise-general-POI-access.patch => 0731-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0733-Add-more-async-catchers.patch => 0732-Add-more-async-catchers.patch} (100%)
 rename patches/server/{0734-Rewrite-entity-bounding-box-lookup-calls.patch => 0733-Rewrite-entity-bounding-box-lookup-calls.patch} (100%)
 rename patches/server/{0735-Optimise-chunk-tick-iteration.patch => 0734-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0736-Execute-chunk-tasks-mid-tick.patch => 0735-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0737-Do-not-copy-visible-chunks.patch => 0736-Do-not-copy-visible-chunks.patch} (100%)
 rename patches/server/{0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0739-Custom-table-implementation-for-blockstate-state-loo.patch => 0738-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0740-Detail-more-information-in-watchdog-dumps.patch => 0739-Detail-more-information-in-watchdog-dumps.patch} (99%)
 rename patches/server/{0741-Manually-inline-methods-in-BlockPosition.patch => 0740-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0742-Distance-manager-tick-timings.patch => 0741-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0743-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0742-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0745-Add-packet-limiter-config.patch => 0744-Add-packet-limiter-config.patch} (98%)
 rename patches/server/{0746-Use-correct-LevelStem-registry-when-loading-default-.patch => 0745-Use-correct-LevelStem-registry-when-loading-default-.patch} (96%)
 rename patches/server/{0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0748-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0747-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0749-Don-t-lookup-fluid-state-when-raytracing.patch => 0748-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0750-Time-scoreboard-search.patch => 0749-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0751-Send-full-pos-packets-for-hard-colliding-entities.patch => 0750-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0752-Do-not-run-raytrace-logic-for-AIR.patch => 0751-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0753-Oprimise-map-impl-for-tracked-players.patch => 0752-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0754-Optimise-BlockSoil-nearby-water-lookup.patch => 0753-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch => 0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch} (100%)
 rename patches/server/{0756-Optimise-random-block-ticking.patch => 0755-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0757-Optimise-non-flush-packet-sending.patch => 0756-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0758-Optimise-nearby-player-lookups.patch => 0757-Optimise-nearby-player-lookups.patch} (100%)
 rename patches/server/{0759-Optimise-WorldServer-notify.patch => 0758-Optimise-WorldServer-notify.patch} (100%)
 rename patches/server/{0760-Remove-streams-for-villager-AI.patch => 0759-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0761-Rewrite-dataconverter-system.patch => 0760-Rewrite-dataconverter-system.patch} (100%)
 rename patches/server/{0762-Use-Velocity-compression-and-cipher-natives.patch => 0761-Use-Velocity-compression-and-cipher-natives.patch} (99%)
 rename patches/server/{0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch => 0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch} (100%)
 rename patches/server/{0765-Async-catch-modifications-to-critical-entity-state.patch => 0764-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0766-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0765-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0768-Check-requirement-before-suggesting-root-nodes.patch => 0767-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (92%)
 rename patches/server/{0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0771-Ensure-valid-vehicle-status.patch => 0770-Ensure-valid-vehicle-status.patch} (90%)
 rename patches/server/{0772-Prevent-softlocked-end-exit-portal-generation.patch => 0771-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0774-Don-t-log-debug-logging-being-disabled.patch => 0773-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0775-fix-various-menus-with-empty-level-accesses.patch => 0774-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch => 0775-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch} (100%)
 rename patches/server/{0777-Preserve-overstacked-loot.patch => 0776-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0778-Update-head-rotation-in-missing-places.patch => 0777-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0779-prevent-unintended-light-block-manipulation.patch => 0778-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0780-Fix-CraftCriteria-defaults-map.patch => 0779-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0781-Fix-upstreams-block-state-factories.patch => 0780-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0782-Add-config-option-for-logging-player-ip-addresses.patch => 0781-Add-config-option-for-logging-player-ip-addresses.patch} (97%)
 rename patches/server/{0783-Configurable-feature-seeds.patch => 0782-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0785-Add-root-admin-user-detection.patch => 0784-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0786-Always-allow-item-changing-in-Fireball.patch => 0785-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0787-don-t-attempt-to-teleport-dead-entities.patch => 0786-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0788-Prevent-excessive-velocity-through-repeated-crits.patch => 0787-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0789-Remove-client-side-code-using-deprecated-for-removal.patch => 0788-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0790-Rewrite-the-light-engine.patch => 0789-Rewrite-the-light-engine.patch} (100%)
 rename patches/server/{0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0792-Fix-removing-recipes-from-RecipeIterator.patch => 0791-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0793-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0792-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0794-Hide-unnecessary-itemmeta-from-clients.patch => 0793-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch => 0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch} (100%)
 rename patches/server/{0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0797-Add-PlayerItemFrameChangeEvent.patch => 0796-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0798-Add-player-health-update-API.patch => 0797-Add-player-health-update-API.patch} (95%)
 rename patches/server/{0799-Optimize-HashMapPalette.patch => 0798-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0800-Allow-delegation-to-vanilla-chunk-gen.patch => 0799-Allow-delegation-to-vanilla-chunk-gen.patch} (98%)
 rename patches/server/{0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0802-Optimise-collision-checking-in-player-move-packet-ha.patch => 0801-Optimise-collision-checking-in-player-move-packet-ha.patch} (99%)
 rename patches/server/{0803-Actually-unload-POI-data.patch => 0802-Actually-unload-POI-data.patch} (100%)
 rename patches/server/{0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0805-Update-Log4j.patch => 0804-Update-Log4j.patch} (100%)
 rename patches/server/{0806-Add-more-Campfire-API.patch => 0805-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0808-Fix-tripwire-state-inconsistency.patch => 0807-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0809-Fix-fluid-logging-on-Block-breakNaturally.patch => 0808-Fix-fluid-logging-on-Block-breakNaturally.patch} (100%)
 rename patches/server/{0810-Forward-CraftEntity-in-teleport-command.patch => 0809-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0811-Improve-scoreboard-entries.patch => 0810-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0812-Entity-powdered-snow-API.patch => 0811-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0813-Add-API-for-item-entity-health.patch => 0812-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0814-Fix-entity-type-tags-suggestions-in-selectors.patch => 0813-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0815-Configurable-max-block-light-for-monster-spawning.patch => 0814-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0817-Load-effect-amplifiers-greater-than-127-correctly.patch => 0816-Load-effect-amplifiers-greater-than-127-correctly.patch} (91%)
 rename patches/server/{0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0819-Fix-bees-aging-inside-hives.patch => 0818-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0820-Bucketable-API.patch => 0819-Bucketable-API.patch} (100%)
 rename patches/server/{0821-Check-player-world-in-endPortalSoundRadius.patch => 0820-Check-player-world-in-endPortalSoundRadius.patch} (100%)
 rename patches/server/{0822-Validate-usernames.patch => 0821-Validate-usernames.patch} (92%)
 rename patches/server/{0823-Fix-saving-configs-with-more-long-comments.patch => 0822-Fix-saving-configs-with-more-long-comments.patch} (100%)
 rename patches/server/{0824-Make-water-animal-spawn-height-configurable.patch => 0823-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (97%)
 rename patches/server/{0826-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0825-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0827-Add-new-overload-to-PersistentDataContainer-has.patch => 0826-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0828-Multiple-Entries-with-Scoreboards.patch => 0827-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0829-Reset-placed-block-on-exception.patch => 0828-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0830-Add-configurable-height-for-slime-spawn.patch => 0829-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (89%)
 rename patches/server/{0832-Fix-xp-reward-for-baby-zombies.patch => 0831-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0833-Kick-on-main-for-illegal-chat.patch => 0832-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0834-Multi-Block-Change-API-Implementation.patch => 0833-Multi-Block-Change-API-Implementation.patch} (97%)
 rename patches/server/{0835-Fix-NotePlayEvent.patch => 0834-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0836-Freeze-Tick-Lock-API.patch => 0835-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0837-Dolphin-API.patch => 0836-Dolphin-API.patch} (100%)
 rename patches/server/{0838-More-PotionEffectType-API.patch => 0837-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0840-API-for-creating-command-sender-which-forwards-feedb.patch => 0839-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0841-Add-config-for-stronghold-seed.patch => 0840-Add-config-for-stronghold-seed.patch} (100%)
 rename patches/server/{0842-Implement-regenerateChunk.patch => 0841-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0843-Fix-cancelled-powdered-snow-bucket-placement.patch => 0842-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (91%)
 rename patches/server/{0845-Add-GameEvent-tags.patch => 0844-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0847-Replace-ticket-level-propagator.patch => 0846-Replace-ticket-level-propagator.patch} (100%)
 rename patches/server/{0848-Furnace-RecipesUsed-API.patch => 0847-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0849-Configurable-sculk-sensor-listener-range.patch => 0848-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0850-Add-missing-block-data-mins-and-maxes.patch => 0849-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (96%)
 rename patches/server/{0852-Put-world-into-worldlist-before-initing-the-world.patch => 0851-Put-world-into-worldlist-before-initing-the-world.patch} (91%)
 rename patches/server/{0853-Fix-Entity-Position-Desync.patch => 0852-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0854-Custom-Potion-Mixes.patch => 0853-Custom-Potion-Mixes.patch} (99%)
 rename patches/server/{0855-Replace-player-chunk-loader-system.patch => 0854-Replace-player-chunk-loader-system.patch} (99%)
 rename patches/server/{0856-Fix-Fluid-tags-isTagged-method.patch => 0855-Fix-Fluid-tags-isTagged-method.patch} (94%)
 rename patches/server/{0857-Force-close-world-loading-screen.patch => 0856-Force-close-world-loading-screen.patch} (95%)
 rename patches/server/{0858-Fix-falling-block-spawn-methods.patch => 0857-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0859-Expose-furnace-minecart-push-values.patch => 0858-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0860-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0861-Fix-save-problems-on-shutdown.patch => 0860-Fix-save-problems-on-shutdown.patch} (100%)
 rename patches/server/{0862-More-Projectile-API.patch => 0861-More-Projectile-API.patch} (100%)
 rename patches/server/{0863-Fix-swamp-hut-cat-generation-deadlock.patch => 0862-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0864-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0863-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0865-Implement-getComputedBiome-API.patch => 0864-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0866-Make-some-itemstacks-nonnull.patch => 0865-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0867-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0866-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%)
 rename patches/server/{0868-Implement-enchantWithLevels-API.patch => 0867-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0869-Fix-saving-in-unloadWorld.patch => 0868-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0870-Buffer-OOB-setBlock-calls.patch => 0869-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0871-Add-TameableDeathMessageEvent.patch => 0870-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0872-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch => 0871-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch} (100%)
 rename patches/server/{0873-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0872-fix-player-loottables-running-when-mob-loot-gamerule.patch} (92%)
 rename patches/server/{0874-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0873-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0875-Guard-against-invalid-entity-positions.patch => 0874-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0876-cache-resource-keys.patch => 0875-cache-resource-keys.patch} (100%)
 rename patches/server/{0877-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0876-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0878-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0877-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0879-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0878-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0880-Prevent-tile-entity-copies-loading-chunks.patch => 0879-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0881-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0880-Use-username-instead-of-display-name-in-PlayerList-g.patch} (92%)
 rename patches/server/{0882-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0881-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0883-Pass-ServerLevel-for-gamerule-callbacks.patch => 0882-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0884-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0883-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0885-WorldCreator-keepSpawnLoaded.patch => 0884-WorldCreator-keepSpawnLoaded.patch} (90%)
 rename patches/server/{0886-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0885-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0887-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0886-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0888-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0887-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0889-Fire-CauldronLevelChange-on-initial-fill.patch => 0888-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0890-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0889-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0891-Add-PlayerStopUsingItemEvent.patch => 0890-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0892-FallingBlock-auto-expire-setting.patch => 0891-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0893-Don-t-tick-markers.patch => 0892-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0894-Do-not-accept-invalid-client-settings.patch => 0893-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0895-Add-support-for-Proxy-Protocol.patch => 0894-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0896-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0895-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0896-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0898-Sanitize-Sent-BlockEntity-NBT.patch => 0897-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0899-Prevent-entity-loading-causing-async-lookups.patch => 0898-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0900-Disable-component-selector-resolving-in-books-by-def.patch => 0899-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0901-Throw-exception-on-world-create-while-being-ticked.patch => 0900-Throw-exception-on-world-create-while-being-ticked.patch} (97%)
 rename patches/server/{0902-Add-Alternate-Current-redstone-implementation.patch => 0901-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0903-Dont-resent-entity-on-art-update.patch => 0902-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0904-Add-missing-spawn-eggs.patch => 0903-Add-missing-spawn-eggs.patch} (100%)
 rename patches/server/{0905-Add-WardenAngerChangeEvent.patch => 0904-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0906-Add-option-for-strict-advancement-dimension-checks.patch => 0905-Add-option-for-strict-advancement-dimension-checks.patch} (94%)
 rename patches/server/{0907-Add-missing-important-BlockStateListPopulator-method.patch => 0906-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0908-Nameable-Banner-API.patch => 0907-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0909-Don-t-broadcast-messages-to-command-blocks.patch => 0908-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0910-Prevent-empty-items-from-being-added-to-world.patch => 0909-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0911-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0910-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0912-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0911-Don-t-print-component-in-resource-pack-rejection-mes.patch} (94%)
 rename patches/server/{0913-Add-Player-getFishHook.patch => 0912-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0914-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0913-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0915-Add-various-missing-EntityDropItemEvent-calls.patch => 0914-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0916-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0915-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0917-Fix-Bee-flower-NPE.patch => 0916-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0918-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0917-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0919-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch => 0918-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch} (100%)
 rename patches/server/{0920-More-Teleport-API.patch => 0919-More-Teleport-API.patch} (98%)
 rename patches/server/{0921-Add-EntityPortalReadyEvent.patch => 0920-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0922-Don-t-use-level-random-in-entity-constructors.patch => 0921-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0923-Send-block-entities-after-destroy-prediction.patch => 0922-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0924-Warn-on-plugins-accessing-faraway-chunks.patch => 0923-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0925-Custom-Chat-Completion-Suggestions-API.patch => 0924-Custom-Chat-Completion-Suggestions-API.patch} (94%)
 rename patches/server/{0926-Add-missing-BlockFadeEvents.patch => 0925-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0927-Collision-API.patch => 0926-Collision-API.patch} (100%)
 rename patches/server/{0928-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0927-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0929-Fix-command-preprocess-cancelling-and-command-changi.patch => 0928-Fix-command-preprocess-cancelling-and-command-changi.patch} (95%)
 rename patches/server/{0930-Remove-invalid-signature-login-stacktrace.patch => 0929-Remove-invalid-signature-login-stacktrace.patch} (89%)
 rename patches/server/{0931-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (91%)
 rename patches/server/{0932-Block-Ticking-API.patch => 0931-Block-Ticking-API.patch} (100%)
 rename patches/server/{0273-Add-Velocity-IP-Forwarding-Support.patch => 0932-Add-Velocity-IP-Forwarding-Support.patch} (86%)

diff --git a/patches/server/0274-Add-more-Witch-API.patch b/patches/server/0273-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0274-Add-more-Witch-API.patch
rename to patches/server/0273-Add-more-Witch-API.patch
diff --git a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
index eb880c818..aa21a434f 100644
--- a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ec50cc71758d0178dfb9a9b70e8fc9050d530f3..d3addc9dbef86ab75707c647b2fce8edbf8b9fba 100644
+index 64d80c0329fd9fc8fa2411805adc9d90626bdc4f..475b2165ae56b76a02b80c95b68fdbc03199d5e6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -568,9 +568,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0277-Reset-players-airTicks-on-respawn.patch b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from patches/server/0277-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0276-Reset-players-airTicks-on-respawn.patch
index 604f55e56..ca5fce40d 100644
--- a/patches/server/0277-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e4f991578d4ee581e65f2edb7d32640ff36a01bd..c5120e5e7414a6b870eab877605e9bb52db3e8cb 100644
+index be79f80270a7400451dcaac55fba8d3ab7bdda52..5f10a2d21553a8dc8c03ea5951190860ee5a4615 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2288,6 +2288,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 98%
rename from patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 3bd7cbcf8..02b480cd0 100644
--- a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -58,7 +58,7 @@ index 336a26733b5bf73455f8ec10347c1e08b8e866f7..4fce18c52c8144460ebf0c1e336dce71
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 95f0525bd4ad62853559cc60d5d2b707cffcb727..202802af054b32beb0dc0d5a7f1dbde8748036c1 100644
+index 560e213f39d82613bd1bfcfb4eb3bd7aeed1c0c6..3d1c7bfeafbad2c5b7275f75d263a3817bd3a8aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0280-Optimize-World-Time-Updates.patch b/patches/server/0279-Optimize-World-Time-Updates.patch
similarity index 96%
rename from patches/server/0280-Optimize-World-Time-Updates.patch
rename to patches/server/0279-Optimize-World-Time-Updates.patch
index 28e966a2f..9b24f9447 100644
--- a/patches/server/0280-Optimize-World-Time-Updates.patch
+++ b/patches/server/0279-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 202802af054b32beb0dc0d5a7f1dbde8748036c1..1a76a4239213c7b8dc40e656164427c1c4f7c2cf 100644
+index 3d1c7bfeafbad2c5b7275f75d263a3817bd3a8aa..89c0c0d0d3458f38a1a0b91617b84f439af667c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1378,12 +1378,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0281-Restore-custom-InventoryHolder-support.patch b/patches/server/0280-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0281-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0280-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 98%
rename from patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
index 8b275ebe6..e624d669a 100644
--- a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 53717a4a2bfd841346c00b5f854899e23661122c..3fadf6b46cc722ad81cf810c0761cf71
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d3addc9dbef86ab75707c647b2fce8edbf8b9fba..ed64fc9f6401fcd57478fa92d7f03e9b931d2dcb 100644
+index 475b2165ae56b76a02b80c95b68fdbc03199d5e6..ef180347fc39b2b6b8665284d967103c26aaddbd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1672,6 +1672,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0285-Make-the-default-permission-message-configurable.patch b/patches/server/0284-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from patches/server/0285-Make-the-default-permission-message-configurable.patch
rename to patches/server/0284-Make-the-default-permission-message-configurable.patch
index 0b9434505..e589453e5 100644
--- a/patches/server/0285-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0284-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index b3a58bf4b654e336826dc04da9e2f80ff8b9a9a7..cd4936ef114b504df8649fba8f1823d9
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59ce840dadcecf9c6aed77747a06519eca5fea90..6031bc3ada3fd7f2389f00b6d9e37db13e242282 100644
+index 21f0e1a23d6e9c6c76abfa9af555642fadeba69c..12d789b0abef2dc0e0965579830ad6d341717ba4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2615,6 +2615,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
index 9676e8716..49ba10fe1 100644
--- a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 30073d1e0c61ad94119fc0859a17b011087b6fcc..83c5264e4af146d3712cee4550d84c824a3a96d6 100644
+index 2643c3d99c11bc6783386502c7e21293b6dfa345..07fd527dd5b72ecc66311c1b81e578158e12a35c 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -126,6 +126,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0288-force-entity-dismount-during-teleportation.patch b/patches/server/0287-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from patches/server/0288-force-entity-dismount-during-teleportation.patch
rename to patches/server/0287-force-entity-dismount-during-teleportation.patch
index ac2768d3f..cdbeee7cd 100644
--- a/patches/server/0288-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0287-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ca3206ad7c6e4acf31eda406c439fc7c70e47c01..f95e8e53fc0438858921446f44279f747414b12f 100644
+index 5f10a2d21553a8dc8c03ea5951190860ee5a4615..b81314654d562036680666bd95be4ec21d9b66e1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1335,11 +1335,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0289-Add-more-Zombie-API.patch b/patches/server/0288-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0289-Add-more-Zombie-API.patch
rename to patches/server/0288-Add-more-Zombie-API.patch
diff --git a/patches/server/0290-Book-Size-Limits.patch b/patches/server/0289-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0290-Book-Size-Limits.patch
rename to patches/server/0289-Book-Size-Limits.patch
index 3883f3971..5beb93a92 100644
--- a/patches/server/0290-Book-Size-Limits.patch
+++ b/patches/server/0289-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ed64fc9f6401fcd57478fa92d7f03e9b931d2dcb..88f58eeaf2566bdee2f6e44ddc1187f762345347 100644
+index ef180347fc39b2b6b8665284d967103c26aaddbd..19924f3d45af6c4006bd2d921cbeab67a4846059 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1121,6 +1121,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from patches/server/0291-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0290-Add-PlayerConnectionCloseEvent.patch
index 2f64296ef..d9509c863 100644
--- a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 83c5264e4af146d3712cee4550d84c824a3a96d6..f6162d65d341ef3df1a9b3f45d7d0c25d52f35cf 100644
+index 07fd527dd5b72ecc66311c1b81e578158e12a35c..527acbc15f3fe30541eef555480e158ab83a6130 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -439,6 +439,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 95%
rename from patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index d10570798..98ca430f2 100644
--- a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f95e8e53fc0438858921446f44279f747414b12f..eaf95c84896f71f36e250b3a07bb504230e4d85d 100644
+index b81314654d562036680666bd95be4ec21d9b66e1..3f9b13048eff59094a229d1a41d219bbd7f3eb01 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -230,6 +230,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index f95e8e53fc0438858921446f44279f747414b12f..eaf95c84896f71f36e250b3a07bb5042
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 734a7b101e5ac9ac4ceb0ba3cb74b94bf2c18683..f6f086d1e5f08e5beae142685cfb682b8e5683f1 100644
+index f8ad63b05ece77cf973ef41ef40111780f0d2d04..bb0c40246f70deecf10b9540d6cba7f65cc91372 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -178,6 +178,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..d7823d7dc88cfba6f6ac9dae220e03de
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index df164a6fe8d53d34db93f4f1f2af6a9c1c98a7e8..500c1a317f58c1b24ae1b7cbcd101f1d327e3ae8 100644
+index 0fcde65af63c4fcfbbef5875bec759b209cfd5f1..1a7f5978ad9ab1ee15f2e40e8109cf6dad5f890c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -168,6 +168,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 839d91d66..303280c1e 100644
--- a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eaf95c84896f71f36e250b3a07bb504230e4d85d..dff1961404ccbc767624e32a1c5158cbbe63d9f7 100644
+index 3f9b13048eff59094a229d1a41d219bbd7f3eb01..3d85bf30b146401bfdbc4056cdbf03f263b4e9a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1577,6 +1577,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 94%
rename from patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
index ddcc815d8..d734c87a1 100644
--- a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 500c1a317f58c1b24ae1b7cbcd101f1d327e3ae8..f201e1b7f4487ce79e296b74e71ed959568fd0ad 100644
+index 1a7f5978ad9ab1ee15f2e40e8109cf6dad5f890c..8a349c179e9abcda140546c56ea884422b409b5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2557,6 +2557,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0296-BlockDestroyEvent.patch b/patches/server/0295-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0296-BlockDestroyEvent.patch
rename to patches/server/0295-BlockDestroyEvent.patch
diff --git a/patches/server/0297-Async-command-map-building.patch b/patches/server/0296-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0297-Async-command-map-building.patch
rename to patches/server/0296-Async-command-map-building.patch
diff --git a/patches/server/0298-Implement-Brigadier-Mojang-API.patch b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0298-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0297-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0300-Limit-Client-Sign-length-more.patch b/patches/server/0299-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0300-Limit-Client-Sign-length-more.patch
rename to patches/server/0299-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 530d74227..5f8a94bdb 100644
--- a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f6f086d1e5f08e5beae142685cfb682b8e5683f1..cf344d87a31d03d87be1df38b772b5301f53e7e7 100644
+index bb0c40246f70deecf10b9540d6cba7f65cc91372..d20954b8d8683d6380ce9f4d87bd2e3a78f7488d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1128,6 +1128,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0306-Entity-getEntitySpawnReason.patch b/patches/server/0305-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0306-Entity-getEntitySpawnReason.patch
rename to patches/server/0305-Entity-getEntitySpawnReason.patch
index 7fcb95db6..a02bd4287 100644
--- a/patches/server/0306-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0305-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index 293657617c32acfe70b0ab98939135e5ac6dae28..6ba45e1322b0d04433b2aac23413a9cd
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf344d87a31d03d87be1df38b772b5301f53e7e7..9ef845190b47263da8e89c4269d613f6cbf74535 100644
+index d20954b8d8683d6380ce9f4d87bd2e3a78f7488d..7205f17da0383b22b6267843c92b31d8c0556caa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -347,7 +347,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0308-Fire-event-on-GS4-query.patch b/patches/server/0307-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0308-Fire-event-on-GS4-query.patch
rename to patches/server/0307-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch b/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0309-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0308-Implement-PlayerPostRespawnEvent.patch
index 515beb067..d5672fc9c 100644
--- a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9ef845190b47263da8e89c4269d613f6cbf74535..8c7286176b96bcd6640a78255e0effc22ce06457 100644
+index 7205f17da0383b22b6267843c92b31d8c0556caa..ee4d2f625629cf74f923592f11ecdb312de0c3ff 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -727,9 +727,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0311-Server-Tick-Events.patch b/patches/server/0310-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0311-Server-Tick-Events.patch
rename to patches/server/0310-Server-Tick-Events.patch
diff --git a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
index 0405c3cfb..a059c795c 100644
--- a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dff1961404ccbc767624e32a1c5158cbbe63d9f7..78603883ca3246fa411b37fb84497dbb08d9adf0 100644
+index 3d85bf30b146401bfdbc4056cdbf03f263b4e9a9..02e81ba08b84f845b57a5148825ceb63313213a6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -775,6 +775,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0314-Add-Heightmap-API.patch b/patches/server/0313-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0314-Add-Heightmap-API.patch
rename to patches/server/0313-Add-Heightmap-API.patch
diff --git a/patches/server/0315-Mob-Spawner-API-Enhancements.patch b/patches/server/0314-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0315-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0314-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
index 629d06681..f9bea9a27 100644
--- a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e2bcaa862c6d69e0989587deb42f2e9adcb971df..18395a47a9d44784359b07e8478229fa202bea9a 100644
+index 90af6b5e7f6188eec4a4e311a0d273857d3d1c5c..db079ad6516eba21915713be4d99f9566da47945 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -516,7 +516,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 95%
rename from patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index ff85eca61..a3e7314fb 100644
--- a/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -29,7 +29,7 @@ index 8c48544daae0f18a39511df12f7066fc0e383d2c..49fe89baab93ae99a990684d78c5c05a
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6031bc3ada3fd7f2389f00b6d9e37db13e242282..eeff73b8b0a8b866ddb139ce6da074bd67463eb4 100644
+index 12d789b0abef2dc0e0965579830ad6d341717ba4..45c88bfdbc004ff59faae25eacdd72e611034c30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2073,7 +2073,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0319-Implement-CraftBlockSoundGroup.patch b/patches/server/0318-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0319-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0318-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 71b6a51be..0bf11f494 100644
--- a/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4a1a3fd8a6f5b9008cfdad6cb1b20393f8a20530..c774a2e9b55ccb124e923102496af322a9fc1962 100644
+index 49fe89baab93ae99a990684d78c5c05a223282c1..5cab48d7db58446310226acfae0dc3fcc1dba920 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -729,31 +729,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0321-ChunkMapDistance-CME.patch b/patches/server/0320-ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/0321-ChunkMapDistance-CME.patch
rename to patches/server/0320-ChunkMapDistance-CME.patch
diff --git a/patches/server/0322-Chunk-debug-command.patch b/patches/server/0321-Chunk-debug-command.patch
similarity index 100%
rename from patches/server/0322-Chunk-debug-command.patch
rename to patches/server/0321-Chunk-debug-command.patch
diff --git a/patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0324-Expose-the-internal-current-tick.patch b/patches/server/0323-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0324-Expose-the-internal-current-tick.patch
rename to patches/server/0323-Expose-the-internal-current-tick.patch
index f4ad9f6ca..42c7d0bb6 100644
--- a/patches/server/0324-Expose-the-internal-current-tick.patch
+++ b/patches/server/0323-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eeff73b8b0a8b866ddb139ce6da074bd67463eb4..97a0bb12b1158618e86bb0fbab64985faa3d1cec 100644
+index 45c88bfdbc004ff59faae25eacdd72e611034c30..6463aeed288c3bb06075107a91a70e66e1420448 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2656,5 +2656,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0325-Fix-World-isChunkGenerated-calls.patch b/patches/server/0324-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0325-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0324-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0328-Configurable-projectile-relative-velocity.patch b/patches/server/0327-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0328-Configurable-projectile-relative-velocity.patch
rename to patches/server/0327-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0329-offset-item-frame-ticking.patch b/patches/server/0328-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0329-offset-item-frame-ticking.patch
rename to patches/server/0328-offset-item-frame-ticking.patch
diff --git a/patches/server/0330-Fix-MC-158900.patch b/patches/server/0329-Fix-MC-158900.patch
similarity index 94%
rename from patches/server/0330-Fix-MC-158900.patch
rename to patches/server/0329-Fix-MC-158900.patch
index 85e032c5c..2254e977c 100644
--- a/patches/server/0330-Fix-MC-158900.patch
+++ b/patches/server/0329-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8c7286176b96bcd6640a78255e0effc22ce06457..6f14cf3546cb0db210e39a918799c3df7998eb1d 100644
+index ee4d2f625629cf74f923592f11ecdb312de0c3ff..7ca5032574ddc4fb63dbf9ef266c71042055fb2a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -611,8 +611,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0332-Dont-send-unnecessary-sign-update.patch b/patches/server/0331-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0332-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0331-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0333-Add-option-to-disable-pillager-patrols.patch b/patches/server/0332-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0333-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0332-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 1707417ae..67269474a 100644
--- a/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 43f2069542b71d158ad3ff959b224ddadc434383..20f26991faddffab45f7aadf35163101739b81cf 100644
+index 8138fbe3f991451134a179f3b0256f7d088375b8..84a1c8d7750a0a33c5f1338d0784e076ed223dac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1867,6 +1867,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0335-Flat-bedrock-generator-settings.patch b/patches/server/0334-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0335-Flat-bedrock-generator-settings.patch
rename to patches/server/0334-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0338-Duplicate-UUID-Resolve-Option.patch b/patches/server/0337-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0338-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0337-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0339-Optimize-Hoppers.patch b/patches/server/0338-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0339-Optimize-Hoppers.patch
rename to patches/server/0338-Optimize-Hoppers.patch
diff --git a/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
index e8093541d..96bde9d37 100644
--- a/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 78603883ca3246fa411b37fb84497dbb08d9adf0..628ef18b5043504f206c6b60b7805892870e5736 100644
+index 02e81ba08b84f845b57a5148825ceb63313213a6..5dea577aeb4fa627e4c207b8a84933c1f2b63516 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -895,7 +895,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0345-Fix-items-not-falling-correctly.patch b/patches/server/0344-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0345-Fix-items-not-falling-correctly.patch
rename to patches/server/0344-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0346-Lag-compensate-eating.patch b/patches/server/0345-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0346-Lag-compensate-eating.patch
rename to patches/server/0345-Lag-compensate-eating.patch
diff --git a/patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0349-Add-effect-to-block-break-naturally.patch b/patches/server/0348-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0349-Add-effect-to-block-break-naturally.patch
rename to patches/server/0348-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0350-Entity-Activation-Range-2.0.patch b/patches/server/0349-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0350-Entity-Activation-Range-2.0.patch
rename to patches/server/0349-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0351-Increase-Light-Queue-Size.patch b/patches/server/0350-Increase-Light-Queue-Size.patch
similarity index 93%
rename from patches/server/0351-Increase-Light-Queue-Size.patch
rename to patches/server/0350-Increase-Light-Queue-Size.patch
index e60d56308..554538586 100644
--- a/patches/server/0351-Increase-Light-Queue-Size.patch
+++ b/patches/server/0350-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8be6de893f1df78afc0e2c023e548a50ff7c2629..b04c5433a1e2cdfe69c5b5cbe77b867ebd55c126 100644
+index a02b674a925f2e070ed1bd203de262b513aae0a5..181e35da5919ba3b91246b427f2c5773acf1dd12 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -780,7 +780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0352-Fix-Light-Command.patch b/patches/server/0351-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0352-Fix-Light-Command.patch
rename to patches/server/0351-Fix-Light-Command.patch
diff --git a/patches/server/0353-Anti-Xray.patch b/patches/server/0352-Anti-Xray.patch
similarity index 99%
rename from patches/server/0353-Anti-Xray.patch
rename to patches/server/0352-Anti-Xray.patch
index ba104ce56..94745c8da 100644
--- a/patches/server/0353-Anti-Xray.patch
+++ b/patches/server/0352-Anti-Xray.patch
@@ -1247,7 +1247,7 @@ index ae37e97e52557b48f129cc02eeea395378a48444..785fbcf9bafcdec1c5be213de3d85126
  
      public int getSerializedSize() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 78e20871e4bd8d92c4475f797a55733c68f6aeb4..723608946947fa2792c7284fa5faa85ab9507897 100644
+index 78e20871e4bd8d92c4475f797a55733c68f6aeb4..b688d239ff11b315f60cd980d8f6780b982a865b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -29,6 +29,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
@@ -1551,7 +1551,7 @@ index cf48c93d89da53e0ec771e5c2c8582e30b35e3f5..518dfbb7dbd4221937636cf46d27109d
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 97a0bb12b1158618e86bb0fbab64985faa3d1cec..08dad640ae4315d0746587d91deb4709231c2bcc 100644
+index 6463aeed288c3bb06075107a91a70e66e1420448..36069181cde281f56ca6c6c8e4b127452a9176d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2228,7 +2228,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0354-Implement-alternative-item-despawn-rate.patch b/patches/server/0353-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0354-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0353-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0355-Tracking-Range-Improvements.patch b/patches/server/0354-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0355-Tracking-Range-Improvements.patch
rename to patches/server/0354-Tracking-Range-Improvements.patch
diff --git a/patches/server/0356-Fix-items-vanishing-through-end-portal.patch b/patches/server/0355-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0356-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0355-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0357-implement-optional-per-player-mob-spawns.patch b/patches/server/0356-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0357-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0356-implement-optional-per-player-mob-spawns.patch
index 2bc510b60..64254218d 100644
--- a/patches/server/0357-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0356-implement-optional-per-player-mob-spawns.patch
@@ -377,7 +377,7 @@ index d66ec02b09bb7ae46aae8e55f00626139f074ae3..de5b80fce9757517e51f2ef55340e884
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 628ef18b5043504f206c6b60b7805892870e5736..75bcab623004159f36a5a976c7b6f69873a108dd 100644
+index 5dea577aeb4fa627e4c207b8a84933c1f2b63516..1796e81889d62b691b7a709616ce08f155733597 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -235,6 +235,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0361-Add-debug-for-sync-chunk-loads.patch b/patches/server/0360-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0361-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0360-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0362-Remove-garbage-Java-version-check.patch b/patches/server/0361-Remove-garbage-Java-version-check.patch
similarity index 91%
rename from patches/server/0362-Remove-garbage-Java-version-check.patch
rename to patches/server/0361-Remove-garbage-Java-version-check.patch
index 454f32cf5..c878e14d1 100644
--- a/patches/server/0362-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0361-Remove-garbage-Java-version-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove garbage Java version check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index beb12dcc620d902594dbe6ba2893062fadb97dc5..9a5373304b445408244fe9850c10526d1df21855 100644
+index 2febe4c031cbd03a9d61dae64fbfa9312e5b752c..3472114c373d7b884d8ae24906e30daa039d0742 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -194,10 +194,6 @@ public class Main {
diff --git a/patches/server/0363-Add-ThrownEggHatchEvent.patch b/patches/server/0362-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0363-Add-ThrownEggHatchEvent.patch
rename to patches/server/0362-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0364-Entity-Jump-API.patch b/patches/server/0363-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0364-Entity-Jump-API.patch
rename to patches/server/0363-Entity-Jump-API.patch
diff --git a/patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0366-Make-the-GUI-graph-fancier.patch b/patches/server/0365-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0366-Make-the-GUI-graph-fancier.patch
rename to patches/server/0365-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0368-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0368-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0371-Optimise-Chunk-getFluid.patch b/patches/server/0370-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0371-Optimise-Chunk-getFluid.patch
rename to patches/server/0370-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch b/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0373-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0372-Add-tick-times-API-and-mspt-command.patch
index eb51df65e..c2a6ffe71 100644
--- a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
@@ -185,7 +185,7 @@ index 181e35da5919ba3b91246b427f2c5773acf1dd12..0612bf8ecc6e1b76d728fea852e850ab
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 08dad640ae4315d0746587d91deb4709231c2bcc..1043271c20d092e3133855335eaf75d9d533d984 100644
+index 36069181cde281f56ca6c6c8e4b127452a9176d8..aa6d408ab8898dc752f137c24e3b906611f76672 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2478,6 +2478,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0374-Expose-MinecraftServer-isRunning.patch b/patches/server/0373-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0374-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0373-Expose-MinecraftServer-isRunning.patch
index 88f87452c..a92d95867 100644
--- a/patches/server/0374-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0373-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1043271c20d092e3133855335eaf75d9d533d984..4b3a431701fa1e1e1595301291baccd5bafa52f6 100644
+index aa6d408ab8898dc752f137c24e3b906611f76672..51aaec29d2d8ed257e22c2538fd95c6e656a8eba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2671,5 +2671,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 96%
rename from patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch
index 3584d5c10..fb799bc57 100644
--- a/patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bd8f051496aae64d317ae0cff9f21662f016c62b..61668447c4314562109e31bd5ca48da181e98529 100644
+index 5893b764d3fceccef8704f1f90a5c826d6012166..6fefc65c6f9364d71e4e410972dfd79d97fdae3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -431,6 +431,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 6ff547ccc..2caafe5a7 100644
--- a/patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 75bcab623004159f36a5a976c7b6f69873a108dd..1c97da7c291c985bf53c88d569077edce1a2d662 100644
+index 1796e81889d62b691b7a709616ce08f155733597..84f68bb96eef7123cda3b096f992e4a2575fcd59 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -231,6 +231,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0380-Don-t-tick-dead-players.patch b/patches/server/0379-Don-t-tick-dead-players.patch
similarity index 91%
rename from patches/server/0380-Don-t-tick-dead-players.patch
rename to patches/server/0379-Don-t-tick-dead-players.patch
index a727a4a80..f66cc88d9 100644
--- a/patches/server/0380-Don-t-tick-dead-players.patch
+++ b/patches/server/0379-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1c97da7c291c985bf53c88d569077edce1a2d662..2b2810ee58eea7b703cb46690752f02c49cc0376 100644
+index 84f68bb96eef7123cda3b096f992e4a2575fcd59..0ad3dfc469145735f1669d4ca9a79f3fecc2ad60 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -652,7 +652,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0381-Optimize-Collision-to-not-load-chunks.patch
similarity index 98%
rename from patches/server/0382-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0381-Optimize-Collision-to-not-load-chunks.patch
index eb42523c1..4b5ca48af 100644
--- a/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0381-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6f14cf3546cb0db210e39a918799c3df7998eb1d..0d9ccaafd69e00ab094c1d291a195214880aeb91 100644
+index 7ca5032574ddc4fb63dbf9ef266c71042055fb2a..bec8969cae05c895a001888d020d61fd2d82a788 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -796,6 +796,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch
similarity index 92%
rename from patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch
index 0d813d192..d3ff87a9b 100644
--- a/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2b2810ee58eea7b703cb46690752f02c49cc0376..104d8dd2941da8153fdeb799c48f884c33e3e585 100644
+index 0ad3dfc469145735f1669d4ca9a79f3fecc2ad60..c2f9933796904628a55476eb9be1204b766893cf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -322,7 +322,7 @@ public class ServerPlayer extends Player {
@@ -32,7 +32,7 @@ index 2b2810ee58eea7b703cb46690752f02c49cc0376..104d8dd2941da8153fdeb799c48f884c
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f1bbfb0acbe79304b2e1c10221bc31b162e63959..ca89bb5bf4de85ca22b004c91f2c7501bb133c55 100644
+index bec8969cae05c895a001888d020d61fd2d82a788..27dd95242c80d875de8f07e111f06e383eeec0d9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -215,6 +215,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0385-Improved-Watchdog-Support.patch b/patches/server/0384-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0385-Improved-Watchdog-Support.patch
rename to patches/server/0384-Improved-Watchdog-Support.patch
index aac883ffe..2e92d775b 100644
--- a/patches/server/0385-Improved-Watchdog-Support.patch
+++ b/patches/server/0384-Improved-Watchdog-Support.patch
@@ -330,7 +330,7 @@ index 5f65aa89dfb21fced457a3a9fef6ba05385b6b76..291bcca206722c86bca6d13058d18c41
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b3a431701fa1e1e1595301291baccd5bafa52f6..b5ed78fa95349974c71ac7113e5f6533bec9385e 100644
+index 51aaec29d2d8ed257e22c2538fd95c6e656a8eba..23ed6183c20ab5284e4ceb1e44237b2d3ddb9710 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2073,7 +2073,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0386-Optimize-Pathfinding.patch b/patches/server/0385-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0386-Optimize-Pathfinding.patch
rename to patches/server/0385-Optimize-Pathfinding.patch
diff --git a/patches/server/0387-Reduce-Either-Optional-allocation.patch b/patches/server/0386-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0387-Reduce-Either-Optional-allocation.patch
rename to patches/server/0386-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0389-Prevent-opening-inventories-when-frozen.patch b/patches/server/0388-Prevent-opening-inventories-when-frozen.patch
similarity index 97%
rename from patches/server/0389-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0388-Prevent-opening-inventories-when-frozen.patch
index 0d1a9b5a4..80482901c 100644
--- a/patches/server/0389-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0388-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 104d8dd2941da8153fdeb799c48f884c33e3e585..0b173c66aaab86ca33eb32ac912543ebcb7c380d 100644
+index c2f9933796904628a55476eb9be1204b766893cf..5e1bb276d61ed72027f94defc3f192756af5808f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -621,7 +621,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0390-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0389-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0390-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0389-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0392-Implement-Player-Client-Options-API.patch b/patches/server/0391-Implement-Player-Client-Options-API.patch
similarity index 97%
rename from patches/server/0392-Implement-Player-Client-Options-API.patch
rename to patches/server/0391-Implement-Player-Client-Options-API.patch
index 994511908..9b8bf897e 100644
--- a/patches/server/0392-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0391-Implement-Player-Client-Options-API.patch
@@ -85,7 +85,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 134579ef5c3b5995f59db8dc2720a62a8016ae95..0b3c81dedd618c613e6ddaf07df2b652b2051ce1 100644
+index 5e1bb276d61ed72027f94defc3f192756af5808f..2a18a60fdb71f1c665bda4a6c04a1fa1ff47a83b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1855,6 +1855,7 @@ public class ServerPlayer extends Player {
@@ -97,7 +97,7 @@ index 134579ef5c3b5995f59db8dc2720a62a8016ae95..0b3c81dedd618c613e6ddaf07df2b652
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bd6dae9bacf4159531cafa1cf3efa1cca821c003..c0386e0ebbf5db991c3e4af9ca9eaedd5fec0fc7 100644
+index 8a349c179e9abcda140546c56ea884422b409b5d..71b96630dd6543d8a4d8df5165d7182fb0f35067 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -574,6 +574,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 96%
rename from patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 0cb0f66de..1ba8c296b 100644
--- a/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -40,7 +40,7 @@ index 0fdf33bfab3191dbb582bc401f6f0b62aadacb4e..5187988a22b55ac783147afe455a1396
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index db8400c7ca9aad9aeee192427661c76778bf9e47..3a40d6fe9edbd997dc9a6b8ac009c3f621ecfe51 100644
+index 2a18a60fdb71f1c665bda4a6c04a1fa1ff47a83b..084521ed853fc2b15be355a17da8421c54716815 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
@@ -52,7 +52,7 @@ index db8400c7ca9aad9aeee192427661c76778bf9e47..3a40d6fe9edbd997dc9a6b8ac009c3f6
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f5f536549d7daf14ed5f678a55969c540a5dc48d..1f32ba033eedcb69b02c29da8594be9edf958f43 100644
+index 97c670508df6e5ee2a05a4765aafbeb23949b647..b48641bbe371ffacbbd659a0ee1783437267a4dc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -281,6 +281,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
similarity index 97%
rename from patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
index 5902c5211..3c2ae883d 100644
--- a/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
@@ -37,7 +37,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8
      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 256a6734455e89154e817bbf82de0d1c928b21cd..76100b605715ae530339da61bde8af634aa60017 100644
+index 84a1c8d7750a0a33c5f1338d0784e076ed223dac..dc75a945a747e6140a5227819e4bb180f4ccb0c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -251,6 +251,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -74,10 +74,10 @@ index 256a6734455e89154e817bbf82de0d1c928b21cd..76100b605715ae530339da61bde8af63
          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 6629fee181b8d0c6ece3d23a028b971e98f8799b..ed384e8ce0050ace3a96a8a5cc6007a1af1720bb 100644
+index c83395364edb4f2ba8515326b19c4f1a436a0502..c99266d4782c5d58339e63f7564c28b4b5b7ac1d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -91,7 +91,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -90,7 +90,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
              }
              // Paper end
          } else if (this.state == ServerLoginPacketListenerImpl.State.DELAY_ACCEPT) {
@@ -86,7 +86,7 @@ index 6629fee181b8d0c6ece3d23a028b971e98f8799b..ed384e8ce0050ace3a96a8a5cc6007a1
  
              if (entityplayer == null) {
                  this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
-@@ -200,7 +200,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -199,7 +199,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
              }
  
              this.connection.send(new ClientboundGameProfilePacket(this.gameProfile));
diff --git a/patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0402-Villager-Restocks-API.patch b/patches/server/0401-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0402-Villager-Restocks-API.patch
rename to patches/server/0401-Villager-Restocks-API.patch
diff --git a/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 66733a6ca..c7b30f9fe 100644
--- a/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63f2b6c26fc052c9e9b120c64dca63e18a338543..e465ffc59138325c2292ad23d5301ad7c1a3ddf3 100644
+index dc75a945a747e6140a5227819e4bb180f4ccb0c8..479365c3b632e74f693b3d3da46e8f1c6eae055e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -970,7 +970,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0404-Expose-game-version.patch b/patches/server/0403-Expose-game-version.patch
similarity index 89%
rename from patches/server/0404-Expose-game-version.patch
rename to patches/server/0403-Expose-game-version.patch
index 566af6eac..f0064948f 100644
--- a/patches/server/0404-Expose-game-version.patch
+++ b/patches/server/0403-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 b5ed78fa95349974c71ac7113e5f6533bec9385e..d45d1ec667fba102a20f62df1b207a95b06318b7 100644
+index 23ed6183c20ab5284e4ceb1e44237b2d3ddb9710..3837eda1aab1104265be6a0b0a684c64aa18aa63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -577,6 +577,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0405-Optimize-Voxel-Shape-Merging.patch b/patches/server/0404-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0405-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0404-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 51d1a58f9..6c54f8368 100644
--- a/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0405-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 0c76f2e8038bf0bc3edf464295c606acf03a8337..c55ae77807e0ec3698f0d0443caaf18928b41017 100644
+index 987bc4577190d827718b5144656aaddf22599cab..5b48047242e20c216b110502935763ea433c55cd 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/0407-misc-debugging-dumps.patch b/patches/server/0406-misc-debugging-dumps.patch
similarity index 94%
rename from patches/server/0407-misc-debugging-dumps.patch
rename to patches/server/0406-misc-debugging-dumps.patch
index 085d0755d..c6d15a5b1 100644
--- a/patches/server/0407-misc-debugging-dumps.patch
+++ b/patches/server/0406-misc-debugging-dumps.patch
@@ -58,10 +58,10 @@ index 40945909bbefa59da6be784bcf440dfb2075b670..b1f8374253d04d1468f5d57792b30f91
          this.running = false;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ed384e8ce0050ace3a96a8a5cc6007a1af1720bb..2279e4cc2602bb66ac1da9822d9749999b73954e 100644
+index c99266d4782c5d58339e63f7564c28b4b5b7ac1d..d477e9fbe6ffb600d08f8ba49741067d14348968 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -214,6 +214,11 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -213,6 +213,11 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
              } catch (Exception exception) {
                  ServerLoginPacketListenerImpl.LOGGER.error("Couldn't place player in world", exception);
                  MutableComponent ichatmutablecomponent = Component.translatable("multiplayer.disconnect.invalid_player_data");
@@ -74,7 +74,7 @@ index ed384e8ce0050ace3a96a8a5cc6007a1af1720bb..2279e4cc2602bb66ac1da9822d974999
                  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 d45d1ec667fba102a20f62df1b207a95b06318b7..96e4ba547472cbb29009574458865090d63464e3 100644
+index 3837eda1aab1104265be6a0b0a684c64aa18aa63..7bc40ce1566821f29d2d199764ef33d2d1c45849 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1000,6 +1000,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0408-Prevent-teleporting-dead-entities.patch b/patches/server/0407-Prevent-teleporting-dead-entities.patch
similarity index 92%
rename from patches/server/0408-Prevent-teleporting-dead-entities.patch
rename to patches/server/0407-Prevent-teleporting-dead-entities.patch
index 3ad2146b3..426450f4c 100644
--- a/patches/server/0408-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0407-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e465ffc59138325c2292ad23d5301ad7c1a3ddf3..1382a5f50e2651eda67dffc040232e8168d774f3 100644
+index 479365c3b632e74f693b3d3da46e8f1c6eae055e..d8517a11187baddb82c56045d34c4e9db05826be 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1635,6 +1635,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 03d220439..3f3a055bc 100644
--- a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -502,7 +502,7 @@ index f114d5dab86aa2cdd59c78406c9d82f9caededca..99fa9f1952ee7ed79b223ff210a658e4
          }
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 2d1db70456b746c8fab77893cb34240e573b92ca..7e11d760f84d2cda85e686c5eca764e666e9389f 100644
+index 31d35af5d0efbd0bd8528c3f05e660a203e67ac9..7f0bcb69a1a14a01bd80ffcba1afb25ceeab19b8 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -62,13 +62,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0410-Implement-Mob-Goal-API.patch b/patches/server/0409-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0410-Implement-Mob-Goal-API.patch
rename to patches/server/0409-Implement-Mob-Goal-API.patch
index e0089a095..d36cbd100 100644
--- a/patches/server/0410-Implement-Mob-Goal-API.patch
+++ b/patches/server/0409-Implement-Mob-Goal-API.patch
@@ -789,7 +789,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 96e4ba547472cbb29009574458865090d63464e3..9933bd2998e2b3723ee87e4f6710f74758bd8107 100644
+index 7bc40ce1566821f29d2d199764ef33d2d1c45849..68eb6756098a9923b63e0d4cfcc15fcfee5acf6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2684,5 +2684,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0411-Add-villager-reputation-API.patch b/patches/server/0410-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0411-Add-villager-reputation-API.patch
rename to patches/server/0410-Add-villager-reputation-API.patch
diff --git a/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0413-ExperienceOrbMergeEvent.patch b/patches/server/0412-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0413-ExperienceOrbMergeEvent.patch
rename to patches/server/0412-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0415-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0414-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0415-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0414-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0416-Potential-bed-API.patch b/patches/server/0415-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0416-Potential-bed-API.patch
rename to patches/server/0415-Potential-bed-API.patch
diff --git a/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
index 60a2439a2..52bb62c00 100644
--- a/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index b1f8374253d04d1468f5d57792b30f91a274b97f..b6a05542a42b1f44b3a43fbcd333003e
          // 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 9933bd2998e2b3723ee87e4f6710f74758bd8107..e8f45ff744c9d297ea803392c988a86a8cbbe5fe 100644
+index 68eb6756098a9923b63e0d4cfcc15fcfee5acf6e..fdcc0d1300e55fcecc267fe6b989b54588896170 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1009,6 +1009,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0422-Ensure-safe-gateway-teleport.patch b/patches/server/0421-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0422-Ensure-safe-gateway-teleport.patch
rename to patches/server/0421-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0423-Add-option-for-console-having-all-permissions.patch b/patches/server/0422-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0423-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0422-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 99%
rename from patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index d1757b83c..3f6b96908 100644
--- a/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -357,7 +357,7 @@ index 42b4214a1319691e9a6cb0c5fafaeeff821f3f99..1d9a0f6effa1654609f4d0752ec69eed
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8dc31f65126db6b2527d4106a885cb9b6dbc7a75..be00b0f9c15e1e7c22c2d2ebf3063639520f2030 100644
+index acc64abd9420b81ed4c8c17cf6a9f5bc5d35f116..06e711aa9a0afedda48395ba2ee369bb211584da 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 100%
rename from patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0428-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0427-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0428-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0427-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0429-Maps-shouldn-t-load-chunks.patch b/patches/server/0428-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0429-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0428-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0433-Fix-sand-duping.patch b/patches/server/0432-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0433-Fix-sand-duping.patch
rename to patches/server/0432-Fix-sand-duping.patch
diff --git a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
index 39bad0910..0ba887395 100644
--- a/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1382a5f50e2651eda67dffc040232e8168d774f3..e7245621bb8014148117f7d20d8b522f201acb37 100644
+index d8517a11187baddb82c56045d34c4e9db05826be..870935874baa29edd1c641869c5f6a22155f2e8f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1449,6 +1449,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0437-Improve-Arrow-API.patch b/patches/server/0436-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0437-Improve-Arrow-API.patch
rename to patches/server/0436-Improve-Arrow-API.patch
diff --git a/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0440-Add-permission-for-command-blocks.patch b/patches/server/0439-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0440-Add-permission-for-command-blocks.patch
rename to patches/server/0439-Add-permission-for-command-blocks.patch
index f43a7b408..2ccc09c36 100644
--- a/patches/server/0440-Add-permission-for-command-blocks.patch
+++ b/patches/server/0439-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index af00442931f9f6cf878bd61137c2f29fc7c8d0b1..431ff490760f54be76847c7b370dbbb4
                  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 bc72672a443bab4c157c5a68dbfbed410d6c0fff..42ca8e95c69beecc82f87e374c69386b901fad52 100644
+index 237bf7e97dc89a551feb28914317344207a28e13..893b9557d742ad1d74a7f6a772c4f8f45a7172f6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -881,7 +881,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 34ddf59a8..19436b8c3 100644
--- a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -102,7 +102,7 @@ index 893b9557d742ad1d74a7f6a772c4f8f45a7172f6..aea4c331c1bb0e84fc4743dbec539143
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e8f45ff744c9d297ea803392c988a86a8cbbe5fe..b4cc5f89b6694f1f3fc38d822a0f503c170d45c4 100644
+index fdcc0d1300e55fcecc267fe6b989b54588896170..701c623fbf4108de3da64174590fe15e97c274fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -949,8 +949,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0443-Paper-dumpitem-command.patch b/patches/server/0442-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0443-Paper-dumpitem-command.patch
rename to patches/server/0442-Paper-dumpitem-command.patch
diff --git a/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0445-Improve-Legacy-Component-serialization-size.patch b/patches/server/0444-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0445-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0444-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0445-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0445-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index c4c18d2c4..2dccca0fc 100644
--- a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0446-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 b4cc5f89b6694f1f3fc38d822a0f503c170d45c4..2d7de60d7e663b91f0a72241f24913338bd725dd 100644
+index 701c623fbf4108de3da64174590fe15e97c274fe..fbe09c604315794b462e6be5bc8c7e87c21806f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -358,7 +358,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0448-incremental-chunk-and-player-saving.patch b/patches/server/0447-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0448-incremental-chunk-and-player-saving.patch
rename to patches/server/0447-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0448-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0448-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0450-Support-old-UUID-format-for-NBT.patch b/patches/server/0449-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0450-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0449-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0450-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0450-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0451-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0451-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0453-Remove-some-streams-from-structures.patch b/patches/server/0452-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0453-Remove-some-streams-from-structures.patch
rename to patches/server/0452-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0453-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0453-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0455-Support-components-in-ItemMeta.patch b/patches/server/0454-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0455-Support-components-in-ItemMeta.patch
rename to patches/server/0454-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0457-Add-entity-liquid-API.patch b/patches/server/0456-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0457-Add-entity-liquid-API.patch
rename to patches/server/0456-Add-entity-liquid-API.patch
diff --git a/patches/server/0458-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0457-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0458-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0457-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0459-Spawn-player-in-correct-world-on-login.patch b/patches/server/0458-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0459-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0458-Spawn-player-in-correct-world-on-login.patch
index 84b6dff1e..cbcca8f89 100644
--- a/patches/server/0459-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0458-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 74f7a49930b6fb1313c96a0d3f8802d1758e039c..04a4f87920f8e8ab56f864d58424153b54686e3f 100644
+index 20bedb5ce597b8e3e96af910d88137e0a0b10066..559db90e1ba3d636ea080f47cdf274d11a1bcb89 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -200,7 +200,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0460-Add-PrepareResultEvent.patch b/patches/server/0459-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0460-Add-PrepareResultEvent.patch
rename to patches/server/0459-Add-PrepareResultEvent.patch
diff --git a/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index d974f5fcb..e3a8ad7d9 100644
--- a/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -796,7 +796,7 @@ index 585892f19bc0aea89889a358c0407f2975b9efe5..918fda0fbbafa39ce0f421dcaf10f8dc
          boolean flag1 = this.chunkMap.promoteChunkMap();
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8faa5ccd643158c59d55a6bf8e0e07a44881e6e9..514d2d69980f843b5bc9339e63c48ba0e1176df5 100644
+index 0720b748ed42bbd2a12cc5de79224f609a5e29be..6f2b52165c1935511790a429792d3754251537c8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -194,6 +194,7 @@ public class ServerPlayer extends Player {
@@ -1112,7 +1112,7 @@ index 8770fe0db46b01e8b608637df4f1a669a3f4cdde..3c1698ba0d3bc412ab957777d9b5211d
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1d5a8cf65b5eb4aa9b2e316d23cf9e9d13500fed..6e433410e5d26627b553c0aabd965da10da9307f 100644
+index 559db90e1ba3d636ea080f47cdf274d11a1bcb89..de84400b0565843a7314a7c8032d14cdadccdb73 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
@@ -1194,7 +1194,7 @@ index b234ba968e82ddf1e8f7c84d3a17659e3beda2b3..af22fa8aa8ddef4d592564b14d0114cc
              net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk) either.left().orElse(null);
              if (chunk != null) addTicket(x, z); // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5f50296f2f2b1c5a68309de9687d7c7c6a2ede3b..593925b1f20f94d7cd25492e0a70b9558c8b63c6 100644
+index 71b96630dd6543d8a4d8df5165d7182fb0f35067..ac232efad56fd69577de8fa4ed47cb852c9a429e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1047,6 +1047,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0463-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0463-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0464-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0464-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 96%
rename from patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch
index 9fcfe6080..09b482e66 100644
--- a/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -26,7 +26,7 @@ index 20a7cdf87f307878d66922aaac0c60cff218e46c..39844531b03eb8a6c70700b4ecbf0ff1
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 981f08a537253516a6ce8b78f6cd04d7e5e1b546..b14773074fc4b10ef427eb0ad9e21601a7287901 100644
+index aadddbc16aa719677c3b6fc4969b6145b9b9ee0b..6fdbe747645eb83f31b56bca77a9d7962237aed8 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -59,7 +59,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
diff --git a/patches/server/0467-Fix-SPIGOT-5989.patch b/patches/server/0466-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0467-Fix-SPIGOT-5989.patch
rename to patches/server/0466-Fix-SPIGOT-5989.patch
index 63815ae54..a968772ad 100644
--- a/patches/server/0467-Fix-SPIGOT-5989.patch
+++ b/patches/server/0466-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e6bc6c1d9dae3e20d3cb937f06f935e22df55200..0b39ddc1bbf4cc20cd3867e57a983678a5cf0568 100644
+index de84400b0565843a7314a7c8032d14cdadccdb73..8c1b6aa3957a988656eeb2ad6323fdbd2f67cd19 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -836,6 +836,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0472-Fix-some-rails-connecting-improperly.patch b/patches/server/0471-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0472-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0471-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0473-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0473-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0475-Brand-support.patch b/patches/server/0474-Brand-support.patch
similarity index 97%
rename from patches/server/0475-Brand-support.patch
rename to patches/server/0474-Brand-support.patch
index b21ddb0ca..46af6923c 100644
--- a/patches/server/0475-Brand-support.patch
+++ b/patches/server/0474-Brand-support.patch
@@ -56,7 +56,7 @@ index aea4c331c1bb0e84fc4743dbec539143755555d2..c489a3f2a0c62a15cd4de45dfc0e9024
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d58223723daab21b0da950dc499fbbe102c06801..9508cee67e50676261af2e94ba488b3be59bdfbf 100644
+index ac232efad56fd69577de8fa4ed47cb852c9a429e..03d43fdc119dc526928abf7b0f1b38d35e985ffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2691,6 +2691,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0476-Add-setMaxPlayers-API.patch b/patches/server/0475-Add-setMaxPlayers-API.patch
similarity index 89%
rename from patches/server/0476-Add-setMaxPlayers-API.patch
rename to patches/server/0475-Add-setMaxPlayers-API.patch
index dc1fa81eb..acd92a2c2 100644
--- a/patches/server/0476-Add-setMaxPlayers-API.patch
+++ b/patches/server/0475-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ec0ceaac85b5868849b6399cdf8eb2b4447508e3..32f8a030abb81aa29cab9432b72f9b522f1f6aa6 100644
+index 8c1b6aa3957a988656eeb2ad6323fdbd2f67cd19..67c50a329e7bdf4056a1217963e29e8ceb99b20f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -147,7 +147,7 @@ public abstract class PlayerList {
@@ -18,7 +18,7 @@ index ec0ceaac85b5868849b6399cdf8eb2b4447508e3..32f8a030abb81aa29cab9432b72f9b52
      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 2d7de60d7e663b91f0a72241f24913338bd725dd..57c4871b977a31f55e5c39aba4159b39b1ac325d 100644
+index fbe09c604315794b462e6be5bc8c7e87c21806f6..369e3807b75b3bdd7609ce64b6da018317642edf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -672,6 +672,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0476-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0476-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0478-Don-t-require-FACING-data.patch b/patches/server/0477-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0478-Don-t-require-FACING-data.patch
rename to patches/server/0477-Don-t-require-FACING-data.patch
diff --git a/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0480-Add-moon-phase-API.patch b/patches/server/0479-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0480-Add-moon-phase-API.patch
rename to patches/server/0479-Add-moon-phase-API.patch
diff --git a/patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0480-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0480-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0482-Prevent-headless-pistons-from-being-created.patch b/patches/server/0481-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0482-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0481-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0483-Add-BellRingEvent.patch b/patches/server/0482-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0483-Add-BellRingEvent.patch
rename to patches/server/0482-Add-BellRingEvent.patch
diff --git a/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0483-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0484-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0483-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0485-Buffer-joins-to-world.patch b/patches/server/0484-Buffer-joins-to-world.patch
similarity index 95%
rename from patches/server/0485-Buffer-joins-to-world.patch
rename to patches/server/0484-Buffer-joins-to-world.patch
index ddbece7c7..f21684f9d 100644
--- a/patches/server/0485-Buffer-joins-to-world.patch
+++ b/patches/server/0484-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 7e11d760f84d2cda85e686c5eca764e666e9389f..65c2263f8872fba4f68779e0e90ea5f96aefdfbd 100644
+index 7f0bcb69a1a14a01bd80ffcba1afb25ceeab19b8..4d2b26fb1ac5663b667ffd16eed379f4a3311677 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -396,8 +396,23 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0486-Eigencraft-redstone-implementation.patch b/patches/server/0485-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0486-Eigencraft-redstone-implementation.patch
rename to patches/server/0485-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 95%
rename from patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
index f07da0ec0..c4f76a0ad 100644
--- a/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -25,10 +25,10 @@ index 43759cdf3da0796d7969c6504ac9a6986c0f0518..750fef0f5b908b776a7306e54653eba4
  
                      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 2279e4cc2602bb66ac1da9822d9749999b73954e..9d1b7748ceeba953150342d709e02bf3d5269863 100644
+index d477e9fbe6ffb600d08f8ba49741067d14348968..2f0a70bc9cc8cda9e9beef00421078c036d6287c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -109,7 +109,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -108,7 +108,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      // CraftBukkit start
      @Deprecated
      public void disconnect(String s) {
diff --git a/patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0487-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0487-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0489-Fix-CraftTeam-null-check.patch b/patches/server/0488-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0489-Fix-CraftTeam-null-check.patch
rename to patches/server/0488-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0490-Add-more-Evoker-API.patch b/patches/server/0489-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0490-Add-more-Evoker-API.patch
rename to patches/server/0489-Add-more-Evoker-API.patch
diff --git a/patches/server/0491-Add-methods-to-get-translation-keys.patch b/patches/server/0490-Add-methods-to-get-translation-keys.patch
similarity index 98%
rename from patches/server/0491-Add-methods-to-get-translation-keys.patch
rename to patches/server/0490-Add-methods-to-get-translation-keys.patch
index 3085ca118..5a5b0a4cd 100644
--- a/patches/server/0491-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0490-Add-methods-to-get-translation-keys.patch
@@ -42,7 +42,7 @@ index a859a675b4bc543e139358223cc92ad5eee3ddb5..31a22f26070059e5379730c1940ff1c5
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 61668447c4314562109e31bd5ca48da181e98529..79bd1a6d4003f990e667e9d66605e6cc74e05eee 100644
+index 6fefc65c6f9364d71e4e410972dfd79d97fdae3e..c65cc24fbd8b6cb9828fbc978c21c3f7ef9171a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -478,6 +478,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0491-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0491-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0493-Cache-block-data-strings.patch b/patches/server/0492-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0493-Cache-block-data-strings.patch
rename to patches/server/0492-Cache-block-data-strings.patch
diff --git a/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 98%
rename from patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 7c97b0a15..f8158d5fb 100644
--- a/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 731d42f34cf4406dcc9427f2000d4d0cfcaab648..6f8a5f3708b3faa389b8d76251d10aedcab92460 100644
+index c489a3f2a0c62a15cd4de45dfc0e90245e1d9b25..60afac8abc0ed87753b7341a388a4280dcda7a7f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -763,7 +763,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 2f66970d3..be65d5330 100644
--- a/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -21,7 +21,7 @@ index 1ed2670ab0687793b9298c2c1deb92da93e7bfd2..511255467688d4c9397037753d2d4821
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 79bd1a6d4003f990e667e9d66605e6cc74e05eee..04b3608424e482daaae7b399e61cf0d5f8e03729 100644
+index c65cc24fbd8b6cb9828fbc978c21c3f7ef9171a3..346f5f4b2afec3127c5d1b8e054eaacb1cb756e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -502,6 +502,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0499-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0499-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0501-Entity-isTicking.patch b/patches/server/0500-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0501-Entity-isTicking.patch
rename to patches/server/0500-Entity-isTicking.patch
diff --git a/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0502-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0502-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
index 40655edda..d19e77595 100644
--- a/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f8a5f3708b3faa389b8d76251d10aedcab92460..79589a5954bdc983dfaf0f6e17f835ff8b3382ef 100644
+index 60afac8abc0ed87753b7341a388a4280dcda7a7f..9b4d5d1745101b28048df16dabc5d983a65eb0bd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -578,9 +578,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0506-Optimise-getType-calls.patch b/patches/server/0505-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0506-Optimise-getType-calls.patch
rename to patches/server/0505-Optimise-getType-calls.patch
diff --git a/patches/server/0507-Villager-resetOffers.patch b/patches/server/0506-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0507-Villager-resetOffers.patch
rename to patches/server/0506-Villager-resetOffers.patch
diff --git a/patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0509-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0509-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0511-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0510-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0511-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0510-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0512-Player-elytra-boost-API.patch b/patches/server/0511-Player-elytra-boost-API.patch
similarity index 94%
rename from patches/server/0512-Player-elytra-boost-API.patch
rename to patches/server/0511-Player-elytra-boost-API.patch
index 050ed8a8a..54561c48a 100644
--- a/patches/server/0512-Player-elytra-boost-API.patch
+++ b/patches/server/0511-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 d70be6515dbf00ab6fe5b3c05d208a5686ce0209..a2a227f24855c89a1a8c45507f8ab0bd750638c4 100644
+index 03d43fdc119dc526928abf7b0f1b38d35e985ffc..fb4f868457ebf06b26ddc60f5ffc5a1d5273a1bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -592,6 +592,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0513-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0512-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0513-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0512-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
index e82189979..d89671c97 100644
--- a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0514-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 57c4871b977a31f55e5c39aba4159b39b1ac325d..da3ca296a4bcc0c6d303df9de5370a89a5ae0d67 100644
+index 369e3807b75b3bdd7609ce64b6da018317642edf..c967e55029e289c8525416122571770ec7c5fe6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1801,6 +1801,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0516-Add-ignore-discounts-API.patch b/patches/server/0515-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0516-Add-ignore-discounts-API.patch
rename to patches/server/0515-Add-ignore-discounts-API.patch
diff --git a/patches/server/0517-Toggle-for-removing-existing-dragon.patch b/patches/server/0516-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0517-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0516-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0518-Fix-client-lag-on-advancement-loading.patch b/patches/server/0517-Fix-client-lag-on-advancement-loading.patch
similarity index 95%
rename from patches/server/0518-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0517-Fix-client-lag-on-advancement-loading.patch
index b4148f901..3c62dff07 100644
--- a/patches/server/0518-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0517-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 04b3608424e482daaae7b399e61cf0d5f8e03729..9f08928bdfc1644b7f902c1685c3324d6ee896c1 100644
+index 346f5f4b2afec3127c5d1b8e054eaacb1cb756e4..3f45ebeb31264f5f9a99123894fe07bd8e4c65d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -340,7 +340,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0519-Item-no-age-no-player-pickup.patch b/patches/server/0518-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0519-Item-no-age-no-player-pickup.patch
rename to patches/server/0518-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0521-Beacon-API-custom-effect-ranges.patch b/patches/server/0520-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0521-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0520-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0522-Add-API-for-quit-reason.patch b/patches/server/0521-Add-API-for-quit-reason.patch
similarity index 92%
rename from patches/server/0522-Add-API-for-quit-reason.patch
rename to patches/server/0521-Add-API-for-quit-reason.patch
index 0ae2db6b9..33be27aec 100644
--- a/patches/server/0522-Add-API-for-quit-reason.patch
+++ b/patches/server/0521-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 65c2263f8872fba4f68779e0e90ea5f96aefdfbd..523e5a01c55d3a2e192d86e70ac751e3eb622aea 100644
+index 4d2b26fb1ac5663b667ffd16eed379f4a3311677..dd81751f64695180331b82225ac878913afe4513 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -147,12 +147,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -25,7 +25,7 @@ index 65c2263f8872fba4f68779e0e90ea5f96aefdfbd..523e5a01c55d3a2e192d86e70ac751e3
                          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 514d2d69980f843b5bc9339e63c48ba0e1176df5..8c6f55efb555c9ca7253ccc1cd9ba615cfb1171c 100644
+index 6f2b52165c1935511790a429792d3754251537c8..9b4436bdb697d8350eac57282f8fad8140029d8f 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 {
@@ -37,7 +37,7 @@ index 514d2d69980f843b5bc9339e63c48ba0e1176df5..8c6f55efb555c9ca7253ccc1cd9ba615
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, @Nullable ProfilePublicKey publicKey) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile, publicKey);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b91b9d2d26ef44ae59645699b82fba7a90e7b25f..81e0dc794ba43a498cb49ed47e03db3f9dc5377e 100644
+index 9b4d5d1745101b28048df16dabc5d983a65eb0bd..b0f9ebcf04a562ce2f0fbee01b731e4fa1c1eab8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -518,6 +518,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -49,7 +49,7 @@ index b91b9d2d26ef44ae59645699b82fba7a90e7b25f..81e0dc794ba43a498cb49ed47e03db3f
              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 aadf37f5005d78db9b87f42b1c2646d614116c97..70d6a3d4901cb39294bef47f42d0d49aea34867a 100644
+index 67c50a329e7bdf4056a1217963e29e8ceb99b20f..1979e8634829f949b7ed80b231b36d5a5e29c717 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -601,7 +601,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0522-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0522-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0524-Expose-world-spawn-angle.patch b/patches/server/0523-Expose-world-spawn-angle.patch
similarity index 93%
rename from patches/server/0524-Expose-world-spawn-angle.patch
rename to patches/server/0523-Expose-world-spawn-angle.patch
index 16a268eb9..32865caa2 100644
--- a/patches/server/0524-Expose-world-spawn-angle.patch
+++ b/patches/server/0523-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 70d6a3d4901cb39294bef47f42d0d49aea34867a..8ca55b57b94bd264951d0b7725bd384ff7764ba6 100644
+index 1979e8634829f949b7ed80b231b36d5a5e29c717..1b188bdf5597b81661ca1cc7acef1a9e93a54967 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -879,7 +879,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0525-Add-Destroy-Speed-API.patch b/patches/server/0524-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0525-Add-Destroy-Speed-API.patch
rename to patches/server/0524-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 93%
rename from patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 9755ee5de..f5ae3e490 100644
--- a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0525-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 4e687f502ef8e0cb11400fb4254e1a1b4640dc1b..61a7f08a78381ee4e3fbec53dc1374ce04ec90ee 100644
+index fb4f868457ebf06b26ddc60f5ffc5a1d5273a1bc..4c7d84a8f0f186dba18dba528ed324a0808605e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2273,7 +2273,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0527-Add-LivingEntity-clearActiveItem.patch b/patches/server/0526-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0527-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0526-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0528-Add-PlayerItemCooldownEvent.patch b/patches/server/0527-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0528-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0527-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0530-More-lightning-API.patch b/patches/server/0529-More-lightning-API.patch
similarity index 100%
rename from patches/server/0530-More-lightning-API.patch
rename to patches/server/0529-More-lightning-API.patch
diff --git a/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0532-Added-missing-default-perms-for-commands.patch b/patches/server/0531-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0532-Added-missing-default-perms-for-commands.patch
rename to patches/server/0531-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0533-Add-PlayerShearBlockEvent.patch b/patches/server/0532-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0533-Add-PlayerShearBlockEvent.patch
rename to patches/server/0532-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0535-Limit-recipe-packets.patch b/patches/server/0534-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0535-Limit-recipe-packets.patch
rename to patches/server/0534-Limit-recipe-packets.patch
diff --git a/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0535-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0535-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0537-Player-Chunk-Load-Unload-Events.patch b/patches/server/0536-Player-Chunk-Load-Unload-Events.patch
similarity index 94%
rename from patches/server/0537-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0536-Player-Chunk-Load-Unload-Events.patch
index f00bed613..04505672a 100644
--- a/patches/server/0537-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0536-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6cb4cda5235ca6c54158d6980526e3d5fceae829..5f1ec63ae45cf3f53cb6c5b55ccdb3962b1ebd72 100644
+index 9b4436bdb697d8350eac57282f8fad8140029d8f..a802529b6f1adfd358295811c4e329e6fe82009b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2134,11 +2134,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0539-Expose-LivingEntity-hurt-direction.patch b/patches/server/0538-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0539-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0538-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0543-Implement-TargetHitEvent.patch b/patches/server/0542-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0543-Implement-TargetHitEvent.patch
rename to patches/server/0542-Implement-TargetHitEvent.patch
diff --git a/patches/server/0544-MC-4-Fix-item-position-desync.patch b/patches/server/0543-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0544-MC-4-Fix-item-position-desync.patch
rename to patches/server/0543-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0545-Additional-Block-Material-API-s.patch b/patches/server/0544-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0545-Additional-Block-Material-API-s.patch
rename to patches/server/0544-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0546-Fix-harming-potion-dupe.patch b/patches/server/0545-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0546-Fix-harming-potion-dupe.patch
rename to patches/server/0545-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0548-Cache-burn-durations.patch b/patches/server/0547-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0548-Cache-burn-durations.patch
rename to patches/server/0547-Cache-burn-durations.patch
diff --git a/patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0553-Zombie-API-breaking-doors.patch b/patches/server/0552-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0553-Zombie-API-breaking-doors.patch
rename to patches/server/0552-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0554-Fix-nerfed-slime-when-splitting.patch b/patches/server/0553-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0554-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0553-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0555-Add-EntityLoadCrossbowEvent.patch b/patches/server/0554-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0555-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0554-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0556-Guardian-beam-workaround.patch b/patches/server/0555-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0556-Guardian-beam-workaround.patch
rename to patches/server/0555-Guardian-beam-workaround.patch
diff --git a/patches/server/0557-Added-WorldGameRuleChangeEvent.patch b/patches/server/0556-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0557-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0556-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0558-Added-ServerResourcesReloadedEvent.patch b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0558-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0557-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0560-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0560-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0561-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0561-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0562-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0562-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0563-Configurable-door-breaking-difficulty.patch b/patches/server/0562-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0563-Configurable-door-breaking-difficulty.patch
rename to patches/server/0562-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0564-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0564-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0566-Remove-stale-POIs.patch b/patches/server/0565-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0566-Remove-stale-POIs.patch
rename to patches/server/0565-Remove-stale-POIs.patch
diff --git a/patches/server/0567-Fix-villager-boat-exploit.patch b/patches/server/0566-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0567-Fix-villager-boat-exploit.patch
rename to patches/server/0566-Fix-villager-boat-exploit.patch
index d021bcae9..4aeae7af1 100644
--- a/patches/server/0567-Fix-villager-boat-exploit.patch
+++ b/patches/server/0566-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8ca55b57b94bd264951d0b7725bd384ff7764ba6..2287f62e9a228822e7da43ddd42946335078ec01 100644
+index 1b188bdf5597b81661ca1cc7acef1a9e93a54967..fa90f805e87985fae1875ded3b295c4736cc7aee 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -626,6 +626,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0568-Add-sendOpLevel-API.patch b/patches/server/0567-Add-sendOpLevel-API.patch
similarity index 91%
rename from patches/server/0568-Add-sendOpLevel-API.patch
rename to patches/server/0567-Add-sendOpLevel-API.patch
index 0068c9271..d0db422d5 100644
--- a/patches/server/0568-Add-sendOpLevel-API.patch
+++ b/patches/server/0567-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2287f62e9a228822e7da43ddd42946335078ec01..65469cfe4dfb87a05a9060fbd8e0aa2fc4bbe066 100644
+index fa90f805e87985fae1875ded3b295c4736cc7aee..39ddb080e9a296fa499ea2959e22172500db6235 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1124,6 +1124,11 @@ public abstract class PlayerList {
@@ -32,7 +32,7 @@ index 2287f62e9a228822e7da43ddd42946335078ec01..65469cfe4dfb87a05a9060fbd8e0aa2f
  
      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 ced1fd7ac0cbc80d5d65c95163ee271b26281773..e3ea73cc055a0738bc575f7f523bd61ff050e171 100644
+index 4c7d84a8f0f186dba18dba528ed324a0808605e3..8024b7bcc18a9b2298864d53230d54c23b9d1166 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -606,6 +606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0569-Add-PaperRegistry.patch b/patches/server/0568-Add-PaperRegistry.patch
similarity index 100%
rename from patches/server/0569-Add-PaperRegistry.patch
rename to patches/server/0568-Add-PaperRegistry.patch
diff --git a/patches/server/0570-Add-StructuresLocateEvent.patch b/patches/server/0569-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0570-Add-StructuresLocateEvent.patch
rename to patches/server/0569-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0571-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0571-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0574-Make-schedule-command-per-world.patch b/patches/server/0573-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0574-Make-schedule-command-per-world.patch
rename to patches/server/0573-Make-schedule-command-per-world.patch
diff --git a/patches/server/0575-Configurable-max-leash-distance.patch b/patches/server/0574-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0575-Configurable-max-leash-distance.patch
rename to patches/server/0574-Configurable-max-leash-distance.patch
diff --git a/patches/server/0576-Implement-BlockPreDispenseEvent.patch b/patches/server/0575-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0576-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0575-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0581-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
similarity index 89%
rename from patches/server/0581-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
index 4d6e6a583..d418f0bca 100644
--- a/patches/server/0581-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 345091d6ba617c26ac7acfd88eb023f2ec8fae11..6b6e0c408d22994a29bc562da523e0dc0575639f 100644
+index a802529b6f1adfd358295811c4e329e6fe82009b..d8ba103fd52c3c540fe386c9ff8264fcb3dbc136 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1181,6 +1181,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0582-add-DragonEggFormEvent.patch b/patches/server/0581-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0582-add-DragonEggFormEvent.patch
rename to patches/server/0581-add-DragonEggFormEvent.patch
diff --git a/patches/server/0583-EntityMoveEvent.patch b/patches/server/0582-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0583-EntityMoveEvent.patch
rename to patches/server/0582-EntityMoveEvent.patch
diff --git a/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0585-Inline-shift-direction-fields.patch b/patches/server/0584-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0585-Inline-shift-direction-fields.patch
rename to patches/server/0584-Inline-shift-direction-fields.patch
diff --git a/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0588-living-entity-allow-attribute-registration.patch b/patches/server/0587-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0588-living-entity-allow-attribute-registration.patch
rename to patches/server/0587-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0589-fix-dead-slime-setSize-invincibility.patch b/patches/server/0588-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0589-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0588-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0591-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0592-Expose-Tracked-Players.patch b/patches/server/0591-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0592-Expose-Tracked-Players.patch
rename to patches/server/0591-Expose-Tracked-Players.patch
diff --git a/patches/server/0593-Remove-streams-from-SensorNearest.patch b/patches/server/0592-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0593-Remove-streams-from-SensorNearest.patch
rename to patches/server/0592-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0595-Improve-ServerGUI.patch b/patches/server/0594-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0595-Improve-ServerGUI.patch
rename to patches/server/0594-Improve-ServerGUI.patch
diff --git a/patches/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0597-fix-converting-txt-to-json-file.patch b/patches/server/0596-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0597-fix-converting-txt-to-json-file.patch
rename to patches/server/0596-fix-converting-txt-to-json-file.patch
index da7b0820f..dfcc5eb72 100644
--- a/patches/server/0597-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0596-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index da83f111199a6b4c712a9bb8ab6f1d1b5c6ae77c..ef02ceba53943d34bd45070297c72bee
          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 78629b9e09d8326780f6f4e92340db7d92a5092b..dc8d3c658c3ce9f85084f06a2c71d4dc24ab6279 100644
+index 39ddb080e9a296fa499ea2959e22172500db6235..f7f0d7556d130197b8cb75841f1e326274eb59cd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -177,6 +177,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0598-Add-worldborder-events.patch b/patches/server/0597-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0598-Add-worldborder-events.patch
rename to patches/server/0597-Add-worldborder-events.patch
diff --git a/patches/server/0599-added-PlayerNameEntityEvent.patch b/patches/server/0598-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0599-added-PlayerNameEntityEvent.patch
rename to patches/server/0598-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0600-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0600-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0601-Add-recipe-to-cook-events.patch b/patches/server/0600-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0601-Add-recipe-to-cook-events.patch
rename to patches/server/0600-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0602-Add-Block-isValidTool.patch b/patches/server/0601-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0602-Add-Block-isValidTool.patch
rename to patches/server/0601-Add-Block-isValidTool.patch
diff --git a/patches/server/0603-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0603-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
index 38489ac47..ffe7f93c4 100644
--- a/patches/server/0603-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ 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 02bd9c219e3982b0e61b16e25e4366ad59aea26d..c9477e3cf2a361b89473743f4e01e00c098c4d95 100644
+index 7db3c6502eb15192e876f5c766bf64c30f52e9c4..9f233a68f4f0717edc7af4bc773fc7cdc9c29faf 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
diff --git a/patches/server/0604-Expand-world-key-API.patch b/patches/server/0603-Expand-world-key-API.patch
similarity index 95%
rename from patches/server/0604-Expand-world-key-API.patch
rename to patches/server/0603-Expand-world-key-API.patch
index 87b237f01..c79dd4172 100644
--- a/patches/server/0604-Expand-world-key-API.patch
+++ b/patches/server/0603-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index ee5e59c37301d9a806e2f696d52d9d217b232833..bb5d22125b6cd4e60d2b7e2e00af158c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da3ca296a4bcc0c6d303df9de5370a89a5ae0d67..65fb1db4dd7078cfc6c0cb9ed5f0fe267e067249 100644
+index c967e55029e289c8525416122571770ec7c5fe6d..1ddc78682e51bdbff6c4d7779a0c31b119b70899 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1141,9 +1141,15 @@ public final class CraftServer implements Server {
@@ -67,7 +67,7 @@ index da3ca296a4bcc0c6d303df9de5370a89a5ae0d67..65fb1db4dd7078cfc6c0cb9ed5f0fe26
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 87cfa45371a8b1c169a31211e2d468377112d47d..b826d59a486e636e93b5bfa5df98ac6c202b4f58 100644
+index dc034bd793842e02f0fea54d1ae49ac7a66af597..1343db872321fe14465ad2b1f363d41989096ed4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -517,6 +517,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0605-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0605-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0606-Item-Rarity-API.patch b/patches/server/0605-Item-Rarity-API.patch
similarity index 96%
rename from patches/server/0606-Item-Rarity-API.patch
rename to patches/server/0605-Item-Rarity-API.patch
index 3ba9dddb0..e3e4b4235 100644
--- a/patches/server/0606-Item-Rarity-API.patch
+++ b/patches/server/0605-Item-Rarity-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item Rarity API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b826d59a486e636e93b5bfa5df98ac6c202b4f58..7f47922bc72392f40b1b32e69cd8da7ae3049ec6 100644
+index 1343db872321fe14465ad2b1f363d41989096ed4..9e27257265dab677175b9b3d921e1fc3f3cb7817 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -522,6 +522,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0608-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0608-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
index d261713d9..9ad98eb6f 100644
--- a/patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 68b24700db1c1ff2ecc5e07208eede035546bfb1..538d7bcebf55af189d31dc64fe12ef5d5adb4cd3 100644
+index f7f0d7556d130197b8cb75841f1e326274eb59cd..304fb7b7255379d1be31ccf86ce04c377ef1d247 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -619,6 +619,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0610-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0610-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 60878b5b2..353225773 100644
--- a/patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9477e3cf2a361b89473743f4e01e00c098c4d95..5f9d482b06141929505489ec605213b84c6d499f 100644
+index 9f233a68f4f0717edc7af4bc773fc7cdc9c29faf..9b23e2caedea8ff851f91dc6da2b6443dba14da6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1297,7 +1297,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0612-Entity-load-save-limit-per-chunk.patch b/patches/server/0611-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0612-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0611-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0613-Expose-protocol-version.patch b/patches/server/0612-Expose-protocol-version.patch
similarity index 91%
rename from patches/server/0613-Expose-protocol-version.patch
rename to patches/server/0612-Expose-protocol-version.patch
index 3f7f85dcb..d01a19241 100644
--- a/patches/server/0613-Expose-protocol-version.patch
+++ b/patches/server/0612-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7f47922bc72392f40b1b32e69cd8da7ae3049ec6..56e50bdb8116f934fd65212f13601b8c9d76c749 100644
+index 9e27257265dab677175b9b3d921e1fc3f3cb7817..7f747fbaa1da49ab930d2a9ff60200a445ca477c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -536,6 +536,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0616-Add-bypass-host-check.patch b/patches/server/0615-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0616-Add-bypass-host-check.patch
rename to patches/server/0615-Add-bypass-host-check.patch
diff --git a/patches/server/0617-Set-area-affect-cloud-rotation.patch b/patches/server/0616-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0617-Set-area-affect-cloud-rotation.patch
rename to patches/server/0616-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
index 7e2e05c13..384d93bd0 100644
--- a/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2fad663e7a4d2d4f2f6d52c0167509ecb5e4f561..30cb1dad2a2b1809e30a40bff64227fd7c0f9c11 100644
+index 9b23e2caedea8ff851f91dc6da2b6443dba14da6..26c707199cb3c87b3b56c28b2d4a1eaa8dd0b106 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2056,6 +2056,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0624-Added-PlayerDeepSleepEvent.patch b/patches/server/0623-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0624-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0623-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0625-More-World-API.patch b/patches/server/0624-More-World-API.patch
similarity index 100%
rename from patches/server/0625-More-World-API.patch
rename to patches/server/0624-More-World-API.patch
diff --git a/patches/server/0626-Added-PlayerBedFailEnterEvent.patch b/patches/server/0625-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0626-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0625-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index e03247ba7..61338a139 100644
--- a/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bee20e1ced20f29531919cb049c7d8214ebc7bb3..10cdb5f5a3c7f2fd367f8bcd008433251152ecce 100644
+index 304fb7b7255379d1be31ccf86ce04c377ef1d247..10b615ad0a038c7237f4664431996774b4e55e2f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -852,6 +852,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0628-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0631-Add-Channel-initialization-listeners.patch b/patches/server/0630-Add-Channel-initialization-listeners.patch
similarity index 98%
rename from patches/server/0631-Add-Channel-initialization-listeners.patch
rename to patches/server/0630-Add-Channel-initialization-listeners.patch
index fb1f43a35..fbea93e05 100644
--- a/patches/server/0631-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0630-Add-Channel-initialization-listeners.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 523e5a01c55d3a2e192d86e70ac751e3eb622aea..0b62d34d8db4331365f1fc0c703bb8af05d5d12a 100644
+index dd81751f64695180331b82225ac878913afe4513..86cc291b5b14523d57c84f8ebd6ba9b9c3b0d1a6 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -567,6 +567,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0633-Add-more-WanderingTrader-API.patch b/patches/server/0632-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0633-Add-more-WanderingTrader-API.patch
rename to patches/server/0632-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0633-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 90%
rename from patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 9f2b3cb58..8402d0763 100644
--- a/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,11 +5,11 @@ 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 9d1b7748ceeba953150342d709e02bf3d5269863..45b0b4261c4b58296c6ddd1c989dab868f88030f 100644
+index 2f0a70bc9cc8cda9e9beef00421078c036d6287c..f6efd220d7f78f3f763bf1983d20c636eb4923b6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -398,12 +398,13 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
-                             // Paper end
+@@ -381,12 +381,13 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+         public void fireEvents() throws Exception {
                          String playerName = ServerLoginPacketListenerImpl.this.gameProfile.getName();
                          java.net.InetAddress address = ((java.net.InetSocketAddress) ServerLoginPacketListenerImpl.this.connection.getRemoteAddress()).getAddress();
 +                        java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) connection.getRawAddress()).getAddress(); // Paper
diff --git a/patches/server/0637-Inventory-close.patch b/patches/server/0636-Inventory-close.patch
similarity index 100%
rename from patches/server/0637-Inventory-close.patch
rename to patches/server/0636-Inventory-close.patch
diff --git a/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 94%
rename from patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
index 1003cdb15..11bc717f0 100644
--- a/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] call PortalCreateEvent players and end platform
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 82d14e0fe2afdd5a8312566ca47d7b176ada2314..01ec3d4a3ea2d5edf1d503cdb6a9532774a89480 100644
+index d8ba103fd52c3c540fe386c9ff8264fcb3dbc136..66a3148985f864c2e4238cd3b27469d59ab3f354 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1208,15 +1208,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0640-Fix-CraftPotionBrewer-cache.patch b/patches/server/0639-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0640-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0639-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0641-Add-basic-Datapack-API.patch b/patches/server/0640-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0641-Add-basic-Datapack-API.patch
rename to patches/server/0640-Add-basic-Datapack-API.patch
index 1a66d7bc0..002be87f9 100644
--- a/patches/server/0641-Add-basic-Datapack-API.patch
+++ b/patches/server/0640-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 65fb1db4dd7078cfc6c0cb9ed5f0fe267e067249..5196eef152a64269f460b3631aba455b0b434246 100644
+index 1ddc78682e51bdbff6c4d7779a0c31b119b70899..0b70d313bf7f2ecf37d21608c380097088516136 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -280,6 +280,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0641-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
index b01b6af6b..db50c8fe4 100644
--- a/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
@@ -139,7 +139,7 @@ index 9e3c6ff6b7db0c6add4fe76d20fdfaff88239660..1811c6492d5fb5910b15b3d955060762
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index af3990e601a3e3b0ccb96e212bb071e3e240f6ff..7d030d7a8a58f4a031e09d09c9718af3d3c1e707 100644
+index 8024b7bcc18a9b2298864d53230d54c23b9d1166..b7803148a96bdf69e1208105ee0ddecf6d9662f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1396,7 +1396,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0644-ItemStack-repair-check-API.patch b/patches/server/0643-ItemStack-repair-check-API.patch
similarity index 97%
rename from patches/server/0644-ItemStack-repair-check-API.patch
rename to patches/server/0643-ItemStack-repair-check-API.patch
index 6a48f8e5e..136bbcb30 100644
--- a/patches/server/0644-ItemStack-repair-check-API.patch
+++ b/patches/server/0643-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 56e50bdb8116f934fd65212f13601b8c9d76c749..44b922c9e6f022c1a9282c0cb686bbd8a8d1c675 100644
+index 7f747fbaa1da49ab930d2a9ff60200a445ca477c..0ebcadd6daf244cd9b6c943ca0a2baaafb3eba50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -537,6 +537,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0645-More-Enchantment-API.patch b/patches/server/0644-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0645-More-Enchantment-API.patch
rename to patches/server/0644-More-Enchantment-API.patch
diff --git a/patches/server/0646-Move-range-check-for-block-placing-up.patch b/patches/server/0645-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0646-Move-range-check-for-block-placing-up.patch
rename to patches/server/0645-Move-range-check-for-block-placing-up.patch
index 63507a193..90ade9e8b 100644
--- a/patches/server/0646-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0645-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3737b9c62d8d1820041e49e4ec75a61fcfbcf10b..7a7ce8bf83f02fc17e68fe4468d80f79490c9daa 100644
+index 1811c6492d5fb5910b15b3d95506076245cd8b89..f54a2fd855c0a901ee72258b7a315d0c1caf4ff0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1833,6 +1833,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
index 72e3dc0a6..7fe78f53d 100644
--- a/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
@@ -272,7 +272,7 @@ index ce4aed84d751a48dcd2a8409190db4a22d78f77b..0a843e0afbcb1af8e2641515eb244b79
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a3964733e0a0459421776b6e00ca19caae5282d9..3f4a2a17790cad61218dcff351d70a2cc50cb56a 100644
+index 486acce909cdd2cacc5f2bb9eab1a600152f9971..749421b638bbb5868a426888e42edc461ad0edf3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -545,11 +545,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -356,7 +356,7 @@ index a96a6af2bcec3134b7caa32299bd07af50e83b89..0d96d1c0b66c57c680759f3567ef1b0c
          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 5196eef152a64269f460b3631aba455b0b434246..e8f327693e8b488790bf58d4927497402211bf1d 100644
+index 0b70d313bf7f2ecf37d21608c380097088516136..39884103ad0d27eecdeaf002076e548386650789 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1202,12 +1202,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0648-Add-Mob-lookAt-API.patch b/patches/server/0647-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0648-Add-Mob-lookAt-API.patch
rename to patches/server/0647-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0649-Add-Unix-domain-socket-support.patch b/patches/server/0648-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0649-Add-Unix-domain-socket-support.patch
rename to patches/server/0648-Add-Unix-domain-socket-support.patch
index f375f81d6..7873f07d9 100644
--- a/patches/server/0649-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0648-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 0b62d34d8db4331365f1fc0c703bb8af05d5d12a..ec1fa6b6cb386542d9c83f5c49c1e8e98c87d417 100644
+index 86cc291b5b14523d57c84f8ebd6ba9b9c3b0d1a6..b5f884d6671823085a2ab0e8da2d30afd2928f32 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -641,6 +641,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0650-Add-EntityInsideBlockEvent.patch b/patches/server/0649-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0650-Add-EntityInsideBlockEvent.patch
rename to patches/server/0649-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0651-Attributes-API-for-item-defaults.patch b/patches/server/0650-Attributes-API-for-item-defaults.patch
similarity index 94%
rename from patches/server/0651-Attributes-API-for-item-defaults.patch
rename to patches/server/0650-Attributes-API-for-item-defaults.patch
index e9852950a..882921f7c 100644
--- a/patches/server/0651-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0650-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 44b922c9e6f022c1a9282c0cb686bbd8a8d1c675..c98c5e070349e5c9356a3dec2344a135ad8f0b56 100644
+index 0ebcadd6daf244cd9b6c943ca0a2baaafb3eba50..6fd3bbc36cb6e270a10f778fe2764823f90cca9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -545,6 +545,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0653-More-Lidded-Block-API.patch b/patches/server/0652-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0653-More-Lidded-Block-API.patch
rename to patches/server/0652-More-Lidded-Block-API.patch
diff --git a/patches/server/0654-Limit-item-frame-cursors-on-maps.patch b/patches/server/0653-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0654-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0653-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0655-Add-PlayerKickEvent-causes.patch b/patches/server/0654-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0655-Add-PlayerKickEvent-causes.patch
rename to patches/server/0654-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0656-Add-PufferFishStateChangeEvent.patch b/patches/server/0655-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0656-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0655-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0660-Add-BellRevealRaiderEvent.patch b/patches/server/0659-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0660-Add-BellRevealRaiderEvent.patch
rename to patches/server/0659-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0661-Fix-invulnerable-end-crystals.patch b/patches/server/0660-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0661-Fix-invulnerable-end-crystals.patch
rename to patches/server/0660-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0661-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0663-Fix-dangerous-end-portal-logic.patch b/patches/server/0662-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0663-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0662-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0665-Make-item-validations-configurable.patch b/patches/server/0664-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0665-Make-item-validations-configurable.patch
rename to patches/server/0664-Make-item-validations-configurable.patch
diff --git a/patches/server/0666-Line-Of-Sight-Changes.patch b/patches/server/0665-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0666-Line-Of-Sight-Changes.patch
rename to patches/server/0665-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0667-add-per-world-spawn-limits.patch b/patches/server/0666-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0667-add-per-world-spawn-limits.patch
rename to patches/server/0666-add-per-world-spawn-limits.patch
diff --git a/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0669-Add-more-LimitedRegion-API.patch b/patches/server/0668-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0669-Add-more-LimitedRegion-API.patch
rename to patches/server/0668-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 94%
rename from patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
index c5e44962a..7d613a826 100644
--- a/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ 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 0f5204733022955df059b3ccff260e1aa375916c..6441c2ea6bcbee9ef49468e6a929162b2b06183e 100644
+index 4a35720430990b358ea5d7f2b6293e27e8d9f7ac..9a60cf249e0b9f089b0966c670e6046e7e1ed08a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2201,7 +2201,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0671-Missing-Entity-Behavior-API.patch b/patches/server/0670-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0671-Missing-Entity-Behavior-API.patch
rename to patches/server/0670-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 708025b26..76c5d7730 100644
--- a/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ 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 c6d6973e15e3a7f81b908eef6d4de81b51958b14..63b7150eca9300a8befc5d39184cb1ae4b3ac242 100644
+index 1b1bf6fdc29a78b70eb39ce0770056a0b92d5e55..6fbba4cb8e3d00ea910c7d32b37b70df7f9cf133 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1216,7 +1216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0676-Adds-PlayerArmSwingEvent.patch b/patches/server/0675-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0676-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0675-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 95%
rename from patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
index 1fe1230e7..496092646 100644
--- a/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6441c2ea6bcbee9ef49468e6a929162b2b06183e..db60c82386f25f272e5f9258045dfd38b2ddddb2 100644
+index 9a60cf249e0b9f089b0966c670e6046e7e1ed08a..787f2b23352fbfb66a76ca5fce6de94cc10b30d2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,7 +260,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 6441c2ea6bcbee9ef49468e6a929162b2b06183e..db60c82386f25f272e5f9258045dfd38
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f104ac728fa27237dce28ec661f03101257ad222..04bbc8a94b62ff6853835c6bbecc00366fc7fa2c 100644
+index dd1ec83feddecfdd8f2dd8248c3cbca0d55393ec..ab956e3bb44374cf8a3792eeadb1ffb1c39ca45b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -525,7 +525,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -59,7 +59,7 @@ index f104ac728fa27237dce28ec661f03101257ad222..04bbc8a94b62ff6853835c6bbecc0036
              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 8147396dc18fe199ffbb59437d0873c2f79b3ee7..5a513838908a5805a724641ad8a78942ee4f7759 100644
+index c332750833cccee1264a3399ed0539f6fee6af44..0e20ebf895e7ebe4201a8596519929ea65f653af 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -592,6 +592,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
similarity index 93%
rename from patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
index 2c3ac1042..28e1719c3 100644
--- a/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index db60c82386f25f272e5f9258045dfd38b2ddddb2..fd68f5f24085001c104f9bc1e1641462c1d37374 100644
+index 787f2b23352fbfb66a76ca5fce6de94cc10b30d2..56ac440465813a7dab8d166e882e18143a50729f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1446,7 +1446,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0683-Stinger-API.patch b/patches/server/0682-Stinger-API.patch
similarity index 100%
rename from patches/server/0683-Stinger-API.patch
rename to patches/server/0682-Stinger-API.patch
diff --git a/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0685-Add-System.out-err-catcher.patch b/patches/server/0684-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0685-Add-System.out-err-catcher.patch
rename to patches/server/0684-Add-System.out-err-catcher.patch
index 58a7215c0..52ecf27cd 100644
--- a/patches/server/0685-Add-System.out-err-catcher.patch
+++ b/patches/server/0684-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 e8f327693e8b488790bf58d4927497402211bf1d..2f91be86f31c868dee3699ce5426a3ce5c8296b0 100644
+index 39884103ad0d27eecdeaf002076e548386650789..0e66d82bd0ab31491dad2ce344935548eb3966b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -282,6 +282,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0686-Fix-test-not-bootstrapping.patch b/patches/server/0685-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0686-Fix-test-not-bootstrapping.patch
rename to patches/server/0685-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0688-Improve-boat-collision-performance.patch b/patches/server/0687-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0688-Improve-boat-collision-performance.patch
rename to patches/server/0687-Improve-boat-collision-performance.patch
diff --git a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
index 3c7ac58d9..f7208675d 100644
--- a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 04bbc8a94b62ff6853835c6bbecc00366fc7fa2c..b20dae88cf6ddc4baa241c0eb92cd2259b6232b1 100644
+index ab956e3bb44374cf8a3792eeadb1ffb1c39ca45b..f9e1057401857ccc48f4655a64f9065dc9d93d5a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -441,7 +441,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0691-Add-PlayerSetSpawnEvent.patch b/patches/server/0690-Add-PlayerSetSpawnEvent.patch
similarity index 97%
rename from patches/server/0691-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0690-Add-PlayerSetSpawnEvent.patch
index ac7334e52..fb613de14 100644
--- a/patches/server/0691-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0690-Add-PlayerSetSpawnEvent.patch
@@ -32,7 +32,7 @@ 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 fd68f5f24085001c104f9bc1e1641462c1d37374..0d4c51faededf36601ea42af5d48b51a2ccab330 100644
+index 56ac440465813a7dab8d166e882e18143a50729f..80e1970f568a74a43e624188a77cfbd28cfa52dd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1287,7 +1287,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index fd68f5f24085001c104f9bc1e1641462c1d37374..0d4c51faededf36601ea42af5d48b51a
  
      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 5a513838908a5805a724641ad8a78942ee4f7759..5d5663d929227b2376c57b130a5c32e349edf009 100644
+index 0e20ebf895e7ebe4201a8596519929ea65f653af..03c413dfd16f415377749baa4fdd41949c6a12b9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -896,13 +896,13 @@ public abstract class PlayerList {
@@ -129,7 +129,7 @@ index c3e49a781f838e6a46cb89744f3f1846de182275..c2f3d3a09327e7cb7d3167609eb3ce68
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 140730ff3e10066d19321c75e241a1e0d8d3ba17..58d9f425187b791d8b36b55a89b37e0f2ba56357 100644
+index bf5931cbcfbfdc6e68706b7e86b24b2478e4bbef..55f4a09bc27c30936e29fa2a2fe2ef0a67b8876d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1216,9 +1216,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0693-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0695-Added-EntityDamageItemEvent.patch b/patches/server/0694-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0695-Added-EntityDamageItemEvent.patch
rename to patches/server/0694-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0696-Optimize-indirect-passenger-iteration.patch b/patches/server/0695-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0696-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0695-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0698-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0700-Clear-bucket-NBT-after-dispense.patch b/patches/server/0699-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0700-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0699-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0702-Add-BlockBreakBlockEvent.patch b/patches/server/0701-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0702-Add-BlockBreakBlockEvent.patch
rename to patches/server/0701-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0704-More-CommandBlock-API.patch b/patches/server/0703-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0704-More-CommandBlock-API.patch
rename to patches/server/0703-More-CommandBlock-API.patch
diff --git a/patches/server/0705-Add-missing-team-sidebar-display-slots.patch b/patches/server/0704-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0705-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0704-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0706-Add-back-EntityPortalExitEvent.patch b/patches/server/0705-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0706-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0705-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0708-Get-entity-default-attributes.patch b/patches/server/0707-Get-entity-default-attributes.patch
similarity index 98%
rename from patches/server/0708-Get-entity-default-attributes.patch
rename to patches/server/0707-Get-entity-default-attributes.patch
index 49b00d01a..c2cbc0160 100644
--- a/patches/server/0708-Get-entity-default-attributes.patch
+++ b/patches/server/0707-Get-entity-default-attributes.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..4ecba0b02c2813a890aecc5586987879
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c98c5e070349e5c9356a3dec2344a135ad8f0b56..7e024b0f0a5201b4e9e7fcd7a160b146d7f12b52 100644
+index 6fd3bbc36cb6e270a10f778fe2764823f90cca9c..51ecfd4c4afe6dfc42c3aa85e6fc55d0e965a5dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -562,6 +562,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0709-Left-handed-API.patch b/patches/server/0708-Left-handed-API.patch
similarity index 100%
rename from patches/server/0709-Left-handed-API.patch
rename to patches/server/0708-Left-handed-API.patch
diff --git a/patches/server/0710-Add-advancement-display-API.patch b/patches/server/0709-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0710-Add-advancement-display-API.patch
rename to patches/server/0709-Add-advancement-display-API.patch
diff --git a/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0712-Add-critical-damage-API.patch b/patches/server/0711-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0712-Add-critical-damage-API.patch
rename to patches/server/0711-Add-critical-damage-API.patch
diff --git a/patches/server/0713-Fix-issues-with-mob-conversion.patch b/patches/server/0712-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0713-Fix-issues-with-mob-conversion.patch
rename to patches/server/0712-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0714-Add-isCollidable-methods-to-various-places.patch b/patches/server/0713-Add-isCollidable-methods-to-various-places.patch
similarity index 96%
rename from patches/server/0714-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0713-Add-isCollidable-methods-to-various-places.patch
index 70c5cdaf6..2b95e405a 100644
--- a/patches/server/0714-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0713-Add-isCollidable-methods-to-various-places.patch
@@ -37,7 +37,7 @@ index 7b9e943b391c061782fccd2b8d705ceec8db50fe..966ac60daebb7bb211ab8096fc0c5f33
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7e024b0f0a5201b4e9e7fcd7a160b146d7f12b52..c3ac503bd2c04a94bc3c172b2c6bfe1308da29aa 100644
+index 51ecfd4c4afe6dfc42c3aa85e6fc55d0e965a5dc..0a3d447f87698dc786d6cab6ded27eb1b5780204 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -574,6 +574,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0715-Goat-ram-API.patch b/patches/server/0714-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0715-Goat-ram-API.patch
rename to patches/server/0714-Goat-ram-API.patch
diff --git a/patches/server/0716-Add-API-for-resetting-a-single-score.patch b/patches/server/0715-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0716-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0715-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
similarity index 97%
rename from patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
index fe3844bf5..2f27482d7 100644
--- a/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
@@ -45,7 +45,7 @@ index b8e5205c165bcba5b8383334f3d0d1daf9d0a8cd..ff8562821ebb363c755e9d316679226d
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c3ac503bd2c04a94bc3c172b2c6bfe1308da29aa..1f491d48b591281e3a054c33683ac4cf76ada802 100644
+index 0a3d447f87698dc786d6cab6ded27eb1b5780204..d3b37adfe6d66e82db18d94f143af3aba4543f79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -457,6 +457,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0718-Vanilla-command-permission-fixes.patch b/patches/server/0717-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0718-Vanilla-command-permission-fixes.patch
rename to patches/server/0717-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0719-Make-CallbackExecutor-strict-again.patch b/patches/server/0718-Make-CallbackExecutor-strict-again.patch
similarity index 100%
rename from patches/server/0719-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0718-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 35a1cb428..05c02fd44 100644
--- a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index 8c95d537c7bf5cc9b63f0e412c9ad67f5e6fe51e..2634eba0537648c0e013455e813e2589
          }
          // 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 0d4c51faededf36601ea42af5d48b51a2ccab330..dfa4b0d4c897f2b15da3f7e53b962b277b1cad12 100644
+index 80e1970f568a74a43e624188a77cfbd28cfa52dd..951ccf3526dc2f5e4e2f16952036683ad132fbe0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1588,6 +1588,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0723-Fix-GameProfileCache-concurrency.patch b/patches/server/0722-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0723-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0722-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 100%
rename from patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0726-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0727-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0726-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0727-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0727-Add-paper-mobcaps-and-paper-playermobcaps.patch
index b5dc131bb..3bf9b36ce 100644
--- a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0727-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -286,7 +286,7 @@ index fa23e9c476d4edc6176d8b8a6cb13c52d2f66a87..4150e8cd7197eac53042d56f0a53a495
          // 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 2f91be86f31c868dee3699ce5426a3ce5c8296b0..669dade4853ae52ba011ede9bc8944ea11e5fa54 100644
+index 0e66d82bd0ab31491dad2ce344935548eb3966b0..dcb6fecaf1df903ce8b29d87d3f84376fb8f5982 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2154,6 +2154,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0728-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
similarity index 100%
rename from patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
rename to patches/server/0728-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0729-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0730-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0729-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0730-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0731-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0730-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0732-Optimise-general-POI-access.patch b/patches/server/0731-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0732-Optimise-general-POI-access.patch
rename to patches/server/0731-Optimise-general-POI-access.patch
diff --git a/patches/server/0733-Add-more-async-catchers.patch b/patches/server/0732-Add-more-async-catchers.patch
similarity index 100%
rename from patches/server/0733-Add-more-async-catchers.patch
rename to patches/server/0732-Add-more-async-catchers.patch
diff --git a/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0733-Rewrite-entity-bounding-box-lookup-calls.patch
similarity index 100%
rename from patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch
rename to patches/server/0733-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0735-Optimise-chunk-tick-iteration.patch b/patches/server/0734-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0735-Optimise-chunk-tick-iteration.patch
rename to patches/server/0734-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0736-Execute-chunk-tasks-mid-tick.patch b/patches/server/0735-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0736-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0735-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0737-Do-not-copy-visible-chunks.patch b/patches/server/0736-Do-not-copy-visible-chunks.patch
similarity index 100%
rename from patches/server/0737-Do-not-copy-visible-chunks.patch
rename to patches/server/0736-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0738-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0738-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0739-Detail-more-information-in-watchdog-dumps.patch
similarity index 99%
rename from patches/server/0740-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0739-Detail-more-information-in-watchdog-dumps.patch
index 322d3b79f..cf57b0b11 100644
--- a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0739-Detail-more-information-in-watchdog-dumps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Detail more information in watchdog dumps
 - Dump player name, player uuid, position, and world for packet handling
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index dc6b467f51b6e17aa46ccce75aa40788afcdf010..28471311a992f5183c39b1a692e0251eb1fee1df 100644
+index 057a0be81b12bd8a4ac71106dc8ada91bd4c9bfd..98443474d1881bbeee8f249b89e44a0f84261be7 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -475,9 +475,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0740-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0741-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0740-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0742-Distance-manager-tick-timings.patch b/patches/server/0741-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0742-Distance-manager-tick-timings.patch
rename to patches/server/0741-Distance-manager-tick-timings.patch
diff --git a/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0742-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0742-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0745-Add-packet-limiter-config.patch b/patches/server/0744-Add-packet-limiter-config.patch
similarity index 98%
rename from patches/server/0745-Add-packet-limiter-config.patch
rename to patches/server/0744-Add-packet-limiter-config.patch
index 3742d8fef..8aa45e5f9 100644
--- a/patches/server/0745-Add-packet-limiter-config.patch
+++ b/patches/server/0744-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 28471311a992f5183c39b1a692e0251eb1fee1df..a5cba4a46f75a7097fb565346e91a73bdb74de55 100644
+index 98443474d1881bbeee8f249b89e44a0f84261be7..51217798bfd549483ce456b44d14089f35642c55 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -131,6 +131,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 96%
rename from patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch
index 4178a2ab8..82aca1adf 100644
--- a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -24,7 +24,7 @@ index 8da1226a6c293abb038d10c7921a77ed71ad06cc..f958f0ae738a6fb26400e17e54c8d69e
          } else {
              Holder<E> holder = registry.getOrCreateHolderOrThrow(entryKey);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 621956c024d64bcaa868e0bb01c485fe4ac11df3..002daab4b5bb32cdab9f822d8229805a8ab36ded 100644
+index 2d94390e3b9fa3afd2471cc691d59de0f470b46c..68c0bb1d493b3de3c3e80018a1655ec968b0316a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -553,7 +553,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0747-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0747-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0748-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0748-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0750-Time-scoreboard-search.patch b/patches/server/0749-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0750-Time-scoreboard-search.patch
rename to patches/server/0749-Time-scoreboard-search.patch
diff --git a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0750-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0750-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0751-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0751-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0752-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0753-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0752-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0753-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0753-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch
similarity index 100%
rename from patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch
rename to patches/server/0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0756-Optimise-random-block-ticking.patch b/patches/server/0755-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0756-Optimise-random-block-ticking.patch
rename to patches/server/0755-Optimise-random-block-ticking.patch
diff --git a/patches/server/0757-Optimise-non-flush-packet-sending.patch b/patches/server/0756-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0757-Optimise-non-flush-packet-sending.patch
rename to patches/server/0756-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0758-Optimise-nearby-player-lookups.patch b/patches/server/0757-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0758-Optimise-nearby-player-lookups.patch
rename to patches/server/0757-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0759-Optimise-WorldServer-notify.patch b/patches/server/0758-Optimise-WorldServer-notify.patch
similarity index 100%
rename from patches/server/0759-Optimise-WorldServer-notify.patch
rename to patches/server/0758-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0760-Remove-streams-for-villager-AI.patch b/patches/server/0759-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0760-Remove-streams-for-villager-AI.patch
rename to patches/server/0759-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0761-Rewrite-dataconverter-system.patch b/patches/server/0760-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0761-Rewrite-dataconverter-system.patch
rename to patches/server/0760-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch
index 5112930ca..ed1f57fae 100644
--- a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch
@@ -341,10 +341,10 @@ 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 45b0b4261c4b58296c6ddd1c989dab868f88030f..b9beea9ff4091e7530adb92ecb7a7e5c3ea20373 100644
+index f6efd220d7f78f3f763bf1983d20c636eb4923b6..77cb18da4f89bb89aea7d1ef5ebe3dd7acfe000d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -326,12 +326,14 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -315,12 +315,14 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
              }
  
              SecretKey secretkey = packet.getSecretKey(privatekey);
diff --git a/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
similarity index 100%
rename from patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
rename to patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0764-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0764-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0765-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0765-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0767-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0767-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 62bd82127..b3bc141eb 100644
--- a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ 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 b20dae88cf6ddc4baa241c0eb92cd2259b6232b1..7baba13852a99f6ee617529b4d1e470d188b5e82 100644
+index f9e1057401857ccc48f4655a64f9065dc9d93d5a..c4fd848c540eb70502b5073a4a50bef90c1c33b0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -850,6 +850,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0771-Ensure-valid-vehicle-status.patch b/patches/server/0770-Ensure-valid-vehicle-status.patch
similarity index 90%
rename from patches/server/0771-Ensure-valid-vehicle-status.patch
rename to patches/server/0770-Ensure-valid-vehicle-status.patch
index a737af891..2d1f854e7 100644
--- a/patches/server/0771-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0770-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ 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 dfa4b0d4c897f2b15da3f7e53b962b277b1cad12..ebfd634c69ba170c6ab5edd35ebc1390480e8c4b 100644
+index 951ccf3526dc2f5e4e2f16952036683ad132fbe0..97de35c614e1e9b0e825f9914173a3e1e0e53221 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -513,7 +513,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0771-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0771-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0773-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0774-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0773-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0774-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0775-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0774-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0775-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 100%
rename from patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/server/0775-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0777-Preserve-overstacked-loot.patch b/patches/server/0776-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0777-Preserve-overstacked-loot.patch
rename to patches/server/0776-Preserve-overstacked-loot.patch
diff --git a/patches/server/0778-Update-head-rotation-in-missing-places.patch b/patches/server/0777-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0778-Update-head-rotation-in-missing-places.patch
rename to patches/server/0777-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0779-prevent-unintended-light-block-manipulation.patch b/patches/server/0778-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0779-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0778-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0780-Fix-CraftCriteria-defaults-map.patch b/patches/server/0779-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0780-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0779-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0781-Fix-upstreams-block-state-factories.patch b/patches/server/0780-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0781-Fix-upstreams-block-state-factories.patch
rename to patches/server/0780-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 97%
rename from patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch
index 20871b2b8..f72d88e11 100644
--- a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch
@@ -49,10 +49,10 @@ 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 b9beea9ff4091e7530adb92ecb7a7e5c3ea20373..2128bafb9b64568ae01a0cfe134185a28be479aa 100644
+index 77cb18da4f89bb89aea7d1ef5ebe3dd7acfe000d..acd581d14e0ef1fe5a6545ee67be00deff589879 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -237,7 +237,10 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -236,7 +236,10 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      }
  
      public String getUserName() {
diff --git a/patches/server/0783-Configurable-feature-seeds.patch b/patches/server/0782-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0783-Configurable-feature-seeds.patch
rename to patches/server/0782-Configurable-feature-seeds.patch
diff --git a/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0785-Add-root-admin-user-detection.patch b/patches/server/0784-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0785-Add-root-admin-user-detection.patch
rename to patches/server/0784-Add-root-admin-user-detection.patch
diff --git a/patches/server/0786-Always-allow-item-changing-in-Fireball.patch b/patches/server/0785-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0786-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0785-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0788-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0788-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0790-Rewrite-the-light-engine.patch b/patches/server/0789-Rewrite-the-light-engine.patch
similarity index 100%
rename from patches/server/0790-Rewrite-the-light-engine.patch
rename to patches/server/0789-Rewrite-the-light-engine.patch
diff --git a/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0791-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0791-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 100%
rename from patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0796-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0797-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0796-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0798-Add-player-health-update-API.patch b/patches/server/0797-Add-player-health-update-API.patch
similarity index 95%
rename from patches/server/0798-Add-player-health-update-API.patch
rename to patches/server/0797-Add-player-health-update-API.patch
index 2c64a44e4..da94ae0e7 100644
--- a/patches/server/0798-Add-player-health-update-API.patch
+++ b/patches/server/0797-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 58d9f425187b791d8b36b55a89b37e0f2ba56357..9f6a26f1fb53c14b68ce7bc2a69a59cabd00de7f 100644
+index 55f4a09bc27c30936e29fa2a2fe2ef0a67b8876d..67833efdd2c4babe20a01691a44ec6f153656729 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2152,9 +2152,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0799-Optimize-HashMapPalette.patch b/patches/server/0798-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0799-Optimize-HashMapPalette.patch
rename to patches/server/0798-Optimize-HashMapPalette.patch
diff --git a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch
index 930b668b6..862d3733f 100644
--- a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0799-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 669dade4853ae52ba011ede9bc8944ea11e5fa54..2a48cb31263426abd7577bbddd1c0504ac42f7e0 100644
+index dcb6fecaf1df903ce8b29d87d3f84376fb8f5982..83d48e4ea33c70494a482103eaa78c4d360347ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2322,6 +2322,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 4e9f2e675..652336831 100644
--- a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,7 +1180,7 @@ 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 ebfd634c69ba170c6ab5edd35ebc1390480e8c4b..1643883aeda01ec4d0d26115c33de44379db2365 100644
+index 97de35c614e1e9b0e825f9914173a3e1e0e53221..b35b36527294dd697d146d2ad817d7911145ae8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -423,7 +423,7 @@ public class ServerPlayer extends Player {
@@ -1202,7 +1202,7 @@ index ebfd634c69ba170c6ab5edd35ebc1390480e8c4b..1643883aeda01ec4d0d26115c33de443
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 49305ca48798ba9047c27dfc9f1755b72689abcb..2595de3d40bc666c3b6e64538127fa9d83a3ef07 100644
+index d3c6c1b9ac00df265507db61301cae397214dca7..8f89c694e08db71a8e1509a102ad96defe788828 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -937,7 +937,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch
index 6dc6ac102..3a3b5f4d7 100644
--- a/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ 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 7baba13852a99f6ee617529b4d1e470d188b5e82..7933bdb29056ddf8cb29a12166598cd15c155b3a 100644
+index c4fd848c540eb70502b5073a4a50bef90c1c33b0..c3ce4657e9eed5a398352b362d0ee6a1861708d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -658,7 +658,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0803-Actually-unload-POI-data.patch b/patches/server/0802-Actually-unload-POI-data.patch
similarity index 100%
rename from patches/server/0803-Actually-unload-POI-data.patch
rename to patches/server/0802-Actually-unload-POI-data.patch
diff --git a/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0805-Update-Log4j.patch b/patches/server/0804-Update-Log4j.patch
similarity index 100%
rename from patches/server/0805-Update-Log4j.patch
rename to patches/server/0804-Update-Log4j.patch
diff --git a/patches/server/0806-Add-more-Campfire-API.patch b/patches/server/0805-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0806-Add-more-Campfire-API.patch
rename to patches/server/0805-Add-more-Campfire-API.patch
diff --git a/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0808-Fix-tripwire-state-inconsistency.patch b/patches/server/0807-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0808-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0807-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0809-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0810-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0809-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0811-Improve-scoreboard-entries.patch b/patches/server/0810-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0811-Improve-scoreboard-entries.patch
rename to patches/server/0810-Improve-scoreboard-entries.patch
diff --git a/patches/server/0812-Entity-powdered-snow-API.patch b/patches/server/0811-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0812-Entity-powdered-snow-API.patch
rename to patches/server/0811-Entity-powdered-snow-API.patch
diff --git a/patches/server/0813-Add-API-for-item-entity-health.patch b/patches/server/0812-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0813-Add-API-for-item-entity-health.patch
rename to patches/server/0812-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 91%
rename from patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch
index cf55a5613..768bf70b1 100644
--- a/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Load effect amplifiers greater than 127 correctly
 MOJIRA: MC-118857
 
 diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
-index b99f15fbe87bcf130d9136559d38a2082a275c12..d545a581b802ec74bcf8a1709d1b0cb790ed5d40 100644
+index 3232ecbf96761528be1bc88f223b51771386ad37..f5c9be3fde2654bd5a6b3ee737afe96a9393e836 100644
 --- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
 +++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
 @@ -265,7 +265,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
diff --git a/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0819-Fix-bees-aging-inside-hives.patch b/patches/server/0818-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0819-Fix-bees-aging-inside-hives.patch
rename to patches/server/0818-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0820-Bucketable-API.patch b/patches/server/0819-Bucketable-API.patch
similarity index 100%
rename from patches/server/0820-Bucketable-API.patch
rename to patches/server/0819-Bucketable-API.patch
diff --git a/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0822-Validate-usernames.patch b/patches/server/0821-Validate-usernames.patch
similarity index 92%
rename from patches/server/0822-Validate-usernames.patch
rename to patches/server/0821-Validate-usernames.patch
index a9dc31e22..bf5280d1d 100644
--- a/patches/server/0822-Validate-usernames.patch
+++ b/patches/server/0821-Validate-usernames.patch
@@ -5,18 +5,18 @@ 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 2128bafb9b64568ae01a0cfe134185a28be479aa..6445af64bc46270533b79270a3a0eaee15e5ef7b 100644
+index acd581d14e0ef1fe5a6545ee67be00deff589879..553eb8e437b07376dbfc54b0018bcc3ff93e4461 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -67,6 +67,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+     @Nullable
      private ProfilePublicKey.Data profilePublicKeyData;
      public String hostname = ""; // CraftBukkit - add field
-     private int velocityLoginMessageId = -1; // Paper - Velocity support
 +    public boolean iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation = false; // Paper - username validation overriding
  
      public ServerLoginPacketListenerImpl(MinecraftServer server, Connection connection) {
          this.state = ServerLoginPacketListenerImpl.State.HELLO;
-@@ -256,10 +257,38 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -255,10 +256,38 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
          }
      }
  
diff --git a/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0822-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0823-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0822-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0824-Make-water-animal-spawn-height-configurable.patch b/patches/server/0823-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0824-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0823-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 97%
rename from patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 54936939f..9cafbd4f1 100644
--- a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 002daab4b5bb32cdab9f822d8229805a8ab36ded..beaefa13a4635a69d06f652a9ec506072490fd19 100644
+index 68c0bb1d493b3de3c3e80018a1655ec968b0316a..a4433426efd0823cd8145a50b38127f63e90adc9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -562,7 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 002daab4b5bb32cdab9f822d8229805a8ab36ded..beaefa13a4635a69d06f652a9ec50607
                  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 2a48cb31263426abd7577bbddd1c0504ac42f7e0..3c4fdd1a6e3bf04c523aca2b18632f6439189caa 100644
+index 83d48e4ea33c70494a482103eaa78c4d360347ca..0706649544d315f81964d9153446b2cde7fca4d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1210,7 +1210,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0828-Multiple-Entries-with-Scoreboards.patch b/patches/server/0827-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0828-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0827-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0829-Reset-placed-block-on-exception.patch b/patches/server/0828-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0829-Reset-placed-block-on-exception.patch
rename to patches/server/0828-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0830-Add-configurable-height-for-slime-spawn.patch b/patches/server/0829-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0830-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0829-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 89%
rename from patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 436aeb050..eb758a555 100644
--- a/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,10 +5,10 @@ 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 6445af64bc46270533b79270a3a0eaee15e5ef7b..4f194eb6cab2347bc6c61f6cd8c47db7c59ff369 100644
+index 553eb8e437b07376dbfc54b0018bcc3ff93e4461..51ff7ab5d8740e755cc893723f659c8481c1ec89 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -438,7 +438,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -421,7 +421,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
  
                          // Paper start
                          com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(ServerLoginPacketListenerImpl.this.gameProfile);
diff --git a/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0831-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0832-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0831-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0833-Kick-on-main-for-illegal-chat.patch b/patches/server/0832-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0833-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0832-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0834-Multi-Block-Change-API-Implementation.patch b/patches/server/0833-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0834-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0833-Multi-Block-Change-API-Implementation.patch
index bd05825fe..16d48b2da 100644
--- a/patches/server/0834-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0833-Multi-Block-Change-API-Implementation.patch
@@ -25,7 +25,7 @@ index 82ea4fabd5732052a286d50bcff8bbcc2c4aa7d7..652bea6868a03a5315965f79c76172fb
      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 9f6a26f1fb53c14b68ce7bc2a69a59cabd00de7f..fca6ccabd527bb05d2f89bf1278b46a85f397318 100644
+index 67833efdd2c4babe20a01691a44ec6f153656729..c569bf167addfedcb0d8c55b2d2cfcb52e05d0a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -29,6 +29,7 @@ import java.util.logging.Logger;
diff --git a/patches/server/0835-Fix-NotePlayEvent.patch b/patches/server/0834-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0835-Fix-NotePlayEvent.patch
rename to patches/server/0834-Fix-NotePlayEvent.patch
diff --git a/patches/server/0836-Freeze-Tick-Lock-API.patch b/patches/server/0835-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0836-Freeze-Tick-Lock-API.patch
rename to patches/server/0835-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0837-Dolphin-API.patch b/patches/server/0836-Dolphin-API.patch
similarity index 100%
rename from patches/server/0837-Dolphin-API.patch
rename to patches/server/0836-Dolphin-API.patch
diff --git a/patches/server/0838-More-PotionEffectType-API.patch b/patches/server/0837-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0838-More-PotionEffectType-API.patch
rename to patches/server/0837-More-PotionEffectType-API.patch
diff --git a/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch
index eaa7c86ed..e9ffecf14 100644
--- a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0839-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 3c4fdd1a6e3bf04c523aca2b18632f6439189caa..b6280e653f4f625272e4208c663fc818424e8fca 100644
+index 0706649544d315f81964d9153446b2cde7fca4d4..9ffbb711b353208a436e96947e156549507a8202 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1988,6 +1988,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0841-Add-config-for-stronghold-seed.patch b/patches/server/0840-Add-config-for-stronghold-seed.patch
similarity index 100%
rename from patches/server/0841-Add-config-for-stronghold-seed.patch
rename to patches/server/0840-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0842-Implement-regenerateChunk.patch b/patches/server/0841-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0842-Implement-regenerateChunk.patch
rename to patches/server/0841-Implement-regenerateChunk.patch
diff --git a/patches/server/0843-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0843-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 9ec9b002d..92346dc14 100644
--- a/patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0843-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 b6280e653f4f625272e4208c663fc818424e8fca..b880b31cd80153569db1fb55655e5485ea36cde0 100644
+index 9ffbb711b353208a436e96947e156549507a8202..67b7516e41d9201b2ff29d0935f68eaa4692060c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2162,6 +2162,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0845-Add-GameEvent-tags.patch b/patches/server/0844-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0845-Add-GameEvent-tags.patch
rename to patches/server/0844-Add-GameEvent-tags.patch
index 1dcf3cecb..1983ffbf4 100644
--- a/patches/server/0845-Add-GameEvent-tags.patch
+++ b/patches/server/0844-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b880b31cd80153569db1fb55655e5485ea36cde0..941e2b22807373f739925b0d9a3eec28300ac7ff 100644
+index 67b7516e41d9201b2ff29d0935f68eaa4692060c..127c86cba3616238361aabbd8aecf55969625af0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2568,6 +2568,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0847-Replace-ticket-level-propagator.patch b/patches/server/0846-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0847-Replace-ticket-level-propagator.patch
rename to patches/server/0846-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0848-Furnace-RecipesUsed-API.patch b/patches/server/0847-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0848-Furnace-RecipesUsed-API.patch
rename to patches/server/0847-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0849-Configurable-sculk-sensor-listener-range.patch b/patches/server/0848-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0849-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0848-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0850-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0849-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0850-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0849-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 0b756d2f5..24a137301 100644
--- a/patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae59d5533a0eb2c427433042512fc560af99940d..630fc9e5597c80ce1d48de85d4e51857a12bc338 100644
+index 1444391ded50ec10e9bfeb073b01c885c429b8bd..faa380a0119d5827735a45104beef9880992240a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -589,7 +589,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0852-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 91%
rename from patches/server/0852-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
index 7d77a911c..b89cf36bb 100644
--- a/patches/server/0852-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 630fc9e5597c80ce1d48de85d4e51857a12bc338..d18ce42b02076aac74c9f272e5ee03293810e702 100644
+index faa380a0119d5827735a45104beef9880992240a..cd1edd0cb404cab5e71efdb82f3b911c2fe96d01 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -601,9 +601,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index 630fc9e5597c80ce1d48de85d4e51857a12bc338..d18ce42b02076aac74c9f272e5ee0329
  
              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 941e2b22807373f739925b0d9a3eec28300ac7ff..8d1992ba6446c2c5a3b4e2410603d98110207d5f 100644
+index 127c86cba3616238361aabbd8aecf55969625af0..54d342d378acc2d16186f1b96e327cf81d1bd99d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1239,10 +1239,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0853-Fix-Entity-Position-Desync.patch b/patches/server/0852-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0853-Fix-Entity-Position-Desync.patch
rename to patches/server/0852-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0854-Custom-Potion-Mixes.patch b/patches/server/0853-Custom-Potion-Mixes.patch
similarity index 99%
rename from patches/server/0854-Custom-Potion-Mixes.patch
rename to patches/server/0853-Custom-Potion-Mixes.patch
index 0f8786412..6b3268298 100644
--- a/patches/server/0854-Custom-Potion-Mixes.patch
+++ b/patches/server/0853-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 8d1992ba6446c2c5a3b4e2410603d98110207d5f..91ba3684c73bb127d67c6385bf55e71d96f69075 100644
+index 54d342d378acc2d16186f1b96e327cf81d1bd99d..0c43516bacdc56b6eca7498b51fa49fb65d4dde4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -283,6 +283,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0855-Replace-player-chunk-loader-system.patch b/patches/server/0854-Replace-player-chunk-loader-system.patch
similarity index 99%
rename from patches/server/0855-Replace-player-chunk-loader-system.patch
rename to patches/server/0854-Replace-player-chunk-loader-system.patch
index c6e8d0833..8870e7a14 100644
--- a/patches/server/0855-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0854-Replace-player-chunk-loader-system.patch
@@ -1218,7 +1218,7 @@ index 0000000000000000000000000000000000000000..b53402903eb6845df361daf6b05a6686
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index c561a2f28fa1e9a327982c4587c4552cd85a7336..868d4913f63b3f4752f7f1cdcd81e118e482c474 100644
+index 66afd752fd7d327e141d49b477f07e1ff3645d02..2a26d03fba2f3b37f176be9e47954ef9a6cd7b3e 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -100,6 +100,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -1889,7 +1889,7 @@ index 856ef0c487af8e8c5689d58decc9acf8d52971c9..836841987ff5dd4901f75f47028a60d8
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1643883aeda01ec4d0d26115c33de44379db2365..815aa9eb2879cbfcfc2f7a00106f3455b6e8a877 100644
+index b35b36527294dd697d146d2ad817d7911145ae8c..18c3d4aecf498f78040c27336d2ea56fd911d034 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2475,5 +2475,5 @@ public class ServerPlayer extends Player {
@@ -1900,7 +1900,7 @@ index 1643883aeda01ec4d0d26115c33de44379db2365..815aa9eb2879cbfcfc2f7a00106f3455
 +    public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 80ea6e59a96b1135823ef8bd228b924caf73faed..a077d5fdfa0d42a6ac22fe1020469a25491d0235 100644
+index dd06ed2a72df27a6f2bd4014ec9055729e7f2773..a01858ee7a4419fb5b85df8863ab0052180079e3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -274,7 +274,7 @@ public abstract class PlayerList {
@@ -2148,7 +2148,7 @@ index 1bbc73dcdf890a9383795ffeb0d368293f7146a5..c4f7aa9ffb72d2bc555ace64bb8cedc5
      // Paper end - view distance api
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fca6ccabd527bb05d2f89bf1278b46a85f397318..c88342c53787a48477dcbec4af53d1d5ce2b02e2 100644
+index c569bf167addfedcb0d8c55b2d2cfcb52e05d0a6..2cf84abadc7fd7806566948d4c6e2212bdf2aeb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -541,45 +541,80 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0856-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0855-Fix-Fluid-tags-isTagged-method.patch
similarity index 94%
rename from patches/server/0856-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0855-Fix-Fluid-tags-isTagged-method.patch
index 1210e3715..0ce876073 100644
--- a/patches/server/0856-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0855-Fix-Fluid-tags-isTagged-method.patch
@@ -18,7 +18,7 @@ index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1f491d48b591281e3a054c33683ac4cf76ada802..8961da579b114cbafb329c00aadf1cf75e70cf97 100644
+index d3b37adfe6d66e82db18d94f143af3aba4543f79..0a4e9b0957c9b0abbb88d472b5b3d7946c256af2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -201,7 +201,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0857-Force-close-world-loading-screen.patch b/patches/server/0856-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0857-Force-close-world-loading-screen.patch
rename to patches/server/0856-Force-close-world-loading-screen.patch
index 10dc5d79b..d11111423 100644
--- a/patches/server/0857-Force-close-world-loading-screen.patch
+++ b/patches/server/0856-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a077d5fdfa0d42a6ac22fe1020469a25491d0235..efdd71d9210727fc3bb43bbec43143e09d579e8b 100644
+index a01858ee7a4419fb5b85df8863ab0052180079e3..e1a5bd0ce00926078a0d2235b05e5972093044ab 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -423,6 +423,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0858-Fix-falling-block-spawn-methods.patch b/patches/server/0857-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0858-Fix-falling-block-spawn-methods.patch
rename to patches/server/0857-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0859-Expose-furnace-minecart-push-values.patch b/patches/server/0858-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0859-Expose-furnace-minecart-push-values.patch
rename to patches/server/0858-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0860-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0860-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0861-Fix-save-problems-on-shutdown.patch b/patches/server/0860-Fix-save-problems-on-shutdown.patch
similarity index 100%
rename from patches/server/0861-Fix-save-problems-on-shutdown.patch
rename to patches/server/0860-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0862-More-Projectile-API.patch b/patches/server/0861-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0862-More-Projectile-API.patch
rename to patches/server/0861-More-Projectile-API.patch
diff --git a/patches/server/0863-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0862-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0863-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0862-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0864-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0863-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0864-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0863-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 7ae90417e..8d01a67ab 100644
--- a/patches/server/0864-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0863-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bf7bcf3d5a57175a1ac8b886734ca869a407f05..192389ac370b40b0e5f0bfdeea4c76e87b996cde 100644
+index 9034b997fdbe5ca1c71eb154205510e99865dc3d..79e5814adca6b38c533fae2288726aa1b99de010 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -588,6 +588,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0865-Implement-getComputedBiome-API.patch b/patches/server/0864-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0865-Implement-getComputedBiome-API.patch
rename to patches/server/0864-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0866-Make-some-itemstacks-nonnull.patch b/patches/server/0865-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0866-Make-some-itemstacks-nonnull.patch
rename to patches/server/0865-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0867-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0866-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0867-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0866-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0868-Implement-enchantWithLevels-API.patch b/patches/server/0867-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0868-Implement-enchantWithLevels-API.patch
rename to patches/server/0867-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0869-Fix-saving-in-unloadWorld.patch b/patches/server/0868-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0869-Fix-saving-in-unloadWorld.patch
rename to patches/server/0868-Fix-saving-in-unloadWorld.patch
index 68deba016..45dd19817 100644
--- a/patches/server/0869-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0868-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 91ba3684c73bb127d67c6385bf55e71d96f69075..092bbbecfbb7154774befe5952e316f607b4334d 100644
+index 0c43516bacdc56b6eca7498b51fa49fb65d4dde4..dccc21db238a7d591f08ad1c78bbaa1662b3b86f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1287,7 +1287,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0870-Buffer-OOB-setBlock-calls.patch b/patches/server/0869-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0870-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0869-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0871-Add-TameableDeathMessageEvent.patch b/patches/server/0870-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0871-Add-TameableDeathMessageEvent.patch
rename to patches/server/0870-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0872-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0871-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0872-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0871-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0873-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0872-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 92%
rename from patches/server/0873-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0872-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 9c272e120..5030bb252 100644
--- a/patches/server/0873-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0872-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ 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 815aa9eb2879cbfcfc2f7a00106f3455b6e8a877..1df90704c90d2b96fa967135e9350b9dc92c9286 100644
+index 18c3d4aecf498f78040c27336d2ea56fd911d034..3f3ebe28c669419091fd20c18185c61712e7f1e8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -861,12 +861,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0874-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0873-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0874-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0873-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0875-Guard-against-invalid-entity-positions.patch b/patches/server/0874-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0875-Guard-against-invalid-entity-positions.patch
rename to patches/server/0874-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0876-cache-resource-keys.patch b/patches/server/0875-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0876-cache-resource-keys.patch
rename to patches/server/0875-cache-resource-keys.patch
diff --git a/patches/server/0877-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0876-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0877-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0876-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0878-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0877-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0878-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0877-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0879-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0878-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0879-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0878-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0880-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0879-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0880-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0879-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0881-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0880-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0881-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0880-Use-username-instead-of-display-name-in-PlayerList-g.patch
index f552286e3..5e0355268 100644
--- a/patches/server/0881-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0880-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index efdd71d9210727fc3bb43bbec43143e09d579e8b..d63bfd9d3194a2972a984ec3a817767a683a940d 100644
+index e1a5bd0ce00926078a0d2235b05e5972093044ab..71623c84a5b15023189c14a6bf36e1b08f935fc1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1477,7 +1477,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0882-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0881-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0882-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0881-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0883-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0882-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0883-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0882-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0884-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0883-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0884-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0883-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0885-WorldCreator-keepSpawnLoaded.patch b/patches/server/0884-WorldCreator-keepSpawnLoaded.patch
similarity index 90%
rename from patches/server/0885-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0884-WorldCreator-keepSpawnLoaded.patch
index 0bc5d393e..9c59850b1 100644
--- a/patches/server/0885-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0884-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 092bbbecfbb7154774befe5952e316f607b4334d..bf19acd9587cd9c3da50aba5ede60708652f0d33 100644
+index dccc21db238a7d591f08ad1c78bbaa1662b3b86f..7ff85a35d75b1b267b8795363469e9fcb7a118c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1246,6 +1246,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0886-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0885-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0886-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0885-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0887-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0886-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0887-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0886-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0888-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0887-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0888-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0887-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0889-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0888-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0889-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0888-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0890-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0889-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0890-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0889-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0891-Add-PlayerStopUsingItemEvent.patch b/patches/server/0890-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0891-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0890-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0892-FallingBlock-auto-expire-setting.patch b/patches/server/0891-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0892-FallingBlock-auto-expire-setting.patch
rename to patches/server/0891-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0893-Don-t-tick-markers.patch b/patches/server/0892-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0893-Don-t-tick-markers.patch
rename to patches/server/0892-Don-t-tick-markers.patch
diff --git a/patches/server/0894-Do-not-accept-invalid-client-settings.patch b/patches/server/0893-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0894-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0893-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0895-Add-support-for-Proxy-Protocol.patch b/patches/server/0894-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0895-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0894-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0896-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0895-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0896-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0895-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0896-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0896-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0898-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0897-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0898-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0897-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0899-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0898-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0899-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0898-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0900-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0899-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0900-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0899-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0900-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 97%
rename from patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0900-Throw-exception-on-world-create-while-being-ticked.patch
index a9f86c39c..0753c2ec4 100644
--- a/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0900-Throw-exception-on-world-create-while-being-ticked.patch
@@ -35,7 +35,7 @@ index 33cf037bf8ed5ea88f52ee3731cde63c70e813ef..081c7160cf727646cdec4cd551dbc2aa
          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 bf19acd9587cd9c3da50aba5ede60708652f0d33..e38a56460ff6c6b04ded3a544a27161ba5ab44d8 100644
+index 7ff85a35d75b1b267b8795363469e9fcb7a118c1..61b58188742b679c9bcd476a57721693103421ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1137,6 +1137,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0902-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0901-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0902-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0901-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0903-Dont-resent-entity-on-art-update.patch b/patches/server/0902-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0903-Dont-resent-entity-on-art-update.patch
rename to patches/server/0902-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0904-Add-missing-spawn-eggs.patch b/patches/server/0903-Add-missing-spawn-eggs.patch
similarity index 100%
rename from patches/server/0904-Add-missing-spawn-eggs.patch
rename to patches/server/0903-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0905-Add-WardenAngerChangeEvent.patch b/patches/server/0904-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0905-Add-WardenAngerChangeEvent.patch
rename to patches/server/0904-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0906-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0905-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 94%
rename from patches/server/0906-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0905-Add-option-for-strict-advancement-dimension-checks.patch
index 942cc9e84..3aaa6591b 100644
--- a/patches/server/0906-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0905-Add-option-for-strict-advancement-dimension-checks.patch
@@ -11,7 +11,7 @@ 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 1df90704c90d2b96fa967135e9350b9dc92c9286..6cbd839cc7529eb0095485c4ef4a0d81a3cd9b19 100644
+index 3f3ebe28c669419091fd20c18185c61712e7f1e8..3615576c24d5d6790a6894a91180de25fa0e5a9c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1251,6 +1251,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0907-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0906-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0907-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0906-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0908-Nameable-Banner-API.patch b/patches/server/0907-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0908-Nameable-Banner-API.patch
rename to patches/server/0907-Nameable-Banner-API.patch
diff --git a/patches/server/0909-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0908-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0909-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0908-Don-t-broadcast-messages-to-command-blocks.patch
index f27d75afb..510aeb5fa 100644
--- a/patches/server/0909-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0908-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index c0195f73cd2c8721e882c681eaead65471710081..861b348f73867af3199f1cc0dab1ddd4
              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 e38a56460ff6c6b04ded3a544a27161ba5ab44d8..bfde5bbcccfaa754ec6bdf4f3817981a93e465bd 100644
+index 61b58188742b679c9bcd476a57721693103421ae..5e8fe876d9214b97acb97de63b36e7b753c43dbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1756,7 +1756,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0910-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0909-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0910-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0909-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0911-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0910-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0911-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0910-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0912-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0911-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 94%
rename from patches/server/0912-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0911-Don-t-print-component-in-resource-pack-rejection-mes.patch
index f832332ab..de82ac55b 100644
--- a/patches/server/0912-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0911-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ 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 30217b09e35a229c3825ee835288c884e9233a7c..87ab9261d85a9cbc89d040561847b97b901c24de 100644
+index a990e92b9136da4e39497c41ef7d08d7879efc75..da19def22a2c965039f042766e310de56e126681 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2051,7 +2051,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0913-Add-Player-getFishHook.patch b/patches/server/0912-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0913-Add-Player-getFishHook.patch
rename to patches/server/0912-Add-Player-getFishHook.patch
diff --git a/patches/server/0914-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0913-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0914-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0913-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0915-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0914-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0915-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0914-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0916-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0915-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0916-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0915-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0917-Fix-Bee-flower-NPE.patch b/patches/server/0916-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0917-Fix-Bee-flower-NPE.patch
rename to patches/server/0916-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0918-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0917-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0918-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0917-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0919-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch b/patches/server/0918-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch
similarity index 100%
rename from patches/server/0919-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch
rename to patches/server/0918-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch
diff --git a/patches/server/0920-More-Teleport-API.patch b/patches/server/0919-More-Teleport-API.patch
similarity index 98%
rename from patches/server/0920-More-Teleport-API.patch
rename to patches/server/0919-More-Teleport-API.patch
index f32e7d3e7..6e347143c 100644
--- a/patches/server/0920-More-Teleport-API.patch
+++ b/patches/server/0919-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75505766d6a1c6693e1545df83cc09fb3b7359e3..bdccb85b1b6a773a3f33e4539d63ba6b592b6610 100644
+index 71279d9c4d3c728f828eb8a5a2d7b435e527c01b..07af82f89b417586aeb9b4b0a44562665a824f3b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1732,11 +1732,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -69,7 +69,7 @@ index 2a6c67634c31c332102d24bef293da1bacd0c000..b80cc0938b2b3928f4450f1314a9fbd7
          // 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 c88342c53787a48477dcbec4af53d1d5ce2b02e2..9f34358dfcb95104c5bb9e63fbe295e6e049a55d 100644
+index 2cf84abadc7fd7806566948d4c6e2212bdf2aeb7..e6411d8293c36f41b790cf17ecc507507f04d604 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1135,7 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0921-Add-EntityPortalReadyEvent.patch b/patches/server/0920-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0921-Add-EntityPortalReadyEvent.patch
rename to patches/server/0920-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0922-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0921-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0922-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0921-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0923-Send-block-entities-after-destroy-prediction.patch b/patches/server/0922-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0923-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0922-Send-block-entities-after-destroy-prediction.patch
index 6dec6fd4c..c1126bbdc 100644
--- a/patches/server/0923-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0922-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 9378e83a67a70dbb1fb4f05b33f1e553d008e62b..5a60f5dc202c44b06ca34e9a19d45cb7
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bdccb85b1b6a773a3f33e4539d63ba6b592b6610..a68b737cdd1e9f1054e0fc3bfee92c20a062fab5 100644
+index 07af82f89b417586aeb9b4b0a44562665a824f3b..e0d676f08f99882170307d6996c83f533aef2999 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1877,8 +1877,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0924-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0923-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0924-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0923-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0925-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0924-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0925-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0924-Custom-Chat-Completion-Suggestions-API.patch
index 9efa33b2d..560a26bd5 100644
--- a/patches/server/0925-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0924-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 9f34358dfcb95104c5bb9e63fbe295e6e049a55d..ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3 100644
+index e6411d8293c36f41b790cf17ecc507507f04d604..743b6e51817ffa1b7e602b1ac82eb1017841b691 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -654,6 +654,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0926-Add-missing-BlockFadeEvents.patch b/patches/server/0925-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0926-Add-missing-BlockFadeEvents.patch
rename to patches/server/0925-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0927-Collision-API.patch b/patches/server/0926-Collision-API.patch
similarity index 100%
rename from patches/server/0927-Collision-API.patch
rename to patches/server/0926-Collision-API.patch
diff --git a/patches/server/0928-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0927-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0928-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0927-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0929-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0928-Fix-command-preprocess-cancelling-and-command-changi.patch
similarity index 95%
rename from patches/server/0929-Fix-command-preprocess-cancelling-and-command-changi.patch
rename to patches/server/0928-Fix-command-preprocess-cancelling-and-command-changi.patch
index 47180bae6..c445f08b4 100644
--- a/patches/server/0929-Fix-command-preprocess-cancelling-and-command-changi.patch
+++ b/patches/server/0928-Fix-command-preprocess-cancelling-and-command-changi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix command preprocess cancelling and command changing
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a68b737cdd1e9f1054e0fc3bfee92c20a062fab5..c39e6a96a120cd9c5f7734ead5dac2091fed7fc8 100644
+index e0d676f08f99882170307d6996c83f533aef2999..f4950ed28a905f7cc227941f9a1f6a1cb64b4eca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2261,13 +2261,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0930-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0929-Remove-invalid-signature-login-stacktrace.patch
similarity index 89%
rename from patches/server/0930-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0929-Remove-invalid-signature-login-stacktrace.patch
index 5f5bc820c..e51733ffd 100644
--- a/patches/server/0930-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0929-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/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 4f194eb6cab2347bc6c61f6cd8c47db7c59ff369..881f6f61015c7f2f28b204467f984dbf8d37d89a 100644
+index 51ff7ab5d8740e755cc893723f659c8481c1ec89..2f0b2d0f3a3dc02076cee9ab5e6dd6ab931143e3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -178,7 +178,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -177,7 +177,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
  
                  profilepublickey = ServerLoginPacketListenerImpl.validatePublicKey(this.profilePublicKeyData, this.gameProfile.getId(), signaturevalidator, this.server.enforceSecureProfile());
              } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
diff --git a/patches/server/0931-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 91%
rename from patches/server/0931-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 621491b8b..4650d8102 100644
--- a/patches/server/0931-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
@@ -5,7 +5,7 @@ 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 c39e6a96a120cd9c5f7734ead5dac2091fed7fc8..31fe9f33b8d02469a67ce2cf31c81373df206af2 100644
+index f4950ed28a905f7cc227941f9a1f6a1cb64b4eca..dbefefc123e3cb38a95bd321d74c384bc087cfba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1760,6 +1760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0932-Block-Ticking-API.patch b/patches/server/0931-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0932-Block-Ticking-API.patch
rename to patches/server/0931-Block-Ticking-API.patch
diff --git a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0932-Add-Velocity-IP-Forwarding-Support.patch
similarity index 86%
rename from patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0932-Add-Velocity-IP-Forwarding-Support.patch
index b6e6d86c6..14a704990 100644
--- a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0932-Add-Velocity-IP-Forwarding-Support.patch
@@ -15,10 +15,10 @@ login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..980e2b4dc308adf9a6cb2596b28eaeee65d629a8
+index 0000000000000000000000000000000000000000..5de2dabbc076a9482b1d6c299f1cff74313af74e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,74 @@
 +package com.destroystokyo.paper.proxy;
 +
 +import io.papermc.paper.configuration.GlobalConfiguration;
@@ -29,6 +29,7 @@ index 0000000000000000000000000000000000000000..980e2b4dc308adf9a6cb2596b28eaeee
 +import java.security.InvalidKeyException;
 +import java.security.MessageDigest;
 +import java.security.NoSuchAlgorithmException;
++import java.util.UUID;
 +
 +import javax.crypto.Mac;
 +import javax.crypto.spec.SecretKeySpec;
@@ -39,7 +40,8 @@ index 0000000000000000000000000000000000000000..980e2b4dc308adf9a6cb2596b28eaeee
 +public class VelocityProxy {
 +    private static final int SUPPORTED_FORWARDING_VERSION = 1;
 +    public static final int MODERN_FORWARDING_WITH_KEY = 2;
-+    public static final byte MAX_SUPPORTED_FORWARDING_VERSION = 2;
++    public static final int MODERN_FORWARDING_WITH_KEY_V2 = 3;
++    public static final byte MAX_SUPPORTED_FORWARDING_VERSION = MODERN_FORWARDING_WITH_KEY_V2;
 +    public static final ResourceLocation PLAYER_INFO_CHANNEL = new ResourceLocation("velocity", "player_info");
 +
 +    public static boolean checkIntegrity(final FriendlyByteBuf buf) {
@@ -86,20 +88,24 @@ index 0000000000000000000000000000000000000000..980e2b4dc308adf9a6cb2596b28eaeee
 +    public static ProfilePublicKey.Data readForwardedKey(FriendlyByteBuf buf) {
 +        return new ProfilePublicKey.Data(buf);
 +    }
++
++    public static UUID readSignerUuidOrElse(FriendlyByteBuf buf, UUID orElse) {
++        return buf.readBoolean() ? buf.readUUID() : orElse;
++    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index c83395364edb4f2ba8515326b19c4f1a436a0502..6629fee181b8d0c6ece3d23a028b971e98f8799b 100644
+index 2f0b2d0f3a3dc02076cee9ab5e6dd6ab931143e3..bf488013e45b9ab97568e587f4dad899498b2f73 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
-     @Nullable
+@@ -67,6 +67,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      private ProfilePublicKey.Data profilePublicKeyData;
      public String hostname = ""; // CraftBukkit - add field
+     public boolean iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation = false; // Paper - username validation overriding
 +    private int velocityLoginMessageId = -1; // Paper - Velocity support
  
      public ServerLoginPacketListenerImpl(MinecraftServer server, Connection connection) {
          this.state = ServerLoginPacketListenerImpl.State.HELLO;
-@@ -263,6 +264,16 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -300,6 +301,16 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
                  this.state = ServerLoginPacketListenerImpl.State.KEY;
                  this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.nonce));
              } else {
@@ -116,7 +122,7 @@ index c83395364edb4f2ba8515326b19c4f1a436a0502..6629fee181b8d0c6ece3d23a028b971e
                  // Spigot start
              // Paper start - Cache authenticator threads
              authenticatorPool.execute(new Runnable() {
-@@ -374,6 +385,12 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+@@ -413,6 +424,12 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      public class LoginHandler {
  
          public void fireEvents() throws Exception {
@@ -128,8 +134,8 @@ index c83395364edb4f2ba8515326b19c4f1a436a0502..6629fee181b8d0c6ece3d23a028b971e
 +                            // Paper end
                          String playerName = ServerLoginPacketListenerImpl.this.gameProfile.getName();
                          java.net.InetAddress address = ((java.net.InetSocketAddress) ServerLoginPacketListenerImpl.this.connection.getRemoteAddress()).getAddress();
-                         java.util.UUID uniqueId = ServerLoginPacketListenerImpl.this.gameProfile.getId();
-@@ -421,6 +438,59 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
+                         java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) connection.getRawAddress()).getAddress(); // Paper
+@@ -461,6 +478,60 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      // Spigot end
  
      public void handleCustomQueryPacket(ServerboundCustomQueryPacket packet) {
@@ -162,13 +168,14 @@ index c83395364edb4f2ba8515326b19c4f1a436a0502..6629fee181b8d0c6ece3d23a028b971e
 +
 +            // We should already have this, but, we'll read it out anyway
 +            //noinspection NonStrictComparisonCanBeEquality
-+            if (version >= com.destroystokyo.paper.proxy.VelocityProxy.MODERN_FORWARDING_WITH_KEY) {
-+                final ProfilePublicKey.Data forwardedKey = com.destroystokyo.paper.proxy.VelocityProxy.readForwardedKey(buf);
++            if (version >= com.destroystokyo.paper.proxy.VelocityProxy.MODERN_FORWARDING_WITH_KEY_V2) {
++                final ProfilePublicKey.Data forwardedKeyData = com.destroystokyo.paper.proxy.VelocityProxy.readForwardedKey(buf);
++                final UUID signer = com.destroystokyo.paper.proxy.VelocityProxy.readSignerUuidOrElse(buf, this.gameProfile.getId());
 +                if (this.profilePublicKeyData == null) {
 +                    try {
-+                        ProfilePublicKey.createValidated(this.server.getServiceSignatureValidator(), this.gameProfile.getId(), forwardedKey, Duration.ZERO);
-+                        this.profilePublicKeyData = forwardedKey;
-+                    } catch (ProfilePublicKey.ValidationException e) {
++                        ServerLoginPacketListenerImpl.validatePublicKey(forwardedKeyData, signer, this.server.getServiceSignatureValidator(), this.server.enforceSecureProfile());
++                        this.profilePublicKeyData = forwardedKeyData;
++                    } catch (ProfilePublicKey.ValidationException err) {
 +                        this.disconnect("Unable to validate forwarded player key");
 +                    }
 +                }
@@ -190,10 +197,10 @@ index c83395364edb4f2ba8515326b19c4f1a436a0502..6629fee181b8d0c6ece3d23a028b971e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 21f0e1a23d6e9c6c76abfa9af555642fadeba69c..59ce840dadcecf9c6aed77747a06519eca5fea90 100644
+index 5e8fe876d9214b97acb97de63b36e7b753c43dbe..bfde5bbcccfaa754ec6bdf4f3817981a93e465bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -764,7 +764,7 @@ public final class CraftServer implements Server {
+@@ -782,7 +782,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations