From 94807a1d2e74b26b1a3154974d4024daa4c95f51 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 16 Jan 2024 19:27:39 +0100
Subject: [PATCH] [ci skip] Minor cleanup and patch merges

---
 patches/api/0009-Paper-Plugins.patch          |  4 +-
 ...s-to-contain-the-source-jars-in-stac.patch |  4 +-
 ...eCollisionEvent-move-HandlerList-up.patch} | 42 ++++++--
 ...sion-moving-velocity-to-VehicleBlock.patch | 49 ---------
 ...eplace-ItemFlag.HIDE_POTION_EFFECTS.patch} |  0
 ...en-API.patch => 0401-Win-Screen-API.patch} |  0
 ...tch => 0402-Add-Entity-Body-Yaw-API.patch} |  0
 ...or-InventoryBlockStartEvent-subclas.patch} |  0
 ...=> 0404-Add-EntityFertilizeEggEvent.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...API.patch => 0406-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ... 0408-Add-Mob-Experience-reward-API.patch} |  0
 ... => 0409-Expand-PlayerItemMendEvent.patch} |  0
 ... => 0410-Add-transient-modifier-API.patch} |  0
 ...he-experimental-smithing-inventory-.patch} |  0
 ...to-remove-all-active-potion-effects.patch} |  0
 ...olia-scheduler-and-owned-region-API.patch} |  0
 ...4-Add-event-for-player-editing-sign.patch} |  0
 ...415-Add-Sign-getInteractableSideFor.patch} |  0
 ...t-API.patch => 0416-Fix-BanList-API.patch} |  0
 ....patch => 0417-Add-whitelist-events.patch} |  0
 ...API-for-updating-recipes-on-clients.patch} |  0
 ...tch => 0419-Add-PlayerFailMoveEvent.patch} |  0
 ...-custom-statistic-criteria-creation.patch} |  0
 ...tch => 0421-SculkCatalyst-bloom-API.patch} |  0
 ...API-for-an-entity-s-scoreboard-name.patch} |  0
 ...lace-methods-with-old-StructureType.patch} |  0
 ... => 0424-Add-Listing-API-for-Player.patch} |  0
 ...d-BlockFace-during-BlockDamageEvent.patch} |  0
 ...h => 0426-Fix-NPE-on-Boat-getStatus.patch} |  0
 ...e-API.patch => 0427-Expand-Pose-API.patch} |  0
 ...MerchantRecipe-add-copy-constructor.patch} |  0
 ...patch => 0429-More-DragonBattle-API.patch} |  0
 ...tch => 0430-Add-PlayerPickItemEvent.patch} |  0
 ...=> 0431-Allow-trident-custom-damage.patch} |  0
 ...pose-hand-during-BlockCanBuildEvent.patch} |  0
 ...t-setBurnTime-to-valid-short-values.patch} |  0
 ... 0434-Add-OfflinePlayer-isConnected.patch} |  0
 ...titleOverride-to-InventoryOpenEvent.patch} |  0
 ...roper-checking-of-empty-item-stacks.patch} |  0
 ...dItemsEvent-throwing-exception-when.patch} |  0
 ...> 0438-Add-player-idle-duration-API.patch} |  0
 ...e-collision-shape-of-a-block-before.patch} |  0
 ...redicate-for-blocks-when-raytracing.patch} |  0
 ...h-event-for-all-player-interactions.patch} |  0
 ...442-Add-UUID-attribute-modifier-API.patch} |  0
 ... => 0443-Expand-LingeringPotion-API.patch} |  0
 ...y-durability-check-in-ItemStack-isS.patch} |  0
 ...tch => 0445-Add-Structure-check-API.patch} |  0
 ...dd-missing-Experimental-annotations.patch} |  0
 ...tch => 0447-Add-more-scoreboard-API.patch} |  0
 ...stry.patch => 0448-Improve-Registry.patch} |  0
 ...h => 0449-Add-experience-points-API.patch} |  0
 ...h => 0450-Add-missing-InventoryType.patch} |  0
 ...h => 0451-Add-drops-to-shear-events.patch} |  0
 ... => 0452-Add-HiddenPotionEffect-API.patch} |  0
 ...> 0453-Add-PlayerShieldDisableEvent.patch} |  0
 ...mpty-String-in-NamespacedKey.fromSt.patch} |  0
 ...0845-Replace-ticket-level-propagator.patch |  2 +-
 ...ent-Mob-AI-Rules-from-Loading-Chunks.patch | 40 --------
 ...interactions-from-causing-chunk-load.patch | 99 +++++++++++++++++++
 ...-Large-Packets-disconnecting-client.patch} |  2 +-
 ...Prevent-rayTrace-from-loading-chunks.patch | 29 ------
 ...ntity-dismount-during-teleportation.patch} |  0
 ...I.patch => 0280-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0281-Book-Size-Limits.patch} |  2 +-
 ...0282-Add-PlayerConnectionCloseEvent.patch} |  2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |  6 +-
 ...Prevent-Enderman-from-loading-chunks.patch | 30 ------
 ...ehicle-tracking-issue-on-disconnect.patch} |  2 +-
 ...-remove-if-the-handle-is-a-custom-p.patch} |  2 +-
 ...ent.patch => 0286-BlockDestroyEvent.patch} |  2 +-
 ... => 0287-Async-command-map-building.patch} |  2 +-
 ...0288-Implement-Brigadier-Mojang-API.patch} |  6 +-
 ...ove-exact-choice-recipe-ingredients.patch} |  0
 ... 0290-Limit-Client-Sign-length-more.patch} |  2 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |  2 +-
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...=> 0293-Entity-getEntitySpawnReason.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...tch => 0295-Fire-event-on-GS4-query.patch} |  0
 ...96-Implement-PlayerPostRespawnEvent.patch} |  2 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0298-Server-Tick-Events.patch} |  0
 ...299-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  2 +-
 ...API.patch => 0301-Add-Heightmap-API.patch} |  2 +-
 ...> 0302-Mob-Spawner-API-Enhancements.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...0305-Implement-CraftBlockSoundGroup.patch} |  2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  6 +-
 ...07-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...08-Expose-the-internal-current-tick.patch} |  2 +-
 ...09-Fix-World-isChunkGenerated-calls.patch} |  4 +-
 ...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 => 0313-offset-item-frame-ticking.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  2 +-
 ...5-Dont-send-unnecessary-sign-update.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  0
 patches/server/0316-Fix-MC-158900.patch       | 25 -----
 ...317-Flat-bedrock-generator-settings.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ... 0320-Duplicate-UUID-Resolve-Option.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...timise-EntityGetter-getPlayerByUUID.patch} |  2 +-
 ...325-Fix-items-not-falling-correctly.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...=> 0328-Entity-Activation-Range-2.0.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...=> 0331-Tracking-Range-Improvements.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  2 +-
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...7-Anti-Xray.patch => 0334-Anti-Xray.patch} |  2 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...36-Improve-Block-breakNaturally-API.patch} |  2 +-
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...0338-Add-debug-for-sync-chunk-loads.patch} |  2 +-
 ... => 0339-Improve-java-version-check.patch} |  0
 ...tch => 0340-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0341-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0343-Make-the-GUI-graph-fancier.patch} |  0
 ...44-add-hand-to-BlockMultiPlaceEvent.patch} |  2 +-
 ...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 => 0348-Optimise-Chunk-getFluid.patch} |  2 +-
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  2 +-
 ...51-Expose-MinecraftServer-isRunning.patch} |  2 +-
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...pawn-settings-and-per-player-option.patch} |  2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |  2 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  2 +-
 ...tch => 0357-Don-t-tick-dead-players.patch} |  2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  4 +-
 ...ove-existing-players-to-world-spawn.patch} |  4 +-
 ...alSelector-Goal.Flag-Set-operations.patch} |  0
 ...h => 0362-Improved-Watchdog-Support.patch} |  2 +-
 ....patch => 0363-Optimize-Pathfinding.patch} |  0
 ...4-Reduce-Either-Optional-allocation.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  4 +-
 ...entity-collision-code-if-not-needed.patch} |  2 +-
 ...Implement-Player-Client-Options-API.patch} |  2 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  4 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  2 +-
 ...layerAttackEntityCooldownResetEvent.patch} |  2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...patch => 0376-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  2 +-
 ...n.patch => 0378-Expose-game-version.patch} |  2 +-
 ...> 0379-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ....patch => 0381-misc-debugging-dumps.patch} |  4 +-
 ...2-Prevent-teleporting-dead-entities.patch} |  2 +-
 ...traces-in-log-messages-crash-report.patch} |  4 +-
 ...atch => 0384-Implement-Mob-Goal-API.patch} |  2 +-
 ...=> 0385-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  2 +-
 ...tch => 0387-ExperienceOrbMergeEvent.patch} |  2 +-
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...API.patch => 0389-Potential-bed-API.patch} |  2 +-
 ...ait-for-Async-Tasks-during-shutdown.patch} |  4 +-
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  6 +-
 ...> 0393-Ensure-safe-gateway-teleport.patch} |  2 +-
 ...-for-console-having-all-permissions.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0396-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 => 0400-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 => 0404-Improve-Arrow-API.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  2 +-
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...8-Add-permission-for-command-blocks.patch} |  2 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  4 +-
 ...atch => 0411-Paper-dumpitem-command.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  2 +-
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  2 +-
 ...incremental-chunk-and-player-saving.patch} |  4 +-
 ...416-Support-old-UUID-format-for-NBT.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...> 0418-Remove-streams-from-hot-code.patch} |  0
 ...0419-Support-components-in-ItemMeta.patch} |  0
 ...e-fix-EntityTargetLivingEntityEvent.patch} |  0
 ...patch => 0421-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...atch => 0423-Add-PrepareResultEvent.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...-5989.patch => 0427-Fix-SPIGOT-5989.patch} | 10 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...support.patch => 0434-Brand-support.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0436-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0438-Add-moon-phase-API.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0441-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0443-Buffer-joins-to-world.patch} |  0
 ...-Eigencraft-redstone-implementation.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...I.patch => 0447-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0450-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0457-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...-Concurrency-issue-in-ShufflingList.patch} |  2 +-
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0462-Optimise-getType-calls.patch} |  0
 ....patch => 0463-Villager-resetOffers.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...67-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0470-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0473-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...475-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0476-Add-API-for-quit-reason.patch} |  2 +-
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...ch => 0478-Expose-world-spawn-angle.patch} |  4 +-
 ...patch => 0479-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...81-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0482-Add-PlayerItemCooldownEvent.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...PI.patch => 0484-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0487-Add-PlayerShearBlockEvent.patch} |  0
 ....patch => 0488-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ...490-Player-Chunk-Load-Unload-Events.patch} |  0
 ...1-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 => 0496-Implement-TargetHitEvent.patch} |  0
 ... 0497-MC-4-Fix-item-position-desync.patch} |  0
 ...498-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0499-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0501-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...ct-event-not-being-called-sometimes.patch} |  0
 ...h => 0506-Zombie-API-breaking-doors.patch} |  0
 ...507-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0508-Add-EntityLoadCrossbowEvent.patch} |  0
 ...0509-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
 ...OIs.patch => 0517-Remove-stale-POIs.patch} |  0
 ...h => 0518-Fix-villager-boat-exploit.patch} |  2 +-
 ...I.patch => 0519-Add-sendOpLevel-API.patch} |  6 +-
 ...0520-TODO-Registry-Modification-API.patch} |  0
 ...h => 0521-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
 ...525-Make-schedule-command-per-world.patch} |  0
 ...526-Configurable-max-leash-distance.patch} |  0
 ...527-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} |  0
 ...atch => 0533-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0534-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0536-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ...atch => 0542-Expose-Tracked-Players.patch} |  0
 ...GUI.patch => 0543-Improve-ServerGUI.patch} |  0
 ...544-fix-converting-txt-to-json-file.patch} |  2 +-
 ...atch => 0545-Add-worldborder-events.patch} |  0
 ...=> 0546-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0548-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0549-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ....patch => 0551-Expand-world-key-API.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0553-Item-Rarity-API.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  2 +-
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...tch => 0557-Expose-protocol-version.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0560-Add-bypass-host-check.patch} |  0
 ...0561-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0567-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0568-More-World-API.patch} |  0
 ... 0569-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  8 +-
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  6 +-
 ...dd-Channel-initialization-listeners.patch} |  0
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0576-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...78-Entity-load-save-limit-per-chunk.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...close.patch => 0580-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...atch => 0582-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ... => 0585-ItemStack-repair-check-API.patch} |  0
 ....patch => 0586-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0589-Add-Mob-lookAt-API.patch} |  0
 ...0590-Add-Unix-domain-socket-support.patch} |  0
 ... => 0591-Add-EntityInsideBlockEvent.patch} |  0
 ...92-Attributes-API-for-item-defaults.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0594-More-Lidded-Block-API.patch} |  0
 ...95-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0596-Add-PlayerKickEvent-causes.patch} |  4 +-
 ...0597-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0601-Add-BellRevealRaiderEvent.patch} |  0
 ... 0602-Fix-invulnerable-end-crystals.patch} |  0
 ...03-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0604-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0607-Line-Of-Sight-Changes.patch} |  0
 ... => 0608-add-per-world-spawn-limits.patch} |  0
 ...h => 0609-Fix-potions-splash-events.patch} |  0
 ... => 0610-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  0
 ...PI.patch => 0612-Missing-Entity-API.patch} |  2 +-
 ...ect-for-book-edit-is-called-on-main.patch} |  0
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0617-Adds-PlayerArmSwingEvent.patch} |  0
 ...-event-leave-message-not-being-sent.patch} |  2 +-
 ...-for-mobs-immune-to-default-effects.patch} |  0
 ...-t-apply-cramming-damage-to-players.patch} |  0
 ...d-timings-for-sensors-and-behaviors.patch} |  0
 ...-bunch-of-missing-forceDrop-toggles.patch} |  0
 ...inger-API.patch => 0623-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0625-Add-System.out-err-catcher.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...-Improve-boat-collision-performance.patch} |  0
 ...AFK-kick-while-watching-end-credits.patch} |  0
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0630-Add-PlayerSetSpawnEvent.patch} |  4 +-
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0634-Added-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...638-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0640-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0642-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0644-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  0
 ... 0646-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0647-Left-handed-API.patch} |  0
 ...ch => 0648-Add-more-advancement-API.patch} |  0
 ...649-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0650-Add-critical-damage-API.patch} |  0
 ...0651-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0653-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...5-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...56-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  0
 ...58-Fix-GameProfileCache-concurrency.patch} |  0
 ...659-Improve-and-expand-AsyncCatcher.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  0
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...=> 0662-Optimise-general-POI-access.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...d-state-when-raytracing-skip-air-bl.patch} | 16 ++-
 ...atch => 0669-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...> 0671-Execute-chunk-tasks-mid-tick.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  0
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ...74-Do-not-run-raytrace-logic-for-AIR.patch | 22 -----
 ... 0674-Optimise-random-block-ticking.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ... 0679-Distance-manager-tick-timings.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  0
 ...h => 0683-Add-packet-limiter-config.patch} |  0
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0685-Ensure-valid-vehicle-status.patch} |  0
 ...ftlocked-end-exit-portal-generation.patch} |  0
 ...r-causing-a-crash-when-trying-to-ge.patch} |  0
 ...-t-log-debug-logging-being-disabled.patch} |  0
 ...ous-menus-with-empty-level-accesses.patch} |  0
 ...h => 0690-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...0693-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ... => 0695-Configurable-feature-seeds.patch} |  0
 ... 0696-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
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...=> 0704-Fix-Spigot-growth-modifiers.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0706-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...tch => 0707-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...tch => 0709-Collision-optimisations.patch} |  4 +-
 ...n-checking-in-player-move-packet-ha.patch} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...patch => 0712-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...14-Fix-tripwire-state-inconsistency.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0716-Improve-scoreboard-entries.patch} |  0
 ...ch => 0717-Entity-powdered-snow-API.patch} |  0
 ...0718-Add-API-for-item-entity-health.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...ax-block-light-for-monster-spawning.patch} |  0
 ...pistons-and-BlockPistonRetractEvent.patch} |  0
 ...plifiers-greater-than-127-correctly.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0724-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0725-Bucketable-API.patch} |  0
 ...es.patch => 0726-Validate-usernames.patch} |  2 +-
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  0
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...heck-for-PersistentDataContainer-ha.patch} |  0
 ...1-Multiple-Entries-with-Scoreboards.patch} |  0
 ...732-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...0734-Fix-xp-reward-for-baby-zombies.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0736-Fix-NotePlayEvent.patch} |  0
 ....patch => 0737-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0738-Dolphin-API.patch} |  0
 ...h => 0739-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...-missing-structure-set-seed-configs.patch} |  0
 ...h => 0743-Implement-regenerateChunk.patch} |  0
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0746-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0748-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...fault-CustomSpawners-in-custom-worl.patch} |  0
 ...-worldlist-before-initing-the-world.patch} |  0
 ... => 0753-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0754-Custom-Potion-Mixes.patch} |  0
 ...55-Force-close-world-loading-screen.patch} |  2 +-
 ...756-Fix-falling-block-spawn-methods.patch} |  0
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  0
 ...I.patch => 0759-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0762-Implement-getComputedBiome-API.patch} |  0
 ...> 0763-Make-some-itemstacks-nonnull.patch} |  0
 ...764-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0765-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0766-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0767-Add-TameableDeathMessageEvent.patch} |  0
 ...ock-data-for-EntityChangeBlockEvent.patch} |  2 +-
 ...bles-running-when-mob-loot-gamerule.patch} |  0
 ...ssenger-world-matches-ridden-entity.patch} |  0
 ...rd-against-invalid-entity-positions.patch} |  0
 ...s.patch => 0772-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} |  4 +-
 ...-ServerLevel-for-gamerule-callbacks.patch} |  0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0780-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-in-CraftPersistentDataTypeRegistry.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0786-Add-PlayerStopUsingItemEvent.patch} |  0
 ...rs.patch => 0787-Don-t-tick-markers.patch} |  0
 ...tch => 0788-Expand-FallingBlock-API.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0790-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0793-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...98-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0799-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0802-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  0
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...atch => 0806-Add-Player-getFishHook.patch} |  0
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  0
 ...PE.patch => 0809-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...API.patch => 0811-More-Teleport-API.patch} |  0
 ... => 0812-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  0
 ...on-plugins-accessing-faraway-chunks.patch} |  0
 ...tom-Chat-Completion-Suggestions-API.patch} |  0
 ...Add-and-fix-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0818-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...API.patch => 0820-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...822-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  0
 ...ok-changes-from-crashing-the-server.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0826-Missing-eating-regain-reason.patch} |  0
 ....patch => 0827-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...0-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0831-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ... 0833-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ... => 0835-Add-getDrops-to-BlockState.patch} |  0
 ...=> 0836-Fix-a-bunch-of-vanilla-bugs.patch} | 20 +++-
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0838-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0839-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0842-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0844-Add-entity-knockback-API.patch} |  0
 ....patch => 0845-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...47-optimize-dirt-and-snow-spreading.patch} |  0
 ...ch => 0848-Add-EntityToggleSitEvent.patch} |  6 +-
 ... => 0849-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0850-Add-Moving-Piston-API.patch} |  0
 ...> 0851-Ignore-impossible-spawn-tick.patch} |  0
 ...source-for-fireworks-from-dispenser.patch} |  4 +-
 ...t-suggestion-permissions-to-align-w.patch} |  0
 ...Event-cancellation-cant-fully-preve.patch} |  0
 ...0855-Add-PrePlayerAttackEntityEvent.patch} |  0
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ...-green-map-markers-do-not-disappear.patch} |  0
 ... 0858-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...-Prevent-compass-from-loading-chunks.patch | 19 ----
 ...860-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0863-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0864-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0866-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0867-Sync-offhand-slot-in-menus.patch} |  0
 ... 0868-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0869-Limit-pet-look-distance.patch} |  0
 ...ch => 0870-Properly-resend-entities.patch} |  2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...ments.patch => 0872-fix-Instruments.patch} |  0
 ...for-some-hot-BlockBehavior-and-Flui.patch} | 11 +--
 ...es-in-dispense-events-regarding-sta.patch} |  2 +-
 ...tch => 0875-Add-BlockLockCheckEvent.patch} |  0
 ... 0876-Add-Sneaking-API-for-Entities.patch} |  0
 ... => 0877-Improve-logging-and-errors.patch} |  0
 ....patch => 0878-Improve-PortalEvents.patch} |  2 +-
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0882-Flying-Fall-Damage.patch} |  0
 ...k-state-to-BlockExplodeEvent-and-En.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  2 +-
 ...onfig-for-disabling-entity-tag-tags.patch} |  0
 ...e-player-info-update-packet-on-join.patch} |  4 +-
 ...k-items-during-EntityResurrectEvent.patch} |  0
 ...en-API.patch => 0888-Win-Screen-API.patch} |  2 +-
 ...ItemStack-setAmount-null-assignment.patch} |  0
 ...ix-force-opening-enchantment-tables.patch} |  0
 ...tch => 0891-Add-Entity-Body-Yaw-API.patch} |  0
 ...vent-sleeping-villagers-moving-towa.patch} |  0
 ...hen-a-captured-block-state-is-outda.patch} |  0
 ...=> 0894-Add-EntityFertilizeEggEvent.patch} |  2 +-
 ...ty-drop-not-updating-the-client-inv.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...ctly-handle-ArmorStand-invisibility.patch} |  0
 ...ancement-triggers-for-entity-damage.patch} |  0
 ...899-Fix-text-display-error-on-spawn.patch} |  0
 ...nventories-returning-null-Locations.patch} |  0
 ...API.patch => 0901-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ...pers.patch => 0903-Optimize-Hoppers.patch} |  0
 ...ives-generating-from-using-bonemeal.patch} |  0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |  0
 ...ence-violations-like-they-should-be.patch} |  2 +-
 ...uplicate-animate-packet-for-records.patch} |  0
 ...xpired-keys-from-impacting-new-join.patch} |  2 +-
 ...ts-being-fired-from-unloaded-chunks.patch} |  2 +-
 ...0910-Use-array-for-gamerule-storage.patch} |  0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |  0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |  0
 ... 0913-Add-Mob-Experience-reward-API.patch} |  0
 ...redstone-on-top-of-trap-doors-early.patch} |  0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |  2 +-
 ...Lazy-Initialization-for-Enum-Fields.patch} |  0
 ...17-More-accurate-isInOpenWater-impl.patch} |  0
 ...ccess-to-lookups-field-in-RegistryO.patch} |  0
 ...ecalcBlockCounts-for-empty-sections.patch} |  0
 ... => 0920-Expand-PlayerItemMendEvent.patch} |  4 +-
 ...sh-ProjectileSource-for-projectiles.patch} |  2 +-
 ... => 0922-Add-transient-modifier-API.patch} |  0
 ...patch => 0923-Fix-block-place-logic.patch} |  0
 ...nd-playing-for-BlockItem-ItemStacks.patch} |  0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |  2 +-
 ...nhasbukkit-default-if-alias-block-e.patch} |  0
 ...pLike-spam-for-missing-key-selector.patch} |  0
 ...-Fix-sniffer-removeExploredLocation.patch} |  0
 ...to-remove-all-active-potion-effects.patch} |  0
 ...yerChunkLoaderData-in-order-to-prep.patch} |  0
 ...rafting-result-amount-for-fireworks.patch} |  0
 ...> 0932-Properly-cancel-usable-items.patch} |  0
 ...3-Add-event-for-player-editing-sign.patch} |  0
 ...k-item-frames-if-players-can-see-it.patch} |  0
 ...ermission-levels-for-command-blocks.patch} |  0
 ...Add-option-to-disable-block-updates.patch} |  0
 ...937-Call-missing-BlockDispenseEvent.patch} |  4 +-
 ...-chunks-for-supporting-block-checks.patch} |  2 +-
 ...Optimize-player-lookups-for-beacons.patch} |  0
 ...940-Add-Sign-getInteractableSideFor.patch} |  0
 ...41-Array-backed-synched-entity-data.patch} |  0
 ...2-fix-item-meta-for-tadpole-buckets.patch} |  0
 ...t-API.patch => 0943-Fix-BanList-API.patch} |  2 +-
 ...d-water-fluid-explosion-resistance-.patch} |  0
 ...x-possible-NPE-on-painting-creation.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |  2 +-
 ...t-throw-both-Spread-and-Grow-Events.patch} |  0
 ....patch => 0949-Add-whitelist-events.patch} |  0
 ... 0950-Implement-PlayerFailMoveEvent.patch} |  2 +-
 ...olia-scheduler-and-owned-region-API.patch} |  4 +-
 ...se-allay-memory-on-non-item-targets.patch} |  0
 ...API-for-updating-recipes-on-clients.patch} |  2 +-
 ...tion-when-spawning-display-entities.patch} |  0
 ...955-Only-capture-actual-tree-growth.patch} |  6 +-
 ...rce-for-mushroom-block-spread-event.patch} |  0
 ...Data-on-more-entities-when-spawning.patch} |  0
 ...-Use-correct-seed-on-api-world-load.patch} |  0
 ...ta-neighbour-ticks-outside-of-range.patch} |  0
 ...> 0960-Cache-map-ids-on-item-frames.patch} |  2 +-
 ...-custom-statistic-criteria-creation.patch} |  0
 ...atch => 0962-Bandaid-fix-for-Effect.patch} |  2 +-
 ...tch => 0963-SculkCatalyst-bloom-API.patch} |  0
 ...API-for-an-entity-s-scoreboard-name.patch} |  0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |  4 +-
 ...lace-methods-with-old-StructureType.patch} |  0
 ...e-namespaced-commands-if-send-names.patch} |  2 +-
 ...-handle-BlockBreakEvent-isDropItems.patch} |  0
 ...entity-death-event-for-ender-dragon.patch} |  0
 ...tity-tracking-range-by-Y-coordinate.patch} |  2 +-
 ... => 0971-Add-Listing-API-for-Player.patch} |  2 +-
 ...figurable-Region-Compression-Format.patch} |  0
 ...3-Add-BlockFace-to-BlockDamageEvent.patch} |  2 +-
 ...h => 0974-Fix-NPE-on-Boat-getStatus.patch} |  0
 ...e-API.patch => 0975-Expand-Pose-API.patch} |  2 +-
 ...patch => 0976-More-DragonBattle-API.patch} |  2 +-
 ... 0977-Deep-clone-unhandled-nbt-tags.patch} |  0
 ...tch => 0978-Add-PlayerPickItemEvent.patch} |  2 +-
 ...-Improve-performance-of-mass-crafts.patch} |  0
 ...=> 0980-Allow-trident-custom-damage.patch} |  0
 ...1-Expose-hand-in-BlockCanBuildEvent.patch} |  0
 ...-nearest-structure-border-iteration.patch} |  0
 ...Implement-OfflinePlayer-isConnected.patch} |  2 +-
 ....patch => 0984-Fix-inventory-desync.patch} |  0
 ...titleOverride-to-InventoryOpenEvent.patch} |  4 +-
 ...86-Configure-sniffer-egg-hatch-time.patch} |  2 +-
 ...-proximity-check-before-entity-look.patch} |  2 +-
 ...kip-POI-finding-if-stuck-in-vehicle.patch} |  0
 ...t-sanity-checks-in-container-clicks.patch} |  4 +-
 ...ll-BlockRedstoneEvents-for-lecterns.patch} |  0
 ...roper-checking-of-empty-item-stacks.patch} |  0
 ...ix-silent-equipment-change-for-mobs.patch} |  0
 ...h => 0993-Fix-spigot-s-Forced-Stats.patch} |  0
 ...ing-InventoryHolders-to-inventories.patch} |  2 +-
 ...entities-in-chunks-that-are-positio.patch} |  0
 ...> 0996-Actually-optimise-explosions.patch} |  2 +-
 ...sing-logs-for-log-ips-config-option.patch} |  0
 ...Remove-Spigot-Bug-Fix-for-MC-109346.patch} |  0
 ...atch => 0999-Fix-SuspiciousStewMeta.patch} |  0
 ... 1000-Optimise-chunk-tick-iteration.patch} |  4 +-
 ...atch => 1001-Lag-compensation-ticks.patch} |  0
 ...n-on-UpgradeData.BlockFixers-class-.patch} |  0
 ...-AdvancementProgress-getDateAwarded.patch} |  0
 ...idebar-objectives-not-being-cleared.patch} |  0
 ...05-Optimise-nearby-player-retrieval.patch} |  4 +-
 ...x-missing-map-initialize-event-call.patch} |  2 +-
 ...a-when-attaching-firework-to-entity.patch} |  0
 ...ble-for-initializing-CraftLootTable.patch} |  0
 ...method-of-Fireballs-change-the-trav.patch} |  0
 ...10-Fix-UnsafeValues-loadAdvancement.patch} |  0
 ...> 1011-Add-player-idle-duration-API.patch} |  2 +-
 ...-if-we-can-see-non-visible-entities.patch} |  2 +-
 ...NPE-in-SculkBloomEvent-world-access.patch} |  0
 ...tack-for-Player-sendEquipmentChange.patch} |  2 +-
 ...Ints.patch => 1015-Optimize-VarInts.patch} |  0
 ...e-collision-shape-of-a-block-before.patch} |  0
 ...redicate-for-blocks-when-raytracing.patch} | 10 +-
 ...em-packets-with-collector-as-source.patch} |  0
 ... => 1019-Expand-LingeringPotion-API.patch} |  0
 ....patch => 1020-Add-MaterialTagsTest.patch} |  0
 ...ngEffect-powers-lightning-rods-and-.patch} |  0
 ...h-event-for-all-player-interactions.patch} |  0
 ...everal-issues-with-EntityBreedEvent.patch} |  4 +-
 ...024-Add-UUID-attribute-modifier-API.patch} |  0
 ...-event-call-for-entity-teleport-API.patch} |  0
 ...y-create-LootContext-for-criterions.patch} |  0
 ...-t-fire-sync-events-during-worldgen.patch} |  0
 ...-getAttributeModifier-duplication-c.patch} |  0
 ...store-vanilla-entity-drops-behavior.patch} |  8 +-
 ...tch => 1030-Add-Structure-check-API.patch} |  0
 ...-Dont-resend-blocks-on-interactions.patch} |  0
 ...evious-behavior-for-setResourcePack.patch} |  2 +-
 ...-read-and-store-sus-effect-duration.patch} |  0
 ...e-correct-max-stack-size-in-crafter.patch} |  0
 ...tch => 1035-add-more-scoreboard-API.patch} |  0
 ...stry.patch => 1036-Improve-Registry.patch} |  0
 ...on-null-loc-for-EntityTeleportEvent.patch} |  0
 ...h => 1038-Add-experience-points-API.patch} |  4 +-
 ...h => 1039-Add-missing-InventoryType.patch} |  0
 ...h => 1040-Add-drops-to-shear-events.patch} |  2 +-
 ...> 1041-Add-PlayerShieldDisableEvent.patch} |  2 +-
 ... => 1042-Add-HiddenPotionEffect-API.patch} |  0
 ...f-bucket-dispenses-will-succeed-for.patch} |  2 +-
 ...x-ItemMeta-removing-CustomModelData.patch} |  0
 ...ate-ResourceLocation-in-NBT-reading.patch} |  2 +-
 ...-experience-dropping-on-block-break.patch} |  4 +-
 ...> 1047-Fixup-NamespacedKey-handling.patch} |  0
 837 files changed, 369 insertions(+), 439 deletions(-)
 rename patches/api/{0328-Move-VehicleCollisionEvent-HandlerList-up.patch => 0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch} (70%)
 delete mode 100644 patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
 rename patches/api/{0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch => 0400-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch} (100%)
 rename patches/api/{0402-Win-Screen-API.patch => 0401-Win-Screen-API.patch} (100%)
 rename patches/api/{0403-Add-Entity-Body-Yaw-API.patch => 0402-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/api/{0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch => 0403-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch} (100%)
 rename patches/api/{0405-Add-EntityFertilizeEggEvent.patch => 0404-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/api/{0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0405-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/api/{0407-Add-Shearable-API.patch => 0406-Add-Shearable-API.patch} (100%)
 rename patches/api/{0408-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0407-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/api/{0409-Add-Mob-Experience-reward-API.patch => 0408-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/api/{0410-Expand-PlayerItemMendEvent.patch => 0409-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/api/{0411-Add-transient-modifier-API.patch => 0410-Add-transient-modifier-API.patch} (100%)
 rename patches/api/{0412-Properly-remove-the-experimental-smithing-inventory-.patch => 0411-Properly-remove-the-experimental-smithing-inventory-.patch} (100%)
 rename patches/api/{0413-Add-method-to-remove-all-active-potion-effects.patch => 0412-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/api/{0414-Folia-scheduler-and-owned-region-API.patch => 0413-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/api/{0415-Add-event-for-player-editing-sign.patch => 0414-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/api/{0416-Add-Sign-getInteractableSideFor.patch => 0415-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/api/{0417-Fix-BanList-API.patch => 0416-Fix-BanList-API.patch} (100%)
 rename patches/api/{0418-Add-whitelist-events.patch => 0417-Add-whitelist-events.patch} (100%)
 rename patches/api/{0419-API-for-updating-recipes-on-clients.patch => 0418-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/api/{0420-Add-PlayerFailMoveEvent.patch => 0419-Add-PlayerFailMoveEvent.patch} (100%)
 rename patches/api/{0421-Fix-custom-statistic-criteria-creation.patch => 0420-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/api/{0422-SculkCatalyst-bloom-API.patch => 0421-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/api/{0423-API-for-an-entity-s-scoreboard-name.patch => 0422-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/api/{0424-Deprecate-and-replace-methods-with-old-StructureType.patch => 0423-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/api/{0425-Add-Listing-API-for-Player.patch => 0424-Add-Listing-API-for-Player.patch} (100%)
 rename patches/api/{0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0425-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/api/{0427-Fix-NPE-on-Boat-getStatus.patch => 0426-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/api/{0428-Expand-Pose-API.patch => 0427-Expand-Pose-API.patch} (100%)
 rename patches/api/{0429-MerchantRecipe-add-copy-constructor.patch => 0428-MerchantRecipe-add-copy-constructor.patch} (100%)
 rename patches/api/{0430-More-DragonBattle-API.patch => 0429-More-DragonBattle-API.patch} (100%)
 rename patches/api/{0431-Add-PlayerPickItemEvent.patch => 0430-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/api/{0432-Allow-trident-custom-damage.patch => 0431-Allow-trident-custom-damage.patch} (100%)
 rename patches/api/{0433-Expose-hand-during-BlockCanBuildEvent.patch => 0432-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/api/{0434-Limit-setBurnTime-to-valid-short-values.patch => 0433-Limit-setBurnTime-to-valid-short-values.patch} (100%)
 rename patches/api/{0435-Add-OfflinePlayer-isConnected.patch => 0434-Add-OfflinePlayer-isConnected.patch} (100%)
 rename patches/api/{0436-Add-titleOverride-to-InventoryOpenEvent.patch => 0435-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/api/{0437-Allow-proper-checking-of-empty-item-stacks.patch => 0436-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/api/{0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch => 0437-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch} (100%)
 rename patches/api/{0439-Add-player-idle-duration-API.patch => 0438-Add-player-idle-duration-API.patch} (100%)
 rename patches/api/{0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0439-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/api/{0441-Add-predicate-for-blocks-when-raytracing.patch => 0440-Add-predicate-for-blocks-when-raytracing.patch} (100%)
 rename patches/api/{0442-Add-hand-to-fish-event-for-all-player-interactions.patch => 0441-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/api/{0443-Add-UUID-attribute-modifier-API.patch => 0442-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/api/{0444-Expand-LingeringPotion-API.patch => 0443-Expand-LingeringPotion-API.patch} (100%)
 rename patches/api/{0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch => 0444-Remove-unnecessary-durability-check-in-ItemStack-isS.patch} (100%)
 rename patches/api/{0446-Add-Structure-check-API.patch => 0445-Add-Structure-check-API.patch} (100%)
 rename patches/api/{0447-add-missing-Experimental-annotations.patch => 0446-add-missing-Experimental-annotations.patch} (100%)
 rename patches/api/{0448-Add-more-scoreboard-API.patch => 0447-Add-more-scoreboard-API.patch} (100%)
 rename patches/api/{0449-Improve-Registry.patch => 0448-Improve-Registry.patch} (100%)
 rename patches/api/{0450-Add-experience-points-API.patch => 0449-Add-experience-points-API.patch} (100%)
 rename patches/api/{0451-Add-missing-InventoryType.patch => 0450-Add-missing-InventoryType.patch} (100%)
 rename patches/api/{0452-Add-drops-to-shear-events.patch => 0451-Add-drops-to-shear-events.patch} (100%)
 rename patches/api/{0453-Add-HiddenPotionEffect-API.patch => 0452-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/api/{0454-Add-PlayerShieldDisableEvent.patch => 0453-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/api/{0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch => 0454-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch} (100%)
 delete mode 100644 patches/server/0254-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
 create mode 100644 patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch
 rename patches/server/{0279-Handle-Large-Packets-disconnecting-client.patch => 0278-Handle-Large-Packets-disconnecting-client.patch} (98%)
 delete mode 100644 patches/server/0278-Prevent-rayTrace-from-loading-chunks.patch
 rename patches/server/{0280-force-entity-dismount-during-teleportation.patch => 0279-force-entity-dismount-during-teleportation.patch} (100%)
 rename patches/server/{0281-Add-more-Zombie-API.patch => 0280-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0282-Book-Size-Limits.patch => 0281-Book-Size-Limits.patch} (96%)
 rename patches/server/{0283-Add-PlayerConnectionCloseEvent.patch => 0282-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename patches/server/{0285-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0283-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 delete mode 100644 patches/server/0284-Prevent-Enderman-from-loading-chunks.patch
 rename patches/server/{0286-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0284-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (91%)
 rename patches/server/{0287-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch => 0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch} (92%)
 rename patches/server/{0288-BlockDestroyEvent.patch => 0286-BlockDestroyEvent.patch} (96%)
 rename patches/server/{0289-Async-command-map-building.patch => 0287-Async-command-map-building.patch} (97%)
 rename patches/server/{0290-Implement-Brigadier-Mojang-API.patch => 0288-Implement-Brigadier-Mojang-API.patch} (97%)
 rename patches/server/{0291-Improve-exact-choice-recipe-ingredients.patch => 0289-Improve-exact-choice-recipe-ingredients.patch} (100%)
 rename patches/server/{0292-Limit-Client-Sign-length-more.patch => 0290-Limit-Client-Sign-length-more.patch} (96%)
 rename patches/server/{0293-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0291-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (88%)
 rename patches/server/{0294-Handle-Oversized-Tile-Entities-in-chunks.patch => 0292-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0295-Entity-getEntitySpawnReason.patch => 0293-Entity-getEntitySpawnReason.patch} (100%)
 rename patches/server/{0296-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0294-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0297-Fire-event-on-GS4-query.patch => 0295-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0298-Implement-PlayerPostRespawnEvent.patch => 0296-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename patches/server/{0299-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0297-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0300-Server-Tick-Events.patch => 0298-Server-Tick-Events.patch} (100%)
 rename patches/server/{0301-PlayerDeathEvent-getItemsToKeep.patch => 0299-PlayerDeathEvent-getItemsToKeep.patch} (97%)
 rename patches/server/{0302-Optimize-Captured-TileEntity-Lookup.patch => 0300-Optimize-Captured-TileEntity-Lookup.patch} (94%)
 rename patches/server/{0303-Add-Heightmap-API.patch => 0301-Add-Heightmap-API.patch} (95%)
 rename patches/server/{0304-Mob-Spawner-API-Enhancements.patch => 0302-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0305-Fix-CB-call-to-changed-postToMainThread-method.patch => 0303-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename patches/server/{0306-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0304-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0307-Implement-CraftBlockSoundGroup.patch => 0305-Implement-CraftBlockSoundGroup.patch} (96%)
 rename patches/server/{0308-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0306-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (97%)
 rename patches/server/{0309-Allow-Saving-of-Oversized-Chunks.patch => 0307-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0310-Expose-the-internal-current-tick.patch => 0308-Expose-the-internal-current-tick.patch} (90%)
 rename patches/server/{0311-Fix-World-isChunkGenerated-calls.patch => 0309-Fix-World-isChunkGenerated-calls.patch} (98%)
 rename patches/server/{0312-Show-blockstate-location-if-we-failed-to-read-it.patch => 0310-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0313-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0311-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0314-Configurable-projectile-relative-velocity.patch => 0312-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0315-offset-item-frame-ticking.patch => 0313-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0317-Prevent-consuming-the-wrong-itemstack.patch => 0314-Prevent-consuming-the-wrong-itemstack.patch} (96%)
 rename patches/server/{0318-Dont-send-unnecessary-sign-update.patch => 0315-Dont-send-unnecessary-sign-update.patch} (100%)
 rename patches/server/{0319-Add-option-to-disable-pillager-patrols.patch => 0316-Add-option-to-disable-pillager-patrols.patch} (100%)
 delete mode 100644 patches/server/0316-Fix-MC-158900.patch
 rename patches/server/{0320-Flat-bedrock-generator-settings.patch => 0317-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0321-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0318-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0322-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0319-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0323-Duplicate-UUID-Resolve-Option.patch => 0320-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename patches/server/{0324-PlayerDeathEvent-shouldDropExperience.patch => 0321-PlayerDeathEvent-shouldDropExperience.patch} (91%)
 rename patches/server/{0325-Prevent-bees-loading-chunks-checking-hive-position.patch => 0322-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0326-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0323-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0327-Optimise-EntityGetter-getPlayerByUUID.patch => 0324-Optimise-EntityGetter-getPlayerByUUID.patch} (94%)
 rename patches/server/{0328-Fix-items-not-falling-correctly.patch => 0325-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0329-Optimize-call-to-getFluid-for-explosions.patch => 0326-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0330-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0327-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0331-Entity-Activation-Range-2.0.patch => 0328-Entity-Activation-Range-2.0.patch} (100%)
 rename patches/server/{0332-Guard-against-serializing-mismatching-chunk-coordina.patch => 0329-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0333-Implement-alternative-item-despawn-rate.patch => 0330-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0334-Tracking-Range-Improvements.patch => 0331-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0335-Fix-items-vanishing-through-end-portal.patch => 0332-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename patches/server/{0336-implement-optional-per-player-mob-spawns.patch => 0333-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0337-Anti-Xray.patch => 0334-Anti-Xray.patch} (99%)
 rename patches/server/{0338-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0335-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0339-Improve-Block-breakNaturally-API.patch => 0336-Improve-Block-breakNaturally-API.patch} (98%)
 rename patches/server/{0340-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0337-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0341-Add-debug-for-sync-chunk-loads.patch => 0338-Add-debug-for-sync-chunk-loads.patch} (99%)
 rename patches/server/{0342-Improve-java-version-check.patch => 0339-Improve-java-version-check.patch} (100%)
 rename patches/server/{0343-Add-ThrownEggHatchEvent.patch => 0340-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0344-Entity-Jump-API.patch => 0341-Entity-Jump-API.patch} (100%)
 rename patches/server/{0345-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0342-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename patches/server/{0346-Make-the-GUI-graph-fancier.patch => 0343-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0347-add-hand-to-BlockMultiPlaceEvent.patch => 0344-add-hand-to-BlockMultiPlaceEvent.patch} (93%)
 rename patches/server/{0348-Validate-tripwire-hook-placement-before-update.patch => 0345-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0349-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0346-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0350-Configurable-chance-of-villager-zombie-infection.patch => 0347-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0351-Optimise-Chunk-getFluid.patch => 0348-Optimise-Chunk-getFluid.patch} (96%)
 rename patches/server/{0352-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0349-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0353-Add-tick-times-API-and-mspt-command.patch => 0350-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename patches/server/{0354-Expose-MinecraftServer-isRunning.patch => 0351-Expose-MinecraftServer-isRunning.patch} (90%)
 rename patches/server/{0355-Add-Raw-Byte-ItemStack-Serialization.patch => 0352-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0356-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0353-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename patches/server/{0357-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (95%)
 rename patches/server/{0358-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0355-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0359-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (96%)
 rename patches/server/{0360-Don-t-tick-dead-players.patch => 0357-Don-t-tick-dead-players.patch} (91%)
 rename patches/server/{0361-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0358-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0362-Optimize-Collision-to-not-load-chunks.patch => 0359-Optimize-Collision-to-not-load-chunks.patch} (97%)
 rename patches/server/{0363-Don-t-move-existing-players-to-world-spawn.patch => 0360-Don-t-move-existing-players-to-world-spawn.patch} (92%)
 rename patches/server/{0364-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0361-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0365-Improved-Watchdog-Support.patch => 0362-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0366-Optimize-Pathfinding.patch => 0363-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0367-Reduce-Either-Optional-allocation.patch => 0364-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0368-Reduce-memory-footprint-of-NBTTagCompound.patch => 0365-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0369-Prevent-opening-inventories-when-frozen.patch => 0366-Prevent-opening-inventories-when-frozen.patch} (95%)
 rename patches/server/{0370-Don-t-run-entity-collision-code-if-not-needed.patch => 0367-Don-t-run-entity-collision-code-if-not-needed.patch} (96%)
 rename patches/server/{0371-Implement-Player-Client-Options-API.patch => 0368-Implement-Player-Client-Options-API.patch} (99%)
 rename patches/server/{0372-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0369-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0373-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0370-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (96%)
 rename patches/server/{0374-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (98%)
 rename patches/server/{0375-Add-PlayerAttackEntityCooldownResetEvent.patch => 0372-Add-PlayerAttackEntityCooldownResetEvent.patch} (95%)
 rename patches/server/{0376-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0373-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0377-Add-phantom-creative-and-insomniac-controls.patch => 0374-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0378-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0375-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0379-Villager-Restocks-API.patch => 0376-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0380-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0377-Validate-PickItem-Packet-and-kick-for-invalid.patch} (95%)
 rename patches/server/{0381-Expose-game-version.patch => 0378-Expose-game-version.patch} (89%)
 rename patches/server/{0382-Optimize-Voxel-Shape-Merging.patch => 0379-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0383-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0380-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0384-misc-debugging-dumps.patch => 0381-misc-debugging-dumps.patch} (96%)
 rename patches/server/{0385-Prevent-teleporting-dead-entities.patch => 0382-Prevent-teleporting-dead-entities.patch} (92%)
 rename patches/server/{0386-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0383-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0387-Implement-Mob-Goal-API.patch => 0384-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0388-Add-villager-reputation-API.patch => 0385-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0389-Option-for-maximum-exp-value-when-merging-orbs.patch => 0386-Option-for-maximum-exp-value-when-merging-orbs.patch} (96%)
 rename patches/server/{0390-ExperienceOrbMergeEvent.patch => 0387-ExperienceOrbMergeEvent.patch} (94%)
 rename patches/server/{0391-Fix-PotionEffect-ignores-icon-flag.patch => 0388-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0392-Potential-bed-API.patch => 0389-Potential-bed-API.patch} (95%)
 rename patches/server/{0393-Wait-for-Async-Tasks-during-shutdown.patch => 0390-Wait-for-Async-Tasks-during-shutdown.patch} (93%)
 rename patches/server/{0394-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0391-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0395-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (97%)
 rename patches/server/{0396-Ensure-safe-gateway-teleport.patch => 0393-Ensure-safe-gateway-teleport.patch} (93%)
 rename patches/server/{0397-Add-option-for-console-having-all-permissions.patch => 0394-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0398-Fix-villager-trading-demand-MC-163962.patch => 0395-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0399-Maps-shouldn-t-load-chunks.patch => 0396-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0400-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0397-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0401-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0398-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0402-Fix-piston-physics-inconsistency-MC-188840.patch => 0399-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0403-Fix-sand-duping.patch => 0400-Fix-sand-duping.patch} (100%)
 rename patches/server/{0404-Fix-missing-chunks-due-to-integer-overflow.patch => 0401-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0405-Prevent-position-desync-in-playerconnection-causing-.patch => 0402-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename patches/server/{0406-Inventory-getHolder-method-without-block-snapshot.patch => 0403-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0407-Improve-Arrow-API.patch => 0404-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0408-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0405-Add-and-implement-PlayerRecipeBookClickEvent.patch} (97%)
 rename patches/server/{0409-Use-distance-map-to-optimise-entity-tracker.patch => 0406-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename patches/server/{0410-Hide-sync-chunk-writes-behind-flag.patch => 0407-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0411-Add-permission-for-command-blocks.patch => 0408-Add-permission-for-command-blocks.patch} (98%)
 rename patches/server/{0412-Ensure-Entity-AABB-s-are-never-invalid.patch => 0409-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0413-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (97%)
 rename patches/server/{0414-Paper-dumpitem-command.patch => 0411-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0415-Improve-Legacy-Component-serialization-size.patch => 0412-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0416-Optimize-Bit-Operations-by-inlining.patch => 0413-Optimize-Bit-Operations-by-inlining.patch} (99%)
 rename patches/server/{0417-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0414-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (98%)
 rename patches/server/{0418-incremental-chunk-and-player-saving.patch => 0415-incremental-chunk-and-player-saving.patch} (98%)
 rename patches/server/{0419-Support-old-UUID-format-for-NBT.patch => 0416-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0420-Convert-legacy-attributes-in-Item-Meta.patch => 0417-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0421-Remove-streams-from-hot-code.patch => 0418-Remove-streams-from-hot-code.patch} (100%)
 rename patches/server/{0422-Support-components-in-ItemMeta.patch => 0419-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0423-Improve-fix-EntityTargetLivingEntityEvent.patch => 0420-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0424-Add-entity-liquid-API.patch => 0421-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0425-Update-itemstack-legacy-name-and-lore.patch => 0422-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0426-Add-PrepareResultEvent.patch => 0423-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0427-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0424-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0428-Fix-arrows-never-despawning-MC-125757.patch => 0425-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0429-Thread-Safe-Vanilla-Command-permission-checking.patch => 0426-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0430-Fix-SPIGOT-5989.patch => 0427-Fix-SPIGOT-5989.patch} (90%)
 rename patches/server/{0431-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0428-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0432-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0429-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0433-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0430-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0434-Optimize-NetworkManager-Exception-Handling.patch => 0431-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0435-Fix-some-rails-connecting-improperly.patch => 0432-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0436-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0433-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0437-Brand-support.patch => 0434-Brand-support.patch} (100%)
 rename patches/server/{0438-Add-playPickupItemAnimation-to-LivingEntity.patch => 0435-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0439-Don-t-require-FACING-data.patch => 0436-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0440-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0437-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0441-Add-moon-phase-API.patch => 0438-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0442-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0439-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0443-Prevent-headless-pistons-from-being-created.patch => 0440-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0444-Add-BellRingEvent.patch => 0441-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0445-Add-zombie-targets-turtle-egg-config.patch => 0442-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0446-Buffer-joins-to-world.patch => 0443-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0447-Eigencraft-redstone-implementation.patch => 0444-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0448-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0445-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0449-PortalCreateEvent-needs-to-know-its-entity.patch => 0446-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0450-Add-more-Evoker-API.patch => 0447-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0451-Add-methods-to-get-translation-keys.patch => 0448-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0452-Create-HoverEvent-from-ItemStack-Entity.patch => 0449-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0453-Cache-block-data-strings.patch => 0450-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0454-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0451-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0455-Add-additional-open-container-api-to-HumanEntity.patch => 0452-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0456-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0453-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0457-Extend-block-drop-capture-to-capture-all-items-added.patch => 0454-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0458-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0455-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0459-Lazily-track-plugin-scoreboards-by-default.patch => 0456-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0460-Entity-isTicking.patch => 0457-Entity-isTicking.patch} (100%)
 rename patches/server/{0461-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0458-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0462-Fix-Concurrency-issue-in-ShufflingList.patch => 0459-Fix-Concurrency-issue-in-ShufflingList.patch} (97%)
 rename patches/server/{0463-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0460-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0464-Fix-for-large-move-vectors-crashing-server.patch => 0461-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0465-Optimise-getType-calls.patch => 0462-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0466-Villager-resetOffers.patch => 0463-Villager-resetOffers.patch} (100%)
 rename patches/server/{0467-Retain-block-place-order-when-capturing-blockstates.patch => 0464-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0468-Reduce-blockpos-allocation-from-pathfinding.patch => 0465-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0469-Fix-item-locations-dropped-from-campfires.patch => 0466-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0470-Fixed-TileEntityBell-memory-leak.patch => 0467-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0471-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0468-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0472-Add-getOfflinePlayerIfCached-String.patch => 0469-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0473-Add-ignore-discounts-API.patch => 0470-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0474-Toggle-for-removing-existing-dragon.patch => 0471-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0475-Fix-client-lag-on-advancement-loading.patch => 0472-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0476-Item-no-age-no-player-pickup.patch => 0473-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0477-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0474-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0478-Beacon-API-custom-effect-ranges.patch => 0475-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0479-Add-API-for-quit-reason.patch => 0476-Add-API-for-quit-reason.patch} (98%)
 rename patches/server/{0480-Add-Wandering-Trader-spawn-rate-config-options.patch => 0477-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0481-Expose-world-spawn-angle.patch => 0478-Expose-world-spawn-angle.patch} (87%)
 rename patches/server/{0482-Add-Destroy-Speed-API.patch => 0479-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0483-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0480-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0484-Add-LivingEntity-clearActiveItem.patch => 0481-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0485-Add-PlayerItemCooldownEvent.patch => 0482-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0486-Significantly-improve-performance-of-the-end-generat.patch => 0483-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0487-More-lightning-API.patch => 0484-More-lightning-API.patch} (100%)
 rename patches/server/{0488-Climbing-should-not-bypass-cramming-gamerule.patch => 0485-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0489-Added-missing-default-perms-for-commands.patch => 0486-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0490-Add-PlayerShearBlockEvent.patch => 0487-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0491-Limit-recipe-packets.patch => 0488-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0492-Fix-CraftSound-backwards-compatibility.patch => 0489-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0493-Player-Chunk-Load-Unload-Events.patch => 0490-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0494-Optimize-Dynamic-get-Missing-Keys.patch => 0491-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0495-Expose-LivingEntity-hurt-direction.patch => 0492-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0496-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0493-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0497-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0494-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0498-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0495-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0499-Implement-TargetHitEvent.patch => 0496-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0500-MC-4-Fix-item-position-desync.patch => 0497-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0501-Additional-Block-Material-API-s.patch => 0498-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0502-Fix-harming-potion-dupe.patch => 0499-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0503-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0500-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0504-Cache-burn-durations.patch => 0501-Cache-burn-durations.patch} (100%)
 rename patches/server/{0505-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0502-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0506-Fix-Not-a-string-Map-Conversion-spam.patch => 0503-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0507-Implement-PlayerFlowerPotManipulateEvent.patch => 0504-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0508-Fix-interact-event-not-being-called-sometimes.patch => 0505-Fix-interact-event-not-being-called-sometimes.patch} (100%)
 rename patches/server/{0509-Zombie-API-breaking-doors.patch => 0506-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0510-Fix-nerfed-slime-when-splitting.patch => 0507-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0511-Add-EntityLoadCrossbowEvent.patch => 0508-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0512-Added-WorldGameRuleChangeEvent.patch => 0509-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0513-Added-ServerResourcesReloadedEvent.patch => 0510-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0514-Added-world-settings-for-mobs-picking-up-loot.patch => 0511-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0515-Implemented-BlockFailedDispenseEvent.patch => 0512-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0516-Added-PlayerLecternPageChangeEvent.patch => 0513-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0517-Added-PlayerLoomPatternSelectEvent.patch => 0514-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0518-Configurable-door-breaking-difficulty.patch => 0515-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0519-Empty-commands-shall-not-be-dispatched.patch => 0516-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0520-Remove-stale-POIs.patch => 0517-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0521-Fix-villager-boat-exploit.patch => 0518-Fix-villager-boat-exploit.patch} (93%)
 rename patches/server/{0522-Add-sendOpLevel-API.patch => 0519-Add-sendOpLevel-API.patch} (91%)
 rename patches/server/{0523-TODO-Registry-Modification-API.patch => 0520-TODO-Registry-Modification-API.patch} (100%)
 rename patches/server/{0524-Add-StructuresLocateEvent.patch => 0521-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0525-Collision-option-for-requiring-a-player-participant.patch => 0522-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0526-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0523-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0527-Return-chat-component-with-empty-text-instead-of-thr.patch => 0524-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0528-Make-schedule-command-per-world.patch => 0525-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0529-Configurable-max-leash-distance.patch => 0526-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0530-Implement-BlockPreDispenseEvent.patch => 0527-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0531-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0528-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0532-Add-toggle-for-always-placing-the-dragon-egg.patch => 0529-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0533-Added-PlayerStonecutterRecipeSelectEvent.patch => 0530-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0534-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0531-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0535-Reset-shield-blocking-on-dimension-change.patch => 0532-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0536-add-DragonEggFormEvent.patch => 0533-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0537-EntityMoveEvent.patch => 0534-EntityMoveEvent.patch} (100%)
 rename patches/server/{0538-added-option-to-disable-pathfinding-updates-on-block.patch => 0535-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0539-Inline-shift-direction-fields.patch => 0536-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0540-Allow-adding-items-to-BlockDropItemEvent.patch => 0537-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0541-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0538-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0542-living-entity-allow-attribute-registration.patch => 0539-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0543-fix-dead-slime-setSize-invincibility.patch => 0540-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0544-Merchant-getRecipes-should-return-an-immutable-list.patch => 0541-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0545-Expose-Tracked-Players.patch => 0542-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0546-Improve-ServerGUI.patch => 0543-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0547-fix-converting-txt-to-json-file.patch => 0544-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0548-Add-worldborder-events.patch => 0545-Add-worldborder-events.patch} (100%)
 rename patches/server/{0549-added-PlayerNameEntityEvent.patch => 0546-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0550-Prevent-grindstones-from-overstacking-items.patch => 0547-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0551-Add-recipe-to-cook-events.patch => 0548-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0552-Add-Block-isValidTool.patch => 0549-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0553-Allow-using-signs-inside-spawn-protection.patch => 0550-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0554-Expand-world-key-API.patch => 0551-Expand-world-key-API.patch} (100%)
 rename patches/server/{0555-Add-fast-alternative-constructor-for-Rotations.patch => 0552-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0556-Item-Rarity-API.patch => 0553-Item-Rarity-API.patch} (100%)
 rename patches/server/{0557-Drop-carried-item-when-player-has-disconnected.patch => 0554-Drop-carried-item-when-player-has-disconnected.patch} (92%)
 rename patches/server/{0558-forced-whitelist-use-configurable-kick-message.patch => 0555-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0559-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0556-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0560-Expose-protocol-version.patch => 0557-Expose-protocol-version.patch} (100%)
 rename patches/server/{0561-Enhance-console-tab-completions-for-brigadier-comman.patch => 0558-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0562-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0559-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0563-Add-bypass-host-check.patch => 0560-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0564-Set-area-affect-cloud-rotation.patch => 0561-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0565-add-isDeeplySleeping-to-HumanEntity.patch => 0562-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0566-add-consumeFuel-to-FurnaceBurnEvent.patch => 0563-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0567-add-get-set-drop-chance-to-EntityEquipment.patch => 0564-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0568-fix-PigZombieAngerEvent-cancellation.patch => 0565-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0569-fix-PlayerItemHeldEvent-firing-twice.patch => 0566-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0570-Added-PlayerDeepSleepEvent.patch => 0567-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0571-More-World-API.patch => 0568-More-World-API.patch} (100%)
 rename patches/server/{0572-Added-PlayerBedFailEnterEvent.patch => 0569-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0573-Implement-methods-to-convert-between-Component-and-B.patch => 0570-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (87%)
 rename patches/server/{0575-Introduce-beacon-activation-deactivation-events.patch => 0572-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0576-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0573-add-RespawnFlags-to-PlayerRespawnEvent.patch} (94%)
 rename patches/server/{0577-Add-Channel-initialization-listeners.patch => 0574-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0578-Send-empty-commands-if-tab-completion-is-disabled.patch => 0575-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0579-Add-more-WanderingTrader-API.patch => 0576-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0580-Add-EntityBlockStorage-clearEntities.patch => 0577-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0581-Entity-load-save-limit-per-chunk.patch => 0578-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0582-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0579-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0583-Inventory-close.patch => 0580-Inventory-close.patch} (100%)
 rename patches/server/{0584-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0581-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0585-Add-basic-Datapack-API.patch => 0582-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0586-Add-environment-variable-to-disable-server-gui.patch => 0583-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0587-additions-to-PlayerGameModeChangeEvent.patch => 0584-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0588-ItemStack-repair-check-API.patch => 0585-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0589-More-Enchantment-API.patch => 0586-More-Enchantment-API.patch} (100%)
 rename patches/server/{0590-Move-range-check-for-block-placing-up.patch => 0587-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0591-Fix-and-optimise-world-force-upgrading.patch => 0588-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0592-Add-Mob-lookAt-API.patch => 0589-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0593-Add-Unix-domain-socket-support.patch => 0590-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0594-Add-EntityInsideBlockEvent.patch => 0591-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0595-Attributes-API-for-item-defaults.patch => 0592-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0596-Add-cause-to-Weather-ThunderChangeEvents.patch => 0593-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0597-More-Lidded-Block-API.patch => 0594-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0598-Limit-item-frame-cursors-on-maps.patch => 0595-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0599-Add-PlayerKickEvent-causes.patch => 0596-Add-PlayerKickEvent-causes.patch} (99%)
 rename patches/server/{0600-Add-PufferFishStateChangeEvent.patch => 0597-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0601-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0598-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0602-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0599-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0603-Add-option-to-fix-items-merging-through-walls.patch => 0600-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0604-Add-BellRevealRaiderEvent.patch => 0601-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0605-Fix-invulnerable-end-crystals.patch => 0602-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0606-Add-ElderGuardianAppearanceEvent.patch => 0603-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0607-Fix-dangerous-end-portal-logic.patch => 0604-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0608-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0605-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0609-Make-item-validations-configurable.patch => 0606-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0610-Line-Of-Sight-Changes.patch => 0607-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0611-add-per-world-spawn-limits.patch => 0608-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0612-Fix-potions-splash-events.patch => 0609-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0613-Add-more-LimitedRegion-API.patch => 0610-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0614-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0611-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0615-Missing-Entity-API.patch => 0612-Missing-Entity-API.patch} (99%)
 rename patches/server/{0616-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0613-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0617-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0614-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0618-Use-getChunkIfLoadedImmediately-in-places.patch => 0615-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0619-Fix-commands-from-signs-not-firing-command-events.patch => 0616-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0620-Adds-PlayerArmSwingEvent.patch => 0617-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0621-Fixes-kick-event-leave-message-not-being-sent.patch => 0618-Fixes-kick-event-leave-message-not-being-sent.patch} (98%)
 rename patches/server/{0622-Add-config-for-mobs-immune-to-default-effects.patch => 0619-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0623-Don-t-apply-cramming-damage-to-players.patch => 0620-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0624-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0621-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0625-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0622-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0626-Stinger-API.patch => 0623-Stinger-API.patch} (100%)
 rename patches/server/{0627-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0624-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0628-Add-System.out-err-catcher.patch => 0625-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0629-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0626-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0630-Improve-boat-collision-performance.patch => 0627-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0631-Prevent-AFK-kick-while-watching-end-credits.patch => 0628-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0632-Allow-skipping-writing-of-comments-to-server.propert.patch => 0629-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0633-Add-PlayerSetSpawnEvent.patch => 0630-Add-PlayerSetSpawnEvent.patch} (98%)
 rename patches/server/{0634-Make-hoppers-respect-inventory-max-stack-size.patch => 0631-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0635-Optimize-entity-tracker-passenger-checks.patch => 0632-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0636-Config-option-for-Piglins-guarding-chests.patch => 0633-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0637-Added-EntityDamageItemEvent.patch => 0634-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0638-Optimize-indirect-passenger-iteration.patch => 0635-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0639-Configurable-item-frame-map-cursor-update-interval.patch => 0636-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0640-Make-EntityUnleashEvent-cancellable.patch => 0637-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0641-Clear-bucket-NBT-after-dispense.patch => 0638-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0642-Change-EnderEye-target-without-changing-other-things.patch => 0639-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0643-Add-BlockBreakBlockEvent.patch => 0640-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0644-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0641-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0645-More-CommandBlock-API.patch => 0642-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0646-Add-missing-team-sidebar-display-slots.patch => 0643-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0647-Add-back-EntityPortalExitEvent.patch => 0644-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0648-Add-methods-to-find-targets-for-lightning-strikes.patch => 0645-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0649-Get-entity-default-attributes.patch => 0646-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0650-Left-handed-API.patch => 0647-Left-handed-API.patch} (100%)
 rename patches/server/{0651-Add-more-advancement-API.patch => 0648-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0652-Add-ItemFactory-getSpawnEgg-API.patch => 0649-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0653-Add-critical-damage-API.patch => 0650-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0654-Fix-issues-with-mob-conversion.patch => 0651-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0655-Add-isCollidable-methods-to-various-places.patch => 0652-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0656-Goat-ram-API.patch => 0653-Goat-ram-API.patch} (100%)
 rename patches/server/{0657-Add-API-for-resetting-a-single-score.patch => 0654-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0658-Add-Raw-Byte-Entity-Serialization.patch => 0655-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0659-Vanilla-command-permission-fixes.patch => 0656-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0660-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0657-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%)
 rename patches/server/{0661-Fix-GameProfileCache-concurrency.patch => 0658-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0662-Improve-and-expand-AsyncCatcher.patch => 0659-Improve-and-expand-AsyncCatcher.patch} (100%)
 rename patches/server/{0663-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0660-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0664-Sanitize-ResourceLocation-error-logging.patch => 0661-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0665-Optimise-general-POI-access.patch => 0662-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0666-Custom-table-implementation-for-blockstate-state-loo.patch => 0663-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0667-Manually-inline-methods-in-BlockPosition.patch => 0664-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0668-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0665-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0669-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0666-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0670-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0667-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0671-Don-t-lookup-fluid-state-when-raytracing.patch => 0668-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch} (60%)
 rename patches/server/{0672-Time-scoreboard-search.patch => 0669-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0673-Send-full-pos-packets-for-hard-colliding-entities.patch => 0670-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0675-Execute-chunk-tasks-mid-tick.patch => 0671-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0676-Oprimise-map-impl-for-tracked-players.patch => 0672-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0677-Optimise-BlockSoil-nearby-water-lookup.patch => 0673-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 delete mode 100644 patches/server/0674-Do-not-run-raytrace-logic-for-AIR.patch
 rename patches/server/{0678-Optimise-random-block-ticking.patch => 0674-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0679-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0675-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0680-Use-Velocity-compression-and-cipher-natives.patch => 0676-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0681-Detail-more-information-in-watchdog-dumps.patch => 0677-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0682-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0678-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0683-Distance-manager-tick-timings.patch => 0679-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0684-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0680-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0685-Check-requirement-before-suggesting-root-nodes.patch => 0681-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0686-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0682-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0687-Add-packet-limiter-config.patch => 0683-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0688-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0684-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0689-Ensure-valid-vehicle-status.patch => 0685-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0690-Prevent-softlocked-end-exit-portal-generation.patch => 0686-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0691-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0687-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0692-Don-t-log-debug-logging-being-disabled.patch => 0688-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0693-fix-various-menus-with-empty-level-accesses.patch => 0689-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0694-Preserve-overstacked-loot.patch => 0690-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0695-Update-head-rotation-in-missing-places.patch => 0691-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0696-prevent-unintended-light-block-manipulation.patch => 0692-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0697-Fix-CraftCriteria-defaults-map.patch => 0693-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0698-Fix-upstreams-block-state-factories.patch => 0694-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0699-Configurable-feature-seeds.patch => 0695-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0700-Add-root-admin-user-detection.patch => 0696-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0701-Always-allow-item-changing-in-Fireball.patch => 0697-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0702-don-t-attempt-to-teleport-dead-entities.patch => 0698-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0703-Prevent-excessive-velocity-through-repeated-crits.patch => 0699-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0704-Remove-client-side-code-using-deprecated-for-removal.patch => 0700-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0705-Fix-removing-recipes-from-RecipeIterator.patch => 0701-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0706-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0702-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0707-Hide-unnecessary-itemmeta-from-clients.patch => 0703-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0708-Fix-Spigot-growth-modifiers.patch => 0704-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0709-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0705-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0710-Add-PlayerItemFrameChangeEvent.patch => 0706-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0711-Optimize-HashMapPalette.patch => 0707-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0712-Allow-delegation-to-vanilla-chunk-gen.patch => 0708-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0713-Collision-optimisations.patch => 0709-Collision-optimisations.patch} (99%)
 rename patches/server/{0714-Optimise-collision-checking-in-player-move-packet-ha.patch => 0710-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0715-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0711-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0716-Add-more-Campfire-API.patch => 0712-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0717-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0713-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0718-Fix-tripwire-state-inconsistency.patch => 0714-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0719-Forward-CraftEntity-in-teleport-command.patch => 0715-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0720-Improve-scoreboard-entries.patch => 0716-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0721-Entity-powdered-snow-API.patch => 0717-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0722-Add-API-for-item-entity-health.patch => 0718-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0723-Fix-entity-type-tags-suggestions-in-selectors.patch => 0719-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0724-Configurable-max-block-light-for-monster-spawning.patch => 0720-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0725-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0721-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0726-Load-effect-amplifiers-greater-than-127-correctly.patch => 0722-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0727-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0723-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0728-Fix-bees-aging-inside-hives.patch => 0724-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0729-Bucketable-API.patch => 0725-Bucketable-API.patch} (100%)
 rename patches/server/{0730-Validate-usernames.patch => 0726-Validate-usernames.patch} (97%)
 rename patches/server/{0731-Make-water-animal-spawn-height-configurable.patch => 0727-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0732-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0728-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0733-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0729-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0734-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch => 0730-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch} (100%)
 rename patches/server/{0735-Multiple-Entries-with-Scoreboards.patch => 0731-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0736-Reset-placed-block-on-exception.patch => 0732-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0737-Add-configurable-height-for-slime-spawn.patch => 0733-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0738-Fix-xp-reward-for-baby-zombies.patch => 0734-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0739-Multi-Block-Change-API-Implementation.patch => 0735-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0740-Fix-NotePlayEvent.patch => 0736-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0741-Freeze-Tick-Lock-API.patch => 0737-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0742-Dolphin-API.patch => 0738-Dolphin-API.patch} (100%)
 rename patches/server/{0743-More-PotionEffectType-API.patch => 0739-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0744-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0740-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0745-API-for-creating-command-sender-which-forwards-feedb.patch => 0741-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0746-Add-missing-structure-set-seed-configs.patch => 0742-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0747-Implement-regenerateChunk.patch => 0743-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0748-Fix-cancelled-powdered-snow-bucket-placement.patch => 0744-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0749-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0745-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0750-Add-GameEvent-tags.patch => 0746-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0751-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0747-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0752-Furnace-RecipesUsed-API.patch => 0748-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0753-Configurable-sculk-sensor-listener-range.patch => 0749-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0754-Add-missing-block-data-mins-and-maxes.patch => 0750-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0755-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0751-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0756-Put-world-into-worldlist-before-initing-the-world.patch => 0752-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0757-Fix-Entity-Position-Desync.patch => 0753-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0758-Custom-Potion-Mixes.patch => 0754-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0759-Force-close-world-loading-screen.patch => 0755-Force-close-world-loading-screen.patch} (95%)
 rename patches/server/{0760-Fix-falling-block-spawn-methods.patch => 0756-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0761-Expose-furnace-minecart-push-values.patch => 0757-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0762-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0758-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0763-More-Projectile-API.patch => 0759-More-Projectile-API.patch} (100%)
 rename patches/server/{0764-Fix-swamp-hut-cat-generation-deadlock.patch => 0760-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0765-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0761-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0766-Implement-getComputedBiome-API.patch => 0762-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0767-Make-some-itemstacks-nonnull.patch => 0763-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0768-Implement-enchantWithLevels-API.patch => 0764-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0769-Fix-saving-in-unloadWorld.patch => 0765-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0770-Buffer-OOB-setBlock-calls.patch => 0766-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0771-Add-TameableDeathMessageEvent.patch => 0767-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0772-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0768-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (99%)
 rename patches/server/{0773-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0769-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0774-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0770-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0775-Guard-against-invalid-entity-positions.patch => 0771-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0776-cache-resource-keys.patch => 0772-cache-resource-keys.patch} (100%)
 rename patches/server/{0777-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0773-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0778-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0774-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0779-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0775-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0780-Prevent-tile-entity-copies-loading-chunks.patch => 0776-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0781-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0777-Use-username-instead-of-display-name-in-PlayerList-g.patch} (87%)
 rename patches/server/{0782-Pass-ServerLevel-for-gamerule-callbacks.patch => 0778-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0783-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0779-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0784-WorldCreator-keepSpawnLoaded.patch => 0780-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0785-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0781-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0786-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0782-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0787-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0783-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0788-Fire-CauldronLevelChange-on-initial-fill.patch => 0784-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0789-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0785-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0790-Add-PlayerStopUsingItemEvent.patch => 0786-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0791-Don-t-tick-markers.patch => 0787-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0792-Expand-FallingBlock-API.patch => 0788-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0793-Do-not-accept-invalid-client-settings.patch => 0789-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0794-Add-support-for-Proxy-Protocol.patch => 0790-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0795-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0791-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0796-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0792-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0797-Sanitize-Sent-BlockEntity-NBT.patch => 0793-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0798-Disable-component-selector-resolving-in-books-by-def.patch => 0794-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0799-Prevent-entity-loading-causing-async-lookups.patch => 0795-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0800-Throw-exception-on-world-create-while-being-ticked.patch => 0796-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0801-Add-Alternate-Current-redstone-implementation.patch => 0797-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0802-Dont-resent-entity-on-art-update.patch => 0798-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0803-Add-WardenAngerChangeEvent.patch => 0799-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0804-Add-option-for-strict-advancement-dimension-checks.patch => 0800-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0805-Add-missing-important-BlockStateListPopulator-method.patch => 0801-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0806-Nameable-Banner-API.patch => 0802-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0807-Don-t-broadcast-messages-to-command-blocks.patch => 0803-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0808-Prevent-empty-items-from-being-added-to-world.patch => 0804-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0809-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0805-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0810-Add-Player-getFishHook.patch => 0806-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0811-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0807-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0812-Add-various-missing-EntityDropItemEvent-calls.patch => 0808-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0813-Fix-Bee-flower-NPE.patch => 0809-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0814-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0810-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0815-More-Teleport-API.patch => 0811-More-Teleport-API.patch} (100%)
 rename patches/server/{0816-Add-EntityPortalReadyEvent.patch => 0812-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0817-Don-t-use-level-random-in-entity-constructors.patch => 0813-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0818-Send-block-entities-after-destroy-prediction.patch => 0814-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0819-Warn-on-plugins-accessing-faraway-chunks.patch => 0815-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0820-Custom-Chat-Completion-Suggestions-API.patch => 0816-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0821-Add-and-fix-missing-BlockFadeEvents.patch => 0817-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0822-Collision-API.patch => 0818-Collision-API.patch} (100%)
 rename patches/server/{0823-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0819-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0824-Block-Ticking-API.patch => 0820-Block-Ticking-API.patch} (100%)
 rename patches/server/{0825-Add-Velocity-IP-Forwarding-Support.patch => 0821-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0826-Add-NamespacedKey-biome-methods.patch => 0822-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0827-Fix-plugin-loggers-on-server-shutdown.patch => 0823-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0828-Stop-large-look-changes-from-crashing-the-server.patch => 0824-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0829-Fire-EntityChangeBlockEvent-in-more-places.patch => 0825-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0830-Missing-eating-regain-reason.patch => 0826-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0831-Missing-effect-cause.patch => 0827-Missing-effect-cause.patch} (100%)
 rename patches/server/{0832-Added-byte-array-serialization-deserialization-for-P.patch => 0828-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0833-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0829-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0834-Call-BlockPhysicsEvent-more-often.patch => 0830-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0835-Configurable-chat-thread-limit.patch => 0831-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0836-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0832-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0837-fix-Jigsaw-block-kicking-user.patch => 0833-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0838-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0834-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0839-Add-getDrops-to-BlockState.patch => 0835-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0840-Fix-a-bunch-of-vanilla-bugs.patch => 0836-Fix-a-bunch-of-vanilla-bugs.patch} (95%)
 rename patches/server/{0841-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0837-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0842-Fix-custom-piglin-loved-items.patch => 0838-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0843-EntityPickupItemEvent-fixes.patch => 0839-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0844-Correctly-handle-interactions-with-items-on-cooldown.patch => 0840-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0845-Add-PlayerInventorySlotChangeEvent.patch => 0841-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0846-Elder-Guardian-appearance-API.patch => 0842-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0847-Allow-changing-bed-s-occupied-property.patch => 0843-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0848-Add-entity-knockback-API.patch => 0844-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0849-Detect-headless-JREs.patch => 0845-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0850-fix-entity-vehicle-collision-event-not-called.patch => 0846-fix-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0851-optimize-dirt-and-snow-spreading.patch => 0847-optimize-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0852-Add-EntityToggleSitEvent.patch => 0848-Add-EntityToggleSitEvent.patch} (96%)
 rename patches/server/{0853-Add-fire-tick-delay-option.patch => 0849-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0854-Add-Moving-Piston-API.patch => 0850-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0855-Ignore-impossible-spawn-tick.patch => 0851-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0856-Track-projectile-source-for-fireworks-from-dispenser.patch => 0852-Track-projectile-source-for-fireworks-from-dispenser.patch} (88%)
 rename patches/server/{0857-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0853-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0858-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0854-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0860-Add-PrePlayerAttackEntityEvent.patch => 0855-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0861-ensure-reset-EnderDragon-boss-event-name.patch => 0856-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0862-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0857-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0863-Add-Player-Warden-Warning-API.patch => 0858-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0864-More-vanilla-friendly-methods-to-update-trades.patch => 0859-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 delete mode 100644 patches/server/0859-Prevent-compass-from-loading-chunks.patch
 rename patches/server/{0865-Add-paper-dumplisteners-command.patch => 0860-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0866-check-global-player-list-where-appropriate.patch => 0861-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0867-Fix-async-entity-add-due-to-fungus-trees.patch => 0862-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0868-ItemStack-damage-API.patch => 0863-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0869-Friction-API.patch => 0864-Friction-API.patch} (100%)
 rename patches/server/{0870-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0865-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0871-Fix-player-kick-on-shutdown.patch => 0866-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0872-Sync-offhand-slot-in-menus.patch => 0867-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0873-Player-Entity-Tracking-Events.patch => 0868-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0874-Limit-pet-look-distance.patch => 0869-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0875-Properly-resend-entities.patch => 0870-Properly-resend-entities.patch} (99%)
 rename patches/server/{0876-Fixes-and-additions-to-the-SpawnReason-API.patch => 0871-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0877-fix-Instruments.patch => 0872-fix-Instruments.patch} (100%)
 rename patches/server/{0878-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0873-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (87%)
 rename patches/server/{0879-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0874-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (99%)
 rename patches/server/{0880-Add-BlockLockCheckEvent.patch => 0875-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0881-Add-Sneaking-API-for-Entities.patch => 0876-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0882-Improve-logging-and-errors.patch => 0877-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0883-Improve-PortalEvents.patch => 0878-Improve-PortalEvents.patch} (93%)
 rename patches/server/{0884-Add-config-option-for-spider-worldborder-climbing.patch => 0879-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0885-Add-missing-SpigotConfig-logCommands-check.patch => 0880-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0886-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0881-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0887-Flying-Fall-Damage.patch => 0882-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0888-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0883-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0889-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0884-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (91%)
 rename patches/server/{0890-config-for-disabling-entity-tag-tags.patch => 0885-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0891-Use-single-player-info-update-packet-on-join.patch => 0886-Use-single-player-info-update-packet-on-join.patch} (94%)
 rename patches/server/{0892-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0887-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0893-Win-Screen-API.patch => 0888-Win-Screen-API.patch} (93%)
 rename patches/server/{0894-Remove-CraftItemStack-setAmount-null-assignment.patch => 0889-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0895-Fix-force-opening-enchantment-tables.patch => 0890-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0896-Add-Entity-Body-Yaw-API.patch => 0891-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0897-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0892-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0898-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0893-Update-the-flag-when-a-captured-block-state-is-outda.patch} (100%)
 rename patches/server/{0899-Add-EntityFertilizeEggEvent.patch => 0894-Add-EntityFertilizeEggEvent.patch} (98%)
 rename patches/server/{0900-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0895-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0901-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0896-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0902-Correctly-handle-ArmorStand-invisibility.patch => 0897-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0903-Fix-advancement-triggers-for-entity-damage.patch => 0898-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0904-Fix-text-display-error-on-spawn.patch => 0899-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0905-Fix-inventories-returning-null-Locations.patch => 0900-Fix-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0906-Add-Shearable-API.patch => 0901-Add-Shearable-API.patch} (100%)
 rename patches/server/{0907-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0902-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0908-Optimize-Hoppers.patch => 0903-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0909-Fix-beehives-generating-from-using-bonemeal.patch => 0904-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0910-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0905-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0911-Treat-sequence-violations-like-they-should-be.patch => 0906-Treat-sequence-violations-like-they-should-be.patch} (92%)
 rename patches/server/{0912-remove-duplicate-animate-packet-for-records.patch => 0907-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0913-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0908-Prevent-causing-expired-keys-from-impacting-new-join.patch} (97%)
 rename patches/server/{0914-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0909-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (91%)
 rename patches/server/{0915-Use-array-for-gamerule-storage.patch => 0910-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0916-Fix-a-couple-of-upstream-bed-issues.patch => 0911-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0917-Fix-demo-flag-not-enabling-demo-mode.patch => 0912-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0918-Add-Mob-Experience-reward-API.patch => 0913-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0919-Break-redstone-on-top-of-trap-doors-early.patch => 0914-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0920-Fix-DamageCause-for-Falling-Blocks.patch => 0915-Fix-DamageCause-for-Falling-Blocks.patch} (92%)
 rename patches/server/{0921-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0916-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0922-More-accurate-isInOpenWater-impl.patch => 0917-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0923-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0918-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0924-Optimise-recalcBlockCounts-for-empty-sections.patch => 0919-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0925-Expand-PlayerItemMendEvent.patch => 0920-Expand-PlayerItemMendEvent.patch} (96%)
 rename patches/server/{0926-Refresh-ProjectileSource-for-projectiles.patch => 0921-Refresh-ProjectileSource-for-projectiles.patch} (97%)
 rename patches/server/{0927-Add-transient-modifier-API.patch => 0922-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0928-Fix-block-place-logic.patch => 0923-Fix-block-place-logic.patch} (100%)
 rename patches/server/{0929-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0924-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0930-Call-BlockGrowEvent-for-missing-blocks.patch => 0925-Call-BlockGrowEvent-for-missing-blocks.patch} (96%)
 rename patches/server/{0931-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0926-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%)
 rename patches/server/{0932-fix-MapLike-spam-for-missing-key-selector.patch => 0927-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0933-Fix-sniffer-removeExploredLocation.patch => 0928-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0934-Add-method-to-remove-all-active-potion-effects.patch => 0929-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0935-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0930-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0936-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0931-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0937-Properly-cancel-usable-items.patch => 0932-Properly-cancel-usable-items.patch} (100%)
 rename patches/server/{0938-Add-event-for-player-editing-sign.patch => 0933-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0939-Only-tick-item-frames-if-players-can-see-it.patch => 0934-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0940-Fix-cmd-permission-levels-for-command-blocks.patch => 0935-Fix-cmd-permission-levels-for-command-blocks.patch} (100%)
 rename patches/server/{0941-Add-option-to-disable-block-updates.patch => 0936-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0942-Call-missing-BlockDispenseEvent.patch => 0937-Call-missing-BlockDispenseEvent.patch} (96%)
 rename patches/server/{0943-Don-t-load-chunks-for-supporting-block-checks.patch => 0938-Don-t-load-chunks-for-supporting-block-checks.patch} (90%)
 rename patches/server/{0944-Optimize-player-lookups-for-beacons.patch => 0939-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0945-Add-Sign-getInteractableSideFor.patch => 0940-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0946-Array-backed-synched-entity-data.patch => 0941-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0947-fix-item-meta-for-tadpole-buckets.patch => 0942-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0948-Fix-BanList-API.patch => 0943-Fix-BanList-API.patch} (99%)
 rename patches/server/{0949-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0944-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0950-Fix-possible-NPE-on-painting-creation.patch => 0945-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0951-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0946-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0952-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0947-ExperienceOrb-should-call-EntitySpawnEvent.patch} (93%)
 rename patches/server/{0953-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0948-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0954-Add-whitelist-events.patch => 0949-Add-whitelist-events.patch} (100%)
 rename patches/server/{0955-Implement-PlayerFailMoveEvent.patch => 0950-Implement-PlayerFailMoveEvent.patch} (98%)
 rename patches/server/{0956-Folia-scheduler-and-owned-region-API.patch => 0951-Folia-scheduler-and-owned-region-API.patch} (99%)
 rename patches/server/{0957-Only-erase-allay-memory-on-non-item-targets.patch => 0952-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0958-API-for-updating-recipes-on-clients.patch => 0953-API-for-updating-recipes-on-clients.patch} (97%)
 rename patches/server/{0959-Fix-rotation-when-spawning-display-entities.patch => 0954-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0960-Only-capture-actual-tree-growth.patch => 0955-Only-capture-actual-tree-growth.patch} (95%)
 rename patches/server/{0961-Use-correct-source-for-mushroom-block-spread-event.patch => 0956-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0962-Respect-randomizeData-on-more-entities-when-spawning.patch => 0957-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0963-Use-correct-seed-on-api-world-load.patch => 0958-Use-correct-seed-on-api-world-load.patch} (100%)
 rename patches/server/{0964-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0959-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0965-Cache-map-ids-on-item-frames.patch => 0960-Cache-map-ids-on-item-frames.patch} (96%)
 rename patches/server/{0966-Fix-custom-statistic-criteria-creation.patch => 0961-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0967-Bandaid-fix-for-Effect.patch => 0962-Bandaid-fix-for-Effect.patch} (98%)
 rename patches/server/{0968-SculkCatalyst-bloom-API.patch => 0963-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0969-API-for-an-entity-s-scoreboard-name.patch => 0964-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0965-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (96%)
 rename patches/server/{0971-Deprecate-and-replace-methods-with-old-StructureType.patch => 0966-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/server/{0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0967-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (95%)
 rename patches/server/{0973-Properly-handle-BlockBreakEvent-isDropItems.patch => 0968-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0974-Fire-entity-death-event-for-ender-dragon.patch => 0969-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0975-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0970-Configurable-entity-tracking-range-by-Y-coordinate.patch} (94%)
 rename patches/server/{0976-Add-Listing-API-for-Player.patch => 0971-Add-Listing-API-for-Player.patch} (99%)
 rename patches/server/{0977-Configurable-Region-Compression-Format.patch => 0972-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0978-Add-BlockFace-to-BlockDamageEvent.patch => 0973-Add-BlockFace-to-BlockDamageEvent.patch} (96%)
 rename patches/server/{0979-Fix-NPE-on-Boat-getStatus.patch => 0974-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0980-Expand-Pose-API.patch => 0975-Expand-Pose-API.patch} (95%)
 rename patches/server/{0981-More-DragonBattle-API.patch => 0976-More-DragonBattle-API.patch} (97%)
 rename patches/server/{0982-Deep-clone-unhandled-nbt-tags.patch => 0977-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{0983-Add-PlayerPickItemEvent.patch => 0978-Add-PlayerPickItemEvent.patch} (96%)
 rename patches/server/{0984-Improve-performance-of-mass-crafts.patch => 0979-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{0985-Allow-trident-custom-damage.patch => 0980-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0986-Expose-hand-in-BlockCanBuildEvent.patch => 0981-Expose-hand-in-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0987-Optimize-nearest-structure-border-iteration.patch => 0982-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{0988-Implement-OfflinePlayer-isConnected.patch => 0983-Implement-OfflinePlayer-isConnected.patch} (94%)
 rename patches/server/{0989-Fix-inventory-desync.patch => 0984-Fix-inventory-desync.patch} (100%)
 rename patches/server/{0990-Add-titleOverride-to-InventoryOpenEvent.patch => 0985-Add-titleOverride-to-InventoryOpenEvent.patch} (97%)
 rename patches/server/{0991-Configure-sniffer-egg-hatch-time.patch => 0986-Configure-sniffer-egg-hatch-time.patch} (94%)
 rename patches/server/{0992-Do-crystal-portal-proximity-check-before-entity-look.patch => 0987-Do-crystal-portal-proximity-check-before-entity-look.patch} (97%)
 rename patches/server/{0993-Skip-POI-finding-if-stuck-in-vehicle.patch => 0988-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{0994-Add-slot-sanity-checks-in-container-clicks.patch => 0989-Add-slot-sanity-checks-in-container-clicks.patch} (93%)
 rename patches/server/{0995-Call-BlockRedstoneEvents-for-lecterns.patch => 0990-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{0996-Allow-proper-checking-of-empty-item-stacks.patch => 0991-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{0997-Fix-silent-equipment-change-for-mobs.patch => 0992-Fix-silent-equipment-change-for-mobs.patch} (100%)
 rename patches/server/{0998-Fix-spigot-s-Forced-Stats.patch => 0993-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{0999-Add-missing-InventoryHolders-to-inventories.patch => 0994-Add-missing-InventoryHolders-to-inventories.patch} (99%)
 rename patches/server/{1000-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 0995-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%)
 rename patches/server/{1001-Actually-optimise-explosions.patch => 0996-Actually-optimise-explosions.patch} (99%)
 rename patches/server/{1002-Add-missing-logs-for-log-ips-config-option.patch => 0997-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{1003-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 0998-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (100%)
 rename patches/server/{1004-Fix-SuspiciousStewMeta.patch => 0999-Fix-SuspiciousStewMeta.patch} (100%)
 rename patches/server/{1005-Optimise-chunk-tick-iteration.patch => 1000-Optimise-chunk-tick-iteration.patch} (99%)
 rename patches/server/{1006-Lag-compensation-ticks.patch => 1001-Lag-compensation-ticks.patch} (100%)
 rename patches/server/{1007-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 1002-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{1008-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 1003-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{1009-Fix-team-sidebar-objectives-not-being-cleared.patch => 1004-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{1010-Optimise-nearby-player-retrieval.patch => 1005-Optimise-nearby-player-retrieval.patch} (98%)
 rename patches/server/{1011-Fix-missing-map-initialize-event-call.patch => 1006-Fix-missing-map-initialize-event-call.patch} (95%)
 rename patches/server/{1012-Update-entity-data-when-attaching-firework-to-entity.patch => 1007-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{1013-Use-correct-variable-for-initializing-CraftLootTable.patch => 1008-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%)
 rename patches/server/{1014-Make-setVelocity-method-of-Fireballs-change-the-trav.patch => 1009-Make-setVelocity-method-of-Fireballs-change-the-trav.patch} (100%)
 rename patches/server/{1015-Fix-UnsafeValues-loadAdvancement.patch => 1010-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{1016-Add-player-idle-duration-API.patch => 1011-Add-player-idle-duration-API.patch} (91%)
 rename patches/server/{1017-Don-t-check-if-we-can-see-non-visible-entities.patch => 1012-Don-t-check-if-we-can-see-non-visible-entities.patch} (91%)
 rename patches/server/{1018-Fix-NPE-in-SculkBloomEvent-world-access.patch => 1013-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 1014-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (90%)
 rename patches/server/{1020-Optimize-VarInts.patch => 1015-Optimize-VarInts.patch} (100%)
 rename patches/server/{1021-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 1016-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{1022-Add-predicate-for-blocks-when-raytracing.patch => 1017-Add-predicate-for-blocks-when-raytracing.patch} (95%)
 rename patches/server/{1023-Broadcast-take-item-packets-with-collector-as-source.patch => 1018-Broadcast-take-item-packets-with-collector-as-source.patch} (100%)
 rename patches/server/{1024-Expand-LingeringPotion-API.patch => 1019-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{1025-Add-MaterialTagsTest.patch => 1020-Add-MaterialTagsTest.patch} (100%)
 rename patches/server/{1026-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 1021-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%)
 rename patches/server/{1027-Add-hand-to-fish-event-for-all-player-interactions.patch => 1022-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{1028-Fix-several-issues-with-EntityBreedEvent.patch => 1023-Fix-several-issues-with-EntityBreedEvent.patch} (97%)
 rename patches/server/{1029-Add-UUID-attribute-modifier-API.patch => 1024-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{1030-Fix-missing-event-call-for-entity-teleport-API.patch => 1025-Fix-missing-event-call-for-entity-teleport-API.patch} (100%)
 rename patches/server/{1031-Lazily-create-LootContext-for-criterions.patch => 1026-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{1032-Don-t-fire-sync-events-during-worldgen.patch => 1027-Don-t-fire-sync-events-during-worldgen.patch} (100%)
 rename patches/server/{1033-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 1028-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%)
 rename patches/server/{1034-Restore-vanilla-entity-drops-behavior.patch => 1029-Restore-vanilla-entity-drops-behavior.patch} (97%)
 rename patches/server/{1035-Add-Structure-check-API.patch => 1030-Add-Structure-check-API.patch} (100%)
 rename patches/server/{1036-Dont-resend-blocks-on-interactions.patch => 1031-Dont-resend-blocks-on-interactions.patch} (100%)
 rename patches/server/{1037-Keep-previous-behavior-for-setResourcePack.patch => 1032-Keep-previous-behavior-for-setResourcePack.patch} (94%)
 rename patches/server/{1038-properly-read-and-store-sus-effect-duration.patch => 1033-properly-read-and-store-sus-effect-duration.patch} (100%)
 rename patches/server/{1039-Use-correct-max-stack-size-in-crafter.patch => 1034-Use-correct-max-stack-size-in-crafter.patch} (100%)
 rename patches/server/{1040-add-more-scoreboard-API.patch => 1035-add-more-scoreboard-API.patch} (100%)
 rename patches/server/{1041-Improve-Registry.patch => 1036-Improve-Registry.patch} (100%)
 rename patches/server/{1042-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 1037-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%)
 rename patches/server/{1043-Add-experience-points-API.patch => 1038-Add-experience-points-API.patch} (95%)
 rename patches/server/{1044-Add-missing-InventoryType.patch => 1039-Add-missing-InventoryType.patch} (100%)
 rename patches/server/{1045-Add-drops-to-shear-events.patch => 1040-Add-drops-to-shear-events.patch} (99%)
 rename patches/server/{1046-Add-PlayerShieldDisableEvent.patch => 1041-Add-PlayerShieldDisableEvent.patch} (97%)
 rename patches/server/{1047-Add-HiddenPotionEffect-API.patch => 1042-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/server/{1048-Correctly-check-if-bucket-dispenses-will-succeed-for.patch => 1043-Correctly-check-if-bucket-dispenses-will-succeed-for.patch} (96%)
 rename patches/server/{1049-fix-ItemMeta-removing-CustomModelData.patch => 1044-fix-ItemMeta-removing-CustomModelData.patch} (100%)
 rename patches/server/{1050-Validate-ResourceLocation-in-NBT-reading.patch => 1045-Validate-ResourceLocation-in-NBT-reading.patch} (98%)
 rename patches/server/{1051-Properly-handle-experience-dropping-on-block-break.patch => 1046-Properly-handle-experience-dropping-on-block-break.patch} (97%)
 rename patches/server/{1052-Fixup-NamespacedKey-handling.patch => 1047-Fixup-NamespacedKey-handling.patch} (100%)

diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch
index 4bf14b1509..caeceff817 100644
--- a/patches/api/0009-Paper-Plugins.patch
+++ b/patches/api/0009-Paper-Plugins.patch
@@ -2097,7 +2097,7 @@ index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..653135352c104a6ddeb74a1b6d4916c6
          }
  
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 64a294aeb6fb548794708b38c3707f9dd882b2ff..74b6581a97a092c44a0876e7981ff8a8e6153100 100644
+index 64a294aeb6fb548794708b38c3707f9dd882b2ff..58d20eff7e0da2d7fcb1609d55e4284715355634 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -31,7 +31,8 @@ import org.jetbrains.annotations.Nullable;
@@ -2124,7 +2124,7 @@ index 64a294aeb6fb548794708b38c3707f9dd882b2ff..74b6581a97a092c44a0876e7981ff8a8
  
 -    PluginClassLoader(@NotNull final JavaPluginLoader loader, @Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader) throws IOException, InvalidPluginException, MalformedURLException {
 +    @org.jetbrains.annotations.ApiStatus.Internal // Paper
-+    public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider
++    public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper - use JarFile provided by SpigotPluginProvider
          super(new URL[] {file.toURI().toURL()}, parent);
 -        Preconditions.checkArgument(loader != null, "Loader cannot be null");
 +        this.loader = null; // Paper - pass null into loader field
diff --git a/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 0f76131486..aefa20a2d9 100644
--- a/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index d6d3e1332e51adc5611543b2a6689efa5921a9f2..877bfe10b858145278133acbc7049f700d2b4f8a 100644
+index 8c5597e02d71c8db66e9cd11f0a41776eb471c46..de017d10db19ca7ca7f73ff0ac08fe6e1773d7dc 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -56,7 +56,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
  
      @org.jetbrains.annotations.ApiStatus.Internal // Paper
-     public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider
+     public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper - use JarFile provided by SpigotPluginProvider
 -        super(new URL[] {file.toURI().toURL()}, parent);
 +        super(file.getName(), new URL[] {file.toURI().toURL()}, parent);
          this.loader = null; // Paper - pass null into loader field
diff --git a/patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
similarity index 70%
rename from patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch
rename to patches/api/0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 4be8907b49..5f5a4f4140 100644
--- a/patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch
+++ b/patches/api/0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
@@ -1,23 +1,48 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Mon, 13 Dec 2021 14:35:27 -0800
-Subject: [PATCH] Move VehicleCollisionEvent HandlerList up
+Subject: [PATCH] Extend VehicleCollisionEvent, move HandlerList up
 
+Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-index 316f625aa595d2ada16529b16d09f013fc4daeac..7ff9aec7ed341c01feddb8d71170b177e1fde47b 100644
+index 316f625aa595d2ada16529b16d09f013fc4daeac..d0a437bd8aeec18f800893f51ece06deb0c8972c 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -9,13 +9,31 @@ import org.jetbrains.annotations.NotNull;
   * Raised when a vehicle collides with a block.
   */
  public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
 -    private static final HandlerList handlers = new HandlerList();
-+    // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
      private final Block block;
++    private final org.bukkit.util.Vector velocity; // Paper
  
++    // Paper start - Add pre-collision velocity
++    @Deprecated
      public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
-@@ -26,15 +26,4 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
++        this(vehicle, block, vehicle.getVelocity());
++    }
++
++    public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block, @NotNull final org.bukkit.util.Vector velocity) { // Paper - Added velocity
+         super(vehicle);
+         this.block = block;
++        this.velocity = velocity;
++    }
++
++    /**
++     * Gets velocity at which the vehicle collided with the block
++     *
++     * @return pre-collision moving velocity
++     */
++    @NotNull
++    public org.bukkit.util.Vector getVelocity() {
++        return velocity;
+     }
++    // Paper end
+ 
+     /**
+      * Gets the block the vehicle collided with
+@@ -26,15 +44,4 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
      public Block getBlock() {
          return block;
      }
@@ -57,19 +82,18 @@ index 9d493c155ad5c26430c1e404fcf0db5f734679e4..aa1d74eade479195bde8095aafcc91a8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
-index 50c762d777ac90a05772501a28cacff8fd3f5126..f7f8d6274d49895f0b7db92a84bc224d936022ba 100644
+index 50c762d777ac90a05772501a28cacff8fd3f5126..77fb04bdf5b1a6d94693a7374a750e020131dc3d 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -10,7 +10,6 @@ import org.jetbrains.annotations.NotNull;
   * Raised when a vehicle collides with an entity.
   */
  public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implements Cancellable {
 -    private static final HandlerList handlers = new HandlerList();
-+    // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
      private final Entity entity;
      private boolean cancelled = false;
      private boolean cancelledPickup = false;
-@@ -55,15 +55,4 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
+@@ -55,15 +54,4 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
      public void setCollisionCancelled(boolean cancel) {
          cancelledCollision = cancel;
      }
diff --git a/patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
deleted file mode 100644
index 25fa280b26..0000000000
--- a/patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Tue, 11 Oct 2022 23:30:32 +0300
-Subject: [PATCH] Expose pre-collision moving velocity to
- VehicleBlockCollisionEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-index 7ff9aec7ed341c01feddb8d71170b177e1fde47b..d2b33f4105ae32a884e714a8936e3d91e23a00a0 100644
---- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-+++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-@@ -11,11 +11,20 @@ import org.jetbrains.annotations.NotNull;
- public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
-     // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
-     private final Block block;
-+    private final org.bukkit.util.Vector velocity; // Paper
- 
-+    // Paper start - Add pre-collision velocity
-+    @Deprecated
-     public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
-+        this(vehicle, block, vehicle.getVelocity());
-+    }
-+
-+    public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block, @NotNull final org.bukkit.util.Vector velocity) { // Paper - Added velocity
-         super(vehicle);
-         this.block = block;
-+        this.velocity = velocity;
-     }
-+    // Paper end
- 
-     /**
-      * Gets the block the vehicle collided with
-@@ -26,4 +35,16 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
-     public Block getBlock() {
-         return block;
-     }
-+
-+    // Paper start
-+    /**
-+     * Gets velocity at which the vehicle collided with the block
-+     *
-+     * @return pre-collision moving velocity
-+     */
-+    @NotNull
-+    public org.bukkit.util.Vector getVelocity() {
-+        return velocity;
-+    }
-+    // Paper end
- }
diff --git a/patches/api/0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0400-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/api/0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/0400-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0402-Win-Screen-API.patch b/patches/api/0401-Win-Screen-API.patch
similarity index 100%
rename from patches/api/0402-Win-Screen-API.patch
rename to patches/api/0401-Win-Screen-API.patch
diff --git a/patches/api/0403-Add-Entity-Body-Yaw-API.patch b/patches/api/0402-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/api/0403-Add-Entity-Body-Yaw-API.patch
rename to patches/api/0402-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0403-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/api/0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/0403-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0405-Add-EntityFertilizeEggEvent.patch b/patches/api/0404-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/api/0405-Add-EntityFertilizeEggEvent.patch
rename to patches/api/0404-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0405-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/api/0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/0405-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0407-Add-Shearable-API.patch b/patches/api/0406-Add-Shearable-API.patch
similarity index 100%
rename from patches/api/0407-Add-Shearable-API.patch
rename to patches/api/0406-Add-Shearable-API.patch
diff --git a/patches/api/0408-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0407-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/api/0408-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/api/0407-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0409-Add-Mob-Experience-reward-API.patch b/patches/api/0408-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/api/0409-Add-Mob-Experience-reward-API.patch
rename to patches/api/0408-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0410-Expand-PlayerItemMendEvent.patch b/patches/api/0409-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/api/0410-Expand-PlayerItemMendEvent.patch
rename to patches/api/0409-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0411-Add-transient-modifier-API.patch b/patches/api/0410-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/api/0411-Add-transient-modifier-API.patch
rename to patches/api/0410-Add-transient-modifier-API.patch
diff --git a/patches/api/0412-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0411-Properly-remove-the-experimental-smithing-inventory-.patch
similarity index 100%
rename from patches/api/0412-Properly-remove-the-experimental-smithing-inventory-.patch
rename to patches/api/0411-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0413-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0412-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/api/0413-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/api/0412-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/api/0414-Folia-scheduler-and-owned-region-API.patch b/patches/api/0413-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/api/0414-Folia-scheduler-and-owned-region-API.patch
rename to patches/api/0413-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/api/0415-Add-event-for-player-editing-sign.patch b/patches/api/0414-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/api/0415-Add-event-for-player-editing-sign.patch
rename to patches/api/0414-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0416-Add-Sign-getInteractableSideFor.patch b/patches/api/0415-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/api/0416-Add-Sign-getInteractableSideFor.patch
rename to patches/api/0415-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0417-Fix-BanList-API.patch b/patches/api/0416-Fix-BanList-API.patch
similarity index 100%
rename from patches/api/0417-Fix-BanList-API.patch
rename to patches/api/0416-Fix-BanList-API.patch
diff --git a/patches/api/0418-Add-whitelist-events.patch b/patches/api/0417-Add-whitelist-events.patch
similarity index 100%
rename from patches/api/0418-Add-whitelist-events.patch
rename to patches/api/0417-Add-whitelist-events.patch
diff --git a/patches/api/0419-API-for-updating-recipes-on-clients.patch b/patches/api/0418-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/api/0419-API-for-updating-recipes-on-clients.patch
rename to patches/api/0418-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0420-Add-PlayerFailMoveEvent.patch b/patches/api/0419-Add-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/api/0420-Add-PlayerFailMoveEvent.patch
rename to patches/api/0419-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0421-Fix-custom-statistic-criteria-creation.patch b/patches/api/0420-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/api/0421-Fix-custom-statistic-criteria-creation.patch
rename to patches/api/0420-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0422-SculkCatalyst-bloom-API.patch b/patches/api/0421-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/api/0422-SculkCatalyst-bloom-API.patch
rename to patches/api/0421-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0423-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0422-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/api/0423-API-for-an-entity-s-scoreboard-name.patch
rename to patches/api/0422-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0424-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0423-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/api/0424-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/api/0423-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0425-Add-Listing-API-for-Player.patch b/patches/api/0424-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/api/0425-Add-Listing-API-for-Player.patch
rename to patches/api/0424-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0425-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/api/0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/api/0425-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0427-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0426-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/api/0427-Fix-NPE-on-Boat-getStatus.patch
rename to patches/api/0426-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0428-Expand-Pose-API.patch b/patches/api/0427-Expand-Pose-API.patch
similarity index 100%
rename from patches/api/0428-Expand-Pose-API.patch
rename to patches/api/0427-Expand-Pose-API.patch
diff --git a/patches/api/0429-MerchantRecipe-add-copy-constructor.patch b/patches/api/0428-MerchantRecipe-add-copy-constructor.patch
similarity index 100%
rename from patches/api/0429-MerchantRecipe-add-copy-constructor.patch
rename to patches/api/0428-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0430-More-DragonBattle-API.patch b/patches/api/0429-More-DragonBattle-API.patch
similarity index 100%
rename from patches/api/0430-More-DragonBattle-API.patch
rename to patches/api/0429-More-DragonBattle-API.patch
diff --git a/patches/api/0431-Add-PlayerPickItemEvent.patch b/patches/api/0430-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/api/0431-Add-PlayerPickItemEvent.patch
rename to patches/api/0430-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0432-Allow-trident-custom-damage.patch b/patches/api/0431-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/api/0432-Allow-trident-custom-damage.patch
rename to patches/api/0431-Allow-trident-custom-damage.patch
diff --git a/patches/api/0433-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0432-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/api/0433-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/api/0432-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0434-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0433-Limit-setBurnTime-to-valid-short-values.patch
similarity index 100%
rename from patches/api/0434-Limit-setBurnTime-to-valid-short-values.patch
rename to patches/api/0433-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0435-Add-OfflinePlayer-isConnected.patch b/patches/api/0434-Add-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/api/0435-Add-OfflinePlayer-isConnected.patch
rename to patches/api/0434-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0436-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0435-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/api/0436-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/api/0435-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0437-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0436-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/api/0437-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/api/0436-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0437-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
similarity index 100%
rename from patches/api/0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
rename to patches/api/0437-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0439-Add-player-idle-duration-API.patch b/patches/api/0438-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/api/0439-Add-player-idle-duration-API.patch
rename to patches/api/0438-Add-player-idle-duration-API.patch
diff --git a/patches/api/0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0439-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/api/0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/api/0439-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0440-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/api/0440-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0442-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0441-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/api/0442-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/api/0441-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0443-Add-UUID-attribute-modifier-API.patch b/patches/api/0442-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/api/0443-Add-UUID-attribute-modifier-API.patch
rename to patches/api/0442-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0444-Expand-LingeringPotion-API.patch b/patches/api/0443-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/api/0444-Expand-LingeringPotion-API.patch
rename to patches/api/0443-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0444-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
similarity index 100%
rename from patches/api/0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
rename to patches/api/0444-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0446-Add-Structure-check-API.patch b/patches/api/0445-Add-Structure-check-API.patch
similarity index 100%
rename from patches/api/0446-Add-Structure-check-API.patch
rename to patches/api/0445-Add-Structure-check-API.patch
diff --git a/patches/api/0447-add-missing-Experimental-annotations.patch b/patches/api/0446-add-missing-Experimental-annotations.patch
similarity index 100%
rename from patches/api/0447-add-missing-Experimental-annotations.patch
rename to patches/api/0446-add-missing-Experimental-annotations.patch
diff --git a/patches/api/0448-Add-more-scoreboard-API.patch b/patches/api/0447-Add-more-scoreboard-API.patch
similarity index 100%
rename from patches/api/0448-Add-more-scoreboard-API.patch
rename to patches/api/0447-Add-more-scoreboard-API.patch
diff --git a/patches/api/0449-Improve-Registry.patch b/patches/api/0448-Improve-Registry.patch
similarity index 100%
rename from patches/api/0449-Improve-Registry.patch
rename to patches/api/0448-Improve-Registry.patch
diff --git a/patches/api/0450-Add-experience-points-API.patch b/patches/api/0449-Add-experience-points-API.patch
similarity index 100%
rename from patches/api/0450-Add-experience-points-API.patch
rename to patches/api/0449-Add-experience-points-API.patch
diff --git a/patches/api/0451-Add-missing-InventoryType.patch b/patches/api/0450-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/api/0451-Add-missing-InventoryType.patch
rename to patches/api/0450-Add-missing-InventoryType.patch
diff --git a/patches/api/0452-Add-drops-to-shear-events.patch b/patches/api/0451-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/api/0452-Add-drops-to-shear-events.patch
rename to patches/api/0451-Add-drops-to-shear-events.patch
diff --git a/patches/api/0453-Add-HiddenPotionEffect-API.patch b/patches/api/0452-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/api/0453-Add-HiddenPotionEffect-API.patch
rename to patches/api/0452-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0454-Add-PlayerShieldDisableEvent.patch b/patches/api/0453-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/api/0454-Add-PlayerShieldDisableEvent.patch
rename to patches/api/0453-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0454-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
similarity index 100%
rename from patches/api/0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
rename to patches/api/0454-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/removed/1.19.2-legacy-chunksystem/0845-Replace-ticket-level-propagator.patch b/patches/removed/1.19.2-legacy-chunksystem/0845-Replace-ticket-level-propagator.patch
index 8959b46f3f..8d248b38bc 100644
--- a/patches/removed/1.19.2-legacy-chunksystem/0845-Replace-ticket-level-propagator.patch
+++ b/patches/removed/1.19.2-legacy-chunksystem/0845-Replace-ticket-level-propagator.patch
@@ -234,7 +234,7 @@ index 06e4d3a02e0d1326b7029157856476db4ef3575e..f581a9f79b2357118d912a15344ff94d
          int newLevel = getTicketLevelAt(arraysetsorted);
          if (newLevel > oldLevel) {
 -            this.ticketTracker.update(i, newLevel, false);
-+            this.updateTicketLevel(i, newLevel); // Paper // Paper - replace ticket level propagator
++            this.updateTicketLevel(i, newLevel); // Paper - replace ticket level propagator
          }
          // Paper end
          return removed; // CraftBukkit
diff --git a/patches/server/0254-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0254-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
deleted file mode 100644
index 398cfb3792..0000000000
--- a/patches/server/0254-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 10 Sep 2018 23:56:36 -0400
-Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-index e3d070d46729c023d594699619a4b3f8658edbce..509317a26c79f453335df1c19dc4c9ec570046af 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-@@ -126,7 +126,9 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
- 
-     @Nullable
-     private BlockPos getPosWithBlock(BlockPos pos, BlockGetter world) {
--        if (world.getBlockState(pos).is(this.blockToRemove)) {
-+        net.minecraft.world.level.block.state.BlockState block = world.getBlockStateIfLoaded(pos); // Paper
-+        if (block == null) return null; // Paper
-+        if (block.is(this.blockToRemove)) { // Paper
-             return pos;
-         } else {
-             BlockPos[] ablockposition = new BlockPos[]{pos.below(), pos.west(), pos.east(), pos.north(), pos.south(), pos.below().below()};
-@@ -136,7 +138,8 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
-             for (int j = 0; j < i; ++j) {
-                 BlockPos blockposition1 = ablockposition1[j];
- 
--                if (world.getBlockState(blockposition1).is(this.blockToRemove)) {
-+                net.minecraft.world.level.block.state.BlockState block2 = world.getBlockStateIfLoaded(blockposition1); // Paper
-+                if (block2 != null && block2.is(this.blockToRemove)) { // Paper
-                     return blockposition1;
-                 }
-             }
-@@ -147,7 +150,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
- 
-     @Override
-     protected boolean isValidTarget(LevelReader world, BlockPos pos) {
--        ChunkAccess ichunkaccess = world.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ()), ChunkStatus.FULL, false);
-+        ChunkAccess ichunkaccess = world.getChunkIfLoadedImmediately(pos.getX() >> 4, pos.getZ() >> 4); // Paper
- 
-         return ichunkaccess == null ? false : ichunkaccess.getBlockState(pos).is(this.blockToRemove) && ichunkaccess.getBlockState(pos.above()).isAir() && ichunkaccess.getBlockState(pos.above(2)).isAir();
-     }
diff --git a/patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch
new file mode 100644
index 0000000000..c56e635c34
--- /dev/null
+++ b/patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch
@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 10 Sep 2018 23:56:36 -0400
+Subject: [PATCH] Prevent various interactions from causing chunk loads
+
+Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
+
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
+index e3d070d46729c023d594699619a4b3f8658edbce..5580a396a56c6e0f364a5368985ee99b9e2be0a8 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
++++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
+@@ -126,7 +126,9 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
+ 
+     @Nullable
+     private BlockPos getPosWithBlock(BlockPos pos, BlockGetter world) {
+-        if (world.getBlockState(pos).is(this.blockToRemove)) {
++        net.minecraft.world.level.block.state.BlockState block = world.getBlockStateIfLoaded(pos); // Paper - Prevent AI rules from loading chunks
++        if (block == null) return null; // Paper - Prevent AI rules from loading chunks
++        if (block.is(this.blockToRemove)) { // Paper - Prevent AI rules from loading chunks
+             return pos;
+         } else {
+             BlockPos[] ablockposition = new BlockPos[]{pos.below(), pos.west(), pos.east(), pos.north(), pos.south(), pos.below().below()};
+@@ -136,7 +138,8 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
+             for (int j = 0; j < i; ++j) {
+                 BlockPos blockposition1 = ablockposition1[j];
+ 
+-                if (world.getBlockState(blockposition1).is(this.blockToRemove)) {
++                net.minecraft.world.level.block.state.BlockState block2 = world.getBlockStateIfLoaded(blockposition1); // Paper - Prevent AI rules from loading chunks
++                if (block2 != null && block2.is(this.blockToRemove)) { // Paper - Prevent AI rules from loading chunks
+                     return blockposition1;
+                 }
+             }
+@@ -147,7 +150,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
+ 
+     @Override
+     protected boolean isValidTarget(LevelReader world, BlockPos pos) {
+-        ChunkAccess ichunkaccess = world.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ()), ChunkStatus.FULL, false);
++        ChunkAccess ichunkaccess = world.getChunkIfLoadedImmediately(pos.getX() >> 4, pos.getZ() >> 4); // Paper - Prevent AI rules from loading chunks
+ 
+         return ichunkaccess == null ? false : ichunkaccess.getBlockState(pos).is(this.blockToRemove) && ichunkaccess.getBlockState(pos.above()).isAir() && ichunkaccess.getBlockState(pos.above(2)).isAir();
+     }
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+index 5c620989acaff4fdb842944ea2d8ae331699a2b4..a859f02074c698c68713568ed99089e33f38ccca 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+@@ -517,7 +517,8 @@ public class EnderMan extends Monster implements NeutralMob {
+             int j = Mth.floor(this.enderman.getY() + randomsource.nextDouble() * 2.0D);
+             int k = Mth.floor(this.enderman.getZ() - 1.0D + randomsource.nextDouble() * 2.0D);
+             BlockPos blockposition = new BlockPos(i, j, k);
+-            BlockState iblockdata = world.getBlockState(blockposition);
++            BlockState iblockdata = world.getBlockStateIfLoaded(blockposition); // Paper - Prevent endermen from loading chunks
++            if (iblockdata == null) return; // Paper - Prevent endermen from loading chunks
+             BlockPos blockposition1 = blockposition.below();
+             BlockState iblockdata1 = world.getBlockState(blockposition1);
+             BlockState iblockdata2 = this.enderman.getCarriedBlock();
+@@ -561,7 +562,8 @@ public class EnderMan extends Monster implements NeutralMob {
+             int j = Mth.floor(this.enderman.getY() + randomsource.nextDouble() * 3.0D);
+             int k = Mth.floor(this.enderman.getZ() - 2.0D + randomsource.nextDouble() * 4.0D);
+             BlockPos blockposition = new BlockPos(i, j, k);
+-            BlockState iblockdata = world.getBlockState(blockposition);
++            BlockState iblockdata = world.getBlockStateIfLoaded(blockposition); // Paper - Prevent endermen from loading chunks
++            if (iblockdata == null) return; // Paper - Prevent endermen from loading chunks
+             Vec3 vec3d = new Vec3((double) this.enderman.getBlockX() + 0.5D, (double) j + 0.5D, (double) this.enderman.getBlockZ() + 0.5D);
+             Vec3 vec3d1 = new Vec3((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D);
+             BlockHitResult movingobjectpositionblock = world.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.enderman));
+diff --git a/src/main/java/net/minecraft/world/item/CompassItem.java b/src/main/java/net/minecraft/world/item/CompassItem.java
+index 5d3047a420efe59063e90bfc7b42392127e0ad7d..b3c67c954acf7e518d89d6af65a55d6f22dac059 100644
+--- a/src/main/java/net/minecraft/world/item/CompassItem.java
++++ b/src/main/java/net/minecraft/world/item/CompassItem.java
+@@ -77,7 +77,7 @@ public class CompassItem extends Item implements Vanishable {
+                 Optional<ResourceKey<Level>> optional = getLodestoneDimension(compoundTag);
+                 if (optional.isPresent() && optional.get() == world.dimension() && compoundTag.contains("LodestonePos")) {
+                     BlockPos blockPos = NbtUtils.readBlockPos(compoundTag.getCompound("LodestonePos"));
+-                    if (!world.isInWorldBounds(blockPos) || !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos)) {
++                    if (!world.isInWorldBounds(blockPos) || (world.hasChunkAt(blockPos) && !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos))) { // Paper - Prevent compass from loading chunks
+                         compoundTag.remove("LodestonePos");
+                     }
+                 }
+diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
+index 3b31a1927aaed7fffc1b4f4bcefc12120d66af3d..618d6a94d695a3bf114307f85f0f151ee24f1879 100644
+--- a/src/main/java/net/minecraft/world/level/BlockGetter.java
++++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
+@@ -83,7 +83,15 @@ public interface BlockGetter extends LevelHeightAccessor {
+ 
+     // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
+     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
+-            BlockState iblockdata = this.getBlockState(blockposition);
++            // Paper start - Prevent raytrace from loading chunks
++            BlockState iblockdata = this.getBlockStateIfLoaded(blockposition);
++            if (iblockdata == null) {
++                // copied the last function parameter (listed below)
++                Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
++
++                return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
++            }
++            // Paper end - Prevent raytrace from loading chunks
+             FluidState fluid = this.getFluidState(blockposition);
+             Vec3 vec3d = raytrace1.getFrom();
+             Vec3 vec3d1 = raytrace1.getTo();
diff --git a/patches/server/0279-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0278-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from patches/server/0279-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0278-Handle-Large-Packets-disconnecting-client.patch
index 11027a5b3d..ecf37a62ee 100644
--- a/patches/server/0279-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0278-Handle-Large-Packets-disconnecting-client.patch
@@ -34,7 +34,7 @@ index df5da9398c903d073485aaa0dce8e70947137cb9..6fcbf8205e1852d5193a42bfe1154f62
              Connection.LOGGER.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java
-index 3d359f80f52bff6f19fcb484f491a874f9dcff27..45b4f1c295eda2fcc5067a4b21de247218ef117f 100644
+index 7070d093c80033b61a9c8495bc56153d986b6b03..2907536f8f9b4b9dccb96f8b4f19d75fa3c5b864 100644
 --- a/src/main/java/net/minecraft/network/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/network/PacketEncoder.java
 @@ -41,7 +41,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
diff --git a/patches/server/0278-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0278-Prevent-rayTrace-from-loading-chunks.patch
deleted file mode 100644
index 72d6ebc434..0000000000
--- a/patches/server/0278-Prevent-rayTrace-from-loading-chunks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 26 Nov 2018 19:21:58 -0500
-Subject: [PATCH] Prevent rayTrace from loading chunks
-
-ray tracing into an unloaded chunk should be treated as a miss
-this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
-
-diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 3b31a1927aaed7fffc1b4f4bcefc12120d66af3d..24073d4d7c45d501c2baec2d8c8b49f60fb76e65 100644
---- a/src/main/java/net/minecraft/world/level/BlockGetter.java
-+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -83,7 +83,15 @@ public interface BlockGetter extends LevelHeightAccessor {
- 
-     // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
-     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
--            BlockState iblockdata = this.getBlockState(blockposition);
-+            // Paper start - Prevent raytrace from loading chunks
-+            BlockState iblockdata = this.getBlockStateIfLoaded(blockposition);
-+            if (iblockdata == null) {
-+                // copied the last function parameter (listed below)
-+                Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
-+
-+                return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
-+            }
-+            // Paper end
-             FluidState fluid = this.getFluidState(blockposition);
-             Vec3 vec3d = raytrace1.getFrom();
-             Vec3 vec3d1 = raytrace1.getTo();
diff --git a/patches/server/0280-force-entity-dismount-during-teleportation.patch b/patches/server/0279-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/0280-force-entity-dismount-during-teleportation.patch
rename to patches/server/0279-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0281-Add-more-Zombie-API.patch b/patches/server/0280-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0281-Add-more-Zombie-API.patch
rename to patches/server/0280-Add-more-Zombie-API.patch
diff --git a/patches/server/0282-Book-Size-Limits.patch b/patches/server/0281-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0282-Book-Size-Limits.patch
rename to patches/server/0281-Book-Size-Limits.patch
index 8c5efb3a7b..281bf0ce71 100644
--- a/patches/server/0282-Book-Size-Limits.patch
+++ b/patches/server/0281-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 20b8fe97ee0b73e3b1a71b8366267d7c5de5da2e..f4c58330cc1f65231fa48a7dd4a199fbfc696f26 100644
+index e0954ab93e4b528595fc3be40a30e2e6775bc4a2..564cc26f8201bd864f5f58c740c9de942d384394 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1026,6 +1026,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0283-Add-PlayerConnectionCloseEvent.patch b/patches/server/0282-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from patches/server/0283-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0282-Add-PlayerConnectionCloseEvent.patch
index 9998c22dff..a77f9f089f 100644
--- a/patches/server/0283-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0282-Add-PlayerConnectionCloseEvent.patch
@@ -69,7 +69,7 @@ index 6fcbf8205e1852d5193a42bfe1154f62ab01e7ad..25881c890c643ce90bdcda6b094d912b
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 96ae1fd95956f5e5a1542dcce3fbd9d4b83d49ba..615fb00e50f3c434809f8e1b201d457b9beae8fd 100644
+index dd4e97ff4c8fb2d2f251713271f5ac493574fcd9..e9d94abb77693a845ea6318b7045bd61a7a46feb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -60,7 +60,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0285-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0283-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from patches/server/0285-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0283-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index bc0c395f44..0abfb7274c 100644
--- a/patches/server/0285-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0283-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 577035b401472d8b3c5966fe908ddf029ee54f46..ccde243c370ff670675b66b19d559461a0e9f111 100644
+index 54297045b5da66827426ae354883a9709d9cdefc..7a5977aa72a0a198144d7b490abe0685326de260 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 577035b401472d8b3c5966fe908ddf029ee54f46..ccde243c370ff670675b66b19d559461
      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 27bfddd847175717697fb589b820ec5a81e08578..4221a45fda5c3b40a1f6342aebe8d7b2e190fb9c 100644
+index 6a3961350030e63b27512261402f675c3cd78485..d3f57dfd5156a5df17a5a7a6e5fe51d8804fd38f 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 {
@@ -106,7 +106,7 @@ index e8490a58dd4d9bc39a5bb2f9fc109526e031b971..5f590575f95eff8bf0cdcafde7dee0e3
      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 baba4105ccd1fe769cbbbd222e9315277394f5c6..108229bb7e6487e84607a918b3ede335a955b869 100644
+index ce73a8c652cf95bae62808fc27db2ab852691fd8..9df9b465df75dd41eabd789e85ee841ed4be092c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -191,6 +191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0284-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0284-Prevent-Enderman-from-loading-chunks.patch
deleted file mode 100644
index 29f11b20e3..0000000000
--- a/patches/server/0284-Prevent-Enderman-from-loading-chunks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Tue, 18 Dec 2018 02:15:08 +0000
-Subject: [PATCH] Prevent Enderman from loading chunks
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 5c620989acaff4fdb842944ea2d8ae331699a2b4..8e72958dec9d4eb35330b72e057733a268e83745 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -517,7 +517,8 @@ public class EnderMan extends Monster implements NeutralMob {
-             int j = Mth.floor(this.enderman.getY() + randomsource.nextDouble() * 2.0D);
-             int k = Mth.floor(this.enderman.getZ() - 1.0D + randomsource.nextDouble() * 2.0D);
-             BlockPos blockposition = new BlockPos(i, j, k);
--            BlockState iblockdata = world.getBlockState(blockposition);
-+            BlockState iblockdata = world.getBlockStateIfLoaded(blockposition); // Paper
-+            if (iblockdata == null) return; // Paper
-             BlockPos blockposition1 = blockposition.below();
-             BlockState iblockdata1 = world.getBlockState(blockposition1);
-             BlockState iblockdata2 = this.enderman.getCarriedBlock();
-@@ -561,7 +562,8 @@ public class EnderMan extends Monster implements NeutralMob {
-             int j = Mth.floor(this.enderman.getY() + randomsource.nextDouble() * 3.0D);
-             int k = Mth.floor(this.enderman.getZ() - 2.0D + randomsource.nextDouble() * 4.0D);
-             BlockPos blockposition = new BlockPos(i, j, k);
--            BlockState iblockdata = world.getBlockState(blockposition);
-+            BlockState iblockdata = world.getBlockStateIfLoaded(blockposition); // Paper
-+            if (iblockdata == null) return; // Paper
-             Vec3 vec3d = new Vec3((double) this.enderman.getBlockX() + 0.5D, (double) j + 0.5D, (double) this.enderman.getBlockZ() + 0.5D);
-             Vec3 vec3d1 = new Vec3((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D);
-             BlockHitResult movingobjectpositionblock = world.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.enderman));
diff --git a/patches/server/0286-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0284-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0286-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0284-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 6f631fb1f9..303a801611 100644
--- a/patches/server/0286-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0284-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 cf1d636660e0e1e8bfec915e0c82525822beba49..a99e06b7507b3490ac8869dd626bdb1cee5b1690 100644
+index 7a5977aa72a0a198144d7b490abe0685326de260..8cc33c1b14668c085dbad1f3feabf7b602812471 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1749,6 +1749,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0287-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
similarity index 92%
rename from patches/server/0287-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
rename to patches/server/0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 2bb621ac7d..0227c4c45f 100644
--- a/patches/server/0287-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bfa59fc123af9189306d8482bac1ae478babab0a..64380c3db88cf5a17a18d166d3869b9a75b1579f 100644
+index 9df9b465df75dd41eabd789e85ee841ed4be092c..9cae7d8a77af303cb509c23efd5541a5e04f54a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -247,8 +247,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0288-BlockDestroyEvent.patch b/patches/server/0286-BlockDestroyEvent.patch
similarity index 96%
rename from patches/server/0288-BlockDestroyEvent.patch
rename to patches/server/0286-BlockDestroyEvent.patch
index 8d684e74d0..526e984657 100644
--- a/patches/server/0288-BlockDestroyEvent.patch
+++ b/patches/server/0286-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b4f7e73fa673006ad0f8ea5a8de5a825aa75e41c..41b8b7890919e2a7a349d701123422e3d27ddc37 100644
+index 14c963d507173dae6015a0c81e3a690768012bed..b10c93cbcf264a3e13d48f30a2c09ae5568a510e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -31,6 +31,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0289-Async-command-map-building.patch b/patches/server/0287-Async-command-map-building.patch
similarity index 97%
rename from patches/server/0289-Async-command-map-building.patch
rename to patches/server/0287-Async-command-map-building.patch
index e717f31d1d..6761f47086 100644
--- a/patches/server/0289-Async-command-map-building.patch
+++ b/patches/server/0287-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index 5a1accff1a7dc2ab40224ec0952a287cd6099aee..2a88cf008c98284954108f2362f46ac1
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ab6402fbe9da82c13d3eb56d22d82d10825105e6..fc0ab6d0436aa6f79b13e0b755d445403fb81330 100644
+index 420201b60be7d07fbbb75192f14e4222f4b386aa..ce370cb1ed9ef67044c5ab448c52367779e5105f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -926,6 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0290-Implement-Brigadier-Mojang-API.patch b/patches/server/0288-Implement-Brigadier-Mojang-API.patch
similarity index 97%
rename from patches/server/0290-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0288-Implement-Brigadier-Mojang-API.patch
index 639092fba5..167f5a6d38 100644
--- a/patches/server/0290-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0288-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b2db0b51895200fc870e536ea97886db3d7a763c..6acb1f37f4c5cb1addd835626041cd3c28eb842f 100644
+index 30edfbf16e7bed29b3261b51d9e4f3124beef026..eaaf9a9779f57ee048245899750bf7a1599b716f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -59,7 +59,7 @@ index da6250df1c5f3385b683cffde47754bca4606f5e..3384501f83d445f45aa8233e98c7597d
      public void removeCommand(String name) {
          this.children.remove(name);
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index ae7be8678ab2859b8eb5e04bc31d76271a74c66b..75b7b3cf90d1d67203ae19dc3302f06a57470f92 100644
+index 5cca4fcdc97d803460e95c534022186a5aad526f..c772fa3b7a1276b0b41c45c6e0f5584b9c3a90cd 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -45,7 +45,7 @@ import net.minecraft.world.phys.Vec2;
@@ -131,7 +131,7 @@ index 2a88cf008c98284954108f2362f46ac14c84200a..b27256d251e5db5781197319f79f89cc
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4c58330cc1f65231fa48a7dd4a199fbfc696f26..b0eb46e60fa51386999cda8ecc31ccf2d3e05b99 100644
+index 564cc26f8201bd864f5f58c740c9de942d384394..833fb2f340065a72903620f974e6ac71cc86f3f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -740,8 +740,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0291-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0289-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0291-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0289-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0292-Limit-Client-Sign-length-more.patch b/patches/server/0290-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from patches/server/0292-Limit-Client-Sign-length-more.patch
rename to patches/server/0290-Limit-Client-Sign-length-more.patch
index cd0ce5cb50..b4f2167b83 100644
--- a/patches/server/0292-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0290-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4c4e1631832adb8d6cd8b90e68a4720b10591db8..199d75d5f4832c0cdc5a4e335f92c21f1ee55e18 100644
+index 833fb2f340065a72903620f974e6ac71cc86f3f9..00fa6126ca51b6ffdb46b59f07725ffdcca9f20a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -291,6 +291,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0293-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0291-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from patches/server/0293-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0291-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 245a47118a..f788b1d62f 100644
--- a/patches/server/0293-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0291-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 1be04d937efaae86e6d0f65b4ec8475294091054..6ee2cdd2bda2aba32661bc93cef00adcd6a83be3 100644
+index d3f57dfd5156a5df17a5a7a6e5fe51d8804fd38f..18dc5ef7892c24f4071c8c0621ac412a5d8767bd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1157,6 +1157,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0294-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0292-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0294-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0292-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0295-Entity-getEntitySpawnReason.patch b/patches/server/0293-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/server/0295-Entity-getEntitySpawnReason.patch
rename to patches/server/0293-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0296-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0294-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0296-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0294-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0297-Fire-event-on-GS4-query.patch b/patches/server/0295-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0297-Fire-event-on-GS4-query.patch
rename to patches/server/0295-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0298-Implement-PlayerPostRespawnEvent.patch b/patches/server/0296-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0298-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0296-Implement-PlayerPostRespawnEvent.patch
index 798b8ae0dd..2619bf686b 100644
--- a/patches/server/0298-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0296-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 f86dd0b58a13c7908961533c75e20ea73c0cb658..b6bebb1eee1ee552b18860c8414f4866897c2bbd 100644
+index c98e4469fa8940762c26a8d787bfabe4b2719fb5..109cefef2a39aaae50ca745d907729d066aa9033 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -751,9 +751,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0299-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0297-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0299-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0297-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0300-Server-Tick-Events.patch b/patches/server/0298-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0300-Server-Tick-Events.patch
rename to patches/server/0298-Server-Tick-Events.patch
diff --git a/patches/server/0301-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0299-PlayerDeathEvent-getItemsToKeep.patch
similarity index 97%
rename from patches/server/0301-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0299-PlayerDeathEvent-getItemsToKeep.patch
index 361abf49a4..d5cc223575 100644
--- a/patches/server/0301-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0299-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a99e06b7507b3490ac8869dd626bdb1cee5b1690..602172f376edbecff94745f88d6a82aa8016c99d 100644
+index 8cc33c1b14668c085dbad1f3feabf7b602812471..91053c2b19751aa3ff219b615b595b730ffa134f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -857,6 +857,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0302-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0300-Optimize-Captured-TileEntity-Lookup.patch
similarity index 94%
rename from patches/server/0302-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0300-Optimize-Captured-TileEntity-Lookup.patch
index 8f55396c36..88c17cf948 100644
--- a/patches/server/0302-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0300-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index be016a6fb0fcf1dfbce3fe6aca1085fbe883abdb..fdcc6666aa9100ddcf0d23a19bcd1dda29510d3e 100644
+index b10c93cbcf264a3e13d48f30a2c09ae5568a510e..3fdec0ff323ac94517f1ab9a13764a8959148127 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -998,9 +998,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0303-Add-Heightmap-API.patch b/patches/server/0301-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0303-Add-Heightmap-API.patch
rename to patches/server/0301-Add-Heightmap-API.patch
index b2c4467070..61a41e7fd1 100644
--- a/patches/server/0303-Add-Heightmap-API.patch
+++ b/patches/server/0301-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fbbad4c209618d1e5994cb5609d29f4bc9c9905c..1b9f52393edcaeafccb290d6a6db9e2407d1a101 100644
+index 620a10f404f44ebaf81fc3fcd8adc77540cd5ba1..cb8bb8b8730b43d02613c7e2ba240017e279a904 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0304-Mob-Spawner-API-Enhancements.patch b/patches/server/0302-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0304-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0302-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0305-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0303-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0305-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0303-Fix-CB-call-to-changed-postToMainThread-method.patch
index 367c890da4..a7639ee7f3 100644
--- a/patches/server/0305-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0303-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/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index cf81671a32874d89588a829e6ad6696e41e1cfa4..77b9a4899f708f41a4e4049e3c946be100f13c6c 100644
+index ca7e4d23f40db5d9404f7aab15e05b9af675e503..44aa178968c87fa72023a2c0f33c1a8123f3db72 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -310,7 +310,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0306-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0304-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0306-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0304-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0307-Implement-CraftBlockSoundGroup.patch b/patches/server/0305-Implement-CraftBlockSoundGroup.patch
similarity index 96%
rename from patches/server/0307-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0305-Implement-CraftBlockSoundGroup.patch
index cdeaeff96c..9bf16806b3 100644
--- a/patches/server/0307-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0305-Implement-CraftBlockSoundGroup.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..3913c407a3bfa7dfa4a5e374a5e79296
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 29bbd44a0d15d78e13d91003fea1460efdf19e88..7f2e4fd1d81d6439475f30e62f0348f38bbc985d 100644
+index 013298c424025cd88f15d61e50d196f70fa4c58b..d4e14ac1514e2d8b87b4667a91c90eded3ba6636 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -622,4 +622,16 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0308-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0306-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 97%
rename from patches/server/0308-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0306-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index e4eb06fae7..4c83e35bc0 100644
--- a/patches/server/0308-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0306-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 af90bb579429336cc4e99386fd620c898c23d274..96fd66ed2742a79064852af6e936830ddaf14f4c 100644
+index cdff8dfc675328e559b7063c67dfe6300f458eb6..6024a9e0dca38b1c21332f5c131d824190a2be90 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -768,30 +768,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -63,7 +63,7 @@ index af90bb579429336cc4e99386fd620c898c23d274..96fd66ed2742a79064852af6e936830d
          // this.updateMobSpawningFlags();
          worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9634efd5e5ef45c905de4af05ee341b6c88a879b..5faaa29ea1e594c9e42e2a0c396ca0a40137119e 100644
+index 43424a9d8e985f4965b4d101f7fee398e3d1f52c..978f0f20c3aceb1c6f967c2bec3d010e344aad0c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1897,12 +1897,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -191,7 +191,7 @@ index 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844f
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5fc33643ad6c5ebd7ebb8ad57d5ef9df2fdba4bd..8bf52e9b92aecb7426e7ee6104166b7df84d5bcc 100644
+index cb8bb8b8730b43d02613c7e2ba240017e279a904..af027128cc06f877f745296b2320e1bca29fd02b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1407,15 +1407,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0309-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0307-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0309-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0307-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0310-Expose-the-internal-current-tick.patch b/patches/server/0308-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0310-Expose-the-internal-current-tick.patch
rename to patches/server/0308-Expose-the-internal-current-tick.patch
index 90e8f298e4..4b74bf8824 100644
--- a/patches/server/0310-Expose-the-internal-current-tick.patch
+++ b/patches/server/0308-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 04ff773b84eb8870d77b09e25ab72e5a887774d4..4b57573660f5d806973edb5a66a0ac183c40c19e 100644
+index 25d059f802a4bdcb7076bca8fa8a587e5de065bd..01fa200bc6911388ee3b0e700e82ad681e02fe4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2853,5 +2853,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0311-Fix-World-isChunkGenerated-calls.patch b/patches/server/0309-Fix-World-isChunkGenerated-calls.patch
similarity index 98%
rename from patches/server/0311-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0309-Fix-World-isChunkGenerated-calls.patch
index fe237d4087..fe7731b917 100644
--- a/patches/server/0311-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0309-Fix-World-isChunkGenerated-calls.patch
@@ -144,7 +144,7 @@ index 72dacdc271325c814fb43cd6daaf3a209801ffda..647ce340c81606ab86d33e1f9dec1fb0
              this.padToFullSector();
          } finally {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 42dc999d820e62c6a222afbd9239cc671fc7de53..b850dba2b0fa5bc762b170ed7083cf8904761f17 100644
+index c46320794e9673d7ff24aae5e9086cc90988791c..deed4d50e0e4d810647a0745ef328c20dfe51093 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -289,6 +289,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -156,7 +156,7 @@ index 42dc999d820e62c6a222afbd9239cc671fc7de53..b850dba2b0fa5bc762b170ed7083cf89
              } catch (Throwable throwable) {
                  if (dataoutputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9814ce8c4f12c82f493ffdd6e44ed2fdfb4e893b..f88a88682862c714db04cfabd1eed501f60d7edc 100644
+index af027128cc06f877f745296b2320e1bca29fd02b..bcd782f9b13c71f1a5bce4836463d0b57e5ada72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -310,9 +310,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0312-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0310-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0312-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0310-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0313-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0311-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0313-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0311-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0314-Configurable-projectile-relative-velocity.patch b/patches/server/0312-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0314-Configurable-projectile-relative-velocity.patch
rename to patches/server/0312-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0315-offset-item-frame-ticking.patch b/patches/server/0313-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0315-offset-item-frame-ticking.patch
rename to patches/server/0313-offset-item-frame-ticking.patch
diff --git a/patches/server/0317-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0314-Prevent-consuming-the-wrong-itemstack.patch
similarity index 96%
rename from patches/server/0317-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0314-Prevent-consuming-the-wrong-itemstack.patch
index e2662cc559..351fd22e90 100644
--- a/patches/server/0317-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0314-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d0482485b13346ac84bb52db30879519f7129091..cde3525320bd7f42c0664e2087d54fa75b7bfb70 100644
+index 8e89eb11e8477c921b30840644b6c3ba9d18c3ef..a3eac4dfe28bc55721d292e2f309b3467a3db140 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3709,9 +3709,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0318-Dont-send-unnecessary-sign-update.patch b/patches/server/0315-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0318-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0315-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0319-Add-option-to-disable-pillager-patrols.patch b/patches/server/0316-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0319-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0316-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0316-Fix-MC-158900.patch b/patches/server/0316-Fix-MC-158900.patch
deleted file mode 100644
index 38342b5322..0000000000
--- a/patches/server/0316-Fix-MC-158900.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Tue, 13 Aug 2019 06:35:17 -0700
-Subject: [PATCH] Fix MC-158900
-
-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 b6bebb1eee1ee552b18860c8414f4866897c2bbd..68935845e9041706c2e203ff436f50d92c190a8f 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -627,8 +627,10 @@ public abstract class PlayerList {
-         Player player = entity.getBukkitEntity();
-         PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.channel.remoteAddress()).getAddress());
- 
--        if (this.getBans().isBanned(gameprofile) && !this.getBans().get(gameprofile).hasExpired()) {
--            UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(gameprofile);
-+        // Paper start - Fix MC-158900
-+        UserBanListEntry gameprofilebanentry;
-+        if (getBans().isBanned(gameprofile) && (gameprofilebanentry = getBans().get(gameprofile)) != null) {
-+            // Paper end
- 
-             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
-             if (gameprofilebanentry.getExpires() != null) {
diff --git a/patches/server/0320-Flat-bedrock-generator-settings.patch b/patches/server/0317-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0320-Flat-bedrock-generator-settings.patch
rename to patches/server/0317-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0321-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0318-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0321-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0318-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0322-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0319-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0322-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0319-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0323-Duplicate-UUID-Resolve-Option.patch b/patches/server/0320-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0323-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0320-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0324-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0321-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0324-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0321-PlayerDeathEvent-shouldDropExperience.patch
index 31696eecd0..873dc400c1 100644
--- a/patches/server/0324-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0321-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 602172f376edbecff94745f88d6a82aa8016c99d..d5b0fba5f38b099d84bb7952363cdc1455772684 100644
+index 91053c2b19751aa3ff219b615b595b730ffa134f..5aef108c5b78cfc02af5c73b9bc03004fba33ca7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -978,7 +978,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0325-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0322-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0325-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0322-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0326-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0323-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0326-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0323-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0327-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0324-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0327-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0324-Optimise-EntityGetter-getPlayerByUUID.patch
index 5d83358582..e5f5c8fc2d 100644
--- a/patches/server/0327-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0324-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5faaa29ea1e594c9e42e2a0c396ca0a40137119e..29a6c17103b443af83cf1506a0d1cfc328028270 100644
+index 978f0f20c3aceb1c6f967c2bec3d010e344aad0c..b10097cd28f0dc360cda9b31e8184ed3a7003780 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -558,6 +558,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0328-Fix-items-not-falling-correctly.patch b/patches/server/0325-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0328-Fix-items-not-falling-correctly.patch
rename to patches/server/0325-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0329-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0326-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0329-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0326-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0330-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0327-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0330-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0327-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0331-Entity-Activation-Range-2.0.patch b/patches/server/0328-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0331-Entity-Activation-Range-2.0.patch
rename to patches/server/0328-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0332-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0329-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0332-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0329-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0333-Implement-alternative-item-despawn-rate.patch b/patches/server/0330-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0333-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0330-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0334-Tracking-Range-Improvements.patch b/patches/server/0331-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0334-Tracking-Range-Improvements.patch
rename to patches/server/0331-Tracking-Range-Improvements.patch
diff --git a/patches/server/0335-Fix-items-vanishing-through-end-portal.patch b/patches/server/0332-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from patches/server/0335-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0332-Fix-items-vanishing-through-end-portal.patch
index 2033b87738..6d10f0f8ff 100644
--- a/patches/server/0335-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0332-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b65c8b48c3a3dd71cb5945dca104cc67a1f2ce6d..cf3742d3d771f6e0c71917bafda7027bd69b1aff 100644
+index 26a611b8d75513690811fbbd15dc37e6f4a50dd4..21eac12dcc3571e647b07b313015d809cb0fbcea 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3411,6 +3411,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0336-implement-optional-per-player-mob-spawns.patch b/patches/server/0333-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0336-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0333-implement-optional-per-player-mob-spawns.patch
index 22cb38d2b0..6b4cfb1bd6 100644
--- a/patches/server/0336-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0333-implement-optional-per-player-mob-spawns.patch
@@ -64,7 +64,7 @@ index 16028723b36c1ca3a3c5d1bf2a7c82d2b42a0be4..24d9a2c37db4bbf2585b33d06f5ea57e
  
                  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 5ef970574ab728dcd118c4d567cb61f0f208b2d7..784be702cbde92a9c81f04fde34ff343056b8ee7 100644
+index 5aef108c5b78cfc02af5c73b9bc03004fba33ca7..26410f43c7bbb368d9ef7206d3b9759f86afba4b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -253,6 +253,10 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0337-Anti-Xray.patch b/patches/server/0334-Anti-Xray.patch
similarity index 99%
rename from patches/server/0337-Anti-Xray.patch
rename to patches/server/0334-Anti-Xray.patch
index df43b53dfc..227fc7d330 100644
--- a/patches/server/0337-Anti-Xray.patch
+++ b/patches/server/0334-Anti-Xray.patch
@@ -1558,7 +1558,7 @@ index 545b14f02ac72dda30891d681eba585d19fd5e1d..6dc7e23e96aaffb912611a9dbd41459c
      private static final byte[] EMPTY_LIGHT = new byte[2048];
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b57573660f5d806973edb5a66a0ac183c40c19e..0a9b61b3af57b098d17443d3f26237489fc11f0e 100644
+index 01fa200bc6911388ee3b0e700e82ad681e02fe4a..217fd2af254f7206cf4c1d7d7ad08384a38427d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2373,7 +2373,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0338-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0335-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0338-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0335-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0339-Improve-Block-breakNaturally-API.patch b/patches/server/0336-Improve-Block-breakNaturally-API.patch
similarity index 98%
rename from patches/server/0339-Improve-Block-breakNaturally-API.patch
rename to patches/server/0336-Improve-Block-breakNaturally-API.patch
index b5d4bf1b2e..d424ef6178 100644
--- a/patches/server/0339-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0336-Improve-Block-breakNaturally-API.patch
@@ -34,7 +34,7 @@ index c919b5a382b1bfcafd938ff926d9146cc5cf0cdc..f05998e0af1e844f19bf86b74f652a99
              if (world.dimensionType().ultraWarm()) {
                  world.removeBlock(pos, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 7f2e4fd1d81d6439475f30e62f0348f38bbc985d..d0b1a419c9bc73066d79459dc3e5998160f8038b 100644
+index d4e14ac1514e2d8b87b4667a91c90eded3ba6636..f041b5d80bff9c022b007e04ef1558e9116acc6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -452,6 +452,18 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0340-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0337-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0340-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0337-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0341-Add-debug-for-sync-chunk-loads.patch b/patches/server/0338-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0341-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0338-Add-debug-for-sync-chunk-loads.patch
index 008c6ebb0c..b190c41a64 100644
--- a/patches/server/0341-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0338-Add-debug-for-sync-chunk-loads.patch
@@ -312,7 +312,7 @@ index 4039bd5a80bd2305082d21c0fe826f76d8beb4c4..974b4970be214ca36a801d39932abcc7
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bfbac715787bc75f77cfd3047f67613e56d7e64b..2480f05dd9ecb2d68ccf193354872ae8cb4009f3 100644
+index 6d6ad6a33f3f8e4b8bc39fea00506daf7b31275c..63437e0cd8ad76e05a3ae40de673d8ff6cae00c6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -651,6 +651,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0342-Improve-java-version-check.patch b/patches/server/0339-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0342-Improve-java-version-check.patch
rename to patches/server/0339-Improve-java-version-check.patch
diff --git a/patches/server/0343-Add-ThrownEggHatchEvent.patch b/patches/server/0340-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0343-Add-ThrownEggHatchEvent.patch
rename to patches/server/0340-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0344-Entity-Jump-API.patch b/patches/server/0341-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0344-Entity-Jump-API.patch
rename to patches/server/0341-Entity-Jump-API.patch
diff --git a/patches/server/0345-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0342-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0345-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0342-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0346-Make-the-GUI-graph-fancier.patch b/patches/server/0343-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0346-Make-the-GUI-graph-fancier.patch
rename to patches/server/0343-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0347-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0344-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from patches/server/0347-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0344-add-hand-to-BlockMultiPlaceEvent.patch
index 8e4f584cda..e5078d1092 100644
--- a/patches/server/0347-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0344-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 18074dab4529f92b164671543dd11d2628ea0982..6e1cff5713e8e0ed8dc481f9c91071eb4b722a49 100644
+index 7c92f9e4b39310da2f112b9c3dac0b9d0c6bcf24..502196b8e97f3de3399f5542e76e6dbbd044d3fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -400,13 +400,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0348-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0345-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0348-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0345-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0349-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0346-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0349-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0346-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0350-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0347-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0350-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0347-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0351-Optimise-Chunk-getFluid.patch b/patches/server/0348-Optimise-Chunk-getFluid.patch
similarity index 96%
rename from patches/server/0351-Optimise-Chunk-getFluid.patch
rename to patches/server/0348-Optimise-Chunk-getFluid.patch
index 22982d0790..57ab428da0 100644
--- a/patches/server/0351-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0348-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 4a5491a79281b7cddf5ad5f060567f174b89d14b..12834995b2bab9e82a40feb01f038532961296cf 100644
+index e599bfb9a7b0b85bea2940f6bf55118305dd0ce8..3acef646275aa05100e13e149bc5ff6d1ccbbea8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -377,18 +377,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0352-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0349-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0352-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0349-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0353-Add-tick-times-API-and-mspt-command.patch b/patches/server/0350-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0353-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0350-Add-tick-times-API-and-mspt-command.patch
index 1e81ff988a..48271b6856 100644
--- a/patches/server/0353-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0350-Add-tick-times-API-and-mspt-command.patch
@@ -184,7 +184,7 @@ index 6024a9e0dca38b1c21332f5c131d824190a2be90..ce113cc2bc52c1135799190a22e0be21
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0a9b61b3af57b098d17443d3f26237489fc11f0e..1774a92b7772f02aad096ac98ff412373630905a 100644
+index 217fd2af254f7206cf4c1d7d7ad08384a38427d2..a74d346cd72d841be195f02801bba8cd00ac4097 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2628,6 +2628,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0354-Expose-MinecraftServer-isRunning.patch b/patches/server/0351-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0354-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0351-Expose-MinecraftServer-isRunning.patch
index e15d9c827b..df99e66826 100644
--- a/patches/server/0354-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0351-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 1774a92b7772f02aad096ac98ff412373630905a..f820cebd30f747596eb3b442965381850376f9f6 100644
+index a74d346cd72d841be195f02801bba8cd00ac4097..b501ed140902a0143553f338871e3b8b71a7f71e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2868,5 +2868,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0355-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0352-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0355-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0352-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0356-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0353-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0356-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0353-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 05613934e0..5d503ec37e 100644
--- a/patches/server/0356-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0353-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 ad167cd343ec38f0263e634124036e741246c6b6..956c0090992a64860bed2c5f72991d86a528b7ba 100644
+index 26410f43c7bbb368d9ef7206d3b9759f86afba4b..4c17ed82554311d2a3c9eab7bf58c79044f71664 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -249,6 +249,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0357-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 95%
rename from patches/server/0357-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 4d20a48ad7..4000b9b254 100644
--- a/patches/server/0357-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 90b261b23f6731f60a7d4f412a6bf4c6c6aa7095..109c7ff78d4c1f5496d294f52ecfd9df2070db1e 100644
+index 7bc90a4b0cbbb2251122038d374860ff02f5edee..5f4f993243f19f1e88b7f2bc5e40a6b2125fd819 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0358-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0355-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0358-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0355-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0359-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 96%
rename from patches/server/0359-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 25f1551ea6..e97ae2aba8 100644
--- a/patches/server/0359-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -25,7 +25,7 @@ index 1f9efff4ddccf2569fdfe42e6cbc92792643d0ea..876200db872bce89976329c4d6c6fbe9
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2480f05dd9ecb2d68ccf193354872ae8cb4009f3..bd40d4056fbf237f2a3f6c7178bed699f9bdf389 100644
+index 63437e0cd8ad76e05a3ae40de673d8ff6cae00c6..1c0d2aad70b3817913e93354ccc055b82ae321bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2514,7 +2514,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0360-Don-t-tick-dead-players.patch b/patches/server/0357-Don-t-tick-dead-players.patch
similarity index 91%
rename from patches/server/0360-Don-t-tick-dead-players.patch
rename to patches/server/0357-Don-t-tick-dead-players.patch
index 7e658ff419..4f18178584 100644
--- a/patches/server/0360-Don-t-tick-dead-players.patch
+++ b/patches/server/0357-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 956c0090992a64860bed2c5f72991d86a528b7ba..4c0968ee547fe606b340ab28dfd391716745bc3f 100644
+index 4c17ed82554311d2a3c9eab7bf58c79044f71664..daedb7b5ef086ccbf091274088170cf7eb331f91 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -732,7 +732,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0361-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0358-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0361-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0358-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0362-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0359-Optimize-Collision-to-not-load-chunks.patch
similarity index 97%
rename from patches/server/0362-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0359-Optimize-Collision-to-not-load-chunks.patch
index 9865b06b9e..7674d900d9 100644
--- a/patches/server/0362-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0359-Optimize-Collision-to-not-load-chunks.patch
@@ -14,10 +14,10 @@ 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 77109036dccabe1af443956aa94123ec240b23ac..13fcc14905ade93494aa67fc53c952db7abcc7f7 100644
+index 109cefef2a39aaae50ca745d907729d066aa9033..d4ae0a201838dbc9c73f7c1a8a67072b344b71bc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -822,6 +822,7 @@ public abstract class PlayerList {
+@@ -820,6 +820,7 @@ public abstract class PlayerList {
          entityplayer1.setShiftKeyDown(false);
          entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
  
diff --git a/patches/server/0363-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0360-Don-t-move-existing-players-to-world-spawn.patch
similarity index 92%
rename from patches/server/0363-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0360-Don-t-move-existing-players-to-world-spawn.patch
index 2134a7ae8d..e4f380afa5 100644
--- a/patches/server/0363-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0360-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4c0968ee547fe606b340ab28dfd391716745bc3f..ff0191dd75b5014e224db8f1419dcec240cb1436 100644
+index daedb7b5ef086ccbf091274088170cf7eb331f91..3738680d935695930be19cdc18478c62ccb93d3a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -385,7 +385,7 @@ public class ServerPlayer extends Player {
@@ -35,7 +35,7 @@ index 4c0968ee547fe606b340ab28dfd391716745bc3f..ff0191dd75b5014e224db8f1419dcec2
          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 d4734253bb5f45b62a31aa5c260a414ce9979736..9036d9941b1597e14d3b25a5143d914248338800 100644
+index d4ae0a201838dbc9c73f7c1a8a67072b344b71bc..03f8e1775e05293665f995b6c3ee52ed11447e79 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -226,6 +226,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0364-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0361-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0364-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0361-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0365-Improved-Watchdog-Support.patch b/patches/server/0362-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0365-Improved-Watchdog-Support.patch
rename to patches/server/0362-Improved-Watchdog-Support.patch
index 1d1edf3f82..7e569d4760 100644
--- a/patches/server/0365-Improved-Watchdog-Support.patch
+++ b/patches/server/0362-Improved-Watchdog-Support.patch
@@ -263,7 +263,7 @@ index 5f4f993243f19f1e88b7f2bc5e40a6b2125fd819..c9cca6ba3500791485bf19155156c38c
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c8a977f6dce36a254f729e97759c14e234ef6674..6d6cac755c45247e1d07e52550f6f4644536f220 100644
+index 03f8e1775e05293665f995b6c3ee52ed11447e79..8c9dcd895f73765327ac00d7cc706b6ae8b9d81f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -532,7 +532,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0366-Optimize-Pathfinding.patch b/patches/server/0363-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0366-Optimize-Pathfinding.patch
rename to patches/server/0363-Optimize-Pathfinding.patch
diff --git a/patches/server/0367-Reduce-Either-Optional-allocation.patch b/patches/server/0364-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0367-Reduce-Either-Optional-allocation.patch
rename to patches/server/0364-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0368-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0365-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0368-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0365-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0369-Prevent-opening-inventories-when-frozen.patch b/patches/server/0366-Prevent-opening-inventories-when-frozen.patch
similarity index 95%
rename from patches/server/0369-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0366-Prevent-opening-inventories-when-frozen.patch
index 84452e4fcb..f6702d49e4 100644
--- a/patches/server/0369-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0366-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 94360a83f72ba310da94f822d8aafd9d96e5121c..0caad3d6f66336cd0124b8b093af209b43ab9b25 100644
+index 3738680d935695930be19cdc18478c62ccb93d3a..f0dd4bd0fd71c90577a5b42a803007de8e97d344 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -701,7 +701,7 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 94360a83f72ba310da94f822d8aafd9d96e5121c..0caad3d6f66336cd0124b8b093af209b
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 21e3070a9aab9b4d8d352655d0145c9921857c0e..5e40ef1370ea150ea19bd8afc4243e38d1d2ef74 100644
+index 0d07501bb9e8721771f5c3fd099f022e41a54337..fa585b6bf914362a7f9e55a20e78811519353608 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -325,7 +325,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0370-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0367-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 96%
rename from patches/server/0370-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0367-Don-t-run-entity-collision-code-if-not-needed.patch
index 37691c2cd2..36a11c3c1f 100644
--- a/patches/server/0370-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0367-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2d28d9a42e89b7efadd4e798c3da61565221a5bd..8577eb85cfe6d061e9e8b7e380db452a8c4ec858 100644
+index f9e2d3cba01fcf39bc29dc8b5b5879ddc3add0e5..0f364937ee7caa0496cfff1f9e5692d83a4dcd97 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3398,10 +3398,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0371-Implement-Player-Client-Options-API.patch b/patches/server/0368-Implement-Player-Client-Options-API.patch
similarity index 99%
rename from patches/server/0371-Implement-Player-Client-Options-API.patch
rename to patches/server/0368-Implement-Player-Client-Options-API.patch
index b019faebba..bad37099c0 100644
--- a/patches/server/0371-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0368-Implement-Player-Client-Options-API.patch
@@ -87,7 +87,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 0caad3d6f66336cd0124b8b093af209b43ab9b25..efe768142bbf37d4ba07257e37fa71d576464a31 100644
+index f0dd4bd0fd71c90577a5b42a803007de8e97d344..37af010c2af4b485d19bbf5fef978d6347054c83 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -386,7 +386,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0372-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0369-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0372-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0369-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0373-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0370-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 96%
rename from patches/server/0373-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0370-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index ee3e9190ff..40f07de971 100644
--- a/patches/server/0373-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0370-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -43,7 +43,7 @@ index 876200db872bce89976329c4d6c6fbe9fd155f24..2db3236bc9d676c86b0af38bd4bfaf9d
          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 fa323141f77923fc766bbf2e8587d7e8792b92ec..3dfbd1225b0c1ee6b6fb2e842efdb1a8ff2c26c6 100644
+index 37af010c2af4b485d19bbf5fef978d6347054c83..71068a285ff039b609f4551d522481f2dff8235e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
@@ -55,7 +55,7 @@ index fa323141f77923fc766bbf2e8587d7e8792b92ec..3dfbd1225b0c1ee6b6fb2e842efdb1a8
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f644c8b89e96d35fb9f2ac7941dcfcf9e8b66451..3986d49b0e3405248913a685c44b27d091c4152e 100644
+index 8c9dcd895f73765327ac00d7cc706b6ae8b9d81f..66a39d00c23bf6bced8ea9c177d84d1409cd2c11 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -295,6 +295,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0374-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 98%
rename from patches/server/0374-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 8fd7088476..a80ab4fdbf 100644
--- a/patches/server/0374-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers <wchilders@nearce.com>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 569fa7caeffcda00ae6bf824af8b44b1d6862835..cb173f30bf5abd7c709d2186dd489e50c178b3cc 100644
+index 66a39d00c23bf6bced8ea9c177d84d1409cd2c11..5c5d1e387ea00a17db99b3ef1f68eede01b09789 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -194,7 +194,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0375-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0372-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0375-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0372-Add-PlayerAttackEntityCooldownResetEvent.patch
index ae1d666725..63d51833e1 100644
--- a/patches/server/0375-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0372-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8577eb85cfe6d061e9e8b7e380db452a8c4ec858..9eea89e4c3ec5f999ec7f5773f4c37209211c173 100644
+index 0f364937ee7caa0496cfff1f9e5692d83a4dcd97..a4b1066bbb36cce7505e5e6dc033b0266ce85974 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2190,7 +2190,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0376-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0373-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0376-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0373-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0377-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0374-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0377-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0374-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0378-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0375-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0378-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0375-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0379-Villager-Restocks-API.patch b/patches/server/0376-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0379-Villager-Restocks-API.patch
rename to patches/server/0376-Villager-Restocks-API.patch
diff --git a/patches/server/0380-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0377-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0380-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0377-Validate-PickItem-Packet-and-kick-for-invalid.patch
index e1911c6e8c..9010a829f8 100644
--- a/patches/server/0380-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0377-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 d8285ff999cfea9a7b62e9914a7a7dfdae2ede76..3b1127ac1e30c809d290192319f8bc5f9de30b46 100644
+index 00fa6126ca51b6ffdb46b59f07725ffdcca9f20a..a6d72d4ace089c76deb87ade48194ccd0517bee0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -867,7 +867,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0381-Expose-game-version.patch b/patches/server/0378-Expose-game-version.patch
similarity index 89%
rename from patches/server/0381-Expose-game-version.patch
rename to patches/server/0378-Expose-game-version.patch
index f8b42138bc..d8b186722e 100644
--- a/patches/server/0381-Expose-game-version.patch
+++ b/patches/server/0378-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 cc08a752db71b7729f2474e129426153eb4fbc17..b805012214f1ff9526110e56b5ad9dde96c0468e 100644
+index b501ed140902a0143553f338871e3b8b71a7f71e..363d251c80b7d8585425cab456822fd6cde67f23 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/0382-Optimize-Voxel-Shape-Merging.patch b/patches/server/0379-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0382-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0379-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0383-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0380-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0383-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0380-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0384-misc-debugging-dumps.patch b/patches/server/0381-misc-debugging-dumps.patch
similarity index 96%
rename from patches/server/0384-misc-debugging-dumps.patch
rename to patches/server/0381-misc-debugging-dumps.patch
index 48d3e6a4fb..8fda4d258f 100644
--- a/patches/server/0384-misc-debugging-dumps.patch
+++ b/patches/server/0381-misc-debugging-dumps.patch
@@ -42,7 +42,7 @@ index b27256d251e5db5781197319f79f89cc7638c80b..337ff2b3e8ea6f106656cf4bef029d81
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 08f7f287af32597d8a39f429013adec9266020bf..e230a6e3810929c2f9ac70a98c9fc41734ec06c2 100644
+index 9a25d351df1141e9218d37c0f90e2d67f9c8c3ef..eab8da0689dcb159cb54b418804e86b6364273fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -918,6 +918,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -87,7 +87,7 @@ index 04a728a16bb629adbae1cd8586764a6dbc22b5dc..e48b287d6229f8043fba8a417f0b7558
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 34016fdfe0357d817092c5932497701153326884..5895544e1c4d1b4c0ae862969d09aa0ed5ce42b8 100644
+index 363d251c80b7d8585425cab456822fd6cde67f23..2d799bd4903113e35acfc7068996a85ddf3d119e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1006,6 +1006,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0385-Prevent-teleporting-dead-entities.patch b/patches/server/0382-Prevent-teleporting-dead-entities.patch
similarity index 92%
rename from patches/server/0385-Prevent-teleporting-dead-entities.patch
rename to patches/server/0382-Prevent-teleporting-dead-entities.patch
index 8df3747b15..2b4515ae5f 100644
--- a/patches/server/0385-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0382-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 3b1127ac1e30c809d290192319f8bc5f9de30b46..1776c839c651fe8491613fe606cfb8e8fe25b239 100644
+index a6d72d4ace089c76deb87ade48194ccd0517bee0..93011db96b1b5e6d08022e8fc31715360f60b9ef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1545,6 +1545,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0386-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0383-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0386-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0383-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index bb83e073cd..0343b8f952 100644
--- a/patches/server/0386-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0383-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -545,7 +545,7 @@ index 2907536f8f9b4b9dccb96f8b4f19d75fa3c5b864..b5b228e67284baad3639b283595427a8
                          throw new SkipPacketException(var13);
                      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9ddcca2c17c15c5c7d88046aeae8b5588ad4612d..c7696765ff6b1e27c108d2668c32abbbab35896c 100644
+index c9cca6ba3500791485bf19155156c38c24f1c761..684e9e9d78f0d410176fa8b9c9d0fbfda6a156dc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -194,6 +194,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -611,7 +611,7 @@ index caeead6c6082855f1651ee28263cc9f60423ca0c..b2bfb3893200362ac35ae60982f203f8
      final MinecraftServer server;
      public volatile boolean running;
 diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index 6a64c58fff9bbed542bf29a029531996f2a50d00..c24898f8e81e8ab9a1f90bf4439ea6c6f42f0508 100644
+index 14bd0b94ece3f826f822b4900c7250ebdc27d937..59eb65e207ff0206b0dfad6f2dcffe785f61f8ff 100644
 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 +++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 @@ -358,7 +358,7 @@ public class OldUsersConverter {
diff --git a/patches/server/0387-Implement-Mob-Goal-API.patch b/patches/server/0384-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0387-Implement-Mob-Goal-API.patch
rename to patches/server/0384-Implement-Mob-Goal-API.patch
index 49feb07d70..46c6388063 100644
--- a/patches/server/0387-Implement-Mob-Goal-API.patch
+++ b/patches/server/0384-Implement-Mob-Goal-API.patch
@@ -794,7 +794,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 22886ae00f92824fc08018b9415537f1126920ee..1197e6f355f9b5a684024de31cddef11f945bcb1 100644
+index 2d799bd4903113e35acfc7068996a85ddf3d119e..1931e33d8a187a5adbd4fa9591f681ee6adc5cc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2881,5 +2881,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0388-Add-villager-reputation-API.patch b/patches/server/0385-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0388-Add-villager-reputation-API.patch
rename to patches/server/0385-Add-villager-reputation-API.patch
diff --git a/patches/server/0389-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0386-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 96%
rename from patches/server/0389-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0386-Option-for-maximum-exp-value-when-merging-orbs.patch
index f1d6501ff3..ad51f871bb 100644
--- a/patches/server/0389-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0386-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 73f11d9d8b23568478e9fca603cbde1a42f3963f..934d3a53d6d593043c8d58fb06e7d7855cde13c7 100644
+index 5d28312a03f1571bb44c31f82e27288d02776a5a..85cad0c7437642c72d806f59cb077db4056a4282 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -702,16 +702,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0390-ExperienceOrbMergeEvent.patch b/patches/server/0387-ExperienceOrbMergeEvent.patch
similarity index 94%
rename from patches/server/0390-ExperienceOrbMergeEvent.patch
rename to patches/server/0387-ExperienceOrbMergeEvent.patch
index 9b49344803..2c5c905fa3 100644
--- a/patches/server/0390-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0387-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 934d3a53d6d593043c8d58fb06e7d7855cde13c7..d0c267a79f262dafdd74a6c661a234b9301eddd2 100644
+index 85cad0c7437642c72d806f59cb077db4056a4282..90b93b7139f9a11028b0d78b109b478b8052e982 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -711,7 +711,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0391-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0388-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0391-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0388-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0392-Potential-bed-API.patch b/patches/server/0389-Potential-bed-API.patch
similarity index 95%
rename from patches/server/0392-Potential-bed-API.patch
rename to patches/server/0389-Potential-bed-API.patch
index 4ce0dba0fa..951766026b 100644
--- a/patches/server/0392-Potential-bed-API.patch
+++ b/patches/server/0389-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 5e40ef1370ea150ea19bd8afc4243e38d1d2ef74..2d0e861275a921ccb3aabcb76ae6eb31f67dd373 100644
+index fa585b6bf914362a7f9e55a20e78811519353608..dcc5947143dc39e8f629b29d3649174327783801 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0393-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0390-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 93%
rename from patches/server/0393-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0390-Wait-for-Async-Tasks-during-shutdown.patch
index 5f866e1b33..2a06bb5735 100644
--- a/patches/server/0393-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0390-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e230a6e3810929c2f9ac70a98c9fc41734ec06c2..81d4870060ea418fecfdd01f1357899038c95fe9 100644
+index eab8da0689dcb159cb54b418804e86b6364273fb..728858a2a52bd23c7b42d0e7340abf5f09d24fc5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -958,6 +958,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -22,7 +22,7 @@ index e230a6e3810929c2f9ac70a98c9fc41734ec06c2..81d4870060ea418fecfdd01f13578990
          // CraftBukkit end
          this.getConnection().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7ffd0447becaaaf4f26fa5a6be7f6d83bd816fb3..dfe8d6d8b592a7dc9b1f1d7fb68d0960dbeb387f 100644
+index 1931e33d8a187a5adbd4fa9591f681ee6adc5cc3..33894e96a54039d5b406c552d8a5db6e17037151 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1016,6 +1016,31 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0394-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0391-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0394-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0391-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0395-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 97%
rename from patches/server/0395-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 3318713b1f..40b0638029 100644
--- a/patches/server/0395-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -25,7 +25,7 @@ index 120151da61398ea8afcd658a8407efcf738b9476..b7cf13fe4a0af243c0e76d75439b28d5
  
                              if (!this.level.isInWorldBounds(blockposition)) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 179a7708a5f4674b31a87c49ca3d5c4c4dbd4b65..d89b6c99e1cf4c6171ea6f2dad1e812760707603 100644
+index 1bb5867bb2e99be1696c89ec47cd3aa0d655fdfb..a7fca2d662e013809fef088213cf0275b596629d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -521,6 +521,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -40,7 +40,7 @@ index 179a7708a5f4674b31a87c49ca3d5c4c4dbd4b65..d89b6c99e1cf4c6171ea6f2dad1e8127
              if (blockstate == null) {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index bdf5443d5974d316b9b216291fadae4346a3123f..2c190473b98899e86d8bcd5a81c72bbc0a85b2a9 100644
+index 89a62fbeeb78c864938a1cea84178478c6dc1b34..5e5199b50847958f7abc6d8e42cfb6806df8421f 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -90,6 +90,19 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -106,7 +106,7 @@ index b3732a6246a2b011e36c5c35fa2ac7749e75db16..bb6c38bb7a054b94a63690f6fd6036d6
  
              world.playSound((Player) null, pos, SoundEvents.PISTON_CONTRACT, SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.15F + 0.6F);
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index b4241ccdf972feec3dc2802ceafeef4f004c62d5..c64213fe3ec0bd34cd1b31ae18eff1fecbcf63d6 100644
+index 2c7d025b2af3a66772c3f394620483045fb80242..79ff216e473ebc4bf7ab3ade42b0fa224f7e4c19 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -182,7 +182,7 @@ public abstract class BlockBehaviour implements FeatureElement {
diff --git a/patches/server/0396-Ensure-safe-gateway-teleport.patch b/patches/server/0393-Ensure-safe-gateway-teleport.patch
similarity index 93%
rename from patches/server/0396-Ensure-safe-gateway-teleport.patch
rename to patches/server/0393-Ensure-safe-gateway-teleport.patch
index c878ac4854..6ca5181f90 100644
--- a/patches/server/0396-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0393-Ensure-safe-gateway-teleport.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure safe gateway teleport
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 676c2a4c9423e37319b097b99a307dd0186061a0..7491e075baebc7d412d35593bb844b200e304447 100644
+index 223550eccdf0a5596b8595a30f02ad891ffd91ea..b7a0d8ffd1823a1d1edee6baaa62c15f69e6af3d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -105,7 +105,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
diff --git a/patches/server/0397-Add-option-for-console-having-all-permissions.patch b/patches/server/0394-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0397-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0394-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0398-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0395-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0398-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0395-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0399-Maps-shouldn-t-load-chunks.patch b/patches/server/0396-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0399-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0396-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0400-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0397-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0400-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0397-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0401-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0398-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0401-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0398-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0402-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0399-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0402-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0399-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0403-Fix-sand-duping.patch b/patches/server/0400-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0403-Fix-sand-duping.patch
rename to patches/server/0400-Fix-sand-duping.patch
diff --git a/patches/server/0404-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0401-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0404-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0401-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0405-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0402-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0405-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0402-Prevent-position-desync-in-playerconnection-causing-.patch
index 2c72306249..fd665a04c5 100644
--- a/patches/server/0405-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0402-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 1776c839c651fe8491613fe606cfb8e8fe25b239..33a9d4047d3a2bd57b12f3517592a333a574fa32 100644
+index 93011db96b1b5e6d08022e8fc31715360f60b9ef..b0f546190f4e5985e2532bb3647856ebc5efb92f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1366,6 +1366,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0406-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0403-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0406-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0403-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0407-Improve-Arrow-API.patch b/patches/server/0404-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0407-Improve-Arrow-API.patch
rename to patches/server/0404-Improve-Arrow-API.patch
diff --git a/patches/server/0408-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0405-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 97%
rename from patches/server/0408-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0405-Add-and-implement-PlayerRecipeBookClickEvent.patch
index d055cd4434..06f658fd87 100644
--- a/patches/server/0408-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0405-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cb4595bd4d82ae01131cd6cf33ae482e8bfbc1d0..bfc36daa96d1de29c57700740b35dc53e7aae2ca 100644
+index b0f546190f4e5985e2532bb3647856ebc5efb92f..ab167cbce4e8c3ee4d755b778bd7b92a8be917de 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2973,16 +2973,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0409-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0406-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0409-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0406-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0410-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0407-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0410-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0407-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0411-Add-permission-for-command-blocks.patch b/patches/server/0408-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0411-Add-permission-for-command-blocks.patch
rename to patches/server/0408-Add-permission-for-command-blocks.patch
index 37db9fa949..02e0abf29d 100644
--- a/patches/server/0411-Add-permission-for-command-blocks.patch
+++ b/patches/server/0408-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index b7e6d8441e8444c36919c126a8adeaeed02df08c..a9ede0d719e866655ab48fb5d0263c7d
                  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 0bc8e06a2a7bc7858433e78fb0ad381d2fcb1f72..85c8dd4f40eb5c71e8df52817167932e70e94c14 100644
+index ab167cbce4e8c3ee4d755b778bd7b92a8be917de..448cbe86cefdf779c7faae84748e04374f16162d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -778,7 +778,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0412-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0409-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0412-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0409-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0413-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 97%
rename from patches/server/0413-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index f36083c569..cde69867b7 100644
--- a/patches/server/0413-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -63,7 +63,7 @@ index 997a96a21440ae72696d68f8031ece4ba487d3ef..d0f851ca4d91791da26902d7d516b0fd
                  return Component.translatable("commands.difficulty.success", difficulty.getDisplayName());
              }, true);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c7696765ff6b1e27c108d2668c32abbbab35896c..4d76d64fad92510de5098613aa0a04e1bbf7bca5 100644
+index 684e9e9d78f0d410176fa8b9c9d0fbfda6a156dc..2d5e8d624b153f55e28d8a4e008dce11853179cf 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -102,7 +102,7 @@ index 448cbe86cefdf779c7faae84748e04374f16162d..101871664077577c5cbe159d5d1a31b0
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dc1a494df0b4dc361e19c57b8e768ab873025956..f6608fb3b6f838479e67f411874c3db30c843af9 100644
+index 33894e96a54039d5b406c552d8a5db6e17037151..4bb4df79dbe65fd5a6f53df64890eaa582724972 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -955,8 +955,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0414-Paper-dumpitem-command.patch b/patches/server/0411-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0414-Paper-dumpitem-command.patch
rename to patches/server/0411-Paper-dumpitem-command.patch
diff --git a/patches/server/0415-Improve-Legacy-Component-serialization-size.patch b/patches/server/0412-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0415-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0412-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0416-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0413-Optimize-Bit-Operations-by-inlining.patch
similarity index 99%
rename from patches/server/0416-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0413-Optimize-Bit-Operations-by-inlining.patch
index 468568d8aa..862cb08aa3 100644
--- a/patches/server/0416-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0413-Optimize-Bit-Operations-by-inlining.patch
@@ -7,7 +7,7 @@ Inline bit operations and reduce instruction count to make these hot
 operations faster
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index fbdbf61f49bd6867eea609d5572fb31ece094944..441ea6b9fd55a5288f264472d7297728d0546d6b 100644
+index e039551efc83af1453a115099b78e16dff2cf190..e5dfc4009cb06e500c6b54ee4228117061758b53 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -37,15 +37,16 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0417-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0414-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0417-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0414-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 18a3bd5e9e..8973135dc1 100644
--- a/patches/server/0417-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0414-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 f6608fb3b6f838479e67f411874c3db30c843af9..ea2ca7a37d0bdcc1ccc1627e4246a8290e32d16f 100644
+index 4bb4df79dbe65fd5a6f53df64890eaa582724972..776b3d4d165303715e70c44689bb556541cb7582 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -377,7 +377,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0418-incremental-chunk-and-player-saving.patch b/patches/server/0415-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0418-incremental-chunk-and-player-saving.patch
rename to patches/server/0415-incremental-chunk-and-player-saving.patch
index 23a9674021..50b81d92b9 100644
--- a/patches/server/0418-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0415-incremental-chunk-and-player-saving.patch
@@ -130,7 +130,7 @@ index d43bf7ff39e9424f5cdcc93d29779570c8735869..fddbd703071ec93d6e3a9ecc1ff17b3e
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      private static final int FLY_STAT_RECORDING_SPEED = 25;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cb173f30bf5abd7c709d2186dd489e50c178b3cc..62888ec5766806016545e34758da20884626697a 100644
+index 5c5d1e387ea00a17db99b3ef1f68eede01b09789..43bdada020a5a28cbe9eb18ec24529be633a49f3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -552,6 +552,7 @@ public abstract class PlayerList {
@@ -141,7 +141,7 @@ index cb173f30bf5abd7c709d2186dd489e50c178b3cc..62888ec5766806016545e34758da2088
          this.playerIo.save(player);
          ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
  
-@@ -1155,10 +1156,22 @@ public abstract class PlayerList {
+@@ -1153,10 +1154,22 @@ public abstract class PlayerList {
      }
  
      public void saveAll() {
diff --git a/patches/server/0419-Support-old-UUID-format-for-NBT.patch b/patches/server/0416-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0419-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0416-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0420-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0417-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0420-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0417-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0421-Remove-streams-from-hot-code.patch b/patches/server/0418-Remove-streams-from-hot-code.patch
similarity index 100%
rename from patches/server/0421-Remove-streams-from-hot-code.patch
rename to patches/server/0418-Remove-streams-from-hot-code.patch
diff --git a/patches/server/0422-Support-components-in-ItemMeta.patch b/patches/server/0419-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0422-Support-components-in-ItemMeta.patch
rename to patches/server/0419-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0423-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0420-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0423-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0420-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0424-Add-entity-liquid-API.patch b/patches/server/0421-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0424-Add-entity-liquid-API.patch
rename to patches/server/0421-Add-entity-liquid-API.patch
diff --git a/patches/server/0425-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0422-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0425-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0422-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0426-Add-PrepareResultEvent.patch b/patches/server/0423-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0426-Add-PrepareResultEvent.patch
rename to patches/server/0423-Add-PrepareResultEvent.patch
diff --git a/patches/server/0427-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0424-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0427-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0424-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0428-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0425-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0428-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0425-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0429-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0426-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0429-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0426-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0430-Fix-SPIGOT-5989.patch b/patches/server/0427-Fix-SPIGOT-5989.patch
similarity index 90%
rename from patches/server/0430-Fix-SPIGOT-5989.patch
rename to patches/server/0427-Fix-SPIGOT-5989.patch
index b863fc029c..54358339de 100644
--- a/patches/server/0430-Fix-SPIGOT-5989.patch
+++ b/patches/server/0427-Fix-SPIGOT-5989.patch
@@ -10,10 +10,10 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 62888ec5766806016545e34758da20884626697a..5f24db6b68b629812d90b7b5e2f06c21732ed098 100644
+index 43bdada020a5a28cbe9eb18ec24529be633a49f3..29b535dae6eff1c6b47a5d2818fbf0653cd32b8f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -808,6 +808,7 @@ public abstract class PlayerList {
+@@ -806,6 +806,7 @@ public abstract class PlayerList {
          // Paper start
          boolean isBedSpawn = false;
          boolean isRespawn = false;
@@ -21,7 +21,7 @@ index 62888ec5766806016545e34758da20884626697a..5f24db6b68b629812d90b7b5e2f06c21
          // Paper end
  
          // CraftBukkit start - fire PlayerRespawnEvent
-@@ -818,7 +819,7 @@ public abstract class PlayerList {
+@@ -816,7 +817,7 @@ public abstract class PlayerList {
                  Optional optional;
  
                  if (blockposition != null) {
@@ -30,7 +30,7 @@ index 62888ec5766806016545e34758da20884626697a..5f24db6b68b629812d90b7b5e2f06c21
                  } else {
                      optional = Optional.empty();
                  }
-@@ -862,7 +863,12 @@ public abstract class PlayerList {
+@@ -860,7 +861,12 @@ public abstract class PlayerList {
              }
              // Spigot End
  
@@ -44,7 +44,7 @@ index 62888ec5766806016545e34758da20884626697a..5f24db6b68b629812d90b7b5e2f06c21
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper
          } else {
-@@ -901,8 +907,14 @@ public abstract class PlayerList {
+@@ -899,8 +905,14 @@ public abstract class PlayerList {
          }
          // entityplayer1.initInventoryMenu();
          entityplayer1.setHealth(entityplayer1.getHealth());
diff --git a/patches/server/0431-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0428-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0431-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0428-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0432-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0429-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0432-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0429-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0433-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0430-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0433-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0430-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0431-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0431-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0435-Fix-some-rails-connecting-improperly.patch b/patches/server/0432-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0435-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0432-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0436-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0433-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0436-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0433-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0437-Brand-support.patch b/patches/server/0434-Brand-support.patch
similarity index 100%
rename from patches/server/0437-Brand-support.patch
rename to patches/server/0434-Brand-support.patch
diff --git a/patches/server/0438-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0435-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0438-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0435-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0439-Don-t-require-FACING-data.patch b/patches/server/0436-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0439-Don-t-require-FACING-data.patch
rename to patches/server/0436-Don-t-require-FACING-data.patch
diff --git a/patches/server/0440-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0437-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0440-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0437-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0441-Add-moon-phase-API.patch b/patches/server/0438-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0441-Add-moon-phase-API.patch
rename to patches/server/0438-Add-moon-phase-API.patch
diff --git a/patches/server/0442-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0439-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0442-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0439-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0443-Prevent-headless-pistons-from-being-created.patch b/patches/server/0440-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0443-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0440-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0444-Add-BellRingEvent.patch b/patches/server/0441-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0444-Add-BellRingEvent.patch
rename to patches/server/0441-Add-BellRingEvent.patch
diff --git a/patches/server/0445-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0442-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0445-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0442-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0446-Buffer-joins-to-world.patch b/patches/server/0443-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0446-Buffer-joins-to-world.patch
rename to patches/server/0443-Buffer-joins-to-world.patch
diff --git a/patches/server/0447-Eigencraft-redstone-implementation.patch b/patches/server/0444-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0447-Eigencraft-redstone-implementation.patch
rename to patches/server/0444-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0448-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0445-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0448-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0445-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0449-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0446-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0449-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0446-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0450-Add-more-Evoker-API.patch b/patches/server/0447-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0450-Add-more-Evoker-API.patch
rename to patches/server/0447-Add-more-Evoker-API.patch
diff --git a/patches/server/0451-Add-methods-to-get-translation-keys.patch b/patches/server/0448-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0451-Add-methods-to-get-translation-keys.patch
rename to patches/server/0448-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0452-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0449-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0452-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0449-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0453-Cache-block-data-strings.patch b/patches/server/0450-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0453-Cache-block-data-strings.patch
rename to patches/server/0450-Cache-block-data-strings.patch
diff --git a/patches/server/0454-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0451-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0454-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0451-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0455-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0452-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0455-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0452-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0456-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0453-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0456-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0453-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0457-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0454-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0457-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0454-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0458-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0455-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0458-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0455-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0459-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0456-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0459-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0456-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0460-Entity-isTicking.patch b/patches/server/0457-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0460-Entity-isTicking.patch
rename to patches/server/0457-Entity-isTicking.patch
diff --git a/patches/server/0461-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0458-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0461-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0458-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0462-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0459-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 97%
rename from patches/server/0462-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0459-Fix-Concurrency-issue-in-ShufflingList.patch
index 064548966e..95287f83e5 100644
--- a/patches/server/0462-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0459-Fix-Concurrency-issue-in-ShufflingList.patch
@@ -7,7 +7,7 @@ if multiple threads from worldgen sort at same time, it will crash.
 So make a copy of the list for sorting purposes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java
-index 1fbe732e840d2018269361f7c9e7d3e4606dbff5..225af5abb839880dd6df15af28172bdc74f7b9e5 100644
+index 281b5cf91135984a37ad013614c910f7d4d2fee3..4190acc01b8bf91b02d92143391979df58f6935c 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java
 @@ -17,7 +17,7 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
diff --git a/patches/server/0463-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0460-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0463-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0460-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0464-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0461-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0464-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0461-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0465-Optimise-getType-calls.patch b/patches/server/0462-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0465-Optimise-getType-calls.patch
rename to patches/server/0462-Optimise-getType-calls.patch
diff --git a/patches/server/0466-Villager-resetOffers.patch b/patches/server/0463-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0466-Villager-resetOffers.patch
rename to patches/server/0463-Villager-resetOffers.patch
diff --git a/patches/server/0467-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0464-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0467-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0464-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0468-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0465-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0468-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0465-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0469-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0466-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0469-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0466-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0470-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0467-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0470-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0467-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0471-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0468-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0471-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0468-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0472-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0469-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0472-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0469-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0473-Add-ignore-discounts-API.patch b/patches/server/0470-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0473-Add-ignore-discounts-API.patch
rename to patches/server/0470-Add-ignore-discounts-API.patch
diff --git a/patches/server/0474-Toggle-for-removing-existing-dragon.patch b/patches/server/0471-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0474-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0471-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0475-Fix-client-lag-on-advancement-loading.patch b/patches/server/0472-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0475-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0472-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0476-Item-no-age-no-player-pickup.patch b/patches/server/0473-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0476-Item-no-age-no-player-pickup.patch
rename to patches/server/0473-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0477-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0474-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0477-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0474-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0478-Beacon-API-custom-effect-ranges.patch b/patches/server/0475-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0478-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0475-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0479-Add-API-for-quit-reason.patch b/patches/server/0476-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0479-Add-API-for-quit-reason.patch
rename to patches/server/0476-Add-API-for-quit-reason.patch
index 16cb4b1757..ff5d7979f6 100644
--- a/patches/server/0479-Add-API-for-quit-reason.patch
+++ b/patches/server/0476-Add-API-for-quit-reason.patch
@@ -49,7 +49,7 @@ index f489b207cd3b62a33723f2e9ed0f46020d7f4fd1..0616a8e89931680602da2dbc64090670
              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 5f24db6b68b629812d90b7b5e2f06c21732ed098..e2669eb88b76460207f2283711b64e0d6fa8f942 100644
+index 29b535dae6eff1c6b47a5d2818fbf0653cd32b8f..ccdb911e723d8cf5ffbfc162778ab948eb4d1bc2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -579,7 +579,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0480-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0477-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0480-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0477-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0481-Expose-world-spawn-angle.patch b/patches/server/0478-Expose-world-spawn-angle.patch
similarity index 87%
rename from patches/server/0481-Expose-world-spawn-angle.patch
rename to patches/server/0478-Expose-world-spawn-angle.patch
index cfa87b6cd4..a70c649155 100644
--- a/patches/server/0481-Expose-world-spawn-angle.patch
+++ b/patches/server/0478-Expose-world-spawn-angle.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e2669eb88b76460207f2283711b64e0d6fa8f942..8cbcbf358b978c85ade7efdefc4e138c09f634ab 100644
+index ccdb911e723d8cf5ffbfc162778ab948eb4d1bc2..d727e401b311eea832315cc681fa7d73886c3f99 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -851,7 +851,7 @@ public abstract class PlayerList {
+@@ -849,7 +849,7 @@ public abstract class PlayerList {
              if (location == null) {
                  worldserver1 = this.server.getLevel(Level.OVERWORLD);
                  blockposition = entityplayer1.getSpawnPoint(worldserver1);
diff --git a/patches/server/0482-Add-Destroy-Speed-API.patch b/patches/server/0479-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0482-Add-Destroy-Speed-API.patch
rename to patches/server/0479-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0483-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0480-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0483-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0480-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0484-Add-LivingEntity-clearActiveItem.patch b/patches/server/0481-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0484-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0481-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0485-Add-PlayerItemCooldownEvent.patch b/patches/server/0482-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0485-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0482-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0486-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0483-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0486-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0483-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0487-More-lightning-API.patch b/patches/server/0484-More-lightning-API.patch
similarity index 100%
rename from patches/server/0487-More-lightning-API.patch
rename to patches/server/0484-More-lightning-API.patch
diff --git a/patches/server/0488-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0485-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0488-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0485-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0489-Added-missing-default-perms-for-commands.patch b/patches/server/0486-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0489-Added-missing-default-perms-for-commands.patch
rename to patches/server/0486-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0490-Add-PlayerShearBlockEvent.patch b/patches/server/0487-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0490-Add-PlayerShearBlockEvent.patch
rename to patches/server/0487-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0491-Limit-recipe-packets.patch b/patches/server/0488-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0491-Limit-recipe-packets.patch
rename to patches/server/0488-Limit-recipe-packets.patch
diff --git a/patches/server/0492-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0489-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0492-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0489-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0493-Player-Chunk-Load-Unload-Events.patch b/patches/server/0490-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0493-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0490-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0494-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0491-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0494-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0491-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0495-Expose-LivingEntity-hurt-direction.patch b/patches/server/0492-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0495-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0492-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0496-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0493-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0496-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0493-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0497-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0494-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0497-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0494-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0498-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0495-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0498-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0495-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0499-Implement-TargetHitEvent.patch b/patches/server/0496-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0499-Implement-TargetHitEvent.patch
rename to patches/server/0496-Implement-TargetHitEvent.patch
diff --git a/patches/server/0500-MC-4-Fix-item-position-desync.patch b/patches/server/0497-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0500-MC-4-Fix-item-position-desync.patch
rename to patches/server/0497-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0501-Additional-Block-Material-API-s.patch b/patches/server/0498-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0501-Additional-Block-Material-API-s.patch
rename to patches/server/0498-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0502-Fix-harming-potion-dupe.patch b/patches/server/0499-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0502-Fix-harming-potion-dupe.patch
rename to patches/server/0499-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0503-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0500-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0503-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0500-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0504-Cache-burn-durations.patch b/patches/server/0501-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0504-Cache-burn-durations.patch
rename to patches/server/0501-Cache-burn-durations.patch
diff --git a/patches/server/0505-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0502-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0505-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0502-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0506-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0503-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0506-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0503-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0507-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0504-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0507-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0504-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0508-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0505-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0508-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0505-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0509-Zombie-API-breaking-doors.patch b/patches/server/0506-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0509-Zombie-API-breaking-doors.patch
rename to patches/server/0506-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0510-Fix-nerfed-slime-when-splitting.patch b/patches/server/0507-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0510-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0507-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0511-Add-EntityLoadCrossbowEvent.patch b/patches/server/0508-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0511-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0508-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0512-Added-WorldGameRuleChangeEvent.patch b/patches/server/0509-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0512-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0509-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0513-Added-ServerResourcesReloadedEvent.patch b/patches/server/0510-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0513-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0510-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0514-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0511-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0514-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0511-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0515-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0512-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0515-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0512-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0516-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0513-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0516-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0513-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0517-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0514-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0517-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0514-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0518-Configurable-door-breaking-difficulty.patch b/patches/server/0515-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0518-Configurable-door-breaking-difficulty.patch
rename to patches/server/0515-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0519-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0516-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0519-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0516-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0520-Remove-stale-POIs.patch b/patches/server/0517-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0520-Remove-stale-POIs.patch
rename to patches/server/0517-Remove-stale-POIs.patch
diff --git a/patches/server/0521-Fix-villager-boat-exploit.patch b/patches/server/0518-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0521-Fix-villager-boat-exploit.patch
rename to patches/server/0518-Fix-villager-boat-exploit.patch
index 6aca9a61ef..f83f80d55a 100644
--- a/patches/server/0521-Fix-villager-boat-exploit.patch
+++ b/patches/server/0518-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 8cbcbf358b978c85ade7efdefc4e138c09f634ab..8137afc62e5430666ee9e74460109f7408baeffd 100644
+index d727e401b311eea832315cc681fa7d73886c3f99..0c495698438e4dd29d4bcddb0c88978fc58db8f3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -604,6 +604,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0522-Add-sendOpLevel-API.patch b/patches/server/0519-Add-sendOpLevel-API.patch
similarity index 91%
rename from patches/server/0522-Add-sendOpLevel-API.patch
rename to patches/server/0519-Add-sendOpLevel-API.patch
index be2e48d0a3..c7a574b1ac 100644
--- a/patches/server/0522-Add-sendOpLevel-API.patch
+++ b/patches/server/0519-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8137afc62e5430666ee9e74460109f7408baeffd..32f93ed20f5f2cec71850d7e0ce8a633fd5efc82 100644
+index 0c495698438e4dd29d4bcddb0c88978fc58db8f3..3aeaf4cb425b141d1a90a40cdee95bc98b2aeb56 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1105,6 +1105,11 @@ public abstract class PlayerList {
+@@ -1103,6 +1103,11 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -20,7 +20,7 @@ index 8137afc62e5430666ee9e74460109f7408baeffd..32f93ed20f5f2cec71850d7e0ce8a633
          if (player.connection != null) {
              byte b0;
  
-@@ -1119,8 +1124,10 @@ public abstract class PlayerList {
+@@ -1117,8 +1122,10 @@ public abstract class PlayerList {
              player.connection.send(new ClientboundEntityEventPacket(player, b0));
          }
  
diff --git a/patches/server/0523-TODO-Registry-Modification-API.patch b/patches/server/0520-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0523-TODO-Registry-Modification-API.patch
rename to patches/server/0520-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0524-Add-StructuresLocateEvent.patch b/patches/server/0521-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0524-Add-StructuresLocateEvent.patch
rename to patches/server/0521-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0525-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0522-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0525-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0522-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0526-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0523-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0526-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0523-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0527-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0524-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0527-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0524-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0528-Make-schedule-command-per-world.patch b/patches/server/0525-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0528-Make-schedule-command-per-world.patch
rename to patches/server/0525-Make-schedule-command-per-world.patch
diff --git a/patches/server/0529-Configurable-max-leash-distance.patch b/patches/server/0526-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0529-Configurable-max-leash-distance.patch
rename to patches/server/0526-Configurable-max-leash-distance.patch
diff --git a/patches/server/0530-Implement-BlockPreDispenseEvent.patch b/patches/server/0527-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0530-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0527-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0531-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0528-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0531-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0528-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0532-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0529-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0532-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0529-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0533-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0530-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0533-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0530-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0534-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0531-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0534-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0531-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0535-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0532-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0535-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0532-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0536-add-DragonEggFormEvent.patch b/patches/server/0533-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0536-add-DragonEggFormEvent.patch
rename to patches/server/0533-add-DragonEggFormEvent.patch
diff --git a/patches/server/0537-EntityMoveEvent.patch b/patches/server/0534-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0537-EntityMoveEvent.patch
rename to patches/server/0534-EntityMoveEvent.patch
diff --git a/patches/server/0538-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0535-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0538-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0535-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0539-Inline-shift-direction-fields.patch b/patches/server/0536-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0539-Inline-shift-direction-fields.patch
rename to patches/server/0536-Inline-shift-direction-fields.patch
diff --git a/patches/server/0540-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0537-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0540-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0537-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0541-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0538-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0541-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0538-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0542-living-entity-allow-attribute-registration.patch b/patches/server/0539-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0542-living-entity-allow-attribute-registration.patch
rename to patches/server/0539-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0543-fix-dead-slime-setSize-invincibility.patch b/patches/server/0540-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0543-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0540-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0544-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0541-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0544-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0541-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0545-Expose-Tracked-Players.patch b/patches/server/0542-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0545-Expose-Tracked-Players.patch
rename to patches/server/0542-Expose-Tracked-Players.patch
diff --git a/patches/server/0546-Improve-ServerGUI.patch b/patches/server/0543-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0546-Improve-ServerGUI.patch
rename to patches/server/0543-Improve-ServerGUI.patch
diff --git a/patches/server/0547-fix-converting-txt-to-json-file.patch b/patches/server/0544-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0547-fix-converting-txt-to-json-file.patch
rename to patches/server/0544-fix-converting-txt-to-json-file.patch
index 250a6e2a28..c8419ed799 100644
--- a/patches/server/0547-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0544-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 2d5e8d624b153f55e28d8a4e008dce11853179cf..b5acccc3339e3e2b817116ecf2af228c
          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 32f93ed20f5f2cec71850d7e0ce8a633fd5efc82..8a13160ff62a671a11740c456a2cbc3ccbac708f 100644
+index 3aeaf4cb425b141d1a90a40cdee95bc98b2aeb56..72b9c50024e82356491a3d35bf248223f3088b5c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -176,6 +176,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0548-Add-worldborder-events.patch b/patches/server/0545-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0548-Add-worldborder-events.patch
rename to patches/server/0545-Add-worldborder-events.patch
diff --git a/patches/server/0549-added-PlayerNameEntityEvent.patch b/patches/server/0546-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0549-added-PlayerNameEntityEvent.patch
rename to patches/server/0546-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0550-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0547-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0550-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0547-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0551-Add-recipe-to-cook-events.patch b/patches/server/0548-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0551-Add-recipe-to-cook-events.patch
rename to patches/server/0548-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0552-Add-Block-isValidTool.patch b/patches/server/0549-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0552-Add-Block-isValidTool.patch
rename to patches/server/0549-Add-Block-isValidTool.patch
diff --git a/patches/server/0553-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0553-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0554-Expand-world-key-API.patch b/patches/server/0551-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0554-Expand-world-key-API.patch
rename to patches/server/0551-Expand-world-key-API.patch
diff --git a/patches/server/0555-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0555-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0556-Item-Rarity-API.patch b/patches/server/0553-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0556-Item-Rarity-API.patch
rename to patches/server/0553-Item-Rarity-API.patch
diff --git a/patches/server/0557-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0557-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
index a7d48b393e..c157596526 100644
--- a/patches/server/0557-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0554-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 8a13160ff62a671a11740c456a2cbc3ccbac708f..d45b529c91e678a1f3b5b3d427eaf4019b8cc424 100644
+index 72b9c50024e82356491a3d35bf248223f3088b5c..dfaedfb4996d9edfb5c50851abf4f5a91f41527c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -597,6 +597,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0558-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0555-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0558-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0555-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0559-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0556-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0559-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0556-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0560-Expose-protocol-version.patch b/patches/server/0557-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0560-Expose-protocol-version.patch
rename to patches/server/0557-Expose-protocol-version.patch
diff --git a/patches/server/0561-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0561-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0562-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0559-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0562-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0559-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0563-Add-bypass-host-check.patch b/patches/server/0560-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0563-Add-bypass-host-check.patch
rename to patches/server/0560-Add-bypass-host-check.patch
diff --git a/patches/server/0564-Set-area-affect-cloud-rotation.patch b/patches/server/0561-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0564-Set-area-affect-cloud-rotation.patch
rename to patches/server/0561-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0565-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0562-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0565-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0562-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0566-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0566-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0567-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0564-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0567-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0564-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0568-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0568-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0569-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0566-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0569-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0566-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0570-Added-PlayerDeepSleepEvent.patch b/patches/server/0567-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0570-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0567-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0571-More-World-API.patch b/patches/server/0568-More-World-API.patch
similarity index 100%
rename from patches/server/0571-More-World-API.patch
rename to patches/server/0568-More-World-API.patch
diff --git a/patches/server/0572-Added-PlayerBedFailEnterEvent.patch b/patches/server/0569-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0572-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0569-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0573-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0570-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0573-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0570-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 87%
rename from patches/server/0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index f58290b66d..b7084efce8 100644
--- a/patches/server/0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d45b529c91e678a1f3b5b3d427eaf4019b8cc424..43e8cb83ec6cd18706dcba7022dd0f56cf24f33b 100644
+index dfaedfb4996d9edfb5c50851abf4f5a91f41527c..af1c4caa17e8b6ae597af123abe6b056bd8fd87d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -824,6 +824,7 @@ public abstract class PlayerList {
+@@ -822,6 +822,7 @@ public abstract class PlayerList {
  
          // Paper start
          boolean isBedSpawn = false;
@@ -17,7 +17,7 @@ index d45b529c91e678a1f3b5b3d427eaf4019b8cc424..43e8cb83ec6cd18706dcba7022dd0f56
          boolean isRespawn = false;
          boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
          // Paper end
-@@ -844,6 +845,7 @@ public abstract class PlayerList {
+@@ -842,6 +843,7 @@ public abstract class PlayerList {
                  if (optional.isPresent()) {
                      BlockState iblockdata = worldserver1.getBlockState(blockposition);
                      boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
@@ -25,7 +25,7 @@ index d45b529c91e678a1f3b5b3d427eaf4019b8cc424..43e8cb83ec6cd18706dcba7022dd0f56
                      Vec3 vec3d = (Vec3) optional.get();
                      float f1;
  
-@@ -872,7 +874,7 @@ public abstract class PlayerList {
+@@ -870,7 +872,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0575-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0575-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0576-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0573-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 94%
rename from patches/server/0576-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0573-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 96e8ecd7a3..fd3a8af4c0 100644
--- a/patches/server/0576-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0573-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,10 +18,10 @@ index 91e1a5fb981dd8468bb13098424b54da1c90a998..206c0a1e783699ed272e3640a29fe349
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 43e8cb83ec6cd18706dcba7022dd0f56cf24f33b..cf39405eddcc9e5b19c2ffae571921494e1857eb 100644
+index af1c4caa17e8b6ae597af123abe6b056bd8fd87d..c3e058cb24fc6cf3e7508ad689af9214d9a20f7d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -783,6 +783,12 @@ public abstract class PlayerList {
+@@ -781,6 +781,12 @@ public abstract class PlayerList {
      }
  
      public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason) {
@@ -34,7 +34,7 @@ index 43e8cb83ec6cd18706dcba7022dd0f56cf24f33b..cf39405eddcc9e5b19c2ffae57192149
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -874,7 +880,7 @@ public abstract class PlayerList {
+@@ -872,7 +878,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/patches/server/0577-Add-Channel-initialization-listeners.patch b/patches/server/0574-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0577-Add-Channel-initialization-listeners.patch
rename to patches/server/0574-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0578-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0575-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0578-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0575-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0579-Add-more-WanderingTrader-API.patch b/patches/server/0576-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0579-Add-more-WanderingTrader-API.patch
rename to patches/server/0576-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0580-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0577-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0580-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0577-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0581-Entity-load-save-limit-per-chunk.patch b/patches/server/0578-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0581-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0578-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0582-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0579-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0582-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0579-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0583-Inventory-close.patch b/patches/server/0580-Inventory-close.patch
similarity index 100%
rename from patches/server/0583-Inventory-close.patch
rename to patches/server/0580-Inventory-close.patch
diff --git a/patches/server/0584-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0581-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0584-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0581-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0585-Add-basic-Datapack-API.patch b/patches/server/0582-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0585-Add-basic-Datapack-API.patch
rename to patches/server/0582-Add-basic-Datapack-API.patch
diff --git a/patches/server/0586-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0583-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0586-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0583-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0587-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0584-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0587-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0584-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0588-ItemStack-repair-check-API.patch b/patches/server/0585-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0588-ItemStack-repair-check-API.patch
rename to patches/server/0585-ItemStack-repair-check-API.patch
diff --git a/patches/server/0589-More-Enchantment-API.patch b/patches/server/0586-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0589-More-Enchantment-API.patch
rename to patches/server/0586-More-Enchantment-API.patch
diff --git a/patches/server/0590-Move-range-check-for-block-placing-up.patch b/patches/server/0587-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0590-Move-range-check-for-block-placing-up.patch
rename to patches/server/0587-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0591-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0588-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0591-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0588-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0592-Add-Mob-lookAt-API.patch b/patches/server/0589-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0592-Add-Mob-lookAt-API.patch
rename to patches/server/0589-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0593-Add-Unix-domain-socket-support.patch b/patches/server/0590-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0593-Add-Unix-domain-socket-support.patch
rename to patches/server/0590-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0594-Add-EntityInsideBlockEvent.patch b/patches/server/0591-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0594-Add-EntityInsideBlockEvent.patch
rename to patches/server/0591-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0595-Attributes-API-for-item-defaults.patch b/patches/server/0592-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0595-Attributes-API-for-item-defaults.patch
rename to patches/server/0592-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0596-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0593-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0596-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0593-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0597-More-Lidded-Block-API.patch b/patches/server/0594-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0597-More-Lidded-Block-API.patch
rename to patches/server/0594-More-Lidded-Block-API.patch
diff --git a/patches/server/0598-Limit-item-frame-cursors-on-maps.patch b/patches/server/0595-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0598-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0595-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0599-Add-PlayerKickEvent-causes.patch b/patches/server/0596-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0599-Add-PlayerKickEvent-causes.patch
rename to patches/server/0596-Add-PlayerKickEvent-causes.patch
index d5911f6435..04d7f1f5ce 100644
--- a/patches/server/0599-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0596-Add-PlayerKickEvent-causes.patch
@@ -437,7 +437,7 @@ index 4d23d019173d0921145338544e190bc34f9f45c2..1a85755ad62498c263783d1d54130d02
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf39405eddcc9e5b19c2ffae571921494e1857eb..891fdeaba2b0f287a0da87a20bb850ffcc9d66bf 100644
+index c3e058cb24fc6cf3e7508ad689af9214d9a20f7d..ff387a1b9ef7165dc755daf672df5d83315b6b7c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -684,7 +684,7 @@ public abstract class PlayerList {
@@ -449,7 +449,7 @@ index cf39405eddcc9e5b19c2ffae571921494e1857eb..891fdeaba2b0f287a0da87a20bb850ff
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -1335,8 +1335,8 @@ public abstract class PlayerList {
+@@ -1333,8 +1333,8 @@ public abstract class PlayerList {
          // Paper end
          // CraftBukkit start - disconnect safely
          for (ServerPlayer player : this.players) {
diff --git a/patches/server/0600-Add-PufferFishStateChangeEvent.patch b/patches/server/0597-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0600-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0597-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0601-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0598-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0601-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0598-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0602-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0599-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0602-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0599-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0603-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0600-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0603-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0600-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0604-Add-BellRevealRaiderEvent.patch b/patches/server/0601-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0604-Add-BellRevealRaiderEvent.patch
rename to patches/server/0601-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0605-Fix-invulnerable-end-crystals.patch b/patches/server/0602-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0605-Fix-invulnerable-end-crystals.patch
rename to patches/server/0602-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0606-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0603-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0606-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0603-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0607-Fix-dangerous-end-portal-logic.patch b/patches/server/0604-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0607-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0604-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0608-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0605-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0608-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0605-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0609-Make-item-validations-configurable.patch b/patches/server/0606-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0609-Make-item-validations-configurable.patch
rename to patches/server/0606-Make-item-validations-configurable.patch
diff --git a/patches/server/0610-Line-Of-Sight-Changes.patch b/patches/server/0607-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0610-Line-Of-Sight-Changes.patch
rename to patches/server/0607-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0611-add-per-world-spawn-limits.patch b/patches/server/0608-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0611-add-per-world-spawn-limits.patch
rename to patches/server/0608-add-per-world-spawn-limits.patch
diff --git a/patches/server/0612-Fix-potions-splash-events.patch b/patches/server/0609-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0612-Fix-potions-splash-events.patch
rename to patches/server/0609-Fix-potions-splash-events.patch
diff --git a/patches/server/0613-Add-more-LimitedRegion-API.patch b/patches/server/0610-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0613-Add-more-LimitedRegion-API.patch
rename to patches/server/0610-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0614-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0611-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0614-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0611-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0615-Missing-Entity-API.patch b/patches/server/0612-Missing-Entity-API.patch
similarity index 99%
rename from patches/server/0615-Missing-Entity-API.patch
rename to patches/server/0612-Missing-Entity-API.patch
index 4cbbbf5a03..f6c3195d8e 100644
--- a/patches/server/0615-Missing-Entity-API.patch
+++ b/patches/server/0612-Missing-Entity-API.patch
@@ -282,7 +282,7 @@ index 14b09adeb9222600c24f3fb846ea8aee467952e6..8241dbf7591b2f56b25cdc3ce9009c71
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 8e72958dec9d4eb35330b72e057733a268e83745..decd59f7104ba26145e2150c3b8e5e0404d31885 100644
+index a859f02074c698c68713568ed99089e33f38ccca..6d29fef4de10c4b75be591046ff1f8e3c24bb9bb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -457,6 +457,16 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0616-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0613-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0616-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0613-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0617-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0614-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0617-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0614-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0618-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0615-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0618-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0615-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0619-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0616-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0619-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0616-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0620-Adds-PlayerArmSwingEvent.patch b/patches/server/0617-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0620-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0617-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0621-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0618-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0621-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0618-Fixes-kick-event-leave-message-not-being-sent.patch
index fdd06094ab..630accdbb9 100644
--- a/patches/server/0621-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0618-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -96,7 +96,7 @@ index da21fdec10a10e4dcec3b0cadb72fa82ef56e4b4..8ed347ad9e758a3d5df7110ea0b098a2
              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 891fdeaba2b0f287a0da87a20bb850ffcc9d66bf..6fdd1175f8d07fba7adf3a63d9c98dedd15e7774 100644
+index ff387a1b9ef7165dc755daf672df5d83315b6b7c..29ad37a8d449b5addfd48ef46dde9835f34a057a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -570,6 +570,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0622-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0619-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0622-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0619-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0623-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0620-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0623-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0620-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0624-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0621-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0624-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0621-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0625-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0622-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0625-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0622-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0626-Stinger-API.patch b/patches/server/0623-Stinger-API.patch
similarity index 100%
rename from patches/server/0626-Stinger-API.patch
rename to patches/server/0623-Stinger-API.patch
diff --git a/patches/server/0627-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0624-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0627-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0624-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0628-Add-System.out-err-catcher.patch b/patches/server/0625-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0628-Add-System.out-err-catcher.patch
rename to patches/server/0625-Add-System.out-err-catcher.patch
diff --git a/patches/server/0629-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0626-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0629-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0626-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0630-Improve-boat-collision-performance.patch b/patches/server/0627-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0630-Improve-boat-collision-performance.patch
rename to patches/server/0627-Improve-boat-collision-performance.patch
diff --git a/patches/server/0631-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0628-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0631-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0628-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0632-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0629-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0632-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0629-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0633-Add-PlayerSetSpawnEvent.patch b/patches/server/0630-Add-PlayerSetSpawnEvent.patch
similarity index 98%
rename from patches/server/0633-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0630-Add-PlayerSetSpawnEvent.patch
index 4233f9c921..154380d736 100644
--- a/patches/server/0633-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0630-Add-PlayerSetSpawnEvent.patch
@@ -154,10 +154,10 @@ index b49b56848bdbbd07c49e44d85997fa36192332c5..9f7c149d3ad1175d55ec02e295ee43bc
  
      public SectionPos getLastSectionPos() {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6fdd1175f8d07fba7adf3a63d9c98dedd15e7774..159932e2807c8d51fbf141c2145a138a39ea8abe 100644
+index 29ad37a8d449b5addfd48ef46dde9835f34a057a..f7588787769902506e317bdb052483c5dc377693 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -874,7 +874,7 @@ public abstract class PlayerList {
+@@ -872,7 +872,7 @@ public abstract class PlayerList {
                      location = CraftLocation.toBukkit(vec3d, worldserver1.getWorld(), f1, 0.0F);
                  } else if (blockposition != null) {
                      entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
diff --git a/patches/server/0634-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0631-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0634-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0631-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0635-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0632-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0635-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0632-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0636-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0633-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0636-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0633-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0637-Added-EntityDamageItemEvent.patch b/patches/server/0634-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0637-Added-EntityDamageItemEvent.patch
rename to patches/server/0634-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0638-Optimize-indirect-passenger-iteration.patch b/patches/server/0635-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0638-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0635-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0639-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0636-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0639-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0636-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0640-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0637-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0640-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0637-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0641-Clear-bucket-NBT-after-dispense.patch b/patches/server/0638-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0641-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0638-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0642-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0639-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0642-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0639-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0643-Add-BlockBreakBlockEvent.patch b/patches/server/0640-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0643-Add-BlockBreakBlockEvent.patch
rename to patches/server/0640-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0644-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0641-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0644-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0641-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0645-More-CommandBlock-API.patch b/patches/server/0642-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0645-More-CommandBlock-API.patch
rename to patches/server/0642-More-CommandBlock-API.patch
diff --git a/patches/server/0646-Add-missing-team-sidebar-display-slots.patch b/patches/server/0643-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0646-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0643-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0647-Add-back-EntityPortalExitEvent.patch b/patches/server/0644-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0647-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0644-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0648-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0645-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0648-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0645-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0649-Get-entity-default-attributes.patch b/patches/server/0646-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0649-Get-entity-default-attributes.patch
rename to patches/server/0646-Get-entity-default-attributes.patch
diff --git a/patches/server/0650-Left-handed-API.patch b/patches/server/0647-Left-handed-API.patch
similarity index 100%
rename from patches/server/0650-Left-handed-API.patch
rename to patches/server/0647-Left-handed-API.patch
diff --git a/patches/server/0651-Add-more-advancement-API.patch b/patches/server/0648-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0651-Add-more-advancement-API.patch
rename to patches/server/0648-Add-more-advancement-API.patch
diff --git a/patches/server/0652-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0649-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0652-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0649-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0653-Add-critical-damage-API.patch b/patches/server/0650-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0653-Add-critical-damage-API.patch
rename to patches/server/0650-Add-critical-damage-API.patch
diff --git a/patches/server/0654-Fix-issues-with-mob-conversion.patch b/patches/server/0651-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0654-Fix-issues-with-mob-conversion.patch
rename to patches/server/0651-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0655-Add-isCollidable-methods-to-various-places.patch b/patches/server/0652-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0655-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0652-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0656-Goat-ram-API.patch b/patches/server/0653-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0656-Goat-ram-API.patch
rename to patches/server/0653-Goat-ram-API.patch
diff --git a/patches/server/0657-Add-API-for-resetting-a-single-score.patch b/patches/server/0654-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0657-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0654-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0658-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0655-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0658-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0655-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0659-Vanilla-command-permission-fixes.patch b/patches/server/0656-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0659-Vanilla-command-permission-fixes.patch
rename to patches/server/0656-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0660-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0657-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0660-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0657-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0661-Fix-GameProfileCache-concurrency.patch b/patches/server/0658-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0661-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0658-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0662-Improve-and-expand-AsyncCatcher.patch b/patches/server/0659-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0662-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0659-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0663-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0660-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0663-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0660-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0664-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0661-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0664-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0661-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0665-Optimise-general-POI-access.patch b/patches/server/0662-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0665-Optimise-general-POI-access.patch
rename to patches/server/0662-Optimise-general-POI-access.patch
diff --git a/patches/server/0666-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0663-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0666-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0663-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0667-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0664-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0667-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0664-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0668-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0665-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0668-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0665-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0669-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0666-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0669-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0666-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0670-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0667-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0670-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0667-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0671-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0668-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 60%
rename from patches/server/0671-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0668-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index d931ef54fa..20c27c4ea4 100644
--- a/patches/server/0671-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0668-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
@@ -1,20 +1,26 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 28 Aug 2020 12:33:47 -0700
-Subject: [PATCH] Don't lookup fluid state when raytracing
+Subject: [PATCH] Don't lookup fluid state when raytracing, skip air blocks
 
 Just use the iblockdata already retrieved, removes a getType call.
 
+Also save approx. 5% for the raytrace call, as most (expensive)
+raytracing tends to go through air and returning early is an
+easy win. The remaining problems with this function
+are mostly with the block getting itself.
+
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 24073d4d7c45d501c2baec2d8c8b49f60fb76e65..bd3eb39981c1d6028804f05c21eec6127389ca40 100644
+index 618d6a94d695a3bf114307f85f0f151ee24f1879..7df62a219d0bcffc793c1a8c55b6ed244fdeb199 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -92,7 +92,7 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -92,7 +92,8 @@ public interface BlockGetter extends LevelHeightAccessor {
                  return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
              }
-             // Paper end
+             // Paper end - Prevent raytrace from loading chunks
 -            FluidState fluid = this.getFluidState(blockposition);
-+            FluidState fluid = iblockdata.getFluidState(); // Paper - don't need to go to world state again
++            if (iblockdata.isAir()) return null; // Paper - Perf: optimise air cases
++            FluidState fluid = iblockdata.getFluidState(); // Paper - Perf: don't need to go to world state again
              Vec3 vec3d = raytrace1.getFrom();
              Vec3 vec3d1 = raytrace1.getTo();
              VoxelShape voxelshape = raytrace1.getBlockShape(iblockdata, this, blockposition);
diff --git a/patches/server/0672-Time-scoreboard-search.patch b/patches/server/0669-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0672-Time-scoreboard-search.patch
rename to patches/server/0669-Time-scoreboard-search.patch
diff --git a/patches/server/0673-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0670-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0673-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0670-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0675-Execute-chunk-tasks-mid-tick.patch b/patches/server/0671-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0675-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0671-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0676-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0672-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0676-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0672-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0677-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0673-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0677-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0673-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0674-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0674-Do-not-run-raytrace-logic-for-AIR.patch
deleted file mode 100644
index 75ece1bf8b..0000000000
--- a/patches/server/0674-Do-not-run-raytrace-logic-for-AIR.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sun, 7 Mar 2021 13:15:04 -0800
-Subject: [PATCH] Do not run raytrace logic for AIR
-
-Saves approx. 5% for the raytrace call, as most (expensive)
-raytracing tends to go through air and returning early is an
-easy win. The remaining problems with this function
-are mostly with the block getting itself.
-
-diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index bd3eb39981c1d6028804f05c21eec6127389ca40..799837c172a5f7856c78e6fe2595c575f3058a5e 100644
---- a/src/main/java/net/minecraft/world/level/BlockGetter.java
-+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -92,6 +92,7 @@ public interface BlockGetter extends LevelHeightAccessor {
-                 return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
-             }
-             // Paper end
-+            if (iblockdata.isAir()) return null; // Paper - optimise air cases
-             FluidState fluid = iblockdata.getFluidState(); // Paper - don't need to go to world state again
-             Vec3 vec3d = raytrace1.getFrom();
-             Vec3 vec3d1 = raytrace1.getTo();
diff --git a/patches/server/0678-Optimise-random-block-ticking.patch b/patches/server/0674-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0678-Optimise-random-block-ticking.patch
rename to patches/server/0674-Optimise-random-block-ticking.patch
diff --git a/patches/server/0679-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0675-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0679-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0675-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0680-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0676-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0680-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0676-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0681-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0677-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0681-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0677-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0682-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0678-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0682-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0678-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0683-Distance-manager-tick-timings.patch b/patches/server/0679-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0683-Distance-manager-tick-timings.patch
rename to patches/server/0679-Distance-manager-tick-timings.patch
diff --git a/patches/server/0684-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0680-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0684-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0680-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0685-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0681-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0685-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0681-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0686-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0682-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0686-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0682-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0687-Add-packet-limiter-config.patch b/patches/server/0683-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0687-Add-packet-limiter-config.patch
rename to patches/server/0683-Add-packet-limiter-config.patch
diff --git a/patches/server/0688-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0684-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0688-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0684-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0689-Ensure-valid-vehicle-status.patch b/patches/server/0685-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0689-Ensure-valid-vehicle-status.patch
rename to patches/server/0685-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0690-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0686-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0690-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0686-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0691-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0687-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0691-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0687-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0692-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0688-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0692-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0688-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0693-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0689-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0693-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0689-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0694-Preserve-overstacked-loot.patch b/patches/server/0690-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0694-Preserve-overstacked-loot.patch
rename to patches/server/0690-Preserve-overstacked-loot.patch
diff --git a/patches/server/0695-Update-head-rotation-in-missing-places.patch b/patches/server/0691-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0695-Update-head-rotation-in-missing-places.patch
rename to patches/server/0691-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0696-prevent-unintended-light-block-manipulation.patch b/patches/server/0692-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0696-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0692-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0697-Fix-CraftCriteria-defaults-map.patch b/patches/server/0693-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0697-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0693-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0698-Fix-upstreams-block-state-factories.patch b/patches/server/0694-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0698-Fix-upstreams-block-state-factories.patch
rename to patches/server/0694-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0699-Configurable-feature-seeds.patch b/patches/server/0695-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0699-Configurable-feature-seeds.patch
rename to patches/server/0695-Configurable-feature-seeds.patch
diff --git a/patches/server/0700-Add-root-admin-user-detection.patch b/patches/server/0696-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0700-Add-root-admin-user-detection.patch
rename to patches/server/0696-Add-root-admin-user-detection.patch
diff --git a/patches/server/0701-Always-allow-item-changing-in-Fireball.patch b/patches/server/0697-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0701-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0697-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0702-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0698-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0702-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0698-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0703-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0699-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0703-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0699-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0704-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0700-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0704-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0700-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0705-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0701-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0705-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0701-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0706-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0702-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0706-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0702-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0707-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0703-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0707-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0703-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0708-Fix-Spigot-growth-modifiers.patch b/patches/server/0704-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0708-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0704-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0709-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0705-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0709-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0705-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0710-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0706-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0710-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0706-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0711-Optimize-HashMapPalette.patch b/patches/server/0707-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0711-Optimize-HashMapPalette.patch
rename to patches/server/0707-Optimize-HashMapPalette.patch
diff --git a/patches/server/0712-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0708-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0712-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0708-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0713-Collision-optimisations.patch b/patches/server/0709-Collision-optimisations.patch
similarity index 99%
rename from patches/server/0713-Collision-optimisations.patch
rename to patches/server/0709-Collision-optimisations.patch
index 5a9ed29a4d..c2a0bb699d 100644
--- a/patches/server/0713-Collision-optimisations.patch
+++ b/patches/server/0709-Collision-optimisations.patch
@@ -2201,10 +2201,10 @@ index 60164d8ff63bf536ddf46605a9dc7931ebc5b82a..7c8f5ae6bd83bd08403738dcd364b0af
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 159932e2807c8d51fbf141c2145a138a39ea8abe..41a5d509a398972db910d32babb70e9bd5fa41da 100644
+index f7588787769902506e317bdb052483c5dc377693..8f0d1e9e8a191a2049f3ad2d9b4ffdbd15c45d9f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -911,7 +911,7 @@ public abstract class PlayerList {
+@@ -909,7 +909,7 @@ public abstract class PlayerList {
          entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
  
          worldserver1.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(location.getBlockX() >> 4, location.getBlockZ() >> 4), 1, entityplayer.getId()); // Paper
diff --git a/patches/server/0714-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0710-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0714-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0710-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0715-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0711-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0715-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0711-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0716-Add-more-Campfire-API.patch b/patches/server/0712-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0716-Add-more-Campfire-API.patch
rename to patches/server/0712-Add-more-Campfire-API.patch
diff --git a/patches/server/0717-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0713-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0717-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0713-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0718-Fix-tripwire-state-inconsistency.patch b/patches/server/0714-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0718-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0714-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0719-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0715-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0719-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0715-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0720-Improve-scoreboard-entries.patch b/patches/server/0716-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0720-Improve-scoreboard-entries.patch
rename to patches/server/0716-Improve-scoreboard-entries.patch
diff --git a/patches/server/0721-Entity-powdered-snow-API.patch b/patches/server/0717-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0721-Entity-powdered-snow-API.patch
rename to patches/server/0717-Entity-powdered-snow-API.patch
diff --git a/patches/server/0722-Add-API-for-item-entity-health.patch b/patches/server/0718-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0722-Add-API-for-item-entity-health.patch
rename to patches/server/0718-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0723-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0719-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0723-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0719-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0724-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0720-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0724-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0720-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0725-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0721-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0725-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0721-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0726-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0722-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0726-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0722-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0727-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0723-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0727-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0723-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0728-Fix-bees-aging-inside-hives.patch b/patches/server/0724-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0728-Fix-bees-aging-inside-hives.patch
rename to patches/server/0724-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0729-Bucketable-API.patch b/patches/server/0725-Bucketable-API.patch
similarity index 100%
rename from patches/server/0729-Bucketable-API.patch
rename to patches/server/0725-Bucketable-API.patch
diff --git a/patches/server/0730-Validate-usernames.patch b/patches/server/0726-Validate-usernames.patch
similarity index 97%
rename from patches/server/0730-Validate-usernames.patch
rename to patches/server/0726-Validate-usernames.patch
index a3126a1fa5..f683c7e5ed 100644
--- a/patches/server/0730-Validate-usernames.patch
+++ b/patches/server/0726-Validate-usernames.patch
@@ -26,7 +26,7 @@ index 7a2f78ae76354e15afa5368c8fb2a571c15dc82d..6121a3879eeb1d13653e93da02ecdbbc
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 41a5d509a398972db910d32babb70e9bd5fa41da..0bb3940da79733ccdfa75598b86ec0887a995933 100644
+index 8f0d1e9e8a191a2049f3ad2d9b4ffdbd15c45d9f..1038bdb761c4b413cb92e08aa7ef634b2e8237d4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -679,7 +679,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0731-Make-water-animal-spawn-height-configurable.patch b/patches/server/0727-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0731-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0727-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0732-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0728-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0732-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0728-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0733-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0729-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0733-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0729-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0734-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0730-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0734-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0730-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0735-Multiple-Entries-with-Scoreboards.patch b/patches/server/0731-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0735-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0731-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0736-Reset-placed-block-on-exception.patch b/patches/server/0732-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0736-Reset-placed-block-on-exception.patch
rename to patches/server/0732-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0737-Add-configurable-height-for-slime-spawn.patch b/patches/server/0733-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0737-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0733-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0738-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0734-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0738-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0734-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0739-Multi-Block-Change-API-Implementation.patch b/patches/server/0735-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0739-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0735-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0740-Fix-NotePlayEvent.patch b/patches/server/0736-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0740-Fix-NotePlayEvent.patch
rename to patches/server/0736-Fix-NotePlayEvent.patch
diff --git a/patches/server/0741-Freeze-Tick-Lock-API.patch b/patches/server/0737-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0741-Freeze-Tick-Lock-API.patch
rename to patches/server/0737-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0742-Dolphin-API.patch b/patches/server/0738-Dolphin-API.patch
similarity index 100%
rename from patches/server/0742-Dolphin-API.patch
rename to patches/server/0738-Dolphin-API.patch
diff --git a/patches/server/0743-More-PotionEffectType-API.patch b/patches/server/0739-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0743-More-PotionEffectType-API.patch
rename to patches/server/0739-More-PotionEffectType-API.patch
diff --git a/patches/server/0744-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0740-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0744-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0740-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0745-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0741-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0745-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0741-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0746-Add-missing-structure-set-seed-configs.patch b/patches/server/0742-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0746-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0742-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0747-Implement-regenerateChunk.patch b/patches/server/0743-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0747-Implement-regenerateChunk.patch
rename to patches/server/0743-Implement-regenerateChunk.patch
diff --git a/patches/server/0748-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0744-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0748-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0744-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0749-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0745-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0749-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0745-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0750-Add-GameEvent-tags.patch b/patches/server/0746-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0750-Add-GameEvent-tags.patch
rename to patches/server/0746-Add-GameEvent-tags.patch
diff --git a/patches/server/0751-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0747-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0751-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0747-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0752-Furnace-RecipesUsed-API.patch b/patches/server/0748-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0752-Furnace-RecipesUsed-API.patch
rename to patches/server/0748-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0753-Configurable-sculk-sensor-listener-range.patch b/patches/server/0749-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0753-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0749-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0754-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0750-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0754-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0750-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0755-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0751-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0755-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0751-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0756-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0752-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0756-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0752-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0757-Fix-Entity-Position-Desync.patch b/patches/server/0753-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0757-Fix-Entity-Position-Desync.patch
rename to patches/server/0753-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0758-Custom-Potion-Mixes.patch b/patches/server/0754-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0758-Custom-Potion-Mixes.patch
rename to patches/server/0754-Custom-Potion-Mixes.patch
diff --git a/patches/server/0759-Force-close-world-loading-screen.patch b/patches/server/0755-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0759-Force-close-world-loading-screen.patch
rename to patches/server/0755-Force-close-world-loading-screen.patch
index ef0f0822d8..e3165b65ba 100644
--- a/patches/server/0759-Force-close-world-loading-screen.patch
+++ b/patches/server/0755-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 0bb3940da79733ccdfa75598b86ec0887a995933..f6f845a1842cb7082e9e3132f91f4addcdaedd97 100644
+index 1038bdb761c4b413cb92e08aa7ef634b2e8237d4..e79748938395c79fcb6c2c164e35a191781b7c2f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -398,6 +398,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0760-Fix-falling-block-spawn-methods.patch b/patches/server/0756-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0760-Fix-falling-block-spawn-methods.patch
rename to patches/server/0756-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0761-Expose-furnace-minecart-push-values.patch b/patches/server/0757-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0761-Expose-furnace-minecart-push-values.patch
rename to patches/server/0757-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0762-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0758-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0762-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0758-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0763-More-Projectile-API.patch b/patches/server/0759-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0763-More-Projectile-API.patch
rename to patches/server/0759-More-Projectile-API.patch
diff --git a/patches/server/0764-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0760-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0764-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0760-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0765-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0761-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0765-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0761-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0766-Implement-getComputedBiome-API.patch b/patches/server/0762-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0766-Implement-getComputedBiome-API.patch
rename to patches/server/0762-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0767-Make-some-itemstacks-nonnull.patch b/patches/server/0763-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0767-Make-some-itemstacks-nonnull.patch
rename to patches/server/0763-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0768-Implement-enchantWithLevels-API.patch b/patches/server/0764-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0768-Implement-enchantWithLevels-API.patch
rename to patches/server/0764-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0769-Fix-saving-in-unloadWorld.patch b/patches/server/0765-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0769-Fix-saving-in-unloadWorld.patch
rename to patches/server/0765-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0770-Buffer-OOB-setBlock-calls.patch b/patches/server/0766-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0770-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0766-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0771-Add-TameableDeathMessageEvent.patch b/patches/server/0767-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0771-Add-TameableDeathMessageEvent.patch
rename to patches/server/0767-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0772-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0768-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 99%
rename from patches/server/0772-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0768-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index c247f8a3e5..34ba74f62d 100644
--- a/patches/server/0772-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0768-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -91,7 +91,7 @@ index 2beece01e1b2acc69eeb92810ce14db01a311f23..71bcd55d9d71fbd5bf3014c7e36d1456
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index decd59f7104ba26145e2150c3b8e5e0404d31885..bd5996eef2d946e9d7765b6b315bc5951158810e 100644
+index 6d29fef4de10c4b75be591046ff1f8e3c24bb9bb..30627f330536b5c89b52452981f0a960b61e4268 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -580,7 +580,7 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0773-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0769-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0773-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0769-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0774-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0770-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0774-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0770-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0775-Guard-against-invalid-entity-positions.patch b/patches/server/0771-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0775-Guard-against-invalid-entity-positions.patch
rename to patches/server/0771-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0776-cache-resource-keys.patch b/patches/server/0772-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0776-cache-resource-keys.patch
rename to patches/server/0772-cache-resource-keys.patch
diff --git a/patches/server/0777-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0773-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0777-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0773-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0778-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0774-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0778-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0774-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0779-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0775-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0779-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0775-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0780-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0776-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0780-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0776-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0781-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0777-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 87%
rename from patches/server/0781-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0777-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 71c2ec984e..4044d54726 100644
--- a/patches/server/0781-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0777-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f6f845a1842cb7082e9e3132f91f4addcdaedd97..6310d19a42f549fda7446569958019e8d75a0ca6 100644
+index e79748938395c79fcb6c2c164e35a191781b7c2f..cd527e612a8a84451f9ef1fa0fcc900e16f54da1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1451,7 +1451,7 @@ public abstract class PlayerList {
+@@ -1449,7 +1449,7 @@ public abstract class PlayerList {
      // CraftBukkit start
      public ServerStatsCounter getPlayerStats(ServerPlayer entityhuman) {
          ServerStatsCounter serverstatisticmanager = entityhuman.getStats();
diff --git a/patches/server/0782-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0778-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0782-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0778-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0783-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0779-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0783-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0779-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0784-WorldCreator-keepSpawnLoaded.patch b/patches/server/0780-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0784-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0780-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0785-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0781-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0785-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0781-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0786-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0782-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0786-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0782-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0787-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0783-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0787-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0783-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0788-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0784-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0788-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0784-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0789-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0785-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0789-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0785-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0790-Add-PlayerStopUsingItemEvent.patch b/patches/server/0786-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0790-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0786-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0791-Don-t-tick-markers.patch b/patches/server/0787-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0791-Don-t-tick-markers.patch
rename to patches/server/0787-Don-t-tick-markers.patch
diff --git a/patches/server/0792-Expand-FallingBlock-API.patch b/patches/server/0788-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0792-Expand-FallingBlock-API.patch
rename to patches/server/0788-Expand-FallingBlock-API.patch
diff --git a/patches/server/0793-Do-not-accept-invalid-client-settings.patch b/patches/server/0789-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0793-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0789-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0794-Add-support-for-Proxy-Protocol.patch b/patches/server/0790-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0794-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0790-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0795-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0791-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0795-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0791-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0796-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0792-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0796-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0792-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0797-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0793-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0797-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0793-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0798-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0794-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0798-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0794-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0799-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0795-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0799-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0795-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0800-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0796-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0800-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0796-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0801-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0797-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0801-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0797-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0802-Dont-resent-entity-on-art-update.patch b/patches/server/0798-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0802-Dont-resent-entity-on-art-update.patch
rename to patches/server/0798-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0803-Add-WardenAngerChangeEvent.patch b/patches/server/0799-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0803-Add-WardenAngerChangeEvent.patch
rename to patches/server/0799-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0804-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0800-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0804-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0800-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0805-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0801-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0805-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0801-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0806-Nameable-Banner-API.patch b/patches/server/0802-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0806-Nameable-Banner-API.patch
rename to patches/server/0802-Nameable-Banner-API.patch
diff --git a/patches/server/0807-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0803-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0807-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0803-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0808-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0804-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0808-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0804-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0809-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0805-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0809-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0805-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0810-Add-Player-getFishHook.patch b/patches/server/0806-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0810-Add-Player-getFishHook.patch
rename to patches/server/0806-Add-Player-getFishHook.patch
diff --git a/patches/server/0811-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0807-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0811-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0807-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0812-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0808-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0812-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0808-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0813-Fix-Bee-flower-NPE.patch b/patches/server/0809-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0813-Fix-Bee-flower-NPE.patch
rename to patches/server/0809-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0814-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0810-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0814-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0810-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0815-More-Teleport-API.patch b/patches/server/0811-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0815-More-Teleport-API.patch
rename to patches/server/0811-More-Teleport-API.patch
diff --git a/patches/server/0816-Add-EntityPortalReadyEvent.patch b/patches/server/0812-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0816-Add-EntityPortalReadyEvent.patch
rename to patches/server/0812-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0817-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0813-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0817-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0813-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0818-Send-block-entities-after-destroy-prediction.patch b/patches/server/0814-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0818-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0814-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0819-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0815-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0819-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0815-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0820-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0816-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0820-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0816-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0821-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0817-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0821-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0817-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0822-Collision-API.patch b/patches/server/0818-Collision-API.patch
similarity index 100%
rename from patches/server/0822-Collision-API.patch
rename to patches/server/0818-Collision-API.patch
diff --git a/patches/server/0823-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0819-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0823-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0819-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0824-Block-Ticking-API.patch b/patches/server/0820-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0824-Block-Ticking-API.patch
rename to patches/server/0820-Block-Ticking-API.patch
diff --git a/patches/server/0825-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0821-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0825-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0821-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0826-Add-NamespacedKey-biome-methods.patch b/patches/server/0822-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0826-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0822-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0827-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0823-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0827-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0823-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0828-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0824-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0828-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0824-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0829-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0825-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0829-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0825-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0830-Missing-eating-regain-reason.patch b/patches/server/0826-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0830-Missing-eating-regain-reason.patch
rename to patches/server/0826-Missing-eating-regain-reason.patch
diff --git a/patches/server/0831-Missing-effect-cause.patch b/patches/server/0827-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0831-Missing-effect-cause.patch
rename to patches/server/0827-Missing-effect-cause.patch
diff --git a/patches/server/0832-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0828-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0832-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0828-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0833-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0829-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0833-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0829-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0834-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0830-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0834-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0830-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0835-Configurable-chat-thread-limit.patch b/patches/server/0831-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0835-Configurable-chat-thread-limit.patch
rename to patches/server/0831-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0836-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0832-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0836-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0832-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0837-fix-Jigsaw-block-kicking-user.patch b/patches/server/0833-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0837-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0833-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0838-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0834-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0838-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0834-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0839-Add-getDrops-to-BlockState.patch b/patches/server/0835-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0839-Add-getDrops-to-BlockState.patch
rename to patches/server/0835-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0840-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0836-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 95%
rename from patches/server/0840-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0836-Fix-a-bunch-of-vanilla-bugs.patch
index fd7ad3339c..06879a4865 100644
--- a/patches/server/0840-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0836-Fix-a-bunch-of-vanilla-bugs.patch
@@ -41,11 +41,9 @@ https://bugs.mojang.com/browse/MC-263999
   Fix mobs breaking doors not spawning block break particles
 
 https://bugs.mojang.com/browse/MC-210802
-  by: BillyGalbreath <Blake.Galbreath@Gmail.com>
   Fixes sheep eating blocks outside of ticking range
 
 https://bugs.mojang.com/browse/MC-123848
-  by: BillyGalbreath <blake.galbreath@gmail.com>
   Fixes item frames dropping items above when pointing down
 
 https://bugs.mojang.com/browse/MC-84789
@@ -70,6 +68,7 @@ https://bugs.mojang.com/browse/MC-200092
 public net/minecraft/world/entity/Mob leashInfoTag
 
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
+Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 index 9f220c99d7374ab3d9db222346694342d3e926c1..d9077127757886e5d5e8d63a46fe27f2bfba1420 100644
@@ -170,6 +169,23 @@ index 4e1ed252bf400ec991f95b02984f01a9689f2989..805c9b9b0e89002b97e1e11e1e6e2435
              this.player.onUpdateAbilities();
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index cd527e612a8a84451f9ef1fa0fcc900e16f54da1..e018cf9ca617adec197e7fa8e116287633002e62 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -711,8 +711,10 @@ public abstract class PlayerList {
+         Player player = entity.getBukkitEntity();
+         PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.channel.remoteAddress()).getAddress());
+ 
+-        if (this.getBans().isBanned(gameprofile) && !this.getBans().get(gameprofile).hasExpired()) {
+-            UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(gameprofile);
++        // Paper start - Fix MC-158900
++        UserBanListEntry gameprofilebanentry;
++        if (getBans().isBanned(gameprofile) && (gameprofilebanentry = getBans().get(gameprofile)) != null) {
++            // Paper end - Fix MC-158900
+ 
+             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
+             if (gameprofilebanentry.getExpires() != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Saddleable.java b/src/main/java/net/minecraft/world/entity/Saddleable.java
 index effe4c4fb37fe13aece70cdef4966047d4719af9..7152674d3f3fb98198585cb5ece2bb88877345f9 100644
 --- a/src/main/java/net/minecraft/world/entity/Saddleable.java
diff --git a/patches/server/0841-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0837-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0841-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0837-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0842-Fix-custom-piglin-loved-items.patch b/patches/server/0838-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0842-Fix-custom-piglin-loved-items.patch
rename to patches/server/0838-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0843-EntityPickupItemEvent-fixes.patch b/patches/server/0839-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0843-EntityPickupItemEvent-fixes.patch
rename to patches/server/0839-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0844-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0840-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0844-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0840-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0845-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0841-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0845-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0841-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0846-Elder-Guardian-appearance-API.patch b/patches/server/0842-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0846-Elder-Guardian-appearance-API.patch
rename to patches/server/0842-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0847-Allow-changing-bed-s-occupied-property.patch b/patches/server/0843-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0847-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0843-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0848-Add-entity-knockback-API.patch b/patches/server/0844-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0848-Add-entity-knockback-API.patch
rename to patches/server/0844-Add-entity-knockback-API.patch
diff --git a/patches/server/0849-Detect-headless-JREs.patch b/patches/server/0845-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0849-Detect-headless-JREs.patch
rename to patches/server/0845-Detect-headless-JREs.patch
diff --git a/patches/server/0850-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0846-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0850-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0846-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0851-optimize-dirt-and-snow-spreading.patch b/patches/server/0847-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0851-optimize-dirt-and-snow-spreading.patch
rename to patches/server/0847-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/0852-Add-EntityToggleSitEvent.patch b/patches/server/0848-Add-EntityToggleSitEvent.patch
similarity index 96%
rename from patches/server/0852-Add-EntityToggleSitEvent.patch
rename to patches/server/0848-Add-EntityToggleSitEvent.patch
index 3b46feb987..7b27f726cd 100644
--- a/patches/server/0852-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0848-Add-EntityToggleSitEvent.patch
@@ -31,7 +31,7 @@ index 1999cda5876bb12283d8c91a1b3e737c0d27bc38..4d32db04040014dba8935d1cb601e0da
          if (inSittingPose) {
              this.entityData.set(DATA_FLAGS_ID, (byte)(b | 1));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 96799179b0dd1886f0cdc386f04e152a19b3337d..a1c28f9590908df5dd9d850dd3f0cadbe83b05c6 100644
+index 96799179b0dd1886f0cdc386f04e152a19b3337d..3d771b137dc29579614aa4c15d12bd456cdc608a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -433,7 +433,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -47,12 +47,12 @@ index 96799179b0dd1886f0cdc386f04e152a19b3337d..a1c28f9590908df5dd9d850dd3f0cadb
      }
  
      public void setSitting(boolean sitting) {
-+    // Paper start
++        // Paper start - Add EntityToggleSitEvent
 +        this.setSitting(sitting, true);
 +    }
 +    public void setSitting(boolean sitting, boolean fireEvent) {
 +        if (fireEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return;
-+    // Paper end - Add EntityToggleSitEvent
++        // Paper end - Add EntityToggleSitEvent
          this.setFlag(1, sitting);
      }
  
diff --git a/patches/server/0853-Add-fire-tick-delay-option.patch b/patches/server/0849-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0853-Add-fire-tick-delay-option.patch
rename to patches/server/0849-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0854-Add-Moving-Piston-API.patch b/patches/server/0850-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0854-Add-Moving-Piston-API.patch
rename to patches/server/0850-Add-Moving-Piston-API.patch
diff --git a/patches/server/0855-Ignore-impossible-spawn-tick.patch b/patches/server/0851-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0855-Ignore-impossible-spawn-tick.patch
rename to patches/server/0851-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0856-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0852-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 88%
rename from patches/server/0856-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0852-Track-projectile-source-for-fireworks-from-dispenser.patch
index 68209c4b28..4cb8a0af3b 100644
--- a/patches/server/0856-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0852-Track-projectile-source-for-fireworks-from-dispenser.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Track projectile source for fireworks from dispensers
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index d9077127757886e5d5e8d63a46fe27f2bfba1420..764ba041a6be42202d0bcda07ef194ca6909f9d9 100644
+index d9077127757886e5d5e8d63a46fe27f2bfba1420..da3081ff803431288843deda87f90165e2bc73f9 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -517,6 +517,7 @@ public interface DispenseItemBehavior {
                  itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
                  Vec3 vec3d = DispenseItemBehavior.getEntityPokingOutOfBlockPos(pointer, EntityType.FIREWORK_ROCKET, enumdirection);
                  FireworkRocketEntity entityfireworks = new FireworkRocketEntity(pointer.level(), itemstack1, vec3d.x(), vec3d.y(), vec3d.z(), true); // Paper - GH-2871 - fix last firework in stack having no effects when dispensed
-+                entityfireworks.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(pointer.blockEntity()); // PaperTrack projectile source for fireworks from dispensers
++                entityfireworks.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(pointer.blockEntity()); // Paper - Track projectile source for fireworks from dispensers
  
                  entityfireworks.shoot((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), 0.5F, 1.0F);
                  pointer.level().addFreshEntity(entityfireworks);
diff --git a/patches/server/0857-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0853-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0857-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0853-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0858-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0854-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0858-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0854-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0860-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0855-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0860-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0855-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0861-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0856-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0861-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0856-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0862-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0857-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0862-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0857-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0863-Add-Player-Warden-Warning-API.patch b/patches/server/0858-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0863-Add-Player-Warden-Warning-API.patch
rename to patches/server/0858-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0864-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0859-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0864-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0859-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0859-Prevent-compass-from-loading-chunks.patch b/patches/server/0859-Prevent-compass-from-loading-chunks.patch
deleted file mode 100644
index fb597663eb..0000000000
--- a/patches/server/0859-Prevent-compass-from-loading-chunks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 6 Nov 2022 22:35:51 +0000
-Subject: [PATCH] Prevent compass from loading chunks
-
-
-diff --git a/src/main/java/net/minecraft/world/item/CompassItem.java b/src/main/java/net/minecraft/world/item/CompassItem.java
-index 5d3047a420efe59063e90bfc7b42392127e0ad7d..b3c67c954acf7e518d89d6af65a55d6f22dac059 100644
---- a/src/main/java/net/minecraft/world/item/CompassItem.java
-+++ b/src/main/java/net/minecraft/world/item/CompassItem.java
-@@ -77,7 +77,7 @@ public class CompassItem extends Item implements Vanishable {
-                 Optional<ResourceKey<Level>> optional = getLodestoneDimension(compoundTag);
-                 if (optional.isPresent() && optional.get() == world.dimension() && compoundTag.contains("LodestonePos")) {
-                     BlockPos blockPos = NbtUtils.readBlockPos(compoundTag.getCompound("LodestonePos"));
--                    if (!world.isInWorldBounds(blockPos) || !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos)) {
-+                    if (!world.isInWorldBounds(blockPos) || (world.hasChunkAt(blockPos) && !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos))) { // Paper - Prevent compass from loading chunks
-                         compoundTag.remove("LodestonePos");
-                     }
-                 }
diff --git a/patches/server/0865-Add-paper-dumplisteners-command.patch b/patches/server/0860-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0865-Add-paper-dumplisteners-command.patch
rename to patches/server/0860-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0866-check-global-player-list-where-appropriate.patch b/patches/server/0861-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0866-check-global-player-list-where-appropriate.patch
rename to patches/server/0861-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0867-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0862-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0867-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0862-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0868-ItemStack-damage-API.patch b/patches/server/0863-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0868-ItemStack-damage-API.patch
rename to patches/server/0863-ItemStack-damage-API.patch
diff --git a/patches/server/0869-Friction-API.patch b/patches/server/0864-Friction-API.patch
similarity index 100%
rename from patches/server/0869-Friction-API.patch
rename to patches/server/0864-Friction-API.patch
diff --git a/patches/server/0870-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0865-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0870-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0865-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0871-Fix-player-kick-on-shutdown.patch b/patches/server/0866-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0871-Fix-player-kick-on-shutdown.patch
rename to patches/server/0866-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0872-Sync-offhand-slot-in-menus.patch b/patches/server/0867-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0872-Sync-offhand-slot-in-menus.patch
rename to patches/server/0867-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0873-Player-Entity-Tracking-Events.patch b/patches/server/0868-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0873-Player-Entity-Tracking-Events.patch
rename to patches/server/0868-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0874-Limit-pet-look-distance.patch b/patches/server/0869-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0874-Limit-pet-look-distance.patch
rename to patches/server/0869-Limit-pet-look-distance.patch
diff --git a/patches/server/0875-Properly-resend-entities.patch b/patches/server/0870-Properly-resend-entities.patch
similarity index 99%
rename from patches/server/0875-Properly-resend-entities.patch
rename to patches/server/0870-Properly-resend-entities.patch
index d9b427e428..1dc13b7d4d 100644
--- a/patches/server/0875-Properly-resend-entities.patch
+++ b/patches/server/0870-Properly-resend-entities.patch
@@ -98,7 +98,7 @@ index 3f60f33c43dfcc4ea99a80c66a70222b2ea2f4a6..2fdc9fcc8f88d78fd4b06bfae947c5cb
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6310d19a42f549fda7446569958019e8d75a0ca6..85ed7d2134902e2b3455efdb0defbbc8627933bf 100644
+index e018cf9ca617adec197e7fa8e116287633002e62..70a1e695a037833c46749a3371ad866b1971037d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -376,7 +376,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0876-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0871-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0876-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0871-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0877-fix-Instruments.patch b/patches/server/0872-fix-Instruments.patch
similarity index 100%
rename from patches/server/0877-fix-Instruments.patch
rename to patches/server/0872-fix-Instruments.patch
diff --git a/patches/server/0878-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0873-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 87%
rename from patches/server/0878-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0873-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 061b9b4433..097481e10f 100644
--- a/patches/server/0878-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0873-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
@@ -52,23 +52,22 @@ index d91a82428a435a65bc55ad466ccebe91e0d905e0..88d7973e83ee828fa71d95924a913493
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/material/FluidState.java b/src/main/java/net/minecraft/world/level/material/FluidState.java
-index ea2a04e5298832177fac93568656ac45784d5eb6..b4d4082c5488e7cb48166c8bf4443b4ffbbaa761 100644
+index ea2a04e5298832177fac93568656ac45784d5eb6..c5d1e4e293d15831f9b550b9964dc190763956b6 100644
 --- a/src/main/java/net/minecraft/world/level/material/FluidState.java
 +++ b/src/main/java/net/minecraft/world/level/material/FluidState.java
-@@ -26,8 +26,12 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
+@@ -25,9 +25,11 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
+     public static final Codec<FluidState> CODEC = codec(BuiltInRegistries.FLUID.byNameCodec(), Fluid::defaultFluidState).stable();
      public static final int AMOUNT_MAX = 9;
      public static final int AMOUNT_FULL = 8;
++    protected final boolean isEmpty; // Paper - Perf: moved from isEmpty()
  
-+    // Paper start - Perf: moved from isEmpty()
-+    protected final boolean isEmpty;
-+    // Paper end - Perf: moved from isEmpty()
      public FluidState(Fluid fluid, ImmutableMap<Property<?>, Comparable<?>> propertiesMap, MapCodec<FluidState> codec) {
          super(fluid, propertiesMap, codec);
 +        this.isEmpty = fluid.isEmpty(); // Paper - Perf: moved from isEmpty()
      }
  
      public Fluid getType() {
-@@ -43,7 +47,7 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
+@@ -43,7 +45,7 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
      }
  
      public boolean isEmpty() {
diff --git a/patches/server/0879-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0874-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 99%
rename from patches/server/0879-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0874-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 964bd1a9df..f07dc47766 100644
--- a/patches/server/0879-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0874-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
@@ -86,7 +86,7 @@ index 90e1914599b43c8bf813596b3b428d8be3bac1b5..6df0db8b4cdab23494ea34236949ece4
      }
  
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index b65d0c2ac5b4f7eb3da85b693c354463c6f49694..415d387f8cfa3ae99b1c809233c86c18b76ad1e2 100644
+index da3081ff803431288843deda87f90165e2bc73f9..21bba99bf1f06a95cc6834de2886b03ebeb9562f 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -217,7 +217,7 @@ public interface DispenseItemBehavior {
diff --git a/patches/server/0880-Add-BlockLockCheckEvent.patch b/patches/server/0875-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0880-Add-BlockLockCheckEvent.patch
rename to patches/server/0875-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0881-Add-Sneaking-API-for-Entities.patch b/patches/server/0876-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0881-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0876-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0882-Improve-logging-and-errors.patch b/patches/server/0877-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0882-Improve-logging-and-errors.patch
rename to patches/server/0877-Improve-logging-and-errors.patch
diff --git a/patches/server/0883-Improve-PortalEvents.patch b/patches/server/0878-Improve-PortalEvents.patch
similarity index 93%
rename from patches/server/0883-Improve-PortalEvents.patch
rename to patches/server/0878-Improve-PortalEvents.patch
index 333ac5fa11..871198c900 100644
--- a/patches/server/0883-Improve-PortalEvents.patch
+++ b/patches/server/0878-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5968a555ce7cc4681f5c096bda7d007005e2a8bf..04ca1f84c68a73addd2177256268bb9b444f72da 100644
+index 1a44341de58519dff830afce72707c286ac51364..68730383d7ad770cf971e3ae27cff329580b9ea8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3765,7 +3765,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0884-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0879-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0884-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0879-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0885-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0880-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0885-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0880-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0886-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0881-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0886-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0881-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0887-Flying-Fall-Damage.patch b/patches/server/0882-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0887-Flying-Fall-Damage.patch
rename to patches/server/0882-Flying-Fall-Damage.patch
diff --git a/patches/server/0888-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0883-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0888-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0883-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0889-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0884-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 91%
rename from patches/server/0889-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0884-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index a0328af938..b47d9f4550 100644
--- a/patches/server/0889-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0884-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 04ca1f84c68a73addd2177256268bb9b444f72da..2d8223ff9e3f51e43946cfcc1bd638235c48ec11 100644
+index 68730383d7ad770cf971e3ae27cff329580b9ea8..25f611ea672ed8ea112a2e31444d0dbdb59f9945 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1162,7 +1162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0890-config-for-disabling-entity-tag-tags.patch b/patches/server/0885-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0890-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0885-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0891-Use-single-player-info-update-packet-on-join.patch b/patches/server/0886-Use-single-player-info-update-packet-on-join.patch
similarity index 94%
rename from patches/server/0891-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0886-Use-single-player-info-update-packet-on-join.patch
index 79d2c8ce32..2fd99efd57 100644
--- a/patches/server/0891-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0886-Use-single-player-info-update-packet-on-join.patch
@@ -18,7 +18,7 @@ index 6d8d07f30cc18357b2b3a6aa50c54deb1c52f2b7..19c1c398ca8e91faa23e8dc3736cd094
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 85ed7d2134902e2b3455efdb0defbbc8627933bf..a34377fb8774e3c43db9e460c88239e2a5b41f5d 100644
+index 70a1e695a037833c46749a3371ad866b1971037d..64635241bf3c1dd1e2f7e6756b34d497875aa6fa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -358,6 +358,7 @@ public abstract class PlayerList {
@@ -39,7 +39,7 @@ index 85ed7d2134902e2b3455efdb0defbbc8627933bf..a34377fb8774e3c43db9e460c88239e2
              }
  
 -            player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer1)));
-+            onlinePlayers.add(entityplayer1); // Pape - Use single player info update packet on join
++            onlinePlayers.add(entityplayer1); // Paper - Use single player info update packet on join
          }
 +        // Paper start - Use single player info update packet on join
 +        if (!onlinePlayers.isEmpty()) {
diff --git a/patches/server/0892-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0887-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0892-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0887-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0893-Win-Screen-API.patch b/patches/server/0888-Win-Screen-API.patch
similarity index 93%
rename from patches/server/0893-Win-Screen-API.patch
rename to patches/server/0888-Win-Screen-API.patch
index a1212185b0..3ebb9a80e9 100644
--- a/patches/server/0893-Win-Screen-API.patch
+++ b/patches/server/0888-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b8b23105d37ac2d461d87d0c8e3c83c6fd09c960..b1d12c30dd23e092531c0d4d3af367262ccb5402 100644
+index a917c616043f7e17144a52ff4cfe0cc0217087b8..351f6667b76cd4943159fc9c130ff8595f7e3a6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1226,6 +1226,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0894-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0889-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0894-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0889-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0895-Fix-force-opening-enchantment-tables.patch b/patches/server/0890-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0895-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0890-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0896-Add-Entity-Body-Yaw-API.patch b/patches/server/0891-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0896-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0891-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0897-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0892-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0897-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0892-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0898-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0893-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0898-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0893-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0899-Add-EntityFertilizeEggEvent.patch b/patches/server/0894-Add-EntityFertilizeEggEvent.patch
similarity index 98%
rename from patches/server/0899-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0894-Add-EntityFertilizeEggEvent.patch
index e24d728361..bef1395d19 100644
--- a/patches/server/0899-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0894-Add-EntityFertilizeEggEvent.patch
@@ -69,7 +69,7 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ef7d6f898c2c94d0697e38230564e110948b0460..dfab64b21eedfbdd129c881b7c862ad962c78f3d 100644
+index f5a1ff50e8943d7ea75f8b8534b17f7788d094e2..5b95d95c89b962315dd07afb2a426c01c77fc4ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2092,4 +2092,29 @@ public class CraftEventFactory {
diff --git a/patches/server/0900-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0895-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0900-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0895-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0901-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0896-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0901-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0896-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0902-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0897-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0902-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0897-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0903-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0898-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0903-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0898-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0904-Fix-text-display-error-on-spawn.patch b/patches/server/0899-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0904-Fix-text-display-error-on-spawn.patch
rename to patches/server/0899-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0905-Fix-inventories-returning-null-Locations.patch b/patches/server/0900-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0905-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0900-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0906-Add-Shearable-API.patch b/patches/server/0901-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0906-Add-Shearable-API.patch
rename to patches/server/0901-Add-Shearable-API.patch
diff --git a/patches/server/0907-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0902-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0907-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0902-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0908-Optimize-Hoppers.patch b/patches/server/0903-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0908-Optimize-Hoppers.patch
rename to patches/server/0903-Optimize-Hoppers.patch
diff --git a/patches/server/0909-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0904-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0909-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0904-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0910-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0905-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0910-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0905-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0911-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0906-Treat-sequence-violations-like-they-should-be.patch
similarity index 92%
rename from patches/server/0911-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0906-Treat-sequence-violations-like-they-should-be.patch
index 1300b8f449..f0ef8afa4a 100644
--- a/patches/server/0911-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0906-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ab5b354b0fb42535e8d176a219876e23f08c1f3d..b55af3bceba3d78110bc9eac6ea136b43d90cd5d 100644
+index 19c1c398ca8e91faa23e8dc3736cd0945a540419..8a907853a81480f2b1bcb9d82b62d9d595dcbd35 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2043,6 +2043,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0912-remove-duplicate-animate-packet-for-records.patch b/patches/server/0907-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0912-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0907-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0913-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0908-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0913-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0908-Prevent-causing-expired-keys-from-impacting-new-join.patch
index d79d1c3697..be1254f5fd 100644
--- a/patches/server/0913-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0908-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..d43106eb89b14667e85cd6e8fa047d64
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b55af3bceba3d78110bc9eac6ea136b43d90cd5d..48bae46261f592923c8c6f1d56c92ce6a121f1b8 100644
+index 8a907853a81480f2b1bcb9d82b62d9d595dcbd35..caa9fd305c90fe84b2eebca0f244c818800021ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0914-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0909-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 91%
rename from patches/server/0914-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0909-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 05d48a9e06..012562f39d 100644
--- a/patches/server/0914-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0909-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4e8e1f4562b3edb7041e299b6719e965df975636..dae52be48e9789db2fbbff699f3e0c44086c864f 100644
+index 0bf8cf88a3385f21ffc00096a4af5ce76070614e..eff2a7e25a7b99613c1e208058c316f1e3586995 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1724,6 +1724,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0915-Use-array-for-gamerule-storage.patch b/patches/server/0910-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0915-Use-array-for-gamerule-storage.patch
rename to patches/server/0910-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0916-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0911-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0916-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0911-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0917-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0912-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0917-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0912-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0918-Add-Mob-Experience-reward-API.patch b/patches/server/0913-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0918-Add-Mob-Experience-reward-API.patch
rename to patches/server/0913-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0919-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0914-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0919-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0914-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0920-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0915-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 92%
rename from patches/server/0920-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0915-Fix-DamageCause-for-Falling-Blocks.patch
index 7a7127e5a3..0bfd342e6f 100644
--- a/patches/server/0920-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0915-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dfab64b21eedfbdd129c881b7c862ad962c78f3d..c4745b8151f41ab55abe01ac30a5c5e54f1fbf7e 100644
+index 5b95d95c89b962315dd07afb2a426c01c77fc4ab..afa9b967aec163eea0359910bb682395401feaa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1085,6 +1085,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0921-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0916-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0921-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0916-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0922-More-accurate-isInOpenWater-impl.patch b/patches/server/0917-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0922-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0917-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0923-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0918-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0923-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0918-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0924-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0919-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0924-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0919-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0925-Expand-PlayerItemMendEvent.patch b/patches/server/0920-Expand-PlayerItemMendEvent.patch
similarity index 96%
rename from patches/server/0925-Expand-PlayerItemMendEvent.patch
rename to patches/server/0920-Expand-PlayerItemMendEvent.patch
index 6147d4eabf..5b1f473acb 100644
--- a/patches/server/0925-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0920-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index 5685951b71a8b81c7a71fd93b099b276d535b401..b37e13c5de1a0a22a3713d04b203afc6
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1d12c30dd23e092531c0d4d3af367262ccb5402..cc0824b3a8e4cb0bbefd53f91faf3942c097a004 100644
+index 351f6667b76cd4943159fc9c130ff8595f7e3a6b..09cbd4dadfc2c2984fc5f50152e1c3a0f1d5a5b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1754,11 +1754,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -51,7 +51,7 @@ index b1d12c30dd23e092531c0d4d3af367262ccb5402..cc0824b3a8e4cb0bbefd53f91faf3942
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c4745b8151f41ab55abe01ac30a5c5e54f1fbf7e..99befdda75711c815f974d7260d8b979ce4e8694 100644
+index afa9b967aec163eea0359910bb682395401feaa4..8e3799f0c778ae15169fadced83a84e6553a7bc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1321,10 +1321,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0926-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0921-Refresh-ProjectileSource-for-projectiles.patch
similarity index 97%
rename from patches/server/0926-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0921-Refresh-ProjectileSource-for-projectiles.patch
index e6f66bc842..d1d793bb08 100644
--- a/patches/server/0926-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0921-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2d8223ff9e3f51e43946cfcc1bd638235c48ec11..3ef46f1a9859c5ba9ea2fcda3b65816679cfc519 100644
+index 25f611ea672ed8ea112a2e31444d0dbdb59f9945..55e53e6e947107fc27ef8322963a877e2deeb741 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -386,6 +386,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0927-Add-transient-modifier-API.patch b/patches/server/0922-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0927-Add-transient-modifier-API.patch
rename to patches/server/0922-Add-transient-modifier-API.patch
diff --git a/patches/server/0928-Fix-block-place-logic.patch b/patches/server/0923-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0928-Fix-block-place-logic.patch
rename to patches/server/0923-Fix-block-place-logic.patch
diff --git a/patches/server/0929-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0924-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0929-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0924-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0930-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0925-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 96%
rename from patches/server/0930-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0925-Call-BlockGrowEvent-for-missing-blocks.patch
index a3c48d3fff..16cfb6da50 100644
--- a/patches/server/0930-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0925-Call-BlockGrowEvent-for-missing-blocks.patch
@@ -19,7 +19,7 @@ index ba94ff948ccaddc16d3452306722759c115bb90a..acaa13f195467c3ebe70677b8440a883
                  world.setBlock(pos.above(), blockState.setValue(HALF, DoubleBlockHalf.UPPER), 3);
              }
 diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-index 6c025c0fac9bd6373b99e374b773ca626d47ee6d..02939518ead6463e677ecf5b045ec89aae154e8c 100644
+index 4d3dc58750f80d4aacb46c98a8ffc66acb4a2edc..77952da3134d782609c66e93f5d52ec5c10d499d 100644
 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
 @@ -72,8 +72,13 @@ public class SnifferEggBlock extends Block {
diff --git a/patches/server/0931-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0926-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0931-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0926-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0932-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0927-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0932-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0927-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0933-Fix-sniffer-removeExploredLocation.patch b/patches/server/0928-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0933-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0928-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0934-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0929-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0934-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0929-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0935-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0930-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0935-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0930-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0936-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0931-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0936-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0931-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0937-Properly-cancel-usable-items.patch b/patches/server/0932-Properly-cancel-usable-items.patch
similarity index 100%
rename from patches/server/0937-Properly-cancel-usable-items.patch
rename to patches/server/0932-Properly-cancel-usable-items.patch
diff --git a/patches/server/0938-Add-event-for-player-editing-sign.patch b/patches/server/0933-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0938-Add-event-for-player-editing-sign.patch
rename to patches/server/0933-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0939-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0934-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0939-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0934-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0940-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0935-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0940-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0935-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0941-Add-option-to-disable-block-updates.patch b/patches/server/0936-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0941-Add-option-to-disable-block-updates.patch
rename to patches/server/0936-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0942-Call-missing-BlockDispenseEvent.patch b/patches/server/0937-Call-missing-BlockDispenseEvent.patch
similarity index 96%
rename from patches/server/0942-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0937-Call-missing-BlockDispenseEvent.patch
index 09aac68d23..87c9052b3c 100644
--- a/patches/server/0942-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0937-Call-missing-BlockDispenseEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call missing BlockDispenseEvent
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 415d387f8cfa3ae99b1c809233c86c18b76ad1e2..5165651f1ddcda78f2551d02ca5a4a5ea97ac91a 100644
+index 21bba99bf1f06a95cc6834de2886b03ebeb9562f..97cff1d1c92f3c06897c7ef5da612eca0ee49b2f 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -1106,6 +1106,13 @@ public interface DispenseItemBehavior {
@@ -50,7 +50,7 @@ index 415d387f8cfa3ae99b1c809233c86c18b76ad1e2..5165651f1ddcda78f2551d02ca5a4a5e
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 99befdda75711c815f974d7260d8b979ce4e8694..ba7f9ac6068bae43c628015fa07b32794fea9369 100644
+index 8e3799f0c778ae15169fadced83a84e6553a7bc0..3f8195475fbad4d517d5417ece9555831377d1cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2098,6 +2098,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0943-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0938-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 90%
rename from patches/server/0943-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0938-Don-t-load-chunks-for-supporting-block-checks.patch
index b9ac71bda7..6ecacbc828 100644
--- a/patches/server/0943-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0938-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3ef46f1a9859c5ba9ea2fcda3b65816679cfc519..d3ec25371478e5f4bfb3886f4765f6eaf54a39ce 100644
+index 55e53e6e947107fc27ef8322963a877e2deeb741..148f146da8f5887deaa52991a8e484d54918f2b9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1362,7 +1362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0944-Optimize-player-lookups-for-beacons.patch b/patches/server/0939-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0944-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0939-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0945-Add-Sign-getInteractableSideFor.patch b/patches/server/0940-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0945-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0940-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0946-Array-backed-synched-entity-data.patch b/patches/server/0941-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0946-Array-backed-synched-entity-data.patch
rename to patches/server/0941-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0947-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0942-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0947-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0942-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0948-Fix-BanList-API.patch b/patches/server/0943-Fix-BanList-API.patch
similarity index 99%
rename from patches/server/0948-Fix-BanList-API.patch
rename to patches/server/0943-Fix-BanList-API.patch
index f61cc30d0c..f7a8267da4 100644
--- a/patches/server/0948-Fix-BanList-API.patch
+++ b/patches/server/0943-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cc0824b3a8e4cb0bbefd53f91faf3942c097a004..4c5ad6275f12a656d5d02ba1c0736fed55ac561e 100644
+index 09cbd4dadfc2c2984fc5f50152e1c3a0f1d5a5b6..28d1c112a0526162c9886cabb54c4be93e16fbb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1652,23 +1652,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0949-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0944-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0949-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0944-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0950-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0945-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0950-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0945-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0951-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0946-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0951-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0946-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0952-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0947-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 93%
rename from patches/server/0952-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0947-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 0a5366e668..afca54d6a6 100644
--- a/patches/server/0952-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0947-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ba7f9ac6068bae43c628015fa07b32794fea9369..ab576ca90606d3c9dabf08ae9f37a339cf1c3f5a 100644
+index 3f8195475fbad4d517d5417ece9555831377d1cc..cf4e32d5199b15bd8d72e412982dfbecde183f91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -734,7 +734,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0953-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0948-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0953-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0948-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0954-Add-whitelist-events.patch b/patches/server/0949-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0954-Add-whitelist-events.patch
rename to patches/server/0949-Add-whitelist-events.patch
diff --git a/patches/server/0955-Implement-PlayerFailMoveEvent.patch b/patches/server/0950-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0955-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0950-Implement-PlayerFailMoveEvent.patch
index 807a4fa81e..a961551be4 100644
--- a/patches/server/0955-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0950-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 589662812bc6f6fb09d50d8793c7ed4cb1140af8..12d714fe819fedd358921c1a146372087e5fb9d1 100644
+index 3f9106eb34db5df10961a44f56f2110fec8bd3c6..e400efa2219fca219ee52021c664409907bc839d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1316,8 +1316,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0956-Folia-scheduler-and-owned-region-API.patch b/patches/server/0951-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0956-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0951-Folia-scheduler-and-owned-region-API.patch
index 22f55be902..ca07db017c 100644
--- a/patches/server/0956-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0951-Folia-scheduler-and-owned-region-API.patch
@@ -1173,7 +1173,7 @@ index 45f7e7efa8cf407cae2db657074478565590bd12..d34f0d5abd93ed1729a00405d78a34a1
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a9cc3d7213f51a2a2cdc915fd9ab3cf97767b698..69e75aec30e8c25f621c8e7d024abe672395a0ef 100644
+index 64635241bf3c1dd1e2f7e6756b34d497875aa6fa..a23b05d49e900287314fb93ae0355daed81b16a8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -649,6 +649,7 @@ public abstract class PlayerList {
@@ -1185,7 +1185,7 @@ index a9cc3d7213f51a2a2cdc915fd9ab3cf97767b698..69e75aec30e8c25f621c8e7d024abe67
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d3ec25371478e5f4bfb3886f4765f6eaf54a39ce..9cf6c04878520bb4f490b13dcdc113e64d2af8af 100644
+index 148f146da8f5887deaa52991a8e484d54918f2b9..acf14c919150f12ddc5ec87bc06e93a8eca6232a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -249,11 +249,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0957-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0952-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0957-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0952-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0958-API-for-updating-recipes-on-clients.patch b/patches/server/0953-API-for-updating-recipes-on-clients.patch
similarity index 97%
rename from patches/server/0958-API-for-updating-recipes-on-clients.patch
rename to patches/server/0953-API-for-updating-recipes-on-clients.patch
index 3daf8af5d6..09d95fb6d7 100644
--- a/patches/server/0958-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0953-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 69e75aec30e8c25f621c8e7d024abe672395a0ef..b33f6f3ceb279eb5a36df7d37d56bfce951c3de7 100644
+index a23b05d49e900287314fb93ae0355daed81b16a8..80777d7fb68b8eac7c00df256ba614772163f49f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1545,6 +1545,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0959-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0954-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0959-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0954-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0960-Only-capture-actual-tree-growth.patch b/patches/server/0955-Only-capture-actual-tree-growth.patch
similarity index 95%
rename from patches/server/0960-Only-capture-actual-tree-growth.patch
rename to patches/server/0955-Only-capture-actual-tree-growth.patch
index 1144b348a5..7baa74d7a4 100644
--- a/patches/server/0960-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0955-Only-capture-actual-tree-growth.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Only capture actual tree growth
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 5165651f1ddcda78f2551d02ca5a4a5ea97ac91a..6b7d8b7b6665aa87af4bd8aa00f75fb2c9dd4b6b 100644
+index 97cff1d1c92f3c06897c7ef5da612eca0ee49b2f..6e19de21b6bb643961afc1d5eced3e0d0d98a027 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -862,6 +862,7 @@ public interface DispenseItemBehavior {
@@ -29,7 +29,7 @@ index 244fcdcb153b1f4d842405302261afe1cce67daa..32a3729b9f1caca789af8176737fc510
                      }
                      entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 28e56e61ff5c14683f55780ed83e593f6b06503c..2c2189a31c608c99abe6a9c0a78bdcb717b51aba 100644
+index 28e56e61ff5c14683f55780ed83e593f6b06503c..a8d22b48bd7108ca22faae178fcf82cb158ee7bb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1898,4 +1898,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -41,7 +41,7 @@ index 28e56e61ff5c14683f55780ed83e593f6b06503c..2c2189a31c608c99abe6a9c0a78bdcb7
 +        // notify observers if the block state is the same and the Y level equals the original y level (for mega trees)
 +        // blocks at the same Y level with the same state can be assumed to be saplings which trigger observers regardless of if the
 +        // tree grew or not
-+        if (craftBlockState.getPosition().getY() == pos.getY() && this.getBlockState(craftBlockState.getPosition()) == craftBlockState.getHandle()) { // Paper - Fix silent equipment change
++        if (craftBlockState.getPosition().getY() == pos.getY() && this.getBlockState(craftBlockState.getPosition()) == craftBlockState.getHandle()) {
 +            this.notifyAndUpdatePhysics(craftBlockState.getPosition(), null, craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getFlag(), 512);
 +        }
 +    }
diff --git a/patches/server/0961-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0956-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0961-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0956-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0962-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0957-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0962-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0957-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0963-Use-correct-seed-on-api-world-load.patch b/patches/server/0958-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0963-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0958-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0964-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0959-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0964-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0959-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0965-Cache-map-ids-on-item-frames.patch b/patches/server/0960-Cache-map-ids-on-item-frames.patch
similarity index 96%
rename from patches/server/0965-Cache-map-ids-on-item-frames.patch
rename to patches/server/0960-Cache-map-ids-on-item-frames.patch
index daee952d39..2d3d641bd8 100644
--- a/patches/server/0965-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0960-Cache-map-ids-on-item-frames.patch
@@ -18,7 +18,7 @@ index 4eee77a14c941b637ec9e9dc844e67c5e933bfe7..148a6a2739dee63147c5244376892a24
  
                      if (worldmap != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 9c11d0af958ec47408d238d34d30750d29ecdd88..8994385e95df467166985083fbdaa89dc1949f91 100644
+index 1ef8bbade35c3e18f53808a9955ba69750b7d30f..c5ec729470aa2b17c6963605cd10b8f53bae5e59 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -50,6 +50,7 @@ public class ItemFrame extends HangingEntity {
diff --git a/patches/server/0966-Fix-custom-statistic-criteria-creation.patch b/patches/server/0961-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0966-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0961-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0967-Bandaid-fix-for-Effect.patch b/patches/server/0962-Bandaid-fix-for-Effect.patch
similarity index 98%
rename from patches/server/0967-Bandaid-fix-for-Effect.patch
rename to patches/server/0962-Bandaid-fix-for-Effect.patch
index 7ded4e8342..68d8c369e1 100644
--- a/patches/server/0967-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0962-Bandaid-fix-for-Effect.patch
@@ -73,7 +73,7 @@ index e3a1a1ed5f165d7d37a4f760e5ab7ecbea993a0e..6bd86a7183042f9023b9e8cf6423e0a1
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4c5ad6275f12a656d5d02ba1c0736fed55ac561e..b9431260c928c264eac9b4d64f5692945a5a0b1b 100644
+index 28d1c112a0526162c9886cabb54c4be93e16fbb6..8bc528408164427380277f3805d5275ebd7c7bb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -873,7 +873,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0968-SculkCatalyst-bloom-API.patch b/patches/server/0963-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0968-SculkCatalyst-bloom-API.patch
rename to patches/server/0963-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0969-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0964-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0969-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0964-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0965-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 96%
rename from patches/server/0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0965-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 88e0ced558..c58acbd21b 100644
--- a/patches/server/0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0965-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 526b52bbf7c5d82645d26710f05e62b781e3cb0e..4af505a8b6074c49f2d16a6447eeaf038c7804e6 100644
+index a9c94645a4bf3837bce5622b76f0d24a5a4ef065..cc1b903111730d4042fdbf4d2dae88ae72ac4bc8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -386,8 +386,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -61,7 +61,7 @@ index 1483007b79e18107e41037c279e048f04f666d1d..5152979bf81345fc365e7b16028c7d97
                      spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index de27b8d578d429564038e01cef5f46d4d3d7e81c..42c42d599d5b4827693cfe3f6cf9a32e67f2e16c 100644
+index 2c3a6cee9519f44c40227c5d9cbd63cc483d2d60..8659402aa75a8e2dd26b11c309852164edb6a799 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0971-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0966-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0971-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0966-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0967-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0967-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index dade7b8eda..20d19d27c2 100644
--- a/patches/server/0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0967-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 12d714fe819fedd358921c1a146372087e5fb9d1..7f26b1e279eb750476fe6200e8c17416467c92d9 100644
+index e400efa2219fca219ee52021c664409907bc839d..17d5efa7ee85b50201c117dc4583e3153c84765f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -807,6 +807,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0973-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0968-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0973-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0968-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0974-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0969-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0974-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0969-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0975-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0970-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 94%
rename from patches/server/0975-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0970-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 39e1032196..64db2f97e3 100644
--- a/patches/server/0975-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0970-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4af505a8b6074c49f2d16a6447eeaf038c7804e6..00a98841d88e8b13501116caa7a03534e1025159 100644
+index cc1b903111730d4042fdbf4d2dae88ae72ac4bc8..3ba98e9bf7db37567d38d62eef6825eba57afdc6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1419,6 +1419,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0976-Add-Listing-API-for-Player.patch b/patches/server/0971-Add-Listing-API-for-Player.patch
similarity index 99%
rename from patches/server/0976-Add-Listing-API-for-Player.patch
rename to patches/server/0971-Add-Listing-API-for-Player.patch
index a637d367e4..91f51e73e9 100644
--- a/patches/server/0976-Add-Listing-API-for-Player.patch
+++ b/patches/server/0971-Add-Listing-API-for-Player.patch
@@ -74,7 +74,7 @@ index d43106eb89b14667e85cd6e8fa047d64f2e8ec87..56eddd28429cf42c02d88b8bf79f8b61
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 359fb75e1ea580bfd5c1b9400000c0c4c8fa08c8..77f585edf113033dc3d7de874d388f4de209fd3b 100644
+index 80777d7fb68b8eac7c00df256ba614772163f49f..ed11fec21b0c3a60fe8c14e699eb3a3823044d66 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -356,14 +356,22 @@ public abstract class PlayerList {
diff --git a/patches/server/0977-Configurable-Region-Compression-Format.patch b/patches/server/0972-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0977-Configurable-Region-Compression-Format.patch
rename to patches/server/0972-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0978-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0973-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 96%
rename from patches/server/0978-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0973-Add-BlockFace-to-BlockDamageEvent.patch
index 23778beed4..9b16eb255a 100644
--- a/patches/server/0978-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0973-Add-BlockFace-to-BlockDamageEvent.patch
@@ -18,7 +18,7 @@ index 1a50a5195043e5e6d6e367c387687480829a3471..8bfd31ce3b4f88f0b32adb242c53771d
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ab576ca90606d3c9dabf08ae9f37a339cf1c3f5a..f5369658f26ccdd9311686bd0f309b9f849cb0b6 100644
+index cf4e32d5199b15bd8d72e412982dfbecde183f91..92584ad04d35c021e1f16ca2338eafe9b07e8ff7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -649,13 +649,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0979-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0974-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0979-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0974-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0980-Expand-Pose-API.patch b/patches/server/0975-Expand-Pose-API.patch
similarity index 95%
rename from patches/server/0980-Expand-Pose-API.patch
rename to patches/server/0975-Expand-Pose-API.patch
index 8117e562a8..8b0e076d97 100644
--- a/patches/server/0980-Expand-Pose-API.patch
+++ b/patches/server/0975-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9cf6c04878520bb4f490b13dcdc113e64d2af8af..aef714923ff1e9d476aacd9bfaa80f85dc84890b 100644
+index acf14c919150f12ddc5ec87bc06e93a8eca6232a..47857a43753e86d1c7c535e69ed07b31d753ad99 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -423,6 +423,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0981-More-DragonBattle-API.patch b/patches/server/0976-More-DragonBattle-API.patch
similarity index 97%
rename from patches/server/0981-More-DragonBattle-API.patch
rename to patches/server/0976-More-DragonBattle-API.patch
index ccbfe560ab..62707b07e2 100644
--- a/patches/server/0981-More-DragonBattle-API.patch
+++ b/patches/server/0976-More-DragonBattle-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals
 public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 390542c42fe957e8e2d21c879c1c8908c8970b44..36b0912fa2fd64b83a163112df478e67408e089b 100644
+index 1469ad613e71bcf0fa8fb9b3389eb830dbd72ca0..e0f11a4ec60a72c510af8fa4297eee3727c791bc 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -439,6 +439,24 @@ public class EndDragonFight {
diff --git a/patches/server/0982-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0977-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0982-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0977-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0983-Add-PlayerPickItemEvent.patch b/patches/server/0978-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0983-Add-PlayerPickItemEvent.patch
rename to patches/server/0978-Add-PlayerPickItemEvent.patch
index 1ecd26fcc0..0b39b25b31 100644
--- a/patches/server/0983-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0978-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f26b1e279eb750476fe6200e8c17416467c92d9..84741f5a9d63b1dbe9e4ab1cfe4179cc3f3ff3c1 100644
+index 17d5efa7ee85b50201c117dc4583e3153c84765f..8efcbf7eee4eecfc7ee256fc07f5cae216b073a3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -944,8 +944,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0984-Improve-performance-of-mass-crafts.patch b/patches/server/0979-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0984-Improve-performance-of-mass-crafts.patch
rename to patches/server/0979-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0985-Allow-trident-custom-damage.patch b/patches/server/0980-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0985-Allow-trident-custom-damage.patch
rename to patches/server/0980-Allow-trident-custom-damage.patch
diff --git a/patches/server/0986-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0981-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0986-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0981-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0987-Optimize-nearest-structure-border-iteration.patch b/patches/server/0982-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0987-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0982-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0988-Implement-OfflinePlayer-isConnected.patch b/patches/server/0983-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/0988-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0983-Implement-OfflinePlayer-isConnected.patch
index 1a7a2582e9..7c630654e4 100644
--- a/patches/server/0988-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0983-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d9a0ee62892a2f8044d874d262125ea03ee60057..85983812ac86ead64bdf3789a49c46302a9566ef 100644
+index 5c3a9c7d6b2d9a810edbb356fb3cdde40b3194b1..874036b417471d4eeb14e0ab387f219c7b3e7975 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -279,6 +279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0989-Fix-inventory-desync.patch b/patches/server/0984-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0989-Fix-inventory-desync.patch
rename to patches/server/0984-Fix-inventory-desync.patch
diff --git a/patches/server/0990-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0985-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 97%
rename from patches/server/0990-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0985-Add-titleOverride-to-InventoryOpenEvent.patch
index 2942806413..40db91caa7 100644
--- a/patches/server/0990-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0985-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 42c42d599d5b4827693cfe3f6cf9a32e67f2e16c..2eb320dc136712aac3896a5aacf8800dc2c121ba 100644
+index 8659402aa75a8e2dd26b11c309852164edb6a799..66c43cb293d4fef727c6d3e7c09cab874bb3eef6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1573,12 +1573,17 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 897e693492bdf9293154535d5772929bc2b1a523..827fe201a7b74f485abb46b127a28bf0
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f5369658f26ccdd9311686bd0f309b9f849cb0b6..57b11760b420f09111899a7e19f0d555785b425f 100644
+index 92584ad04d35c021e1f16ca2338eafe9b07e8ff7..6e3d13d6c60491b7147f8bb3d60354b01d047cc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1440,10 +1440,21 @@ public class CraftEventFactory {
diff --git a/patches/server/0991-Configure-sniffer-egg-hatch-time.patch b/patches/server/0986-Configure-sniffer-egg-hatch-time.patch
similarity index 94%
rename from patches/server/0991-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0986-Configure-sniffer-egg-hatch-time.patch
index dd9b57737f..0899af12fe 100644
--- a/patches/server/0991-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0986-Configure-sniffer-egg-hatch-time.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configure sniffer egg hatch time
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-index 02939518ead6463e677ecf5b045ec89aae154e8c..a18b85769d5d46efa43b0cd2face958b3250571a 100644
+index 77952da3134d782609c66e93f5d52ec5c10d499d..f11f52c76dea7acb30bf6cc314c533f1dc0f3f0d 100644
 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
 @@ -63,7 +63,7 @@ public class SnifferEggBlock extends Block {
diff --git a/patches/server/0992-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0987-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 97%
rename from patches/server/0992-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0987-Do-crystal-portal-proximity-check-before-entity-look.patch
index 2ae71ff137..c5c4ed65ca 100644
--- a/patches/server/0992-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0987-Do-crystal-portal-proximity-check-before-entity-look.patch
@@ -34,7 +34,7 @@ index ca1edc083847b47bb450b291723aca778a5912dc..e1696f6b77df4c8fceaece64701d4db7
                      }
  
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 36b0912fa2fd64b83a163112df478e67408e089b..e1604fd1fb5f779b5fb96f98c94918e4db88918a 100644
+index e0f11a4ec60a72c510af8fa4297eee3727c791bc..6046dc009c59ac3472eca6a8cfb759eacbfbc70a 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -558,6 +558,12 @@ public class EndDragonFight {
diff --git a/patches/server/0993-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0988-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0993-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0988-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0994-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0989-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 93%
rename from patches/server/0994-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0989-Add-slot-sanity-checks-in-container-clicks.patch
index 779817084e..c8db5d7d1a 100644
--- a/patches/server/0994-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0989-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 84741f5a9d63b1dbe9e4ab1cfe4179cc3f3ff3c1..75a763afecd63ab1b4c020460da58c8364e950b7 100644
+index 8efcbf7eee4eecfc7ee256fc07f5cae216b073a3..8568de90c39838e1627f286c5c3ca4b0f19002cb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2992,6 +2992,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -22,7 +22,7 @@ index 84741f5a9d63b1dbe9e4ab1cfe4179cc3f3ff3c1..75a763afecd63ab1b4c020460da58c83
                                  Slot clickedSlot = this.player.containerMenu.getSlot(packet.getSlotNum());
                                  if (clickedSlot.mayPickup(this.player)) {
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 9ee3c2e0dcfaa4280be4973479c6490ded33809c..924e2d510752aa332129d79574ce85c5a4d5f0a4 100644
+index cd82b7e83f79e813d9d87d074bbccad4d2712d60..b50d04415539f84ce0b7c24c1f97be24b21e7f14 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -423,6 +423,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0995-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0990-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0995-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0990-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0996-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0991-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0996-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0991-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0997-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0992-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/0997-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0992-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0998-Fix-spigot-s-Forced-Stats.patch b/patches/server/0993-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0998-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0993-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0999-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0994-Add-missing-InventoryHolders-to-inventories.patch
similarity index 99%
rename from patches/server/0999-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0994-Add-missing-InventoryHolders-to-inventories.patch
index f0f3ef98aa..eb31184f55 100644
--- a/patches/server/0999-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0994-Add-missing-InventoryHolders-to-inventories.patch
@@ -57,7 +57,7 @@ index ff1aba1e69cfde633fd01724f1a8d0af7f59437f..9546d93f90ca34b4d35bd98df847bf89
      public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) {
          this.bukkitOwner = owner;
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 924e2d510752aa332129d79574ce85c5a4d5f0a4..eb8155e29821d5622320d69041c5a1a6406afbbc 100644
+index b50d04415539f84ce0b7c24c1f97be24b21e7f14..47a3c18401e2df4c89908691348f2411d3ef6fda 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -1029,4 +1029,15 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/1000-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0995-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1000-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0995-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1001-Actually-optimise-explosions.patch b/patches/server/0996-Actually-optimise-explosions.patch
similarity index 99%
rename from patches/server/1001-Actually-optimise-explosions.patch
rename to patches/server/0996-Actually-optimise-explosions.patch
index 879be2c332..4010a95875 100644
--- a/patches/server/1001-Actually-optimise-explosions.patch
+++ b/patches/server/0996-Actually-optimise-explosions.patch
@@ -34,7 +34,7 @@ The results indicate that this logic is 5 times faster than Vanilla
 and 2.3 times faster than Lithium.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index dbe679bb81a903668262cdf629469e971b49e088..9442f58dff89ec843c321533965fbee2727d02f8 100644
+index 7bb8dc1f4697960cdc6bac0daec4b7a06a2dd7c4..210b6d71207b99e66ba014b176b2c1445053b1d1 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -111,6 +111,271 @@ public class Explosion {
diff --git a/patches/server/1002-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0997-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/1002-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0997-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1003-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0998-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/1003-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/0998-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1004-Fix-SuspiciousStewMeta.patch b/patches/server/0999-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/1004-Fix-SuspiciousStewMeta.patch
rename to patches/server/0999-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1005-Optimise-chunk-tick-iteration.patch b/patches/server/1000-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/1005-Optimise-chunk-tick-iteration.patch
rename to patches/server/1000-Optimise-chunk-tick-iteration.patch
index 335327b20a..8897e12ee3 100644
--- a/patches/server/1005-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1000-Optimise-chunk-tick-iteration.patch
@@ -108,7 +108,7 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..627a88ec8c3b215b19b55a6d461c8754
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 00a98841d88e8b13501116caa7a03534e1025159..abe94c37513f41dce1ec924d00205a752d3195aa 100644
+index 3ba98e9bf7db37567d38d62eef6825eba57afdc6..e7cb1eb0740dcf8184a609172031f45fbf92957b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -191,6 +191,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -365,7 +365,7 @@ index 5152979bf81345fc365e7b16028c7d970d2f5856..44ada45d9bf2d9b48e5de1c3cb1a8559
              gameprofilerfiller.pop();
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2eb320dc136712aac3896a5aacf8800dc2c121ba..67a4c0a436cb1a0b5b9fc7c80dc501b1fb546f8f 100644
+index 66c43cb293d4fef727c6d3e7c09cab874bb3eef6..daa42371a100928c399d3684e101707386198f72 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -325,6 +325,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1006-Lag-compensation-ticks.patch b/patches/server/1001-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/1006-Lag-compensation-ticks.patch
rename to patches/server/1001-Lag-compensation-ticks.patch
diff --git a/patches/server/1007-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1002-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/1007-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/1002-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1008-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1003-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/1008-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/1003-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1009-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1004-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1009-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/1004-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1010-Optimise-nearby-player-retrieval.patch b/patches/server/1005-Optimise-nearby-player-retrieval.patch
similarity index 98%
rename from patches/server/1010-Optimise-nearby-player-retrieval.patch
rename to patches/server/1005-Optimise-nearby-player-retrieval.patch
index 764647638f..e170ab23cb 100644
--- a/patches/server/1010-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1005-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2e293fb94024d21769faf0e60e79e91efac79007..9f1ba9240b6a8ea0ca19344a49e93a63e3132729 100644
+index 973a9deba3b11399cafb3482f4c56c9c648c4d5f..dcd3b58165df89fa57e37df532dad263cd124f6a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -581,6 +581,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -208,7 +208,7 @@ index 58422f00c7d64dbd1cf6d7211c9838875cbe7778..c157309ac78e7af084d3acb6e8b2bcd4
      private boolean testInvisible = true;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index b3293a722fb5c5262a777402140c764c03367800..bb685325e6cb2ac5ddccfca8602013e38b4a4891 100644
+index a3d15f30eaab29d85cb6b3d693df9980a880f686..ff0b7b9e4ae3aa0c170d05bc51fd7ff26e7531ee 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
 @@ -230,9 +230,13 @@ public interface EntityGetter {
diff --git a/patches/server/1011-Fix-missing-map-initialize-event-call.patch b/patches/server/1006-Fix-missing-map-initialize-event-call.patch
similarity index 95%
rename from patches/server/1011-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1006-Fix-missing-map-initialize-event-call.patch
index 8e3ae38957..c04e5b3249 100644
--- a/patches/server/1011-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1006-Fix-missing-map-initialize-event-call.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9f1ba9240b6a8ea0ca19344a49e93a63e3132729..ad4a987c1de4265f9f0d6a8769aaed95d0a66786 100644
+index dcd3b58165df89fa57e37df532dad263cd124f6a..01c7b3623314bb0e6fa0a135de3db7c42ca5e373 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2133,13 +2133,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1012-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1007-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1012-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1007-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1013-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1008-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1013-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1008-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1014-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1009-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1014-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1009-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1015-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1010-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1015-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1010-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1016-Add-player-idle-duration-API.patch b/patches/server/1011-Add-player-idle-duration-API.patch
similarity index 91%
rename from patches/server/1016-Add-player-idle-duration-API.patch
rename to patches/server/1011-Add-player-idle-duration-API.patch
index a3b91651f5..d57581e539 100644
--- a/patches/server/1016-Add-player-idle-duration-API.patch
+++ b/patches/server/1011-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 85983812ac86ead64bdf3789a49c46302a9566ef..2a639bc8d3edca5eb7bfca2cc117b56587e5e525 100644
+index 874036b417471d4eeb14e0ab387f219c7b3e7975..8e7d4c52b95a85e97152c810dd93fe0575c063a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3311,6 +3311,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1017-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1012-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 91%
rename from patches/server/1017-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1012-Don-t-check-if-we-can-see-non-visible-entities.patch
index 5bfab6e4e0..19ba458122 100644
--- a/patches/server/1017-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1012-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check if we can see non-visible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index abe94c37513f41dce1ec924d00205a752d3195aa..4a473f75c1c14549acd134c20adbe0c52663405f 100644
+index e7cb1eb0740dcf8184a609172031f45fbf92957b..4160fff108cc83bc0a1f0a0389ab22f722d483b4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1435,7 +1435,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/1018-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1013-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1018-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1013-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1014-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 90%
rename from patches/server/1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1014-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 9267ffa134..90d3ad7a75 100644
--- a/patches/server/1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1014-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2a639bc8d3edca5eb7bfca2cc117b56587e5e525..132692091fdec45f0330c8bc668cc16873db2976 100644
+index 8e7d4c52b95a85e97152c810dd93fe0575c063a5..0b9a29c0e36d18282e8a65aa8b05523334fffe74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1083,7 +1083,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1020-Optimize-VarInts.patch b/patches/server/1015-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1020-Optimize-VarInts.patch
rename to patches/server/1015-Optimize-VarInts.patch
diff --git a/patches/server/1021-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1016-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/1021-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1016-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1022-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1017-Add-predicate-for-blocks-when-raytracing.patch
similarity index 95%
rename from patches/server/1022-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1017-Add-predicate-for-blocks-when-raytracing.patch
index a2bf2131a9..750db7206c 100644
--- a/patches/server/1022-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/1017-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate for blocks when raytracing
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 799837c172a5f7856c78e6fe2595c575f3058a5e..0abbe9be08cf7450f5d2d17deed590053c77a528 100644
+index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..4b7ea18a34675702c5b17c4819f7977807c1c935 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
 @@ -83,6 +83,12 @@ public interface BlockGetter extends LevelHeightAccessor {
@@ -24,10 +24,10 @@ index 799837c172a5f7856c78e6fe2595c575f3058a5e..0abbe9be08cf7450f5d2d17deed59005
 @@ -92,7 +98,7 @@ public interface BlockGetter extends LevelHeightAccessor {
                  return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
              }
-             // Paper end
--            if (iblockdata.isAir()) return null; // Paper - optimise air cases
-+            if (iblockdata.isAir() || (canCollide != null && this instanceof LevelAccessor levelAccessor && !canCollide.test(org.bukkit.craftbukkit.block.CraftBlock.at(levelAccessor, blockposition)))) return null; // Paper - optimise air cases and check canCollide predicate
-             FluidState fluid = iblockdata.getFluidState(); // Paper - don't need to go to world state again
+             // Paper end - Prevent raytrace from loading chunks
+-            if (iblockdata.isAir()) return null; // Paper - Perf: optimise air cases
++            if (iblockdata.isAir() || (canCollide != null && this instanceof LevelAccessor levelAccessor && !canCollide.test(org.bukkit.craftbukkit.block.CraftBlock.at(levelAccessor, blockposition)))) return null; // Paper - Perf: optimise air cases &g check canCollide predicate
+             FluidState fluid = iblockdata.getFluidState(); // Paper - Perf: don't need to go to world state again
              Vec3 vec3d = raytrace1.getFrom();
              Vec3 vec3d1 = raytrace1.getTo();
 @@ -108,8 +114,14 @@ public interface BlockGetter extends LevelHeightAccessor {
diff --git a/patches/server/1023-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1018-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/1023-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1018-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/1024-Expand-LingeringPotion-API.patch b/patches/server/1019-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/1024-Expand-LingeringPotion-API.patch
rename to patches/server/1019-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1025-Add-MaterialTagsTest.patch b/patches/server/1020-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1025-Add-MaterialTagsTest.patch
rename to patches/server/1020-Add-MaterialTagsTest.patch
diff --git a/patches/server/1026-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1021-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/1026-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1021-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1027-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1022-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1027-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1022-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1028-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1023-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 97%
rename from patches/server/1028-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1023-Fix-several-issues-with-EntityBreedEvent.patch
index 22f13f1ab2..7ed4b69881 100644
--- a/patches/server/1028-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/1023-Fix-several-issues-with-EntityBreedEvent.patch
@@ -54,7 +54,7 @@ index 907ed82fea71254d6624eda878e2668cd26422a7..081d1e38b7b1f286e138b0981aaa760e
          this.level().broadcastEntityEvent(this, (byte) 18);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 683cc5f9f066d554383fcd30e3654ac06ec76510..089328028b9f82be3ddbfab42b6d0f015c4b71b5 100644
+index 25a7602670b9f736b3b9ff4523bc867e65c0998a..ead5060ae2840a0519c5bf8b4b84aa12cc41b02a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -649,8 +649,9 @@ public class Panda extends Animal {
@@ -69,7 +69,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..089328028b9f82be3ddbfab42b6d0f01
                  if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
                      return InteractionResult.PASS;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 1d9427da270edb447a2c8e031c4f05fe5d39603b..01b07320d8c94907e41283d5bc8943da2bbc6c6e 100644
+index 17cff1a4657f688ed704404f76f6ceead3be3be1..abd913079c00f335944c8eb590fd08bd518b1a10 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -389,7 +389,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
diff --git a/patches/server/1029-Add-UUID-attribute-modifier-API.patch b/patches/server/1024-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1029-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1024-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1030-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1025-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/1030-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1025-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1031-Lazily-create-LootContext-for-criterions.patch b/patches/server/1026-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1031-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1026-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1032-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/1027-Don-t-fire-sync-events-during-worldgen.patch
similarity index 100%
rename from patches/server/1032-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/1027-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/1033-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1028-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/1033-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1028-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1034-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1029-Restore-vanilla-entity-drops-behavior.patch
similarity index 97%
rename from patches/server/1034-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1029-Restore-vanilla-entity-drops-behavior.patch
index 3f6577f1b1..e6e08469f8 100644
--- a/patches/server/1034-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/1029-Restore-vanilla-entity-drops-behavior.patch
@@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped
 items like CB does.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 67a4c0a436cb1a0b5b9fc7c80dc501b1fb546f8f..d8bea03eb39b393751a69c4cfc8c004215ebd3d3 100644
+index daa42371a100928c399d3684e101707386198f72..0a1977905de97522cf3311f59a2cdc6c0a5f98f9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -944,22 +944,20 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 67a4c0a436cb1a0b5b9fc7c80dc501b1fb546f8f..d8bea03eb39b393751a69c4cfc8c0042
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d77faa799de1b7cc23adb91d82a45a05532532f1..29853426230ef7e95c7060cf1a44870d369d5f68 100644
+index b240dc6a1e45b534a017806b41ddb76423691ee7..14fbaef2215f7de4acb5303ad6f677b348f855d8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2703,6 +2703,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -104,7 +104,7 @@ index d77faa799de1b7cc23adb91d82a45a05532532f1..29853426230ef7e95c7060cf1a44870d
              return this.spawnAtLocation(entityitem);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7204fc4d535fb7cf5579aa51148e6a1262f3124d..3b7459226ae022c9e1de6dbf775046a767b409c9 100644
+index a42023793805b294dc167ec2cd5445f32b0c51eb..38793c3ab6db7e311866de88ba272b8e98178a4b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -254,7 +254,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -165,7 +165,7 @@ index ab708b256183fc54fe8e13f341d8a38acf611739..a9c1f99ba2461333bd154ac16e812031
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 57b11760b420f09111899a7e19f0d555785b425f..b648d1960280d6aa235e511edf30848ee20bb693 100644
+index 6e3d13d6c60491b7147f8bb3d60354b01d047cc7..24917c3996d06677e9da72ab53902c9868e00d86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -939,17 +939,21 @@ public class CraftEventFactory {
diff --git a/patches/server/1035-Add-Structure-check-API.patch b/patches/server/1030-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/1035-Add-Structure-check-API.patch
rename to patches/server/1030-Add-Structure-check-API.patch
diff --git a/patches/server/1036-Dont-resend-blocks-on-interactions.patch b/patches/server/1031-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/1036-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1031-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/1037-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1032-Keep-previous-behavior-for-setResourcePack.patch
similarity index 94%
rename from patches/server/1037-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1032-Keep-previous-behavior-for-setResourcePack.patch
index a3de6ac330..7281666cd5 100644
--- a/patches/server/1037-Keep-previous-behavior-for-setResourcePack.patch
+++ b/patches/server/1032-Keep-previous-behavior-for-setResourcePack.patch
@@ -10,7 +10,7 @@ packs before sending the new pack. Other API exists
 for adding a new pack to the existing packs on a client.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 132692091fdec45f0330c8bc668cc16873db2976..a257e7a998b79f33662cc96c8f5e6329910bdec6 100644
+index 0b9a29c0e36d18282e8a65aa8b05523334fffe74..3d9f54b10b274815b8d7a0d770153a34f28a6742 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2351,8 +2351,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1038-properly-read-and-store-sus-effect-duration.patch b/patches/server/1033-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/1038-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/1033-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/1039-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1034-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/1039-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/1034-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/1040-add-more-scoreboard-API.patch b/patches/server/1035-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/1040-add-more-scoreboard-API.patch
rename to patches/server/1035-add-more-scoreboard-API.patch
diff --git a/patches/server/1041-Improve-Registry.patch b/patches/server/1036-Improve-Registry.patch
similarity index 100%
rename from patches/server/1041-Improve-Registry.patch
rename to patches/server/1036-Improve-Registry.patch
diff --git a/patches/server/1042-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/1037-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/1042-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/1037-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/1043-Add-experience-points-API.patch b/patches/server/1038-Add-experience-points-API.patch
similarity index 95%
rename from patches/server/1043-Add-experience-points-API.patch
rename to patches/server/1038-Add-experience-points-API.patch
index 67e0c99c80..ce9d3a7e89 100644
--- a/patches/server/1043-Add-experience-points-API.patch
+++ b/patches/server/1038-Add-experience-points-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7f3466340891b4409d1399ebeb2ca865d77841cd..0a9ee8aee52b34566f1613229951e33e53394f29 100644
+index 9851d5803caa33cbf740f1ef91d71255d9c3b018..d6b502308f22c92d2221bd2d03cde4cb78e82fbc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1833,7 +1833,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index 7f3466340891b4409d1399ebeb2ca865d77841cd..0a9ee8aee52b34566f1613229951e33e
      // Paper start - send SoundEffect to everyone who can see fromEntity
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a257e7a998b79f33662cc96c8f5e6329910bdec6..1359db54d76c1eb81ef65a6dc6f56b3ffad4bb62 100644
+index 3d9f54b10b274815b8d7a0d770153a34f28a6742..99830dfacc0d4ff78f43f970b2d1486710c83ef3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1821,6 +1821,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1044-Add-missing-InventoryType.patch b/patches/server/1039-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/1044-Add-missing-InventoryType.patch
rename to patches/server/1039-Add-missing-InventoryType.patch
diff --git a/patches/server/1045-Add-drops-to-shear-events.patch b/patches/server/1040-Add-drops-to-shear-events.patch
similarity index 99%
rename from patches/server/1045-Add-drops-to-shear-events.patch
rename to patches/server/1040-Add-drops-to-shear-events.patch
index df6f2b963b..d65d09d7d0 100644
--- a/patches/server/1045-Add-drops-to-shear-events.patch
+++ b/patches/server/1040-Add-drops-to-shear-events.patch
@@ -233,7 +233,7 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..b5d6857eaf2bed14adcb5f5e80d91b44
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b648d1960280d6aa235e511edf30848ee20bb693..417e63d99216edd23d784ac5733432c541baf452 100644
+index 24917c3996d06677e9da72ab53902c9868e00d86..55c26840957f69860816c917c16f59d02074b388 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1718,20 +1718,20 @@ public class CraftEventFactory {
diff --git a/patches/server/1046-Add-PlayerShieldDisableEvent.patch b/patches/server/1041-Add-PlayerShieldDisableEvent.patch
similarity index 97%
rename from patches/server/1046-Add-PlayerShieldDisableEvent.patch
rename to patches/server/1041-Add-PlayerShieldDisableEvent.patch
index c8ae6cd662..8bdf29b42d 100644
--- a/patches/server/1046-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/1041-Add-PlayerShieldDisableEvent.patch
@@ -33,7 +33,7 @@ index c81c72bf1027fcbaac67808fbcf6e0af112176bc..42e2be9286b75a1d34845f303ffc65e9
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0a9ee8aee52b34566f1613229951e33e53394f29..5fffd5fde567affa51b3cf4bcc58249134a95e20 100644
+index d6b502308f22c92d2221bd2d03cde4cb78e82fbc..2668c3b6f752d5d8bc45f4e6e52c20cc6a36a957 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -979,7 +979,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/1047-Add-HiddenPotionEffect-API.patch b/patches/server/1042-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1047-Add-HiddenPotionEffect-API.patch
rename to patches/server/1042-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1048-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1043-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 96%
rename from patches/server/1048-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/1043-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 28d8d3e499..e6214b88bb 100644
--- a/patches/server/1048-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/1043-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
@@ -8,7 +8,7 @@ in order to fire the BlockDispenseEvent. This patch corrects
 that.
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 6b7d8b7b6665aa87af4bd8aa00f75fb2c9dd4b6b..409d6415162d87d611694795a3864693f9ec6432 100644
+index 6e19de21b6bb643961afc1d5eced3e0d0d98a027..8e13c661a06aa2f7b5f558d39fb9e989a8145904 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -628,7 +628,13 @@ public interface DispenseItemBehavior {
diff --git a/patches/server/1049-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1044-fix-ItemMeta-removing-CustomModelData.patch
similarity index 100%
rename from patches/server/1049-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/1044-fix-ItemMeta-removing-CustomModelData.patch
diff --git a/patches/server/1050-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1045-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 98%
rename from patches/server/1050-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/1045-Validate-ResourceLocation-in-NBT-reading.patch
index 4f9fa600b7..5860eeb99d 100644
--- a/patches/server/1050-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/1045-Validate-ResourceLocation-in-NBT-reading.patch
@@ -40,7 +40,7 @@ index 38e2a8cec48bc779b8154d6d719031f457a2403e..4379090b74d156b62b88163a234c22e7
          this.path = path;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index abb2a02e0fc1deedb0ad76aec64f74ce355129cc..4bede2ca556a3bbcfbde9709c8415c9ea94383de 100644
+index d362a06d0600003d40f632eac602ff552cafb9da..081937597a8984b52a1e92d4c6032c04c942116e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -618,7 +618,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/1051-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1046-Properly-handle-experience-dropping-on-block-break.patch
similarity index 97%
rename from patches/server/1051-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/1046-Properly-handle-experience-dropping-on-block-break.patch
index fe8724fbc2..904409a218 100644
--- a/patches/server/1051-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/1046-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,7 +7,7 @@ This causes spawnAfterBreak to spawn xp by default, removing the need to manuall
 For classes that use custom xp amounts, they can drop the resources with disabling
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2c2189a31c608c99abe6a9c0a78bdcb717b51aba..00ff7de3fe0feb166a792c61aa81a1e201d7e928 100644
+index a8d22b48bd7108ca22faae178fcf82cb158ee7bb..b05e11e6b091c7616df5a9bbef867b06cafe3dc3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1103,7 +1103,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -68,7 +68,7 @@ index 8ac67dd1b06eee08787150abdfc74a8cccec94fc..3f2fdf73e2e520838c7b59fe994e67ab
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 17d2b90441d7513d7907b988610be8604ac05282..f03fd4bc44fb95cc17cae69dbe3fd684ed562d6f 100644
+index 88d7973e83ee828fa71d95924a9134935e80954d..7a29d43d06de9138c8db5d3f4af29d6b5dc60efc 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -1286,6 +1286,7 @@ public abstract class BlockBehaviour implements FeatureElement {
diff --git a/patches/server/1052-Fixup-NamespacedKey-handling.patch b/patches/server/1047-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/1052-Fixup-NamespacedKey-handling.patch
rename to patches/server/1047-Fixup-NamespacedKey-handling.patch