From 484d6bfb4efe5caac0207cd64a466dcca31bf2dd Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 23 Jan 2024 12:06:27 +0100
Subject: [PATCH] [ci skip] Move some disruptive patches back

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

diff --git a/patches/server/0359-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0358-Don-t-move-existing-players-to-world-spawn.patch
similarity index 93%
rename from patches/server/0359-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0358-Don-t-move-existing-players-to-world-spawn.patch
index 3aa820769..77541b835 100644
--- a/patches/server/0359-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0358-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 d70316c45bd657243d6c998723f6bb1324b6a880..5c3373863bd91682bd7facd3eb57580b33e160b7 100644
+index 3fbd65849649d77f9ef8920fcd7ab32c829f91c6..d7c5697ab781bb0c1cb3cb60685dca2466e966d3 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 d70316c45bd657243d6c998723f6bb1324b6a880..5c3373863bd91682bd7facd3eb57580b
          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 37b53bfe58689f498a48ad5e0e59d98462ccdd7f..201331acd9fae6af27f44c072379c48485b3be07 100644
+index 71619422fdb212b3aad8cf64a3a417168e3e8d2d..05983ba80532f3c0235af7e712948edf4d8f021b 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/0362-Optimize-Pathfinding.patch b/patches/server/0359-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0362-Optimize-Pathfinding.patch
rename to patches/server/0359-Optimize-Pathfinding.patch
diff --git a/patches/server/0363-Reduce-Either-Optional-allocation.patch b/patches/server/0360-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0363-Reduce-Either-Optional-allocation.patch
rename to patches/server/0360-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0364-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0361-Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0364-Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0361-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0365-Prevent-opening-inventories-when-frozen.patch b/patches/server/0362-Prevent-opening-inventories-when-frozen.patch
similarity index 97%
rename from patches/server/0365-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0362-Prevent-opening-inventories-when-frozen.patch
index c800e18d2..7d9c54a36 100644
--- a/patches/server/0365-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0362-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 5c3373863bd91682bd7facd3eb57580b33e160b7..cc2378916009f961fb70d5b4b1bd5bb6867de792 100644
+index d7c5697ab781bb0c1cb3cb60685dca2466e966d3..36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2 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 {
diff --git a/patches/server/0366-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0363-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 96%
rename from patches/server/0366-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0363-Don-t-run-entity-collision-code-if-not-needed.patch
index dd36b88f5..ac9cee85c 100644
--- a/patches/server/0366-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0363-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 fa496424e48c73672605b2128ec2bd3a6be86889..1782ffbf08d362b98d648c296f99fd2c49e4d8cf 100644
+index b813357da558649c2244af524f79141fdc7f997e..ddbb823a5f1ac6318b6931fef2140b7e16e61056 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/0367-Implement-Player-Client-Options-API.patch b/patches/server/0364-Implement-Player-Client-Options-API.patch
similarity index 99%
rename from patches/server/0367-Implement-Player-Client-Options-API.patch
rename to patches/server/0364-Implement-Player-Client-Options-API.patch
index 9ea021753..2d4cec5a3 100644
--- a/patches/server/0367-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0364-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 cc2378916009f961fb70d5b4b1bd5bb6867de792..4de3de5b195698cc804d73307a2483c83f48525e 100644
+index 36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2..0a75cba1b0b5a85826bd60615e3f09d2f41cc6a3 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/0368-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0365-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0368-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0365-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0369-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 95%
rename from patches/server/0369-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index e193b8f31..069501220 100644
--- a/patches/server/0369-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -31,7 +31,7 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 37e6b841b3c3d8720a1947065d4fada8c25ec2cf..2785619ed6d04e06a25bfbb2a7fbd99f81c1f858 100644
+index e3146ae94ae55764fcd7ec650a44d457889c179d..9ddad716d641d649e09c094795240bd2e8c926b9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -996,6 +996,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -43,7 +43,7 @@ index 37e6b841b3c3d8720a1947065d4fada8c25ec2cf..2785619ed6d04e06a25bfbb2a7fbd99f
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4de3de5b195698cc804d73307a2483c83f48525e..c87e5dd12b5931f9d06bd70a3dd591882a5c1f17 100644
+index 0a75cba1b0b5a85826bd60615e3f09d2f41cc6a3..b5dcb539548ca35d7c8a076d474a5c679a61c071 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 4de3de5b195698cc804d73307a2483c83f48525e..c87e5dd12b5931f9d06bd70a3dd59188
      // 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 54a82f30fd8a4712bcf7ffeccab8ce3075f55f83..2af14ca8c9008da254ddef591f0aff9e4aba8cd5 100644
+index 05983ba80532f3c0235af7e712948edf4d8f021b..dc6774fdc215de6a157b64678aec5a79344084e9 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/0370-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0367-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 96%
rename from patches/server/0370-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0367-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index c36547279..29df490d6 100644
--- a/patches/server/0370-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0367-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 2af14ca8c9008da254ddef591f0aff9e4aba8cd5..805759ae7d92f690cea4c700c914769d39e3c0b6 100644
+index dc6774fdc215de6a157b64678aec5a79344084e9..7750c1980ea7e211a35ad077b95ab0e206900e17 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 {
@@ -87,10 +87,10 @@ index 2af14ca8c9008da254ddef591f0aff9e4aba8cd5..805759ae7d92f690cea4c700c914769d
          }
          // Paper end - Entity#getEntitySpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 538931a474841e7efae505f5aeae58715108da1b..ee55a63edd38c9919d4dfdc8434ba80f697ba0c0 100644
+index b6b4be7f49ae756ebbda59e55dee98000aec2314..0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2336,27 +2336,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2335,27 +2335,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
              // CraftBukkit end
  
diff --git a/patches/server/0371-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0368-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0371-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0368-Add-PlayerAttackEntityCooldownResetEvent.patch
index dc20899b7..cf0433593 100644
--- a/patches/server/0371-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0368-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 1782ffbf08d362b98d648c296f99fd2c49e4d8cf..69f7cdb2c507ba45dc4a689d4f33c059a57907a1 100644
+index ddbb823a5f1ac6318b6931fef2140b7e16e61056..e309d74047b039e595cb59396710f68490a2249a 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/0372-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0369-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0372-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0369-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0373-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0370-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0373-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0370-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0374-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0371-Fix-item-duplication-and-teleport-issues.patch
similarity index 95%
rename from patches/server/0374-Fix-item-duplication-and-teleport-issues.patch
rename to patches/server/0371-Fix-item-duplication-and-teleport-issues.patch
index fab99ea43..64cceef8a 100644
--- a/patches/server/0374-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0371-Fix-item-duplication-and-teleport-issues.patch
@@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d52da3acfd 100644
+index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808ef4d9e9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2466,11 +2466,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2465,11 +2465,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -34,7 +34,7 @@ index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d5
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -3270,6 +3271,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3269,6 +3270,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, Vec3 location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d5
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
              this.level().getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -3296,6 +3303,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3295,6 +3302,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  // CraftBukkit end
  
                  this.level().getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d5
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {
-@@ -3313,10 +3325,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3312,10 +3324,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d5
                      // CraftBukkit end
                  }
  
-@@ -3435,7 +3443,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3434,7 +3442,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean canChangeDimensions() {
@@ -80,7 +80,7 @@ index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d5
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 69f7cdb2c507ba45dc4a689d4f33c059a57907a1..4605978cad9cbaa8b55b12c26476f85471658c82 100644
+index e309d74047b039e595cb59396710f68490a2249a..6114cc60d8cb122b708ae65db86bfd1ea2ea82c1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1705,9 +1705,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0375-Villager-Restocks-API.patch b/patches/server/0372-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0375-Villager-Restocks-API.patch
rename to patches/server/0372-Villager-Restocks-API.patch
diff --git a/patches/server/0376-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0373-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0376-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0373-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 0fec46037..703e337df 100644
--- a/patches/server/0376-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0373-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 a191254fa3bd8cdf2cb5446c88c71ed0be6761e8..ebf436e8160c0a6ff064c2b279a47b272e3acb05 100644
+index f3abc5552d058c5b96ed56fc49ffd9f420668d01..a1da534dab13f475dca626645c246ef36aea6938 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/0377-Expose-game-version.patch b/patches/server/0374-Expose-game-version.patch
similarity index 89%
rename from patches/server/0377-Expose-game-version.patch
rename to patches/server/0374-Expose-game-version.patch
index d8b186722..169ab7f81 100644
--- a/patches/server/0377-Expose-game-version.patch
+++ b/patches/server/0374-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 b501ed140902a0143553f338871e3b8b71a7f71e..363d251c80b7d8585425cab456822fd6cde67f23 100644
+index f88426ce7f1b4ebc65a39c19900e75de22c5903b..28fe0834c6287181cc21b9ceedc2dd1074db984e 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/0379-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0375-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0379-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0375-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 6960e9409..1bcb557b1 100644
--- a/patches/server/0379-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0375-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 78e007b15699fc83a3fcc2e2767209387444f0e5..68b849321757493c64e874b5a2c5d5357a52d698 100644
+index 5030b865c84d84ed5be9f4987a7f0a829b8ea1e5..b4975e80c1929826feb880526b41b2c871ac8c8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -26,6 +26,7 @@ public class Main {
diff --git a/patches/server/0380-misc-debugging-dumps.patch b/patches/server/0376-misc-debugging-dumps.patch
similarity index 88%
rename from patches/server/0380-misc-debugging-dumps.patch
rename to patches/server/0376-misc-debugging-dumps.patch
index 721ee8807..1553a974f 100644
--- a/patches/server/0380-misc-debugging-dumps.patch
+++ b/patches/server/0376-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 867f22bdeed5f1c3f063a5815a3477d143057152..5c4a89fc7388b8e6ca9ade03fd34a8da79ae0ad9 100644
+index 40ff3090fb17fb0f01a9b52639fb783ea57ce6b6..d39743d9626eb01c942194387dafb1106f13601b 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -341,7 +341,7 @@ public class Commands {
@@ -42,26 +42,26 @@ index 867f22bdeed5f1c3f063a5815a3477d143057152..5c4a89fc7388b8e6ca9ade03fd34a8da
                  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 570c163e4a56206d1cf259ee1ffcb6f865f72b1c..1963cf2716879c6d193cbed8de9538094dda9b3d 100644
+index 831998b12c296d5731ae09d4abb5548201226c77..0b79a72b8b2325416cd1a5743a27787e93ffa644 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
+@@ -914,6 +914,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
      // CraftBukkit start
      private boolean hasStopped = false;
-     public volatile boolean hasFullyShutdown = false; // Paper
 +    private boolean hasLoggedStop = false; // Paper - Debugging
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -932,6 +933,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -928,6 +929,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
 +        if (!hasLoggedStop && isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-         // Paper start - kill main thread, and kill it hard
-         shutdownThread = Thread.currentThread();
-         org.spigotmc.WatchdogThread.doStop(); // Paper
-@@ -1032,6 +1034,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         // CraftBukkit end
+         if (this.metricsRecorder.isRecording()) {
+             this.cancelRecordingMetrics();
+@@ -1002,6 +1004,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          this.isRestarting = isRestarting;
@@ -87,7 +87,7 @@ index 04a728a16bb629adbae1cd8586764a6dbc22b5dc..d130f843975236018df4fa2ccc3ca6aa
              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 363d251c80b7d8585425cab456822fd6cde67f23..2333858596a76ff8dddb014f31ad2a3d7e926baf 100644
+index 28fe0834c6287181cc21b9ceedc2dd1074db984e..42548bcd1a890e713c4b5103f36a5a9facc703d0 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/0381-Prevent-teleporting-dead-entities.patch b/patches/server/0377-Prevent-teleporting-dead-entities.patch
similarity index 93%
rename from patches/server/0381-Prevent-teleporting-dead-entities.patch
rename to patches/server/0377-Prevent-teleporting-dead-entities.patch
index 9aa032436..f308ef1e7 100644
--- a/patches/server/0381-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0377-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 ebf436e8160c0a6ff064c2b279a47b272e3acb05..4d5fc9123e13ad764a88c40f1be1205b6f6f102e 100644
+index a1da534dab13f475dca626645c246ef36aea6938..11f50899ee0144fc56e6829850ad37dd8e6349eb 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/0382-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 97%
rename from patches/server/0382-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index b29b08d08..e6644e517 100644
--- a/patches/server/0382-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -471,7 +471,7 @@ index 2d5494d2813b773e60ddba6790b750a9a08f21f8..0b210bdf7c1f5962afbd44195af6f84f
      }
  }
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index 059b1a0bf048af6a28c322f35da3d3cbbe426546..e047dee632022abfe05865d1e71838be8d5d053a 100644
+index a9a0248b1bd1ac454064e977b61f9b7d80962ff8..6f2452de76e8f5fcc1367066e0e753740764eb98 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
 @@ -34,6 +34,7 @@ public class CrashReport {
@@ -495,7 +495,7 @@ index 52eb3176437113f9a0ff85d10ce5c2415e1b5570..b54ddd0ba0b001fbcb1838a838ca4890
          }
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index c66fc75fb88c4f0a4273d69009a4e6defb0b29e9..b99dbe3878df8f67a6920195088c00a01289a79f 100644
+index 128debf837da32d27ba37184162e7b3bfb463812..6cfb814ecaf12161ec2e2545560453d7dd41e2da 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -75,13 +75,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -545,7 +545,7 @@ index 61f05f34ca33837c643f2915e753ec3935a38314..85b8be8ffac0fb40e9cae0528271ed41
                          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 0e2978b6e4f03932c4ebdf1309d20454b9130132..ab84c4b098184370c8b63cbae687116a7b077cf5 100644
+index 3779e02083fb41e93248aed27a9214be88167e5a..1d8f8b1910f50e90d60bb2a924d49f3fd3518fd6 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
@@ -570,7 +570,7 @@ index d130f843975236018df4fa2ccc3ca6aaca7a06b8..76f31845fe50200d09e5ab6a6c08da00
              // Paper end - Debugging
              this.connection.send(new ClientboundDisconnectPacket(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA));
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index caeead6c6082855f1651ee28263cc9f60423ca0c..b2bfb3893200362ac35ae60982f203f86a1148ec 100644
+index 9db7fc8c053aa9e929fa6dddf70290a8f7ad5273..dfa07c9ede9d748a05ee47826bdbcf7390ec8219 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -52,10 +52,10 @@ public class ServerConnectionListener {
@@ -609,7 +609,7 @@ index 14bd0b94ece3f826f822b4900c7250ebdc27d937..59eb65e207ff0206b0dfad6f2dcffe78
                              }
                         }
 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 4891073602609fc2709715460e0675a7cc2a4cdd..d85ed706703e50f76df8db414827ccd41a5985d9 100644
+index 796aa86e12cf9062b3467a3678c895af5ad626fe..9e01a22df54492d9c8e9f9defd84014dc109514b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -599,7 +599,7 @@ public class LevelChunk extends ChunkAccess {
@@ -638,10 +638,10 @@ index 3c1992e212a6d6f1db4d5b807b38d71913619fc0..9c1aff17aabd062640e3f451a2ef8c50
  
      CraftAsyncScheduler() {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 5ca863aa1859922fa359eba32539229db40e5b98..dca163ff5436f1007383c8261cac1ac7c0613f23 100644
+index 230d55820778e84c1c8aa2b013ae0e5e35568ea1..a15749bcfb2b36a31801cb1a26b7181ce304e0ee 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -105,7 +105,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -102,7 +102,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      log.log( Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity" );
                      log.log( Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated" );
                      log.log( Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
@@ -650,7 +650,7 @@ index 5ca863aa1859922fa359eba32539229db40e5b98..dca163ff5436f1007383c8261cac1ac7
                      {
                          log.log( Level.SEVERE, "\t\t" + stack );
                      }
-@@ -192,7 +192,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -174,7 +174,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
          }
          log.log( Level.SEVERE, "\tStack:" );
          //
@@ -660,7 +660,7 @@ index 5ca863aa1859922fa359eba32539229db40e5b98..dca163ff5436f1007383c8261cac1ac7
              log.log( Level.SEVERE, "\t\t" + stack );
          }
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 266b4e6fb3988b5848021c83fdc68e342c70b188..2b247d55e39246fbef31279b14c45fc40f956bfb 100644
+index ea4e2161c0bd43884055cc6b8d70b2139f70e720..4e2ca9162450c1f54b7ab95a63c1bad8efe81a06 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -30,10 +30,14 @@
diff --git a/patches/server/0383-Implement-Mob-Goal-API.patch b/patches/server/0379-Implement-Mob-Goal-API.patch
similarity index 95%
rename from patches/server/0383-Implement-Mob-Goal-API.patch
rename to patches/server/0379-Implement-Mob-Goal-API.patch
index e5f9766f2..2605232bd 100644
--- a/patches/server/0383-Implement-Mob-Goal-API.patch
+++ b/patches/server/0379-Implement-Mob-Goal-API.patch
@@ -744,41 +744,15 @@ index 0000000000000000000000000000000000000000..0d30e0b21b9024df939a9d070bd4a99b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
-index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..b0ee4fbd4a52e30a9dff4179aa0fbf62ee1767ad 100644
+index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..16f9a98b8a939e5ca7e2dc04f87134a7ed66736b 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
-@@ -7,6 +7,14 @@ public abstract class Goal {
-     private final EnumSet<Goal.Flag> flags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
-     private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<net.minecraft.world.entity.ai.goal.Goal.Flag> goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
- 
-+    // Paper start - Mob goal API; make sure goaltypes is never empty
-+    public Goal() {
-+        if (this.goalTypes.size() == 0) {
-+            this.goalTypes.addUnchecked(Flag.UNKNOWN_BEHAVIOR);
-+        }
-+    }
-+    // Paper end - Mob goal API
-+
-     public abstract boolean canUse();
- 
-     public boolean canContinueToUse() {
-@@ -34,6 +42,10 @@ public abstract class Goal {
-         // Paper start - remove streams from pathfindergoalselector
-         this.goalTypes.clear();
-         this.goalTypes.addAllUnchecked(controls);
-+        // make sure its never empty
-+        if (this.goalTypes.size() == 0) {
-+            this.goalTypes.addUnchecked(Flag.UNKNOWN_BEHAVIOR);
-+        }
-         // Paper end - remove streams from pathfindergoalselector
-     }
- 
-@@ -56,7 +68,19 @@ public abstract class Goal {
+@@ -51,7 +51,19 @@ public abstract class Goal {
          return Mth.positiveCeilDiv(serverTicks, 2);
      }
  
 +    // Paper start - Mob goal api
-+    private com.destroystokyo.paper.entity.ai.PaperVanillaGoal<?> vanillaGoal = null;
++    private com.destroystokyo.paper.entity.ai.PaperVanillaGoal<?> vanillaGoal;
 +    public <T extends org.bukkit.entity.Mob> com.destroystokyo.paper.entity.ai.Goal<T> asPaperVanillaGoal() {
 +        if(this.vanillaGoal == null) {
 +            this.vanillaGoal = new com.destroystokyo.paper.entity.ai.PaperVanillaGoal<>(this);
@@ -794,7 +768,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..b0ee4fbd4a52e30a9dff4179aa0fbf62
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2333858596a76ff8dddb014f31ad2a3d7e926baf..6fd94e54abe92b1a081591a64af8da09b9303d08 100644
+index 42548bcd1a890e713c4b5103f36a5a9facc703d0..8997f35d4e3d66f4ac2e1b774e7869771d938dde 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/0384-Add-villager-reputation-API.patch b/patches/server/0380-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0384-Add-villager-reputation-API.patch
rename to patches/server/0380-Add-villager-reputation-API.patch
diff --git a/patches/server/0385-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0381-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0385-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0381-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0386-ExperienceOrbMergeEvent.patch b/patches/server/0382-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0386-ExperienceOrbMergeEvent.patch
rename to patches/server/0382-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0387-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0383-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0387-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0383-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0388-Potential-bed-API.patch b/patches/server/0384-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0388-Potential-bed-API.patch
rename to patches/server/0384-Potential-bed-API.patch
diff --git a/patches/server/0389-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0385-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 91%
rename from patches/server/0389-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0385-Wait-for-Async-Tasks-during-shutdown.patch
index 40dc5a4f6..803c2f5e8 100644
--- a/patches/server/0389-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0385-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,10 +10,10 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1963cf2716879c6d193cbed8de9538094dda9b3d..9829f86520c4028a94f239fb4804fb0f2a2ac6fa 100644
+index 0b79a72b8b2325416cd1a5743a27787e93ffa644..87966edd7fb8b936c55659257291478c862e2542 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
+@@ -941,6 +941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
@@ -22,7 +22,7 @@ index 1963cf2716879c6d193cbed8de9538094dda9b3d..9829f86520c4028a94f239fb4804fb0f
          // 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 6fd94e54abe92b1a081591a64af8da09b9303d08..c2cafdacde4edef8674b96fd8614a47b6af4b64b 100644
+index 8997f35d4e3d66f4ac2e1b774e7869771d938dde..ad390e137aa1492a4aa807f7cc315fb0cac46e62 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/0390-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0386-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0390-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0386-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0392-Ensure-safe-gateway-teleport.patch b/patches/server/0387-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0392-Ensure-safe-gateway-teleport.patch
rename to patches/server/0387-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0393-Add-option-for-console-having-all-permissions.patch b/patches/server/0388-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0393-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0388-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0394-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0389-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0394-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0389-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0395-Maps-shouldn-t-load-chunks.patch b/patches/server/0390-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0395-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0390-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0396-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0391-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0396-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0391-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0397-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0392-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0397-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0392-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0398-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0393-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 97%
rename from patches/server/0398-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0393-Fix-piston-physics-inconsistency-MC-188840.patch
index 564e1578c..b8b63a48f 100644
--- a/patches/server/0398-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0393-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,10 +32,10 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index e4a3c937950b26e81b89d6ddcf3d6c2794ed934d..c34b34a6be594c502d1cb59703ace8ad8dd96915 100644
+index b3732a6246a2b011e36c5c35fa2ac7749e75db16..3ae61e7b50bfc440c597f88843f92903f8a66801 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -426,14 +426,26 @@ public class PistonBaseBlock extends DirectionalBlock {
+@@ -413,14 +413,26 @@ public class PistonBaseBlock extends DirectionalBlock {
              }
  
              for (j = list.size() - 1; j >= 0; --j) {
diff --git a/patches/server/0399-Fix-sand-duping.patch b/patches/server/0394-Fix-sand-duping.patch
similarity index 94%
rename from patches/server/0399-Fix-sand-duping.patch
rename to patches/server/0394-Fix-sand-duping.patch
index d616a66fc..a32b1f586 100644
--- a/patches/server/0399-Fix-sand-duping.patch
+++ b/patches/server/0394-Fix-sand-duping.patch
@@ -7,7 +7,7 @@ If the falling block dies during teleportation (entity#move), then we need
 to detect that by placing a check after the move.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 9be45ff8139c9d385c1deb1200e3718ed3add801..fc33d05cf1a3cceb220dab1ee1da33ffe37834db 100644
+index ffed5f2295f60416535015a28635975aa2d211dd..bfd8304f4fc2aded1681c7a59cf9d81192e5a3b2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -131,6 +131,11 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0400-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0395-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0400-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0395-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0401-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0396-Prevent-position-desync-causing-tp-exploit.patch
similarity index 94%
rename from patches/server/0401-Prevent-position-desync-causing-tp-exploit.patch
rename to patches/server/0396-Prevent-position-desync-causing-tp-exploit.patch
index 54aa3e2e8..a22c84b5d 100644
--- a/patches/server/0401-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0396-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,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 4d5fc9123e13ad764a88c40f1be1205b6f6f102e..802602882a76fbb026c524225f74bb3780d219c0 100644
+index 11f50899ee0144fc56e6829850ad37dd8e6349eb..709eb006717da012ce5f0d3dba9e5bee1e277a90 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/0402-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0397-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0402-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0397-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0403-Improve-Arrow-API.patch b/patches/server/0398-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0403-Improve-Arrow-API.patch
rename to patches/server/0398-Improve-Arrow-API.patch
diff --git a/patches/server/0404-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0399-Add-PlayerRecipeBookClickEvent.patch
similarity index 97%
rename from patches/server/0404-Add-PlayerRecipeBookClickEvent.patch
rename to patches/server/0399-Add-PlayerRecipeBookClickEvent.patch
index d4141a174..e85f3cb08 100644
--- a/patches/server/0404-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0399-Add-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 802602882a76fbb026c524225f74bb3780d219c0..d244a20961e5e3e459bf2bc784014b3f963590ea 100644
+index 709eb006717da012ce5f0d3dba9e5bee1e277a90..99bcaf518e22b8d3cd79068defe776bb792abe6c 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/0406-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0400-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0406-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0400-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0407-Add-permission-for-command-blocks.patch b/patches/server/0401-Add-permission-for-command-blocks.patch
similarity index 97%
rename from patches/server/0407-Add-permission-for-command-blocks.patch
rename to patches/server/0401-Add-permission-for-command-blocks.patch
index 329cf1a7e..9f6c638bb 100644
--- a/patches/server/0407-Add-permission-for-command-blocks.patch
+++ b/patches/server/0401-Add-permission-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 3629f164f05cc2d33c76bb21cfe4598539aa08e0..5b951937511126d58665c5e2baf18186a7a8d325 100644
+index 99784bac05ea0d2ea1e9053466e21c1175fe0a4b..9f3450d6bbd330a2aebd271a086965bf364c9fe4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -399,7 +399,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 3629f164f05cc2d33c76bb21cfe4598539aa08e0..5b951937511126d58665c5e2baf18186
                  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 d244a20961e5e3e459bf2bc784014b3f963590ea..56a664d7810e4c4b0f85d714e2b89014bb460fac 100644
+index 99bcaf518e22b8d3cd79068defe776bb792abe6c..2502b8145da151a63dc769c4e717d53d651203c3 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/0408-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch
similarity index 91%
rename from patches/server/0408-Ensure-Entity-position-and-AABB-are-never-invalid.patch
rename to patches/server/0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 605dceccc..bfb02d5bc 100644
--- a/patches/server/0408-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f51453bd3018667aa491c9b64b6f9c4d5c703d7a..e68a29eb0c81285039a1a980d8b9b83f0b1d022e 100644
+index d0f46b955041487ce1cec4a9a5ed8808ef4d9e9f..7040b3b9b743b4f88f00da698e37afa42f277990 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -727,8 +727,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -693,8 +693,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void setPos(double x, double y, double z) {
@@ -20,7 +20,7 @@ index f51453bd3018667aa491c9b64b6f9c4d5c703d7a..e68a29eb0c81285039a1a980d8b9b83f
      }
  
      protected AABB makeBoundingBox() {
-@@ -4240,7 +4240,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4206,7 +4206,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
@@ -50,7 +50,7 @@ index f51453bd3018667aa491c9b64b6f9c4d5c703d7a..e68a29eb0c81285039a1a980d8b9b83f
          // Paper start - rewrite chunk system
          if (this.updatingSectionStatus) {
              LOGGER.error("Refusing to update position for entity " + this + " to position " + new Vec3(x, y, z) + " since it is processing a section status update", new Throwable());
-@@ -4264,6 +4286,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4230,6 +4252,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0409-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 91%
rename from patches/server/0409-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 7c9c8be7f..cfa2f0e06 100644
--- a/patches/server/0409-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,10 +8,10 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9829f86520c4028a94f239fb4804fb0f2a2ac6fa..229f5c1d651d903e1c641e67661004a4ee010417 100644
+index 87966edd7fb8b936c55659257291478c862e2542..74ce2fc0256c1747bb1638eea8947d3416f23ab8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -828,7 +828,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -825,7 +825,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper - Configurable Keep Spawn Loaded range per world
          // CraftBukkit start
          // this.updateMobSpawningFlags();
@@ -20,7 +20,7 @@ index 9829f86520c4028a94f239fb4804fb0f2a2ac6fa..229f5c1d651d903e1c641e67661004a4
  
          this.forceTicks = false;
          // CraftBukkit end
-@@ -1814,11 +1814,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1759,11 +1759,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -40,7 +40,7 @@ index 9829f86520c4028a94f239fb4804fb0f2a2ac6fa..229f5c1d651d903e1c641e67661004a4
          }
      }
  
-@@ -1832,7 +1835,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1777,7 +1780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
  
@@ -63,7 +63,7 @@ index 997a96a21440ae72696d68f8031ece4ba487d3ef..3d8584929cee000ae7df10c5bd94f358
                  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 ab84c4b098184370c8b63cbae687116a7b077cf5..09956f69b63844d67aeab1339ae65910fc8eb8bf 100644
+index 1d8f8b1910f50e90d60bb2a924d49f3fd3518fd6..b6f87e28625df68548a296001a0d67601513f7d1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -76,7 +76,7 @@ index ab84c4b098184370c8b63cbae687116a7b077cf5..09956f69b63844d67aeab1339ae65910
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c87e5dd12b5931f9d06bd70a3dd591882a5c1f17..241c16b8df5128f2c88ed2f9e9c51d7f7b8420b4 100644
+index b5dcb539548ca35d7c8a076d474a5c679a61c071..6020da902ef3c05d38116c302e3848aa1828e1fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1209,7 +1209,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index c87e5dd12b5931f9d06bd70a3dd591882a5c1f17..241c16b8df5128f2c88ed2f9e9c51d7f
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 56a664d7810e4c4b0f85d714e2b89014bb460fac..75073ab08a90bd0ce8afc54634e7d61d50650742 100644
+index 2502b8145da151a63dc769c4e717d53d651203c3..2f8715e200b9b8ae4c4b70ddd7cdc3368a109939 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3176,7 +3176,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -102,7 +102,7 @@ index 56a664d7810e4c4b0f85d714e2b89014bb460fac..75073ab08a90bd0ce8afc54634e7d61d
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c2cafdacde4edef8674b96fd8614a47b6af4b64b..71da3ebf372b63119fadbe2412aa02dce61086b4 100644
+index ad390e137aa1492a4aa807f7cc315fb0cac46e62..c5bb505112f7d8207f4a62cc00111cce2cb09cf0 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 {
@@ -117,7 +117,7 @@ index c2cafdacde4edef8674b96fd8614a47b6af4b64b..71da3ebf372b63119fadbe2412aa02dc
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9896ea05523f6fb75213c861c9cf3962976cce88..85bc6dbfe71d841b4ed1ed912d3fe19d994a17f0 100644
+index 40c9f9a0e1a2b126160428124b3430b56f5a0b83..d5b308cab976c5a4004683592882aa09fe72e345 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1158,7 +1158,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0410-Paper-dumpitem-command.patch b/patches/server/0404-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0410-Paper-dumpitem-command.patch
rename to patches/server/0404-Paper-dumpitem-command.patch
diff --git a/patches/server/0411-Improve-Legacy-Component-serialization-size.patch b/patches/server/0405-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0411-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0405-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0413-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0406-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 97%
rename from patches/server/0413-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0406-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 6068e39f2..32198f287 100644
--- a/patches/server/0413-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0406-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 71da3ebf372b63119fadbe2412aa02dce61086b4..a25cc6f7d91100b98996d9f07fff3c62018ddf86 100644
+index c5bb505112f7d8207f4a62cc00111cce2cb09cf0..6dde3d479aa1ae50c6404419ec5da52f0b68a11e 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 {
@@ -44,7 +44,7 @@ index 71da3ebf372b63119fadbe2412aa02dce61086b4..a25cc6f7d91100b98996d9f07fff3c62
          this.printSaveWarning = false;
          this.console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 85bc6dbfe71d841b4ed1ed912d3fe19d994a17f0..2d6ef62205ff5a4da72e718f9b33d955a58d805f 100644
+index d5b308cab976c5a4004683592882aa09fe72e345..b91205b8459cfc78fce4b98e04ae4517eef22e20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -282,7 +282,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0414-incremental-chunk-and-player-saving.patch b/patches/server/0407-incremental-chunk-and-player-saving.patch
similarity index 92%
rename from patches/server/0414-incremental-chunk-and-player-saving.patch
rename to patches/server/0407-incremental-chunk-and-player-saving.patch
index d4c3970f9..a0d416a43 100644
--- a/patches/server/0414-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0407-incremental-chunk-and-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 229f5c1d651d903e1c641e67661004a4ee010417..08e3f07c4547f8fa7b571ecef7436ba1fbee578a 100644
+index 74ce2fc0256c1747bb1638eea8947d3416f23ab8..efb5a5b31ada326593b3bea0f49c05591db18801 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -901,7 +901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -898,7 +898,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index 229f5c1d651d903e1c641e67661004a4ee010417..08e3f07c4547f8fa7b571ecef7436ba1
              flag3 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1427,16 +1427,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1372,16 +1372,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          --this.ticksUntilAutosave;
@@ -34,7 +34,7 @@ index 229f5c1d651d903e1c641e67661004a4ee010417..08e3f07c4547f8fa7b571ecef7436ba1
 +        int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate;
 +        if (playerSaveInterval < 0) {
 +            playerSaveInterval = autosavePeriod;
-+        }
+         }
 +        this.profiler.push("save");
 +        final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
 +        try {
@@ -49,14 +49,14 @@ index 229f5c1d651d903e1c641e67661004a4ee010417..08e3f07c4547f8fa7b571ecef7436ba1
 +            }
 +        } finally {
 +            this.isSaving = false;
-         }
++        }
 +        this.profiler.pop();
 +        // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 56fe3f4edd15239533a1ae9287e86528b3296bdc..a35957eef3f6ab2dcfebc01eaa9bea1b249599e2 100644
+index a2220291f6d0726019187c2fc93bca801a3f0610..25009accd401fc3860c57cac1ef628b233e746e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -450,6 +450,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -76,7 +76,7 @@ index 56fe3f4edd15239533a1ae9287e86528b3296bdc..a35957eef3f6ab2dcfebc01eaa9bea1b
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1b92cee2f51b844340d213ccfc78d1524a71c9dc..d9d4a8df764bce67ee13a542e0b21a5ec7fd8ca7 100644
+index 6a1e893d4ec1e5fe598422807f1717b19579fe2e..cdd766ccf85df7d0c17d36c544a5346dc46b4f22 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1301,6 +1301,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -118,7 +118,7 @@ index 1b92cee2f51b844340d213ccfc78d1524a71c9dc..d9d4a8df764bce67ee13a542e0b21a5e
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 241c16b8df5128f2c88ed2f9e9c51d7f7b8420b4..9b3425857342f4c75ae23aee922d792977aa8c4e 100644
+index 6020da902ef3c05d38116c302e3848aa1828e1fa..553cdac6fef1626d0eac86ca971fcf65a17839f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -190,6 +190,7 @@ import org.bukkit.inventory.MainHand;
@@ -130,7 +130,7 @@ index 241c16b8df5128f2c88ed2f9e9c51d7f7b8420b4..9b3425857342f4c75ae23aee922d7929
      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 805759ae7d92f690cea4c700c914769d39e3c0b6..ca0e6c8e27f998a078e6f60a3cad67ddda7706c7 100644
+index 7750c1980ea7e211a35ad077b95ab0e206900e17..8c32e68e82a1c87a473b2ea50afeeb0043b0e8fa 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 805759ae7d92f690cea4c700c914769d39e3c0b6..ca0e6c8e27f998a078e6f60a3cad67dd
          this.playerIo.save(player);
          ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
  
-@@ -1153,10 +1154,22 @@ public abstract class PlayerList {
+@@ -1152,10 +1153,22 @@ public abstract class PlayerList {
      }
  
      public void saveAll() {
diff --git a/patches/server/0415-Support-old-UUID-format-for-NBT.patch b/patches/server/0408-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0415-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0408-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0416-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0409-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0416-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0409-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0418-Support-components-in-ItemMeta.patch b/patches/server/0410-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0418-Support-components-in-ItemMeta.patch
rename to patches/server/0410-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0419-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0411-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0419-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0411-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0420-Add-entity-liquid-API.patch b/patches/server/0412-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0420-Add-entity-liquid-API.patch
rename to patches/server/0412-Add-entity-liquid-API.patch
diff --git a/patches/server/0421-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0413-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0421-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0413-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0422-Add-PrepareResultEvent.patch b/patches/server/0414-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0422-Add-PrepareResultEvent.patch
rename to patches/server/0414-Add-PrepareResultEvent.patch
diff --git a/patches/server/0423-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 91%
rename from patches/server/0423-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 2110cd04e..a2dfcd322 100644
--- a/patches/server/0423-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4605978cad9cbaa8b55b12c26476f85471658c82..be239cce5b4d326da46bcf63394d1bc03f2a9bb6 100644
+index 6114cc60d8cb122b708ae65db86bfd1ea2ea82c1..b691d188c741c8acf8d20bc9e6184b6445ba6332 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3510,7 +3510,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0424-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0416-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0424-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0416-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0425-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0417-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 97%
rename from patches/server/0425-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0417-Thread-Safe-Vanilla-Command-permission-checking.patch
index b6cc617e9..d3ee9cbba 100644
--- a/patches/server/0425-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0417-Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -26,7 +26,7 @@ index d8142624f9f3a5909e7cc5665f1629a1a67dd302..b02fb15c98ab873fa78635d7a23706dd
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 8e0ea79a41136b697f5e58b5cd71f6a9bc3cab73..de7d11baf17d1b6c3d5fb3402d38052f3a28c246 100644
+index 0f98345f8adc6e9bf7fb2dc9ce4eba59a33ded61..907bc9d84dbc98427384cf529bfde4b09d8ce8ca 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -64,7 +64,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
diff --git a/patches/server/0426-Fix-SPIGOT-5989.patch b/patches/server/0418-Fix-SPIGOT-5989.patch
similarity index 95%
rename from patches/server/0426-Fix-SPIGOT-5989.patch
rename to patches/server/0418-Fix-SPIGOT-5989.patch
index d666fe055..f5dde126e 100644
--- a/patches/server/0426-Fix-SPIGOT-5989.patch
+++ b/patches/server/0418-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ca0e6c8e27f998a078e6f60a3cad67ddda7706c7..f68691542e57da7866253c43251c10235ebc57a0 100644
+index 8c32e68e82a1c87a473b2ea50afeeb0043b0e8fa..d5890b41c2ddf955416a64132f3022d95850f04b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -806,6 +806,7 @@ public abstract class PlayerList {
@@ -44,7 +44,7 @@ index ca0e6c8e27f998a078e6f60a3cad67ddda7706c7..f68691542e57da7866253c43251c1023
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper - Add PlayerPostRespawnEvent
          } else {
-@@ -899,8 +905,14 @@ public abstract class PlayerList {
+@@ -898,8 +904,14 @@ public abstract class PlayerList {
          }
          // entityplayer1.initInventoryMenu();
          entityplayer1.setHealth(entityplayer1.getHealth());
diff --git a/patches/server/0427-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0419-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0427-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0419-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0428-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0420-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0428-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0420-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0429-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0421-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 97%
rename from patches/server/0429-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0421-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 8d0427e70..f1039e4bf 100644
--- a/patches/server/0429-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0421-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
@@ -55,7 +55,7 @@ index 5450734060428426981e2c1f1025b1aa5aa4d271..805459ba815520165c86a537fbb1f3e0
              LootContext lootContext = EntityPredicate.createContext(player, player);
              List<CriterionTrigger.Listener<T>> list = null;
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index f6daa77856f5d57b1a3b38e709bff47214372973..f29ddc244cfa5eba9b2903d40d8509731fc18287 100644
+index c61789a2df774761feb79123d31eab75f9996bf2..6e0073a54f59621d8adb4e8a70e6c89c708eabba 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -63,6 +63,7 @@ public class PlayerAdvancements {
diff --git a/patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0422-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0422-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0431-Fix-some-rails-connecting-improperly.patch b/patches/server/0423-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0431-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0423-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0432-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0424-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0432-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0424-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0433-Brand-support.patch b/patches/server/0425-Brand-support.patch
similarity index 96%
rename from patches/server/0433-Brand-support.patch
rename to patches/server/0425-Brand-support.patch
index d9dd9c999..f08785872 100644
--- a/patches/server/0433-Brand-support.patch
+++ b/patches/server/0425-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dc0869c5f4e4fcae9d4fed41a33bc9a278da6d22..1d19688f9861f6a44ed6ff181befd1f7b5cc6947 100644
+index 553cdac6fef1626d0eac86ca971fcf65a17839f8..2834161f763a556400f0c8acdcc7e88c4317d318 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index dc0869c5f4e4fcae9d4fed41a33bc9a278da6d22..1d19688f9861f6a44ed6ff181befd1f7
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 1b53b0ee686f34a881840c549c66ea1cbab36c9f..5e86123f41e63fbf3d37d0351c04a8c73da60f63 100644
+index e69043316372d98b122ed3788fda79cdd36849e8..6597e6e9987ddb5906909c22704fdfb6557aee8e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -55,6 +55,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0434-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0426-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0434-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0426-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0435-Don-t-require-FACING-data.patch b/patches/server/0427-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0435-Don-t-require-FACING-data.patch
rename to patches/server/0427-Don-t-require-FACING-data.patch
diff --git a/patches/server/0436-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 93%
rename from patches/server/0436-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 38b19523e..5c5e481dd 100644
--- a/patches/server/0436-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d9d4a8df764bce67ee13a542e0b21a5ec7fd8ca7..489db5b6cf82c518806dbabc43ec18fca7e672c4 100644
+index cdd766ccf85df7d0c17d36c544a5346dc46b4f22..5089fe44bdd1d20b6b54ef26e8107c5c75ff3ea2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2014,9 +2014,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index d9d4a8df764bce67ee13a542e0b21a5ec7fd8ca7..489db5b6cf82c518806dbabc43ec18fc
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2d6ef62205ff5a4da72e718f9b33d955a58d805f..bbae63fb0a5f3f61c25f8348b72b1f20dcece00a 100644
+index b91205b8459cfc78fce4b98e04ae4517eef22e20..705c1b2bba2b60b260c59a6953151f34cdfc8960 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -262,12 +262,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0437-Add-moon-phase-API.patch b/patches/server/0429-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0437-Add-moon-phase-API.patch
rename to patches/server/0429-Add-moon-phase-API.patch
diff --git a/patches/server/0438-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0430-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0438-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0430-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0439-Prevent-headless-pistons-from-being-created.patch b/patches/server/0431-Prevent-headless-pistons-from-being-created.patch
similarity index 92%
rename from patches/server/0439-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0431-Prevent-headless-pistons-from-being-created.patch
index 280e6fc1c..2254a27e1 100644
--- a/patches/server/0439-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0431-Prevent-headless-pistons-from-being-created.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index cf81854facadaf3c1f860bcaaf69db463a31b0c9..299583b1eb72cfdb4771ba0755fd71f2135484c1 100644
+index b1fdfae75aeea78ca77987e40242bf498447bc08..5097d9f1a3ab4e49e1899ede1742436357b0ad91 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -206,6 +206,15 @@ public class Explosion {
+@@ -205,6 +205,15 @@ public class Explosion {
  
                              if (f > 0.0F && this.damageCalculator.shouldBlockExplode(this, this.level, blockposition, iblockdata, f)) {
                                  set.add(blockposition);
diff --git a/patches/server/0440-Add-BellRingEvent.patch b/patches/server/0432-Add-BellRingEvent.patch
similarity index 93%
rename from patches/server/0440-Add-BellRingEvent.patch
rename to patches/server/0432-Add-BellRingEvent.patch
index 02c07c5c3..6fe7f72b6 100644
--- a/patches/server/0440-Add-BellRingEvent.patch
+++ b/patches/server/0432-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d147f545e80695fc30b458da640f66c7ab809cce..d51af2830fd347d5e55f5fa788df0e5b8481248c 100644
+index 8ac093866aec59b4e031b953d4c3c3af66733812..915f49bbfca87682a3ae497dfcd335268f974efe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -366,10 +366,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0441-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0433-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0441-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0433-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0442-Buffer-joins-to-world.patch b/patches/server/0434-Buffer-joins-to-world.patch
similarity index 95%
rename from patches/server/0442-Buffer-joins-to-world.patch
rename to patches/server/0434-Buffer-joins-to-world.patch
index e51227cf3..a8b0b7d08 100644
--- a/patches/server/0442-Buffer-joins-to-world.patch
+++ b/patches/server/0434-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index b99dbe3878df8f67a6920195088c00a01289a79f..19df0fa85080897a36bdbffa8fcef0991dbdd191 100644
+index 6cfb814ecaf12161ec2e2545560453d7dd41e2da..a25090d277f586c932e975068636ccd6cc43b204 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -498,14 +498,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0444-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0435-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 97%
rename from patches/server/0444-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0435-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 4d1e146d3..7976f5c39 100644
--- a/patches/server/0444-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0435-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -29,7 +29,7 @@ index 21aafb1ea51769659462d722aa318460b37cbc1c..228359f13511262a0e4afeb9deff982c
                      this.connection.disconnect(ichatmutablecomponent);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index e9d94abb77693a845ea6318b7045bd61a7a46feb..e2c7fa3fd05ebb3b76388410d26b6493baf4f877 100644
+index ba0bdd685c49c02bcb1b6d840ddceb9049565d34..d4658328eeecb1c9e3e25eec14dea07e9e2a8b74 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -99,7 +99,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0445-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0436-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 98%
rename from patches/server/0445-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0436-PortalCreateEvent-needs-to-know-its-entity.patch
index 0881951f2..a0a45caf7 100644
--- a/patches/server/0445-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0436-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -79,7 +79,7 @@ index 5e5d0e5b41b5ed90a5f0109b231d468bbc566ae7..b1e9ea9ece5ef8ecbe2ed919fda8e115
  
      private static int getFireTickDelay(RandomSource random) {
 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 2d1062d2b0412180cc08765ecf9b0a071983c06a..d1d00b9a078ee1f5a6c5dd51c2f0409d12c85c26 100644
+index 7e4264f87a0f81db71d49dbede32a1bad87f7ca8..aa15d65f69f89da97cecd47c3458cd3b4937055f 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
 @@ -43,6 +43,7 @@ import net.minecraft.world.item.DyeColor;
diff --git a/patches/server/0446-Add-more-Evoker-API.patch b/patches/server/0437-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0446-Add-more-Evoker-API.patch
rename to patches/server/0437-Add-more-Evoker-API.patch
diff --git a/patches/server/0447-Add-methods-to-get-translation-keys.patch b/patches/server/0438-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0447-Add-methods-to-get-translation-keys.patch
rename to patches/server/0438-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0448-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0439-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0448-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0439-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0449-Cache-block-data-strings.patch b/patches/server/0440-Cache-block-data-strings.patch
similarity index 95%
rename from patches/server/0449-Cache-block-data-strings.patch
rename to patches/server/0440-Cache-block-data-strings.patch
index 0f2424d33..06f4d481f 100644
--- a/patches/server/0449-Cache-block-data-strings.patch
+++ b/patches/server/0440-Cache-block-data-strings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 08e3f07c4547f8fa7b571ecef7436ba1fbee578a..2600be3ec00a1ba8cff5f03c8e3f7a06a05bbeaf 100644
+index efb5a5b31ada326593b3bea0f49c05591db18801..903d43aaa84fa20f1ca8a3e1dbf97c91584c8891 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2134,6 +2134,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2071,6 +2071,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
diff --git a/patches/server/0450-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 92%
rename from patches/server/0450-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 28de9a6d2..40c9cdc16 100644
--- a/patches/server/0450-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75073ab08a90bd0ce8afc54634e7d61d50650742..4c9a5b53d5b170593c759de1d5dc3c411d9d50b2 100644
+index 2f8715e200b9b8ae4c4b70ddd7cdc3368a109939..fba468f0a15dca041acf00e3865485055d2b8cb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -657,7 +657,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -31,10 +31,10 @@ index 75073ab08a90bd0ce8afc54634e7d61d50650742..4c9a5b53d5b170593c759de1d5dc3c41
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e68a29eb0c81285039a1a980d8b9b83f0b1d022e..522b5575e7e465ccf235fad7d2e87c92074312bd 100644
+index 7040b3b9b743b4f88f00da698e37afa42f277990..945d702f5fd204b2197d445e74bb941e814c09f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -162,6 +162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -161,6 +161,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -42,7 +42,7 @@ index e68a29eb0c81285039a1a980d8b9b83f0b1d022e..522b5575e7e465ccf235fad7d2e87c92
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1870,6 +1871,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1836,6 +1837,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
@@ -57,7 +57,7 @@ index e68a29eb0c81285039a1a980d8b9b83f0b1d022e..522b5575e7e465ccf235fad7d2e87c92
          this.setYRot(yaw);
          this.setXRot(pitch);
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index f4e1a540243d1f699dd2ef407707af27517d9360..b90c1e4e03f85dbfa7134bffd8da59330cea1e28 100644
+index 0c14b382e7660ce518096e9f26525ccea57a1bf9..a9c74ef33182505b6982fea273a760e937ddbf51 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -169,6 +169,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0451-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0442-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0451-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0442-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0452-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0443-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0452-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0443-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0453-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0444-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 93%
rename from patches/server/0453-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0444-Extend-block-drop-capture-to-capture-all-items-added.patch
index f6c24355d..6184e7d41 100644
--- a/patches/server/0453-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0444-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 489db5b6cf82c518806dbabc43ec18fca7e672c4..7227d29c6ecf77b026c84e06a3c605926e1f7e5e 100644
+index 5089fe44bdd1d20b6b54ef26e8107c5c75ff3ea2..53404e9a6f5f3aff625ce2e247bea1bfe478a996 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1512,6 +1512,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -23,7 +23,7 @@ index 489db5b6cf82c518806dbabc43ec18fca7e672c4..7227d29c6ecf77b026c84e06a3c60592
              if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 5b951937511126d58665c5e2baf18186a7a8d325..60c18af9253607bc51ecb9d23c23e652a9ba36e9 100644
+index 9f3450d6bbd330a2aebd271a086965bf364c9fe4..a157ccbedb94f287c610975d6c3cfb66a3bddbe8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -431,10 +431,12 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0454-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0454-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index ba65c24e8..6bc5b0b8c 100644
--- a/patches/server/0454-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 522b5575e7e465ccf235fad7d2e87c92074312bd..6ee2dc0ef43ffa89b2692adc01b3fd6090f5cbf6 100644
+index 945d702f5fd204b2197d445e74bb941e814c09f8..d26516fd10ec60bc8e27490df8e1f70aa0976d5c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4507,4 +4507,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4473,4 +4473,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0455-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0446-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0455-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0446-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0456-Entity-isTicking.patch b/patches/server/0447-Entity-isTicking.patch
similarity index 90%
rename from patches/server/0456-Entity-isTicking.patch
rename to patches/server/0447-Entity-isTicking.patch
index 06affcb10..1ee10cfb0 100644
--- a/patches/server/0456-Entity-isTicking.patch
+++ b/patches/server/0447-Entity-isTicking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6ee2dc0ef43ffa89b2692adc01b3fd6090f5cbf6..c359ba2c20a5f1a63a8342ba593ba51dc8daa905 100644
+index d26516fd10ec60bc8e27490df8e1f70aa0976d5c..49bea2b71d4fd3f2e38eabd1ebb57dd66d9abe0b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4512,5 +4512,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4478,5 +4478,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0457-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 90%
rename from patches/server/0457-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 6698fe0dc..4a158e1ee 100644
--- a/patches/server/0457-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2600be3ec00a1ba8cff5f03c8e3f7a06a05bbeaf..bb2de4fafa5a21c7dbf71dbad4bd01d0e6ece36f 100644
+index 903d43aaa84fa20f1ca8a3e1dbf97c91584c8891..abee10fbb354e22f6c41b04d9f281ffeafdc4498 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2217,13 +2217,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2154,13 +2154,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.isEnforceWhitelist()) {
              PlayerList playerlist = source.getServer().getPlayerList();
              UserWhiteList whitelist = playerlist.getWhiteList();
diff --git a/patches/server/0458-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0449-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 97%
rename from patches/server/0458-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0449-Fix-Concurrency-issue-in-ShufflingList.patch
index d97d2734d..36f5a879a 100644
--- a/patches/server/0458-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0449-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 281b5cf91135984a37ad013614c910f7d4d2fee3..79e7a7adf9f9d8b9fee7ae3bb3bebab86fa7fd72 100644
+index 419eadbe31b86b7192fd7a63268d547705e7c7ce..4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89 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/0459-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0450-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0459-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0450-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0460-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0451-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0460-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0451-Fix-for-large-move-vectors-crashing-server.patch
index ea1b925ed..7eafb0c19 100644
--- a/patches/server/0460-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0451-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4c9a5b53d5b170593c759de1d5dc3c411d9d50b2..da28ef2db1b96a79ffae87518b8c77647f3f13df 100644
+index fba468f0a15dca041acf00e3865485055d2b8cb1..8682ba8d677461842fbb0b40a3d5fdd4d22a8e9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -473,9 +473,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0461-Optimise-getType-calls.patch b/patches/server/0452-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0461-Optimise-getType-calls.patch
rename to patches/server/0452-Optimise-getType-calls.patch
diff --git a/patches/server/0462-Villager-resetOffers.patch b/patches/server/0453-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0462-Villager-resetOffers.patch
rename to patches/server/0453-Villager-resetOffers.patch
diff --git a/patches/server/0463-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0454-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0463-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0454-Retain-block-place-order-when-capturing-blockstates.patch
index 4b8e75e70..91b1830d1 100644
--- a/patches/server/0463-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0454-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 92f250b9cc965a433dc9b9de1f9bfeb2acf4363e..15021a6791a5f76c3bb55e88a32b41d0c0ebaf58 100644
+index f8246abc1bf9be51e93d645e03b9223326e919f9..b0c61b274c24e2ced86a6acc0ea007a80e61fd3e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -159,7 +159,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0464-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0455-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0464-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0455-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0465-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0456-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0465-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0456-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0466-Fix-bell-block-entity-memory-leak.patch b/patches/server/0457-Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/server/0466-Fix-bell-block-entity-memory-leak.patch
rename to patches/server/0457-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0467-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0458-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0467-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0458-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0468-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0459-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0468-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0459-Add-getOfflinePlayerIfCached-String.patch
index c07593241..32d7d4f54 100644
--- a/patches/server/0468-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0459-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a25cc6f7d91100b98996d9f07fff3c62018ddf86..f80846c1940d6a094c5980a451016a9214d594fb 100644
+index 6dde3d479aa1ae50c6404419ec5da52f0b68a11e..4b787a548a21512f8fe44a32568181ed18a38157 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1909,6 +1909,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0469-Add-ignore-discounts-API.patch b/patches/server/0460-Add-ignore-discounts-API.patch
similarity index 99%
rename from patches/server/0469-Add-ignore-discounts-API.patch
rename to patches/server/0460-Add-ignore-discounts-API.patch
index df5811002..60e260aea 100644
--- a/patches/server/0469-Add-ignore-discounts-API.patch
+++ b/patches/server/0460-Add-ignore-discounts-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ignore discounts API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index c0aa370367856a159412dd141f683b7d51e11c8b..b33fa26d6e3cf8999fb24137069d0a4178f82caf 100644
+index 7956c1ec7bf6b9fe224ec14bb695c0b8ca9dcf2d..fb5d4b1a86d00fce9482ed4fd4ae71fdcdb63781 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -508,6 +508,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0470-Toggle-for-removing-existing-dragon.patch b/patches/server/0461-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0470-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0461-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0471-Fix-client-lag-on-advancement-loading.patch b/patches/server/0462-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0471-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0462-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0472-Item-no-age-no-player-pickup.patch b/patches/server/0463-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0472-Item-no-age-no-player-pickup.patch
rename to patches/server/0463-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0474-Beacon-API-custom-effect-ranges.patch b/patches/server/0464-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0474-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0464-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0475-Add-API-for-quit-reason.patch b/patches/server/0465-Add-API-for-quit-reason.patch
similarity index 95%
rename from patches/server/0475-Add-API-for-quit-reason.patch
rename to patches/server/0465-Add-API-for-quit-reason.patch
index e2fcc31f8..6b25d656a 100644
--- a/patches/server/0475-Add-API-for-quit-reason.patch
+++ b/patches/server/0465-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index a25090d277f586c932e975068636ccd6cc43b204..dd7deb9175059857c59c85c745053cc8
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1d19688f9861f6a44ed6ff181befd1f7b5cc6947..115ecf1d50f796adb85df6fdd8739f71740faf3e 100644
+index 2834161f763a556400f0c8acdcc7e88c4317d318..cf3c2229347f8a8ca860e8b1fbf9226c497df479 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 1d19688f9861f6a44ed6ff181befd1f7b5cc6947..115ecf1d50f796adb85df6fdd8739f71
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 5e86123f41e63fbf3d37d0351c04a8c73da60f63..7c17c3d4f4f5ebc42186fcc98008bda062715e55 100644
+index 6597e6e9987ddb5906909c22704fdfb6557aee8e..6bb846d3ee2fb54ab3ffa116607f2a83e538460e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -315,6 +315,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -49,7 +49,7 @@ index 5e86123f41e63fbf3d37d0351c04a8c73da60f63..7c17c3d4f4f5ebc42186fcc98008bda0
              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 f68691542e57da7866253c43251c10235ebc57a0..fdfa2fe6a2564a963dfabff3f9a49ca26c71d2be 100644
+index d5890b41c2ddf955416a64132f3022d95850f04b..bd009fdf73d2eb03708e80683d360be0ba13edd6 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/0476-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0466-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0476-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0466-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0477-Expose-world-spawn-angle.patch b/patches/server/0467-Expose-world-spawn-angle.patch
similarity index 91%
rename from patches/server/0477-Expose-world-spawn-angle.patch
rename to patches/server/0467-Expose-world-spawn-angle.patch
index a4e4c3ef8..67e838080 100644
--- a/patches/server/0477-Expose-world-spawn-angle.patch
+++ b/patches/server/0467-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fdfa2fe6a2564a963dfabff3f9a49ca26c71d2be..711956432c421d812b5e0d37834ce4cd276cea06 100644
+index bd009fdf73d2eb03708e80683d360be0ba13edd6..a393af8e54837e6bf9e05050dd3b38d5ad015782 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -849,7 +849,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0478-Add-Destroy-Speed-API.patch b/patches/server/0468-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0478-Add-Destroy-Speed-API.patch
rename to patches/server/0468-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0479-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0469-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0479-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0469-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0480-Add-LivingEntity-clearActiveItem.patch b/patches/server/0470-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0480-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0470-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0481-Add-PlayerItemCooldownEvent.patch b/patches/server/0471-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0481-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0471-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0482-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0472-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0482-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0472-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0483-More-lightning-API.patch b/patches/server/0473-More-lightning-API.patch
similarity index 100%
rename from patches/server/0483-More-lightning-API.patch
rename to patches/server/0473-More-lightning-API.patch
diff --git a/patches/server/0484-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0474-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0484-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0474-Climbing-should-not-bypass-cramming-gamerule.patch
index f5a8e23a0..f0a4f0386 100644
--- a/patches/server/0484-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0474-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c359ba2c20a5f1a63a8342ba593ba51dc8daa905..b7a0fb1d6500d0a0d6734726484b04a084ce757c 100644
+index 49bea2b71d4fd3f2e38eabd1ebb57dd66d9abe0b..5baa6503b9d0e4f854c2546d0bbdd527c9f63cca 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2063,6 +2063,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2029,6 +2029,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean isPushable() {
@@ -44,7 +44,7 @@ index c9c7833755af3c7bef1d40f2ca425cbec59efa68..75cdddbfbbc4c0c521194dde27ba5f5d
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index be239cce5b4d326da46bcf63394d1bc03f2a9bb6..f4050168502e714f530c249d4730525c06958f6b 100644
+index b691d188c741c8acf8d20bc9e6184b6445ba6332..cf57c977d64a76d29a4f9a4811d55a17cc51e368 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3426,7 +3426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0485-Add-missing-default-perms-for-commands.patch b/patches/server/0475-Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0485-Add-missing-default-perms-for-commands.patch
rename to patches/server/0475-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0486-Add-PlayerShearBlockEvent.patch b/patches/server/0476-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0486-Add-PlayerShearBlockEvent.patch
rename to patches/server/0476-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0487-Limit-recipe-packets.patch b/patches/server/0477-Limit-recipe-packets.patch
similarity index 96%
rename from patches/server/0487-Limit-recipe-packets.patch
rename to patches/server/0477-Limit-recipe-packets.patch
index ad49c3d49..0d6c1aaa3 100644
--- a/patches/server/0487-Limit-recipe-packets.patch
+++ b/patches/server/0477-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index da28ef2db1b96a79ffae87518b8c77647f3f13df..1f51d1e6fb85a73ed6c046a5dd32c27b43f9d63b 100644
+index 8682ba8d677461842fbb0b40a3d5fdd4d22a8e9e..3756ea70ae32005eb5d6b8285b1b1c1273c553f0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -258,6 +258,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0488-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0478-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0488-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0478-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0489-Player-Chunk-Load-Unload-Events.patch b/patches/server/0479-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0489-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0479-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0490-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0480-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0490-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0480-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0491-Expose-LivingEntity-hurt-direction.patch b/patches/server/0481-Expose-LivingEntity-hurt-direction.patch
similarity index 96%
rename from patches/server/0491-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0481-Expose-LivingEntity-hurt-direction.patch
index 896e17653..29f45c6f9 100644
--- a/patches/server/0491-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0481-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index ca7f6ffdbfc8c796c3a26108f281bef7af560f78..07e15c65bf52725b6f63c89ae421afd3d95ffd87 100644
+index 2a7d62305d16074de4eeb84d8870a089cf8641ac..1f5f27bea4afdab99bb41f87288f66b29d7c5264 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -178,7 +178,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0492-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0482-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 91%
rename from patches/server/0492-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0482-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 21f0a261e..4531ba2a8 100644
--- a/patches/server/0492-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0482-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d51af2830fd347d5e55f5fa788df0e5b8481248c..650ff96dc5d2b690520d2f2eb91d25bdf182e22e 100644
+index 915f49bbfca87682a3ae497dfcd335268f974efe..23fb49657e07c99e10d238420ecb177ca515a2af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -301,6 +301,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0493-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0483-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 100%
rename from patches/server/0493-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/0483-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0495-Add-TargetHitEvent.patch b/patches/server/0484-Add-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0495-Add-TargetHitEvent.patch
rename to patches/server/0484-Add-TargetHitEvent.patch
diff --git a/patches/server/0496-MC-4-Fix-item-position-desync.patch b/patches/server/0485-MC-4-Fix-item-position-desync.patch
similarity index 93%
rename from patches/server/0496-MC-4-Fix-item-position-desync.patch
rename to patches/server/0485-MC-4-Fix-item-position-desync.patch
index ad0abd54b..d81d8f0fb 100644
--- a/patches/server/0496-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0485-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..3c4ac79c094dc2fff7de94150a34b7bf
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b7a0fb1d6500d0a0d6734726484b04a084ce757c..7472e3aba473afe474ec0928d3cd1166bb59d0b2 100644
+index 5baa6503b9d0e4f854c2546d0bbdd527c9f63cca..0b7ac3f3115a6e83fe5f2bee8a372ad01dd91fb3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4283,6 +4283,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4249,6 +4249,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0497-Additional-Block-Material-API.patch b/patches/server/0486-Additional-Block-Material-API.patch
similarity index 100%
rename from patches/server/0497-Additional-Block-Material-API.patch
rename to patches/server/0486-Additional-Block-Material-API.patch
diff --git a/patches/server/0498-Fix-harming-potion-dupe.patch b/patches/server/0487-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0498-Fix-harming-potion-dupe.patch
rename to patches/server/0487-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0499-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0488-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/server/0499-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/server/0488-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0500-Cache-burn-durations.patch b/patches/server/0489-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0500-Cache-burn-durations.patch
rename to patches/server/0489-Cache-burn-durations.patch
diff --git a/patches/server/0501-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0490-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0501-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0490-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0502-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0491-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0502-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0491-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0503-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0492-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0503-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0492-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0504-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0493-Fix-interact-event-not-being-called-sometimes.patch
similarity index 97%
rename from patches/server/0504-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0493-Fix-interact-event-not-being-called-sometimes.patch
index f2c474f44..ce207281d 100644
--- a/patches/server/0504-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0493-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1f51d1e6fb85a73ed6c046a5dd32c27b43f9d63b..e27395ff1b8e4546877c42f1df5ba836c11cdb6e 100644
+index 3756ea70ae32005eb5d6b8285b1b1c1273c553f0..c169c44321c8bd6ea562f99f6c8a5a5f5be79425 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1760,7 +1760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0505-Zombie-API-breaking-doors.patch b/patches/server/0494-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0505-Zombie-API-breaking-doors.patch
rename to patches/server/0494-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0506-Fix-nerfed-slime-when-splitting.patch b/patches/server/0495-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0506-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0495-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0507-Add-EntityLoadCrossbowEvent.patch b/patches/server/0496-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0507-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0496-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0508-Add-WorldGameRuleChangeEvent.patch b/patches/server/0497-Add-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0508-Add-WorldGameRuleChangeEvent.patch
rename to patches/server/0497-Add-WorldGameRuleChangeEvent.patch
index 78f64f78b..449e76ade 100644
--- a/patches/server/0508-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0497-Add-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 334001cb749600c973c82391e1c11f0e40bd2dfb..f3cdf1fa7731eb7bb1cb89aa6a37204d
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bbae63fb0a5f3f61c25f8348b72b1f20dcece00a..f62cec4122b384603ae5d3ad6f6134eff2d703fe 100644
+index 705c1b2bba2b60b260c59a6953151f34cdfc8960..e092afa65bc6d14c53a09175b0a8cd9ad50a7477 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1930,8 +1930,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0509-Add-ServerResourcesReloadedEvent.patch b/patches/server/0498-Add-ServerResourcesReloadedEvent.patch
similarity index 94%
rename from patches/server/0509-Add-ServerResourcesReloadedEvent.patch
rename to patches/server/0498-Add-ServerResourcesReloadedEvent.patch
index 5eb5aa8de..8e5036524 100644
--- a/patches/server/0509-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0498-Add-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bb2de4fafa5a21c7dbf71dbad4bd01d0e6ece36f..563dc53b10389f106f310d9c9ecfe33f7e701553 100644
+index abee10fbb354e22f6c41b04d9f281ffeafdc4498..6268b8ffe365c45406df7f40fcbc0567cc5d1db4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2094,7 +2094,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2039,7 +2039,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index bb2de4fafa5a21c7dbf71dbad4bd01d0e6ece36f..563dc53b10389f106f310d9c9ecfe33f
          RegistryAccess.Frozen iregistrycustom_dimension = this.registries.getAccessForLoading(RegistryLayer.RELOADABLE);
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
-@@ -2135,6 +2141,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2072,6 +2078,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
              org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings; they can be defined by datapacks so refresh it here
diff --git a/patches/server/0510-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0499-Add-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0510-Add-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0499-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0511-Add-BlockFailedDispenseEvent.patch b/patches/server/0500-Add-BlockFailedDispenseEvent.patch
similarity index 96%
rename from patches/server/0511-Add-BlockFailedDispenseEvent.patch
rename to patches/server/0500-Add-BlockFailedDispenseEvent.patch
index 5cf7a3438..d9cb60b94 100644
--- a/patches/server/0511-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0500-Add-BlockFailedDispenseEvent.patch
@@ -32,7 +32,7 @@ index 913ed110d8402d377152753325901eb7f3ac82d6..1d13f8a1009d6eda351c697052d499d5
              } else {
                  ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 650ff96dc5d2b690520d2f2eb91d25bdf182e22e..fd7e23b015ee99f7024759b31ad71b66a5b04d07 100644
+index 23fb49657e07c99e10d238420ecb177ca515a2af..0887f8102b703ede1e528345851e48f786dc7c58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2040,4 +2040,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0512-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0501-Add-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0512-Add-PlayerLecternPageChangeEvent.patch
rename to patches/server/0501-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0513-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0502-Add-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0513-Add-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0502-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0514-Configurable-door-breaking-difficulty.patch b/patches/server/0503-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0514-Configurable-door-breaking-difficulty.patch
rename to patches/server/0503-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0515-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0504-Empty-commands-shall-not-be-dispatched.patch
similarity index 89%
rename from patches/server/0515-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0504-Empty-commands-shall-not-be-dispatched.patch
index c1753a8a9..7a48e3018 100644
--- a/patches/server/0515-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0504-Empty-commands-shall-not-be-dispatched.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Empty commands shall not be dispatched
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 5c4a89fc7388b8e6ca9ade03fd34a8da79ae0ad9..f844f7ae935b55d254c422b702a8ca2a81119baa 100644
+index d39743d9626eb01c942194387dafb1106f13601b..0741c0f85536c5188d8552e999943a9c771a548e 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -287,6 +287,7 @@ public class Commands {
diff --git a/patches/server/0516-Remove-stale-POIs.patch b/patches/server/0505-Remove-stale-POIs.patch
similarity index 92%
rename from patches/server/0516-Remove-stale-POIs.patch
rename to patches/server/0505-Remove-stale-POIs.patch
index 24b52efc0..819aae912 100644
--- a/patches/server/0516-Remove-stale-POIs.patch
+++ b/patches/server/0505-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7227d29c6ecf77b026c84e06a3c605926e1f7e5e..f059ba5cfc0a3e12ea4b1b3554d85170fe782fff 100644
+index 53404e9a6f5f3aff625ce2e247bea1bfe478a996..fdf85454fc55de4d966442d32ee004e7e66b0ed7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2083,6 +2083,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0517-Fix-villager-boat-exploit.patch b/patches/server/0506-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0517-Fix-villager-boat-exploit.patch
rename to patches/server/0506-Fix-villager-boat-exploit.patch
index 21017f52f..bcb2dd68c 100644
--- a/patches/server/0517-Fix-villager-boat-exploit.patch
+++ b/patches/server/0506-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 711956432c421d812b5e0d37834ce4cd276cea06..c962a1f40a97ca210e36341d79a1db02be2b20b8 100644
+index a393af8e54837e6bf9e05050dd3b38d5ad015782..77302ac01edc715c0536821611a88ac951135a41 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/0518-Add-sendOpLevel-API.patch b/patches/server/0507-Add-sendOpLevel-API.patch
similarity index 91%
rename from patches/server/0518-Add-sendOpLevel-API.patch
rename to patches/server/0507-Add-sendOpLevel-API.patch
index 036fddc2e..4dcf5e900 100644
--- a/patches/server/0518-Add-sendOpLevel-API.patch
+++ b/patches/server/0507-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 c962a1f40a97ca210e36341d79a1db02be2b20b8..b1ef7d734c053f8a26da5258826dbc50af9c1162 100644
+index 77302ac01edc715c0536821611a88ac951135a41..ed106322419be1065fd900b02f4f71d268726e38 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1103,6 +1103,11 @@ public abstract class PlayerList {
+@@ -1102,6 +1102,11 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -20,7 +20,7 @@ index c962a1f40a97ca210e36341d79a1db02be2b20b8..b1ef7d734c053f8a26da5258826dbc50
          if (player.connection != null) {
              byte b0;
  
-@@ -1117,8 +1122,10 @@ public abstract class PlayerList {
+@@ -1116,8 +1121,10 @@ public abstract class PlayerList {
              player.connection.send(new ClientboundEntityEventPacket(player, b0));
          }
  
diff --git a/patches/server/0519-TODO-Registry-Modification-API.patch b/patches/server/0508-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0519-TODO-Registry-Modification-API.patch
rename to patches/server/0508-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0520-Add-StructuresLocateEvent.patch b/patches/server/0509-Add-StructuresLocateEvent.patch
similarity index 99%
rename from patches/server/0520-Add-StructuresLocateEvent.patch
rename to patches/server/0509-Add-StructuresLocateEvent.patch
index 1a76378c9..a0a334487 100644
--- a/patches/server/0520-Add-StructuresLocateEvent.patch
+++ b/patches/server/0509-Add-StructuresLocateEvent.patch
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..2667067fd13f61e0464ba88ae4e4a707
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index f430589fc2cdda23b099b20ace9818e8a8eb7278..0a21632a3e02690a8edcc17ac25d2551a8964bbe 100644
+index 1eacb6998f99833441dd1dcb8301f25759675f53..180f8ae443d1ea44a748c7f3ebb82a0bab8d31f1 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -121,6 +121,24 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0521-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0510-Collision-option-for-requiring-a-player-participant.patch
similarity index 95%
rename from patches/server/0521-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0510-Collision-option-for-requiring-a-player-participant.patch
index 52b993868..992c90a2f 100644
--- a/patches/server/0521-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0510-Collision-option-for-requiring-a-player-participant.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7472e3aba473afe474ec0928d3cd1166bb59d0b2..b7a83aebbf0602a338a1510f678cf5037ff619b8 100644
+index 0b7ac3f3115a6e83fe5f2bee8a372ad01dd91fb3..d80d849e9991da00f6aa63913407bf7fd368cadf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1933,6 +1933,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1899,6 +1899,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public void push(Entity entity) {
          if (!this.isPassengerOfSameVehicle(entity)) {
              if (!entity.noPhysics && !this.noPhysics) {
diff --git a/patches/server/0522-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0511-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0522-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0511-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0523-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0512-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 92%
rename from patches/server/0523-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0512-Return-chat-component-with-empty-text-instead-of-thr.patch
index 3204d5fe1..ba3a6a7f9 100644
--- a/patches/server/0523-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0512-Return-chat-component-with-empty-text-instead-of-thr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 1465dbc29fc34bfe6ebb53e95fa6a4cbf2127a6c..7d7b60a5c27a620b570dc5e72bb0b4c7963ca4d4 100644
+index 52e57fa3b25dce10c17682964cbd4bcb4c130dc6..94fe6bd403222049e4e7a407bb6ca99bcaab6acb 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -89,7 +89,12 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0524-Make-schedule-command-per-world.patch b/patches/server/0513-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0524-Make-schedule-command-per-world.patch
rename to patches/server/0513-Make-schedule-command-per-world.patch
diff --git a/patches/server/0525-Configurable-max-leash-distance.patch b/patches/server/0514-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0525-Configurable-max-leash-distance.patch
rename to patches/server/0514-Configurable-max-leash-distance.patch
diff --git a/patches/server/0526-Add-BlockPreDispenseEvent.patch b/patches/server/0515-Add-BlockPreDispenseEvent.patch
similarity index 95%
rename from patches/server/0526-Add-BlockPreDispenseEvent.patch
rename to patches/server/0515-Add-BlockPreDispenseEvent.patch
index 143cefb36..9e6a75172 100644
--- a/patches/server/0526-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0515-Add-BlockPreDispenseEvent.patch
@@ -17,7 +17,7 @@ index 5593a0aa9e618071b6521b213dde0f628348c3dc..644e64850479cea20a98b8a65503ccf3
                      tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fd7e23b015ee99f7024759b31ad71b66a5b04d07..5bc8991249520139c6646736bf210440922f24da 100644
+index 0887f8102b703ede1e528345851e48f786dc7c58..1e45ca6c042fe86785ac36645e1ce2f5a85a8d23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2047,5 +2047,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0527-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0516-Add-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0527-Add-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0516-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0528-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0517-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0528-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0517-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0529-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0518-Add-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0529-Add-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0518-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0530-Expand-EntityUnleashEvent.patch b/patches/server/0519-Expand-EntityUnleashEvent.patch
similarity index 98%
rename from patches/server/0530-Expand-EntityUnleashEvent.patch
rename to patches/server/0519-Expand-EntityUnleashEvent.patch
index d8f093006..98433c53e 100644
--- a/patches/server/0530-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0519-Expand-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 321076a70653b5b499eb56ce3d9b2b0a4a8b92dc..74004b78673e81218b44097eea89a79217e005a6 100644
+index a04240f64541009f342bcdeb725ccb04c65b697b..59b776c591af3e890b81f9c2ca67c119ba89695e 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1305,12 +1305,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -122,7 +122,7 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..006aba8bbb34a0d45ef626a1d299e819
                              flag1 = true;
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5bc8991249520139c6646736bf210440922f24da..74d018a0184daf7535f315e65f54b5d2152ad58b 100644
+index 1e45ca6c042fe86785ac36645e1ce2f5a85a8d23..54b0e6e6c21c02bd6a2a702f6b6416d573f62f9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1637,8 +1637,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0531-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0520-Reset-shield-blocking-on-dimension-change.patch
similarity index 90%
rename from patches/server/0531-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0520-Reset-shield-blocking-on-dimension-change.patch
index 06243f3ec..80b3f993f 100644
--- a/patches/server/0531-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0520-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 94ddc704114af810a3f9c858863e10b5a2b87edd..c9ac912c5cdd5d2aeb09154b224386fb73dfbc69 100644
+index cf3c2229347f8a8ca860e8b1fbf9226c497df479..449bd6d823746b5d6bbcbde54eeb3105f9cf9f04 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1247,6 +1247,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0532-Add-DragonEggFormEvent.patch b/patches/server/0521-Add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0532-Add-DragonEggFormEvent.patch
rename to patches/server/0521-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0533-Add-EntityMoveEvent.patch b/patches/server/0522-Add-EntityMoveEvent.patch
similarity index 91%
rename from patches/server/0533-Add-EntityMoveEvent.patch
rename to patches/server/0522-Add-EntityMoveEvent.patch
index e6d6cec8a..f8555a31f 100644
--- a/patches/server/0533-Add-EntityMoveEvent.patch
+++ b/patches/server/0522-Add-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 563dc53b10389f106f310d9c9ecfe33f7e701553..b0e0c955e9b5c92d4a8e8d55149d5e8123011420 100644
+index 6268b8ffe365c45406df7f40fcbc0567cc5d1db4..e048caafe645e33764a26154b5150c5c5de5b1ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1584,6 +1584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1529,6 +1529,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -17,7 +17,7 @@ index 563dc53b10389f106f310d9c9ecfe33f7e701553..b0e0c955e9b5c92d4a8e8d55149d5e81
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f059ba5cfc0a3e12ea4b1b3554d85170fe782fff..186a4ea81212ba9a0c928de3226dd25fac1f4252 100644
+index fdf85454fc55de4d966442d32ee004e7e66b0ed7..4b1ddc849efaaba6fe35e46d7a979e6c65f0dbd2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index f059ba5cfc0a3e12ea4b1b3554d85170fe782fff..186a4ea81212ba9a0c928de3226dd25f
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f4050168502e714f530c249d4730525c06958f6b..f0409e77e2bfb4463fce9f4cbbf1233589c102ea 100644
+index cf57c977d64a76d29a4f9a4811d55a17cc51e368..a2ed9d38f66004d8e7affd5d8e6277076ea04b3d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3361,6 +3361,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0534-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0523-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 92%
rename from patches/server/0534-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0523-added-option-to-disable-pathfinding-updates-on-block.patch
index f60db1c08..4eec5bfe6 100644
--- a/patches/server/0534-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0523-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 186a4ea81212ba9a0c928de3226dd25fac1f4252..b3d5d0dc5671f3c2bb41263ef52951da5c87ed74 100644
+index 4b1ddc849efaaba6fe35e46d7a979e6c65f0dbd2..8aa3d8ea13fe7a68628e7647f4da2558873415b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1657,6 +1657,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0535-Inline-shift-direction-fields.patch b/patches/server/0524-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0535-Inline-shift-direction-fields.patch
rename to patches/server/0524-Inline-shift-direction-fields.patch
diff --git a/patches/server/0536-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0525-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0536-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0525-Allow-adding-items-to-BlockDropItemEvent.patch
index 5305d7daa..4f2a76f71 100644
--- a/patches/server/0536-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0525-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 74d018a0184daf7535f315e65f54b5d2152ad58b..2da51dc36e21e45ecc3cbbe357947f8359e538eb 100644
+index 54b0e6e6c21c02bd6a2a702f6b6416d573f62f9c..166035d8f708b94a9563c3802418ab6200071bc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -450,13 +450,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0537-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0526-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0537-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0526-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0538-living-entity-allow-attribute-registration.patch b/patches/server/0527-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0538-living-entity-allow-attribute-registration.patch
rename to patches/server/0527-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0539-fix-dead-slime-setSize-invincibility.patch b/patches/server/0528-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0539-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0528-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0540-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0529-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0540-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0529-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0541-Expose-Tracked-Players.patch b/patches/server/0530-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0541-Expose-Tracked-Players.patch
rename to patches/server/0530-Expose-Tracked-Players.patch
diff --git a/patches/server/0542-Improve-ServerGUI.patch b/patches/server/0531-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0542-Improve-ServerGUI.patch
rename to patches/server/0531-Improve-ServerGUI.patch
diff --git a/patches/server/0543-fix-converting-txt-to-json-file.patch b/patches/server/0532-fix-converting-txt-to-json-file.patch
similarity index 95%
rename from patches/server/0543-fix-converting-txt-to-json-file.patch
rename to patches/server/0532-fix-converting-txt-to-json-file.patch
index 9c650b7e7..019c77e87 100644
--- a/patches/server/0543-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0532-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..1c9cf5e1c4ee05724ffcdbd77a19bca1
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 09956f69b63844d67aeab1339ae65910fc8eb8bf..c2d11d89a94218cc84790df1b5b61e50db884801 100644
+index b6f87e28625df68548a296001a0d67601513f7d1..a27e9ba8448930e45e283b8e19156bcf86b9baee 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -199,6 +199,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -48,7 +48,7 @@ index 09956f69b63844d67aeab1339ae65910fc8eb8bf..c2d11d89a94218cc84790df1b5b61e50
          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 b1ef7d734c053f8a26da5258826dbc50af9c1162..298c5bece0e3bd992df8027d53ca6ada5b82d507 100644
+index ed106322419be1065fd900b02f4f71d268726e38..6d31d09c4c14c7038d2698fc13de47cc56ef2964 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/0544-Add-worldborder-events.patch b/patches/server/0533-Add-worldborder-events.patch
similarity index 97%
rename from patches/server/0544-Add-worldborder-events.patch
rename to patches/server/0533-Add-worldborder-events.patch
index aa20cc3a0..f39382cd6 100644
--- a/patches/server/0544-Add-worldborder-events.patch
+++ b/patches/server/0533-Add-worldborder-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add worldborder events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-index dd74e8a034022fe72a1652f92712182b4910f651..8e441aafff788eab9e3d6d2fc7b70183d90b9ef4 100644
+index bf5ac907507bf3b5bfcef45b566c0bc12626e2c0..350aabd20329f429248c84d73ab8b5eb145943a7 100644
 --- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
 +++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
 @@ -123,6 +123,14 @@ public class WorldBorder {
diff --git a/patches/server/0545-Add-PlayerNameEntityEvent.patch b/patches/server/0534-Add-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0545-Add-PlayerNameEntityEvent.patch
rename to patches/server/0534-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0546-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0535-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0546-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0535-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0547-Add-recipe-to-cook-events.patch b/patches/server/0536-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0547-Add-recipe-to-cook-events.patch
rename to patches/server/0536-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0548-Add-Block-isValidTool.patch b/patches/server/0537-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0548-Add-Block-isValidTool.patch
rename to patches/server/0537-Add-Block-isValidTool.patch
diff --git a/patches/server/0549-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0538-Allow-using-signs-inside-spawn-protection.patch
similarity index 95%
rename from patches/server/0549-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0538-Allow-using-signs-inside-spawn-protection.patch
index 4a1cbafca..264b2f0c1 100644
--- a/patches/server/0549-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0538-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e27395ff1b8e4546877c42f1df5ba836c11cdb6e..258855b702c6705ce78a32c20c665682ed65d3f2 100644
+index c169c44321c8bd6ea562f99f6c8a5a5f5be79425..dba0aa5d1dc63e8d9f4a429e7b7c415bea0af3d8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1752,7 +1752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0550-Expand-world-key-API.patch b/patches/server/0539-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0550-Expand-world-key-API.patch
rename to patches/server/0539-Expand-world-key-API.patch
index c7a789fc2..cb490b2a3 100644
--- a/patches/server/0550-Expand-world-key-API.patch
+++ b/patches/server/0539-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index 0fb214ddd919b568da64541fd9b531c65caa5fad..9cd267f53505658d1c75187b662c4d9f
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f80846c1940d6a094c5980a451016a9214d594fb..f192bd669e48865ae3ca7c79fd3c356d96556bd8 100644
+index 4b787a548a21512f8fe44a32568181ed18a38157..cd3131c2ebac59a1a2a05fe0216214d9b301abfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1137,9 +1137,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0551-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0540-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0551-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0540-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0552-Item-Rarity-API.patch b/patches/server/0541-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0552-Item-Rarity-API.patch
rename to patches/server/0541-Item-Rarity-API.patch
diff --git a/patches/server/0553-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0542-Drop-carried-item-when-player-has-disconnected.patch
similarity index 93%
rename from patches/server/0553-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0542-Drop-carried-item-when-player-has-disconnected.patch
index eeea2fbaf..5d0ecd0f7 100644
--- a/patches/server/0553-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0542-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 298c5bece0e3bd992df8027d53ca6ada5b82d507..c8cff0054c7f5eaab3143e828e463e7ad913cd92 100644
+index 6d31d09c4c14c7038d2698fc13de47cc56ef2964..be5f0e2f23673b914d259e114281fdc0b6047ab6 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/0554-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0543-forced-whitelist-use-configurable-kick-message.patch
similarity index 87%
rename from patches/server/0554-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0543-forced-whitelist-use-configurable-kick-message.patch
index b4788befb..8798f4c76 100644
--- a/patches/server/0554-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0543-forced-whitelist-use-configurable-kick-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b0e0c955e9b5c92d4a8e8d55149d5e8123011420..d99217292a094713287cd597c9d7c01f04b9c7c7 100644
+index e048caafe645e33764a26154b5150c5c5de5b1ad..ccb26a6ccd7b5eb493d926ba0fcff22b924280d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2233,7 +2233,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2170,7 +2170,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
diff --git a/patches/server/0555-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0544-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0555-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0544-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 94029d841..e971d75cc 100644
--- a/patches/server/0555-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0544-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 258855b702c6705ce78a32c20c665682ed65d3f2..c81003c3642dafeb591d28b3bb1cf1a690b80937 100644
+index dba0aa5d1dc63e8d9f4a429e7b7c415bea0af3d8..faac58b840e173469a1549680bc80b60ed74b6e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1187,7 +1187,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0556-Expose-protocol-version.patch b/patches/server/0545-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0556-Expose-protocol-version.patch
rename to patches/server/0545-Expose-protocol-version.patch
diff --git a/patches/server/0557-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0546-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0557-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0546-Enhance-console-tab-completions-for-brigadier-comman.patch
index 3a5ba6b74..d78dcd57e 100644
--- a/patches/server/0557-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0546-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c2d11d89a94218cc84790df1b5b61e50db884801..a380f1f289dec841f98c3c8f39d58d8fffff7b8c 100644
+index a27e9ba8448930e45e283b8e19156bcf86b9baee..83bf6e7fd2f59ddc6b10a11d64ad198f8277e0fa 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0558-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 93%
rename from patches/server/0558-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 204dc2c7e..8b56804e9 100644
--- a/patches/server/0558-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f0409e77e2bfb4463fce9f4cbbf1233589c102ea..1fd1d8abedeebf3f1d1e2465fa3792d404787c68 100644
+index a2ed9d38f66004d8e7affd5d8e6277076ea04b3d..c7070680373145caaa2d94df15590bb308361fea 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3859,6 +3859,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0559-Add-bypass-host-check.patch b/patches/server/0548-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0559-Add-bypass-host-check.patch
rename to patches/server/0548-Add-bypass-host-check.patch
diff --git a/patches/server/0560-Set-area-affect-cloud-rotation.patch b/patches/server/0549-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0560-Set-area-affect-cloud-rotation.patch
rename to patches/server/0549-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0561-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0550-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0561-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0550-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0562-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0551-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0562-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0551-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0563-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0552-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0563-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0552-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0564-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0553-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0564-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0553-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0565-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0554-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0565-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0554-fix-PlayerItemHeldEvent-firing-twice.patch
index 0935be9b7..1486c9c61 100644
--- a/patches/server/0565-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0554-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c81003c3642dafeb591d28b3bb1cf1a690b80937..7dad8382910b405cdd3345454721f9b72921a7f4 100644
+index faac58b840e173469a1549680bc80b60ed74b6e8..6252f71c6b5df2a35d58c8f7cd64049b2819ddc0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1921,6 +1921,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0566-Add-PlayerDeepSleepEvent.patch b/patches/server/0555-Add-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0566-Add-PlayerDeepSleepEvent.patch
rename to patches/server/0555-Add-PlayerDeepSleepEvent.patch
index acf66e0c7..66243717f 100644
--- a/patches/server/0566-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0555-Add-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 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 07e15c65bf52725b6f63c89ae421afd3d95ffd87..617ede60a9e6634ae984a63ed4f32e845e5a571b 100644
+index 1f5f27bea4afdab99bb41f87288f66b29d7c5264..14b96e150ea6c2068a48e1713ba98f81c8aabb54 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0567-More-World-API.patch b/patches/server/0556-More-World-API.patch
similarity index 97%
rename from patches/server/0567-More-World-API.patch
rename to patches/server/0556-More-World-API.patch
index 6ab4109aa..23d4acb67 100644
--- a/patches/server/0567-More-World-API.patch
+++ b/patches/server/0556-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f62cec4122b384603ae5d3ad6f6134eff2d703fe..d8e6dab184f2c049f777ebef87dbad141016580b 100644
+index e092afa65bc6d14c53a09175b0a8cd9ad50a7477..0f6d279475d296e644ff8be39644557afe683398 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2176,6 +2176,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0568-Add-PlayerBedFailEnterEvent.patch b/patches/server/0557-Add-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0568-Add-PlayerBedFailEnterEvent.patch
rename to patches/server/0557-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0569-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0558-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 96%
rename from patches/server/0569-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0558-Implement-methods-to-convert-between-Component-and-B.patch
index 3659c401b..77ecc68ca 100644
--- a/patches/server/0569-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0558-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a380f1f289dec841f98c3c8f39d58d8fffff7b8c..acca6ea4ddab9382c2511193cbd7cfe6771c733c 100644
+index 83bf6e7fd2f59ddc6b10a11d64ad198f8277e0fa..143720bfa65e08262b96afbe53d6cf42bc326052 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -210,6 +210,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0570-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0559-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 95%
rename from patches/server/0570-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
rename to patches/server/0559-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 04cec82f1..3cb57469a 100644
--- a/patches/server/0570-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0559-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7dad8382910b405cdd3345454721f9b72921a7f4..d64cbafda18cf6352a8d1347e4df0750df5bb0f0 100644
+index 6252f71c6b5df2a35d58c8f7cd64049b2819ddc0..cc393b070f6df598bd4523605d20900c622eac1b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2639,7 +2639,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -19,7 +19,7 @@ index 7dad8382910b405cdd3345454721f9b72921a7f4..d64cbafda18cf6352a8d1347e4df0750
                  } 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 c8cff0054c7f5eaab3143e828e463e7ad913cd92..e27904551ca7f461026e62a2225c2607975a805f 100644
+index be5f0e2f23673b914d259e114281fdc0b6047ab6..67513e8a00e2a5208628c2804dd88c5f576df993 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -781,6 +781,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0571-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0560-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0571-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0560-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0572-Add-Channel-initialization-listeners.patch b/patches/server/0561-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0572-Add-Channel-initialization-listeners.patch
rename to patches/server/0561-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0573-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0562-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0573-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0562-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0574-Add-more-WanderingTrader-API.patch b/patches/server/0563-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0574-Add-more-WanderingTrader-API.patch
rename to patches/server/0563-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0575-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0564-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0575-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0564-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0576-Entity-load-save-limit-per-chunk.patch b/patches/server/0565-Entity-load-save-limit-per-chunk.patch
similarity index 97%
rename from patches/server/0576-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0565-Entity-load-save-limit-per-chunk.patch
index d8ae6c858..48d14bb03 100644
--- a/patches/server/0576-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0565-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 9d16fc698b0771bcb3c95f5fb017879c37ebb39b..2fa2e5cada590c0f44a4735bcf20de51892f428b 100644
+index bd4ae65070eb4b98dae0529b5985f80093bf8185..3ddb1cc0edddcf77c1b5d6157247498cb90c57a7 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -631,9 +631,20 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0577-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0566-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 96%
rename from patches/server/0577-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0566-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index fad0f8a7d..4a803357b 100644
--- a/patches/server/0577-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0566-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index f29ddc244cfa5eba9b2903d40d8509731fc18287..f655e0ae4a287886d0291cd0089bad2000249d0f 100644
+index 6e0073a54f59621d8adb4e8a70e6c89c708eabba..24e5993b281448734eb67c7a8439a349bbf9fd72 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -236,11 +236,21 @@ public class PlayerAdvancements {
diff --git a/patches/server/0578-Inventory-close.patch b/patches/server/0567-Inventory-close.patch
similarity index 100%
rename from patches/server/0578-Inventory-close.patch
rename to patches/server/0567-Inventory-close.patch
diff --git a/patches/server/0579-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0568-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0579-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0568-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0580-Add-basic-Datapack-API.patch b/patches/server/0569-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0580-Add-basic-Datapack-API.patch
rename to patches/server/0569-Add-basic-Datapack-API.patch
index bdb8a7c4b..ae5337949 100644
--- a/patches/server/0580-Add-basic-Datapack-API.patch
+++ b/patches/server/0569-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f192bd669e48865ae3ca7c79fd3c356d96556bd8..05868e37b03ac912ac902b105f3956f9351b1209 100644
+index cd3131c2ebac59a1a2a05fe0216214d9b301abfe..6fff086f1a6ffd02945ac30d5041b61d289e8478 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -301,6 +301,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0581-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0570-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0581-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0570-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0582-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0571-Expand-PlayerGameModeChangeEvent.patch
similarity index 97%
rename from patches/server/0582-Expand-PlayerGameModeChangeEvent.patch
rename to patches/server/0571-Expand-PlayerGameModeChangeEvent.patch
index 68f1f5ab9..8d6a1c2a7 100644
--- a/patches/server/0582-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0571-Expand-PlayerGameModeChangeEvent.patch
@@ -45,7 +45,7 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..f7c9127346261d83413ca03a1cdaa849
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c9ac912c5cdd5d2aeb09154b224386fb73dfbc69..9f67542726e2b147564c4085e3b1a3cb6b6cba93 100644
+index 449bd6d823746b5d6bbcbde54eeb3105f9cf9f04..d295098c311b4a63bc1bb8a8b53e832c6ecf75cf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1989,8 +1989,16 @@ public class ServerPlayer extends Player {
@@ -94,7 +94,7 @@ index c9ac912c5cdd5d2aeb09154b224386fb73dfbc69..9f67542726e2b147564c4085e3b1a3cb
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 60c18af9253607bc51ecb9d23c23e652a9ba36e9..066e7e420b8eaa9733532a893855bcab14c22d0e 100644
+index a157ccbedb94f287c610975d6c3cfb66a3bddbe8..03b337ce5ccb1db61dc395b91b061a2aecf8fbf6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -73,21 +73,28 @@ public class ServerPlayerGameMode {
@@ -131,7 +131,7 @@ index 60c18af9253607bc51ecb9d23c23e652a9ba36e9..066e7e420b8eaa9733532a893855bcab
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d64cbafda18cf6352a8d1347e4df0750df5bb0f0..dac6952492d0eaf6a83034f50dd7b6b7be5ab462 100644
+index cc393b070f6df598bd4523605d20900c622eac1b..e0e09e9d127cd54ece239c0c1e931bb8802c17a1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2648,7 +2648,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0583-ItemStack-repair-check-API.patch b/patches/server/0572-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0583-ItemStack-repair-check-API.patch
rename to patches/server/0572-ItemStack-repair-check-API.patch
diff --git a/patches/server/0584-More-Enchantment-API.patch b/patches/server/0573-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0584-More-Enchantment-API.patch
rename to patches/server/0573-More-Enchantment-API.patch
diff --git a/patches/server/0585-Move-range-check-for-block-placing-up.patch b/patches/server/0574-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0585-Move-range-check-for-block-placing-up.patch
rename to patches/server/0574-Move-range-check-for-block-placing-up.patch
index 2b62c07aa..c55a15074 100644
--- a/patches/server/0585-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0574-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dac6952492d0eaf6a83034f50dd7b6b7be5ab462..e68ecbc56e05b088dddaf38368e5a4b6bd6a2b51 100644
+index e0e09e9d127cd54ece239c0c1e931bb8802c17a1..2f69f4368bb0fb6d254c1f445953c8dd05d0b0aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1738,6 +1738,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0586-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0575-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0586-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0575-Fix-and-optimise-world-force-upgrading.patch
index 31350fb93..99e215313 100644
--- a/patches/server/0586-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0575-Fix-and-optimise-world-force-upgrading.patch
@@ -267,10 +267,10 @@ index 1cad3585ca122a465572b16d4ecbb7231e87c7de..b0a0909fa9501dfacfbe70dc4118062d
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4a270f4a59be4dfe7d9f6baf7388a0d8d70e1bf6..2a000635c18878377b2f434929e460e809b02cc4 100644
+index ccb26a6ccd7b5eb493d926ba0fcff22b924280d0..e789a6369c792e577e918fcb44bb59c6c5f71d49 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -586,11 +586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -583,11 +583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  worlddata = new PrimaryLevelData(worldsettings, worldoptions, worlddimensions_b.specialWorldProperty(), lifecycle);
              }
              worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
@@ -283,7 +283,7 @@ index 4a270f4a59be4dfe7d9f6baf7388a0d8d70e1bf6..2a000635c18878377b2f434929e460e8
  
              PrimaryLevelData iworlddataserver = worlddata;
              boolean flag = worlddata.isDebugWorld();
-@@ -605,6 +601,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -602,6 +598,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
  
@@ -298,7 +298,7 @@ index 4a270f4a59be4dfe7d9f6baf7388a0d8d70e1bf6..2a000635c18878377b2f434929e460e8
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index dfac52f69ce02e041842ca5174dac22ca9349914..dc01da6f8d260ad6b2a06ec7c838d7fda5a99aab 100644
+index b0c61b274c24e2ced86a6acc0ea007a80e61fd3e..50db0a36c17791373fcae1c7b80f7353ef665f3c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -186,6 +186,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0587-Add-Mob-lookAt-API.patch b/patches/server/0576-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0587-Add-Mob-lookAt-API.patch
rename to patches/server/0576-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0588-Add-Unix-domain-socket-support.patch b/patches/server/0577-Add-Unix-domain-socket-support.patch
similarity index 96%
rename from patches/server/0588-Add-Unix-domain-socket-support.patch
rename to patches/server/0577-Add-Unix-domain-socket-support.patch
index 87ab600a7..77027b2a1 100644
--- a/patches/server/0588-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0577-Add-Unix-domain-socket-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Unix domain socket support
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index acca6ea4ddab9382c2511193cbd7cfe6771c733c..01535fc66fbf5fb99ee5705eb6db9b6552ba79b9 100644
+index 143720bfa65e08262b96afbe53d6cf42bc326052..70fd0256a58f66122629572a72f90fb22e30bddc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -47,7 +47,7 @@ index acca6ea4ddab9382c2511193cbd7cfe6771c733c..01535fc66fbf5fb99ee5705eb6db9b65
              DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
              DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 4414b12218a5693fecaa8c1e7c7676a58bcad324..c0ae3ccf4ddf14a4967c86548ec7305cfcc0b48a 100644
+index b69483e248cd84293b9d4b9df2f5ccd2a80c14cd..13fc9b88c06b0436d23039ef4686f3a88589447e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -78,7 +78,12 @@ public class ServerConnectionListener {
@@ -87,7 +87,7 @@ index 4414b12218a5693fecaa8c1e7c7676a58bcad324..c0ae3ccf4ddf14a4967c86548ec7305c
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e68ecbc56e05b088dddaf38368e5a4b6bd6a2b51..f97d5e0703d9ccb01f0614e4a410b1c9e2785388 100644
+index 2f69f4368bb0fb6d254c1f445953c8dd05d0b0aa..e70ff6389436f33f4ec1d0b238601419bddb3fe0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2471,6 +2471,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0589-Add-EntityInsideBlockEvent.patch b/patches/server/0578-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0589-Add-EntityInsideBlockEvent.patch
rename to patches/server/0578-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0590-Attributes-API-for-item-defaults.patch b/patches/server/0579-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0590-Attributes-API-for-item-defaults.patch
rename to patches/server/0579-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0591-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0580-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 97%
rename from patches/server/0591-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0580-Add-cause-to-Weather-ThunderChangeEvents.patch
index ed480599e..be3df3891 100644
--- a/patches/server/0591-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0580-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b3d5d0dc5671f3c2bb41263ef52951da5c87ed74..41c11a6fa0d99d6c66bac35f6c9578d39f6d34ad 100644
+index 8aa3d8ea13fe7a68628e7647f4da2558873415b4..6409a731209b3dbb6c1ad790aff1954f449bf759 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -667,8 +667,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,7 +95,7 @@ index f5ac36fa54f3d3b39de103c95abb9ca3adfe8dda..59ba982dc96ce47e47399514e8f74d2b
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d8e6dab184f2c049f777ebef87dbad141016580b..a2625d439fbed368a196ce71d77b8f3f1b141326 100644
+index 0f6d279475d296e644ff8be39644557afe683398..bce1253ce219db35bf31ec05e36dfede845bdf46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1243,7 +1243,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0592-More-Lidded-Block-API.patch b/patches/server/0581-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0592-More-Lidded-Block-API.patch
rename to patches/server/0581-More-Lidded-Block-API.patch
diff --git a/patches/server/0593-Limit-item-frame-cursors-on-maps.patch b/patches/server/0582-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0593-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0582-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0594-Add-PlayerKickEvent-causes.patch b/patches/server/0583-Add-PlayerKickEvent-causes.patch
similarity index 98%
rename from patches/server/0594-Add-PlayerKickEvent-causes.patch
rename to patches/server/0583-Add-PlayerKickEvent-causes.patch
index 740dc9be3..60350d70b 100644
--- a/patches/server/0594-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0583-Add-PlayerKickEvent-causes.patch
@@ -48,10 +48,10 @@ index 96814e626a95e4e3c2f4df1a0339d37bb02f2e61..ba12919c3f9aec34a9e64993b143ae92
  
          public boolean shouldDisconnect() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2a000635c18878377b2f434929e460e809b02cc4..6f2fcf39835d8a8b7408a39a511a2a9ee1e31248 100644
+index e789a6369c792e577e918fcb44bb59c6c5f71d49..88645ffa12f630daf9bd74bb5848ed9dd23d0c1f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2236,7 +2236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2173,7 +2173,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
@@ -437,7 +437,7 @@ index e70ff6389436f33f4ec1d0b238601419bddb3fe0..cde1ae539f8808ecaf28afda20dc5ea2
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5aef84c708865d7bf078e2c40b0d1d4e7dc36b82..52b57867e91c4e777c550098ddf8a75169db6c87 100644
+index 67513e8a00e2a5208628c2804dd88c5f576df993..fc26226d59bb670957587b8e221214cd1d19f844 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 5aef84c708865d7bf078e2c40b0d1d4e7dc36b82..52b57867e91c4e777c550098ddf8a751
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -1333,8 +1333,8 @@ public abstract class PlayerList {
+@@ -1332,8 +1332,8 @@ public abstract class PlayerList {
          // Paper end
          // CraftBukkit start - disconnect safely
          for (ServerPlayer player : this.players) {
@@ -530,7 +530,7 @@ index 44a63ead4c00e82254de8d41a3711cf3e1c4f083..b4980d4f99aae9b2ab9d408e77e50bc5
              if (msg.startsWith("/")) {
                  this.getHandle().connection.handleCommand(msg);
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 631457374fda492776f4af0515cee2e43a934d2c..da7d5efd76c9ef92e9ce22860fec791890a687be 100644
+index 051b9e3a5d29a5840d596468e3ddd013bedc8da3..e3b262add194a126e731c68e68f3139a00cacacb 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -73,7 +73,7 @@ public class RestartCommand extends Command
diff --git a/patches/server/0595-Add-PufferFishStateChangeEvent.patch b/patches/server/0584-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0595-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0584-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0596-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0585-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0596-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0585-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0597-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0586-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0597-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0586-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0598-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0587-Add-option-to-fix-items-merging-through-walls.patch
similarity index 93%
rename from patches/server/0598-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0587-Add-option-to-fix-items-merging-through-walls.patch
index 5675e044e..abc3aaaa5 100644
--- a/patches/server/0598-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0587-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index ffbeea768cbb09b6f828ef1a9394c9fe50e99914..c865456d58cf7c2077ac452b6a1e3db2b84047ef 100644
+index 7f8b35d6ae27086fa128abfe9b2369bb6c91ce60..459f793a6603d4f98c84df4e549f069298c54985 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -276,6 +276,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0599-Add-BellRevealRaiderEvent.patch b/patches/server/0588-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0599-Add-BellRevealRaiderEvent.patch
rename to patches/server/0588-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0600-Fix-invulnerable-end-crystals.patch b/patches/server/0589-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0600-Fix-invulnerable-end-crystals.patch
rename to patches/server/0589-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0601-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0590-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0601-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0590-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0602-Fix-dangerous-end-portal-logic.patch b/patches/server/0591-Fix-dangerous-end-portal-logic.patch
similarity index 86%
rename from patches/server/0602-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0591-Fix-dangerous-end-portal-logic.patch
index 989ffee4c..c59b55b1f 100644
--- a/patches/server/0602-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0591-Fix-dangerous-end-portal-logic.patch
@@ -11,13 +11,13 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b7a83aebbf0602a338a1510f678cf5037ff619b8..421da47d0de7d9a7ac2d8134487b642f7f59f98c 100644
+index d80d849e9991da00f6aa63913407bf7fd368cadf..4a0c8976df5164423daee48f2d9494e8eb8080a8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -491,6 +491,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -487,6 +487,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+ 
+     public boolean updatingSectionStatus = false;
      // Paper end
-     // Paper start - optimise entity tracking
-     final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
 +    // Paper start - make end portalling safe
 +    public BlockPos portalBlock;
 +    public ServerLevel portalWorld;
@@ -42,16 +42,16 @@ index b7a83aebbf0602a338a1510f678cf5037ff619b8..421da47d0de7d9a7ac2d8134487b642f
 +        event.callEvent();
 +
 +        if (this instanceof ServerPlayer) {
-+            ((ServerPlayer)this).changeDimension(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
++            ((ServerPlayer) this).changeDimension(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
 +            return;
 +        }
 +        this.teleportTo(worldserver, null);
 +    }
 +    // Paper end - make end portalling safe
  
-     public boolean isLegacyTrackingEntity = false;
- 
-@@ -2878,6 +2908,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+     public Entity(EntityType<?> type, Level world) {
+         this.id = Entity.ENTITY_COUNTER.incrementAndGet();
+@@ -2844,6 +2874,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0603-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0592-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0603-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0592-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0604-Make-item-validations-configurable.patch b/patches/server/0593-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0604-Make-item-validations-configurable.patch
rename to patches/server/0593-Make-item-validations-configurable.patch
diff --git a/patches/server/0605-Line-Of-Sight-Changes.patch b/patches/server/0594-Line-Of-Sight-Changes.patch
similarity index 97%
rename from patches/server/0605-Line-Of-Sight-Changes.patch
rename to patches/server/0594-Line-Of-Sight-Changes.patch
index 4f7c11f54..644ecc704 100644
--- a/patches/server/0605-Line-Of-Sight-Changes.patch
+++ b/patches/server/0594-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1fd1d8abedeebf3f1d1e2465fa3792d404787c68..d3d2e971b36b5a240b598015edeb1166672fec89 100644
+index c7070680373145caaa2d94df15590bb308361fea..c7752c20c8e83c21cf96e0cedf9a8269775f51e5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3606,7 +3606,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0606-add-per-world-spawn-limits.patch b/patches/server/0595-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0606-add-per-world-spawn-limits.patch
rename to patches/server/0595-add-per-world-spawn-limits.patch
index d6f7381f1..2be5b3262 100644
--- a/patches/server/0606-add-per-world-spawn-limits.patch
+++ b/patches/server/0595-add-per-world-spawn-limits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add per world spawn limits
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a2625d439fbed368a196ce71d77b8f3f1b141326..36bc006924599b8270c95e41e80dc51ad0262f61 100644
+index bce1253ce219db35bf31ec05e36dfede845bdf46..0fdc047f55473d9a208fe344b20787fdd6f23fd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -215,6 +215,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0607-Fix-potions-splash-events.patch b/patches/server/0596-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0607-Fix-potions-splash-events.patch
rename to patches/server/0596-Fix-potions-splash-events.patch
diff --git a/patches/server/0608-Add-more-LimitedRegion-API.patch b/patches/server/0597-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0608-Add-more-LimitedRegion-API.patch
rename to patches/server/0597-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0609-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0598-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 89%
rename from patches/server/0609-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0598-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 66ac32f56..3fddefdb9 100644
--- a/patches/server/0609-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0598-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9f67542726e2b147564c4085e3b1a3cb6b6cba93..f3bca38d1529a3acbd8d99237efd75c2dee774a2 100644
+index d295098c311b4a63bc1bb8a8b53e832c6ecf75cf..da43449e16ac281daf32df66cae5b23f35b160ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2391,7 +2391,7 @@ public class ServerPlayer extends Player {
@@ -18,7 +18,7 @@ index 9f67542726e2b147564c4085e3b1a3cb6b6cba93..f3bca38d1529a3acbd8d99237efd75c2
  
                  this.awardStat(Stats.DROP);
 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 617ede60a9e6634ae984a63ed4f32e845e5a571b..322c8c437b4c5fa4a9db038736f24da24d45d646 100644
+index 14b96e150ea6c2068a48e1713ba98f81c8aabb54..fd28898a150a13d3e18bb46145e4b2e827b42aee 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -725,6 +725,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0610-Missing-Entity-API.patch b/patches/server/0599-Missing-Entity-API.patch
similarity index 99%
rename from patches/server/0610-Missing-Entity-API.patch
rename to patches/server/0599-Missing-Entity-API.patch
index 6f246f230..3d09f0190 100644
--- a/patches/server/0610-Missing-Entity-API.patch
+++ b/patches/server/0599-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 d259d7b8f7380763e3976f5f20bc01f06ce6901c..2a8ed27101ff78542db120ff183ff33276fb832a 100644
+index 9637c26a3c381869f0a4dfe9189c0095387009b4..c360135b923aa8d1ed2c7caf97ede981cb605cf2 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/0611-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0600-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0611-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0600-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 8c8bc235d..aa232f3f8 100644
--- a/patches/server/0611-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0600-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 846a9595857d5e6faa0b9dbc566b52d41efaa9ed..2a24a9c95c3701ff11aadaab45c47c60fde7bcab 100644
+index cde1ae539f8808ecaf28afda20dc5ea24d006d5f..3adf67c4bd427cf666bb0b79f4ea7b94c8c5453c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1096,7 +1096,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0612-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0601-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0612-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0601-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0613-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0602-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 94%
rename from patches/server/0613-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0602-Use-getChunkIfLoadedImmediately-in-places.patch
index bd83e1eef..89c6509a2 100644
--- a/patches/server/0613-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0602-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 41c11a6fa0d99d6c66bac35f6c9578d39f6d34ad..813acbb57271e6568d35f2cbf9a637c44603aa95 100644
+index 6409a731209b3dbb6c1ad790aff1954f449bf759..3aa1bd080064008a2f8a280947ee7741ce205b59 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -224,7 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index 41c11a6fa0d99d6c66bac35f6c9578d39f6d34ad..813acbb57271e6568d35f2cbf9a637c4
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c253fea302d86b4b91aa814f26082a678786608a..d538dc2f15b3b1553109df99f50457ee79732e43 100644
+index 50db0a36c17791373fcae1c7b80f7353ef665f3c..80a5bd7a57ceb617752f645c1a4f046fea6e8de6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -203,6 +203,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0614-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0603-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0614-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0603-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0615-Add-PlayerArmSwingEvent.patch b/patches/server/0604-Add-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0615-Add-PlayerArmSwingEvent.patch
rename to patches/server/0604-Add-PlayerArmSwingEvent.patch
index c399b1534..43f386552 100644
--- a/patches/server/0615-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0604-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2a24a9c95c3701ff11aadaab45c47c60fde7bcab..b4d3420c58fcc03c624c5d2e2f73ac911ce00f0d 100644
+index 3adf67c4bd427cf666bb0b79f4ea7b94c8c5453c..6d385f169b5daab69cd40e37ffaa38416dc91223 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2328,7 +2328,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0616-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0605-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 94%
rename from patches/server/0616-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0605-Fix-kick-event-leave-message-not-being-sent.patch
index 34c5fb92d..dcc9e9a7b 100644
--- a/patches/server/0616-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0605-Fix-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f3bca38d1529a3acbd8d99237efd75c2dee774a2..08f675754e7ac5574cdd4e6c3dab7a5a9890c457 100644
+index da43449e16ac281daf32df66cae5b23f35b160ee..17c11953df9308d228220e92736232376f02f248 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -273,7 +273,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index f3bca38d1529a3acbd8d99237efd75c2dee774a2..08f675754e7ac5574cdd4e6c3dab7a5a
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 3049377685ee4fe75f0c4b68eab39a916ac20785..f5f2d65d2e02b0d79352585d9d4ef588ab59dce7 100644
+index a65a1466dab52fca75cda16a4b22fef03b6207a0..0306771b8f90dcdd77f151c19c6c2d75c41f8feb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -77,6 +77,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -50,7 +50,7 @@ index 3049377685ee4fe75f0c4b68eab39a916ac20785..f5f2d65d2e02b0d79352585d9d4ef588
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b4d3420c58fcc03c624c5d2e2f73ac911ce00f0d..bc3c72f66050460affcaeec272d4bbe3f49a4e73 100644
+index 6d385f169b5daab69cd40e37ffaa38416dc91223..cfe980606a87ccad1cbf9354728a8d2e57686fa4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1882,6 +1882,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -96,7 +96,7 @@ index b4d3420c58fcc03c624c5d2e2f73ac911ce00f0d..bc3c72f66050460affcaeec272d4bbe3
              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 c12ad5eabb7be2648f1a0314855664466b8665b0..c143b9eb97920945ea36c8f0f36db6086961746c 100644
+index fc26226d59bb670957587b8e221214cd1d19f844..5f7f42586949aae4a3722bd0486c68b2c8499b8f 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/0617-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0606-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0617-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0606-Add-config-for-mobs-immune-to-default-effects.patch
index 8cd0fcdc3..2ae8c665e 100644
--- a/patches/server/0617-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0606-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d3d2e971b36b5a240b598015edeb1166672fec89..8673e4eff6bd66b5cdf0fc6101aa9ff9c226dbfe 100644
+index c7752c20c8e83c21cf96e0cedf9a8269775f51e5..8438ca0157d8a27f76858d8f5139a5f8a699a65c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0618-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0607-Don-t-apply-cramming-damage-to-players.patch
similarity index 94%
rename from patches/server/0618-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0607-Don-t-apply-cramming-damage-to-players.patch
index d969fc1f4..f33a5fe05 100644
--- a/patches/server/0618-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0607-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 08f675754e7ac5574cdd4e6c3dab7a5a9890c457..6284e567d5247b18dba06bc9525c877882fe8d88 100644
+index 17c11953df9308d228220e92736232376f02f248..2535c002c45d2d92bc779d3c9198cf3c737bd7f2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0619-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0608-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0619-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0608-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0620-Add-missing-forceDrop-toggles.patch b/patches/server/0609-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0620-Add-missing-forceDrop-toggles.patch
rename to patches/server/0609-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0621-Stinger-API.patch b/patches/server/0610-Stinger-API.patch
similarity index 100%
rename from patches/server/0621-Stinger-API.patch
rename to patches/server/0610-Stinger-API.patch
diff --git a/patches/server/0622-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0611-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0622-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0611-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0623-Add-System.out-err-catcher.patch b/patches/server/0612-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0623-Add-System.out-err-catcher.patch
rename to patches/server/0612-Add-System.out-err-catcher.patch
index a3cbc7f6c..9077dcbce 100644
--- a/patches/server/0623-Add-System.out-err-catcher.patch
+++ b/patches/server/0612-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 08d43545262e2be74566c270f3dd2c600b773616..775e40dc356406cf289807abb83cda5ca186563f 100644
+index ffc6e2a5e2b6e3f4595249d470e531cd555789af..0b780946ace3a5c644e3ad4ab89c1a6179892087 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0624-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0613-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 98%
rename from patches/server/0624-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0613-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30..e3b686c58 100644
--- a/patches/server/0624-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0613-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
@@ -230,7 +230,7 @@ index 0000000000000000000000000000000000000000..34734bb969a1a74c7a4f9c17d40ebf00
 +    }
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 2b247d55e39246fbef31279b14c45fc40f956bfb..675cd61221e807aadf28322b46c3daa1370241b5 100644
+index 4e2ca9162450c1f54b7ab95a63c1bad8efe81a06..32e64b3866bdd1489a90339bda2268adafbb15de 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -34,6 +34,10 @@
diff --git a/patches/server/0626-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0614-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0626-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0614-Prevent-AFK-kick-while-watching-end-credits.patch
index 607a60728..f391ce959 100644
--- a/patches/server/0626-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0614-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bc3c72f66050460affcaeec272d4bbe3f49a4e73..0e92cf3206b6b694f6dca5c244ec30826ba4db9e 100644
+index cfe980606a87ccad1cbf9354728a8d2e57686fa4..fa6783305aae385723d6bdb83166e147b8ebcfe9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,7 +390,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0627-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0615-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0627-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0615-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0628-Add-PlayerSetSpawnEvent.patch b/patches/server/0616-Add-PlayerSetSpawnEvent.patch
similarity index 98%
rename from patches/server/0628-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0616-Add-PlayerSetSpawnEvent.patch
index 2dfc85f43..ac149cd2b 100644
--- a/patches/server/0628-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0616-Add-PlayerSetSpawnEvent.patch
@@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6284e567d5247b18dba06bc9525c877882fe8d88..1951cecbd2ffe70077f0894cab4697ecbc2369c3 100644
+index 2535c002c45d2d92bc779d3c9198cf3c737bd7f2..165d75cdc40af7e35d41fed242e11eedfc385c3f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player {
@@ -154,7 +154,7 @@ index 6284e567d5247b18dba06bc9525c877882fe8d88..1951cecbd2ffe70077f0894cab4697ec
  
      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 c143b9eb97920945ea36c8f0f36db6086961746c..6e56b55329e31682d3052949110762e8f9fc96da 100644
+index 5f7f42586949aae4a3722bd0486c68b2c8499b8f..89c91072a6b50b2b917d8a21510d9b5daa5d6005 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -872,7 +872,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0629-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0617-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0629-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0617-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0630-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0618-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0630-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0618-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0631-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0619-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0631-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0619-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0632-Add-EntityDamageItemEvent.patch b/patches/server/0620-Add-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0632-Add-EntityDamageItemEvent.patch
rename to patches/server/0620-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0633-Optimize-indirect-passenger-iteration.patch b/patches/server/0621-Optimize-indirect-passenger-iteration.patch
similarity index 91%
rename from patches/server/0633-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0621-Optimize-indirect-passenger-iteration.patch
index 2b01ec35e..d554a6baa 100644
--- a/patches/server/0633-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0621-Optimize-indirect-passenger-iteration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 421da47d0de7d9a7ac2d8134487b642f7f59f98c..2fe7c03eea6cff2b44fb887711168871b5f487bd 100644
+index 4a0c8976df5164423daee48f2d9494e8eb8080a8..cc72445c662107949d18ceec8285b7cf6871cc22 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3923,20 +3923,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3889,20 +3889,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index 421da47d0de7d9a7ac2d8134487b642f7f59f98c..2fe7c03eea6cff2b44fb887711168871
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3959,6 +3973,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3925,6 +3939,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0634-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0622-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0634-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0622-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0635-Clear-bucket-NBT-after-dispense.patch b/patches/server/0623-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0635-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0623-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0636-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0624-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0636-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0624-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0637-Add-BlockBreakBlockEvent.patch b/patches/server/0625-Add-BlockBreakBlockEvent.patch
similarity index 94%
rename from patches/server/0637-Add-BlockBreakBlockEvent.patch
rename to patches/server/0625-Add-BlockBreakBlockEvent.patch
index 958399ea0..1fe7b5cc9 100644
--- a/patches/server/0637-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0625-Add-BlockBreakBlockEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add BlockBreakBlockEvent
 
 
 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 5e5199b50847958f7abc6d8e42cfb6806df8421f..af62781cc96354c87aa63d4f03f9e25b81959081 100644
+index 89a62fbeeb78c864938a1cea84178478c6dc1b34..9120b4a70dbf84f19480b952658414e16d2c23c1 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -326,6 +326,23 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -313,6 +313,23 @@ public class Block extends BlockBehaviour implements ItemLike {
          }
  
      }
@@ -33,10 +33,10 @@ index 5e5199b50847958f7abc6d8e42cfb6806df8421f..af62781cc96354c87aa63d4f03f9e25b
      public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
          if (world instanceof ServerLevel) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index c34b34a6be594c502d1cb59703ace8ad8dd96915..4342bc4535ea812fef3fab56917e5de15947c42d 100644
+index 3ae61e7b50bfc440c597f88843f92903f8a66801..0dbdcd443fe8a299119ea5ba3acb1a0412856184 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -415,7 +415,7 @@ public class PistonBaseBlock extends DirectionalBlock {
+@@ -402,7 +402,7 @@ public class PistonBaseBlock extends DirectionalBlock {
                  iblockdata1 = world.getBlockState(blockposition3);
                  BlockEntity tileentity = iblockdata1.hasBlockEntity() ? world.getBlockEntity(blockposition3) : null;
  
diff --git a/patches/server/0638-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0626-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0638-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0626-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0639-More-CommandBlock-API.patch b/patches/server/0627-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0639-More-CommandBlock-API.patch
rename to patches/server/0627-More-CommandBlock-API.patch
diff --git a/patches/server/0640-Add-missing-team-sidebar-display-slots.patch b/patches/server/0628-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0640-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0628-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0641-Add-back-EntityPortalExitEvent.patch b/patches/server/0629-Add-back-EntityPortalExitEvent.patch
similarity index 93%
rename from patches/server/0641-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0629-Add-back-EntityPortalExitEvent.patch
index 5e4b6f65c..237027a30 100644
--- a/patches/server/0641-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0629-Add-back-EntityPortalExitEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2fe7c03eea6cff2b44fb887711168871b5f487bd..ef5782537ac65ebe113046c4e292a27b1e24510a 100644
+index cc72445c662107949d18ceec8285b7cf6871cc22..5398bcce745c977aad083777e18c72fa93245107 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3372,6 +3372,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3338,6 +3338,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -37,7 +37,7 @@ index 2fe7c03eea6cff2b44fb887711168871b5f487bd..ef5782537ac65ebe113046c4e292a27b
                  if (worldserver == this.level) {
                      // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
                      this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
-@@ -3391,8 +3413,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3357,8 +3379,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0642-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0630-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 94%
rename from patches/server/0642-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0630-Add-methods-to-find-targets-for-lightning-strikes.patch
index 74272e17b..ca0a46776 100644
--- a/patches/server/0642-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0630-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 813acbb57271e6568d35f2cbf9a637c44603aa95..290c9e34e945ce316908fa7e0dee0bb51bf3ef18 100644
+index 3aa1bd080064008a2f8a280947ee7741ce205b59..0f245c374695c6652506417e38c0a0ea58d379e6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -993,6 +993,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,7 +31,7 @@ index 813acbb57271e6568d35f2cbf9a637c44603aa95..290c9e34e945ce316908fa7e0dee0bb5
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 36bc006924599b8270c95e41e80dc51ad0262f61..e3f790c50881f5b0d47ff1b68912d5e85c9b91f9 100644
+index 0fdc047f55473d9a208fe344b20787fdd6f23fd9..d1b77ffe565a112556c7a04057c82b827e8ea7aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0643-Get-entity-default-attributes.patch b/patches/server/0631-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0643-Get-entity-default-attributes.patch
rename to patches/server/0631-Get-entity-default-attributes.patch
diff --git a/patches/server/0644-Left-handed-API.patch b/patches/server/0632-Left-handed-API.patch
similarity index 100%
rename from patches/server/0644-Left-handed-API.patch
rename to patches/server/0632-Left-handed-API.patch
diff --git a/patches/server/0645-Add-more-advancement-API.patch b/patches/server/0633-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0645-Add-more-advancement-API.patch
rename to patches/server/0633-Add-more-advancement-API.patch
diff --git a/patches/server/0646-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0634-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0646-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0634-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0647-Add-critical-damage-API.patch b/patches/server/0635-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0647-Add-critical-damage-API.patch
rename to patches/server/0635-Add-critical-damage-API.patch
index f4f5ef8bc..2c744adb8 100644
--- a/patches/server/0647-Add-critical-damage-API.patch
+++ b/patches/server/0635-Add-critical-damage-API.patch
@@ -28,7 +28,7 @@ index df8c88bfa749e02f633350446101dcce05db7ac1..ed1277fad60992344b94f8a939febaca
 +    // Paper end - add critical damage 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 04b698ab61ab8cd7e6ee7159294e473e1608f2fd..85b616bf136535bac40693545cf68a768f4e343d 100644
+index fd28898a150a13d3e18bb46145e4b2e827b42aee..e248a519db685bc744a884f56ca1c13fb38aaebc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1263,7 +1263,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0648-Fix-issues-with-mob-conversion.patch b/patches/server/0636-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0648-Fix-issues-with-mob-conversion.patch
rename to patches/server/0636-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0649-Add-isCollidable-methods-to-various-places.patch b/patches/server/0637-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0649-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0637-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0650-Goat-ram-API.patch b/patches/server/0638-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0650-Goat-ram-API.patch
rename to patches/server/0638-Goat-ram-API.patch
diff --git a/patches/server/0651-Add-API-for-resetting-a-single-score.patch b/patches/server/0639-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0651-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0639-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0652-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0640-Add-Raw-Byte-Entity-Serialization.patch
similarity index 96%
rename from patches/server/0652-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0640-Add-Raw-Byte-Entity-Serialization.patch
index 3bf88af03..b5e0cc8f2 100644
--- a/patches/server/0652-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0640-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ef5782537ac65ebe113046c4e292a27b1e24510a..66df50658958c7ad799fbe9d2cdb676a90d8bb4e 100644
+index 5398bcce745c977aad083777e18c72fa93245107..4335ba4821017a0f097d1664dbc8ef7ed957d807 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2158,6 +2158,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2124,6 +2124,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
      }
  
diff --git a/patches/server/0653-Vanilla-command-permission-fixes.patch b/patches/server/0641-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0653-Vanilla-command-permission-fixes.patch
rename to patches/server/0641-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0654-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 93%
rename from patches/server/0654-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 3868e7c91..72c038388 100644
--- a/patches/server/0654-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 290c9e34e945ce316908fa7e0dee0bb51bf3ef18..705c427097477cad2d75f0f1d7ee06f3311e759b 100644
+index 0f245c374695c6652506417e38c0a0ea58d379e6..109143fca98c6952ca6129f261a9ff8b43f00e52 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1558,9 +1558,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -28,7 +28,7 @@ index 290c9e34e945ce316908fa7e0dee0bb51bf3ef18..705c427097477cad2d75f0f1d7ee06f3
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1951cecbd2ffe70077f0894cab4697ecbc2369c3..8d657cdb516b6b439b29100c48cccd5b27178fe9 100644
+index 165d75cdc40af7e35d41fed242e11eedfc385c3f..9cd64d14d4b6df92bb30d0ad610f8af85791962a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1630,6 +1630,18 @@ public class ServerPlayer extends Player {
@@ -51,7 +51,7 @@ index 1951cecbd2ffe70077f0894cab4697ecbc2369c3..8d657cdb516b6b439b29100c48cccd5b
      @Override
      public void doCloseContainer() {
 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 30b603284e5fbc48ba7bc3cc6a69b8a4b94851a1..80caada014bae0571a5aa6aa67d9bb87f89db17f 100644
+index e248a519db685bc744a884f56ca1c13fb38aaebc..e33278611e4f52ff01cf628c570bd3378ff5c071 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -508,6 +508,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0655-Fix-GameProfileCache-concurrency.patch b/patches/server/0643-Fix-GameProfileCache-concurrency.patch
similarity index 98%
rename from patches/server/0655-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0643-Fix-GameProfileCache-concurrency.patch
index bd43b7aa1..dd06a021e 100644
--- a/patches/server/0655-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0643-Fix-GameProfileCache-concurrency.patch
@@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups
 from stalling simple state access/write calls
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 85172de608f04abca1be4591749564ccc0e8d600..572263b112762e69bd61fedf7c0fdd810164e6dd 100644
+index 641cbe71064e9574e16e36f8107e1a08db25a24d..6fe9065c391804818b19fad2cf68d31aa8f1ae82 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -60,6 +60,11 @@ public class GameProfileCache {
diff --git a/patches/server/0656-Improve-and-expand-AsyncCatcher.patch b/patches/server/0644-Improve-and-expand-AsyncCatcher.patch
similarity index 97%
rename from patches/server/0656-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0644-Improve-and-expand-AsyncCatcher.patch
index 54bb833e5..bc8d25cf1 100644
--- a/patches/server/0656-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0644-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0e92cf3206b6b694f6dca5c244ec30826ba4db9e..4a6a8de70c65ecae0a53df69881326b9b953b9e8 100644
+index fa6783305aae385723d6bdb83166e147b8ebcfe9..27bcfe893db83bb369186ccf1d48f28e9d2cae82 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1570,6 +1570,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -29,7 +29,7 @@ index 0e92cf3206b6b694f6dca5c244ec30826ba4db9e..4a6a8de70c65ecae0a53df69881326b9
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 36ffb7f61e2e29a67c069336f251172130dda207..dfc62f5cfad3e0e0f5f25c614055426bbfcd5327 100644
+index 8438ca0157d8a27f76858d8f5139a5f8a699a65c..bcb842a40ab97b4920e4e32cb3e6c8e1ff3081bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1118,7 +1118,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -166,7 +166,7 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e3f790c50881f5b0d47ff1b68912d5e85c9b91f9..00b7ce38044ac08133d06472efc6eb92b56efad2 100644
+index d1b77ffe565a112556c7a04057c82b827e8ea7aa..989abde6b753a16b389c1145b3e6b337eb73c715 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1803,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0657-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0645-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0657-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0645-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 481332ab2..2ed183d62 100644
--- a/patches/server/0657-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0645-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -257,7 +257,7 @@ index 0000000000000000000000000000000000000000..d3b39d88a72ca25057fd8574d32f28db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index db22e35d19597488a08ba3cd710ced7da77f8b5e..a9b452be0454082f7d62f19fbac574113ed2db64 100644
+index b27e0f31d0b3f5c57157a27f1f1db0f847d42a0c..5a4db70543ab446630c1cf0252496b57edc4252a 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -190,6 +190,16 @@ public final class NaturalSpawner {
@@ -278,7 +278,7 @@ index db22e35d19597488a08ba3cd710ced7da77f8b5e..a9b452be0454082f7d62f19fbac57411
          // Paper start - Optional per player mob spawns
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 775e40dc356406cf289807abb83cda5ca186563f..b603541d56c7cee7aff8d3448d18c76cd72b63cb 100644
+index 0b780946ace3a5c644e3ad4ab89c1a6179892087..b9e6d28d8eb982a404981ac4df71238bf30d0989 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2279,6 +2279,11 @@ public final class CraftServer implements Server {
@@ -294,7 +294,7 @@ index 775e40dc356406cf289807abb83cda5ca186563f..b603541d56c7cee7aff8d3448d18c76c
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 00b7ce38044ac08133d06472efc6eb92b56efad2..3e25f22ffd656cded58634049d48f19d97694496 100644
+index 989abde6b753a16b389c1145b3e6b337eb73c715..1977368c44212eb290a1b141216bb3a880b3742e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1761,9 +1761,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0658-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0646-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0658-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0646-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0661-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0647-Manually-inline-methods-in-BlockPosition.patch
similarity index 92%
rename from patches/server/0661-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0647-Manually-inline-methods-in-BlockPosition.patch
index e07cb082f..5771a5a30 100644
--- a/patches/server/0661-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0647-Manually-inline-methods-in-BlockPosition.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Manually inline methods in BlockPosition
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 50ba9e57d60df7308f7445540b3f412a0edf6065..e17fa30966dea2836fb791becd032fc7d5cc2611 100644
+index 3b3d81886d50ee6510ff366e11817a578c645089..541cef99113af865b995af2cfb7a1e4724dd8878 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -515,9 +515,9 @@ public class BlockPos extends Vec3i {
+@@ -516,9 +516,9 @@ public class BlockPos extends Vec3i {
          }
  
          public BlockPos.MutableBlockPos set(int x, int y, int z) {
@@ -21,7 +21,7 @@ index 50ba9e57d60df7308f7445540b3f412a0edf6065..e17fa30966dea2836fb791becd032fc7
              return this;
          }
  
-@@ -580,19 +580,19 @@ public class BlockPos extends Vec3i {
+@@ -581,19 +581,19 @@ public class BlockPos extends Vec3i {
  
          @Override
          public BlockPos.MutableBlockPos setX(int i) {
diff --git a/patches/server/0662-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0648-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0662-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0648-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0663-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0663-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 8eed2d279..b550d336f 100644
--- a/patches/server/0663-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -10,7 +10,7 @@ chunks did get inlined, but the standard CPS.getChunkAt
 method was not inlined.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d538dc2f15b3b1553109df99f50457ee79732e43..d0470e78b55d5973d9adbf4dd1496ccad4035243 100644
+index 80a5bd7a57ceb617752f645c1a4f046fea6e8de6..a9f963ba9306b840a3d97c9a39fc81b09340065f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -457,6 +457,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0664-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0650-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0664-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0650-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0665-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0651-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0665-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0651-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0666-Time-scoreboard-search.patch b/patches/server/0652-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0666-Time-scoreboard-search.patch
rename to patches/server/0652-Time-scoreboard-search.patch
diff --git a/patches/server/0667-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0653-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0667-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0653-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0668-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0654-Oprimise-map-impl-for-tracked-players.patch
similarity index 87%
rename from patches/server/0668-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0654-Oprimise-map-impl-for-tracked-players.patch
index a3103e4ff..c1df820c6 100644
--- a/patches/server/0668-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0654-Oprimise-map-impl-for-tracked-players.patch
@@ -7,10 +7,10 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 03eb13021c3aa6d7b7254660ebc40908460a4cb6..dd16f13ca44cda3051a38085f6de117a475ce797 100644
+index 9ddad716d641d649e09c094795240bd2e8c926b9..fea9355a25ab42f81504f90be7b3448044fa76dd 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1297,7 +1297,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1199,7 +1199,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0669-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0655-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0669-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0655-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0670-Distance-manager-tick-timings.patch b/patches/server/0656-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0670-Distance-manager-tick-timings.patch
rename to patches/server/0656-Distance-manager-tick-timings.patch
diff --git a/patches/server/0671-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0657-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0671-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0657-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0672-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0658-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0672-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0658-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0673-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0659-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0673-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0659-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0674-Add-packet-limiter-config.patch b/patches/server/0660-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0674-Add-packet-limiter-config.patch
rename to patches/server/0660-Add-packet-limiter-config.patch
diff --git a/patches/server/0675-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0661-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0675-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0661-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0676-Ensure-valid-vehicle-status.patch b/patches/server/0662-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0676-Ensure-valid-vehicle-status.patch
rename to patches/server/0662-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0677-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0663-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0677-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0663-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0678-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0664-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0678-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0664-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0679-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0665-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0679-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0665-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0680-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0666-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0680-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0666-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0681-Preserve-overstacked-loot.patch b/patches/server/0667-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0681-Preserve-overstacked-loot.patch
rename to patches/server/0667-Preserve-overstacked-loot.patch
diff --git a/patches/server/0682-Update-head-rotation-in-missing-places.patch b/patches/server/0668-Update-head-rotation-in-missing-places.patch
similarity index 84%
rename from patches/server/0682-Update-head-rotation-in-missing-places.patch
rename to patches/server/0668-Update-head-rotation-in-missing-places.patch
index a55311ded..580638dc4 100644
--- a/patches/server/0682-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0668-Update-head-rotation-in-missing-places.patch
@@ -8,10 +8,10 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 51791692213866adaff2eea48f14f818aaaa276c..b90caa5e25837bfb866bbac884468bd730b1f6d5 100644
+index 4335ba4821017a0f097d1664dbc8ef7ed957d807..4fed53d9b23da65bbf2a0243a64403d4472e8407 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1875,6 +1875,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1841,6 +1841,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index 51791692213866adaff2eea48f14f818aaaa276c..b90caa5e25837bfb866bbac884468bd7
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1913,6 +1914,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1879,6 +1880,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();
diff --git a/patches/server/0683-prevent-unintended-light-block-manipulation.patch b/patches/server/0669-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0683-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0669-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0684-Fix-CraftCriteria-defaults-map.patch b/patches/server/0670-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0684-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0670-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0685-Fix-upstreams-block-state-factories.patch b/patches/server/0671-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0685-Fix-upstreams-block-state-factories.patch
rename to patches/server/0671-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0686-Configurable-feature-seeds.patch b/patches/server/0672-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0686-Configurable-feature-seeds.patch
rename to patches/server/0672-Configurable-feature-seeds.patch
diff --git a/patches/server/0687-Add-root-admin-user-detection.patch b/patches/server/0673-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0687-Add-root-admin-user-detection.patch
rename to patches/server/0673-Add-root-admin-user-detection.patch
index 61ae81963..e00d1ab16 100644
--- a/patches/server/0687-Add-root-admin-user-detection.patch
+++ b/patches/server/0673-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 01535fc66fbf5fb99ee5705eb6db9b6552ba79b9..bb3acbe0ad049703245c51a92539376811365eb2 100644
+index 70fd0256a58f66122629572a72f90fb22e30bddc..3cc0aa9fa1ba11d85ce07013de86ad6f89c52f67 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0688-Always-allow-item-changing-in-Fireball.patch b/patches/server/0674-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0688-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0674-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0689-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0675-don-t-attempt-to-teleport-dead-entities.patch
similarity index 85%
rename from patches/server/0689-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0675-don-t-attempt-to-teleport-dead-entities.patch
index 6410a0cf6..49a5fc128 100644
--- a/patches/server/0689-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0675-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b90caa5e25837bfb866bbac884468bd730b1f6d5..6c2c9c2e0599fbe03f6a1622c64e071f92b66f34 100644
+index 4fed53d9b23da65bbf2a0243a64403d4472e8407..e0e57b91abde69f37ce7e5c0dd8e1f9efc67069f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -793,7 +793,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -759,7 +759,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
diff --git a/patches/server/0690-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0676-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 91%
rename from patches/server/0690-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0676-Prevent-excessive-velocity-through-repeated-crits.patch
index 7bef82bf1..d73be1c8a 100644
--- a/patches/server/0690-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0676-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 09425940b041755fd640a94362fffcd69636bcf1..9bd611292cf6e686c9e737d332bb0ae6d2fbaa98 100644
+index bcb842a40ab97b4920e4e32cb3e6c8e1ff3081bd..d6159b34c366d47a4eefd007032687a8d2557978 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2677,13 +2677,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2676,13 +2676,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.hasEffect(MobEffects.JUMP) ? 0.1F * ((float) this.getEffect(MobEffects.JUMP).getAmplifier() + 1.0F) : 0.0F;
      }
  
diff --git a/patches/server/0691-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0677-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 90%
rename from patches/server/0691-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0677-Remove-client-side-code-using-deprecated-for-removal.patch
index c5c2fdc4f..2ed18ebae 100644
--- a/patches/server/0691-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0677-Remove-client-side-code-using-deprecated-for-removal.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Remove client-side code using deprecated for removal
 Fixes warnings on build
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index eb80741b313daab36dcfeb1079eb0fbb19614904..b40864e41e1506884fdefefbf3cf4833a8f706c3 100644
+index 765e4bc00a0526aab6e263dae7233f63f7f31498..edf937591abf62416bd692e40b7b7a6badbe877d 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -952,17 +952,7 @@ public class Util {
+@@ -951,17 +951,7 @@ public class Util {
          }
  
          public void openUrl(URL url) {
diff --git a/patches/server/0692-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0678-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0692-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0678-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0693-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0679-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 95%
rename from patches/server/0693-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0679-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 93eb21653..0e7b3d401 100644
--- a/patches/server/0693-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0679-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,10 +34,10 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..945a0317e9e49a159a1f42882a0a267a
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9bd611292cf6e686c9e737d332bb0ae6d2fbaa98..afed1b1287668250974bea61a7bc1b6720d19701 100644
+index d6159b34c366d47a4eefd007032687a8d2557978..140cf1fd4a9850e28c7fa0f0abef6122564474dc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3188,7 +3188,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3187,7 +3187,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
          equipmentChanges.forEach((enumitemslot, itemstack) -> {
              ItemStack itemstack1 = itemstack.copy();
  
@@ -49,7 +49,7 @@ index 9bd611292cf6e686c9e737d332bb0ae6d2fbaa98..afed1b1287668250974bea61a7bc1b67
              switch (enumitemslot.getType()) {
                  case HAND:
                      this.setLastHandItem(enumitemslot, itemstack1);
-@@ -3201,6 +3204,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3200,6 +3203,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
          ((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  
diff --git a/patches/server/0694-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0680-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 97%
rename from patches/server/0694-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0680-Hide-unnecessary-itemmeta-from-clients.patch
index b59fc0acc..e853de641 100644
--- a/patches/server/0694-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0680-Hide-unnecessary-itemmeta-from-clients.patch
@@ -33,10 +33,10 @@ index 0280c215f4e502cd0471523b040d8b54c50f7ab8..5aa9f337e1e251485310436f87786b02
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index afed1b1287668250974bea61a7bc1b6720d19701..fc965b9d51cc0c8fd5c0ea6440e4eae3eb50ed73 100644
+index 140cf1fd4a9850e28c7fa0f0abef6122564474dc..e0f70157655ab26f5c7330f305c3234f64f677d1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3190,7 +3190,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3189,7 +3189,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              // Paper start - prevent oversized data
              ItemStack toSend = sanitizeItemStack(itemstack1, true);
@@ -45,7 +45,7 @@ index afed1b1287668250974bea61a7bc1b6720d19701..fc965b9d51cc0c8fd5c0ea6440e4eae3
              // Paper end - prevent oversized data
              switch (enumitemslot.getType()) {
                  case HAND:
-@@ -3204,6 +3204,77 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3203,6 +3203,77 @@ public abstract class LivingEntity extends Entity implements Attackable {
          ((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  
diff --git a/patches/server/0695-Fix-Spigot-growth-modifiers.patch b/patches/server/0681-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0695-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0681-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0696-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0682-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0696-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0682-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0697-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0683-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0697-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0683-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0698-Optimize-HashMapPalette.patch b/patches/server/0684-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0698-Optimize-HashMapPalette.patch
rename to patches/server/0684-Optimize-HashMapPalette.patch
diff --git a/patches/server/0699-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0685-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0699-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0685-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0700-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0686-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0700-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0686-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0701-Add-more-Campfire-API.patch b/patches/server/0687-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0701-Add-more-Campfire-API.patch
rename to patches/server/0687-Add-more-Campfire-API.patch
diff --git a/patches/server/0702-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0688-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0702-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0688-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0703-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0689-Forward-CraftEntity-in-teleport-command.patch
similarity index 89%
rename from patches/server/0703-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0689-Forward-CraftEntity-in-teleport-command.patch
index 68f601893..7bbf951b7 100644
--- a/patches/server/0703-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0689-Forward-CraftEntity-in-teleport-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6c2c9c2e0599fbe03f6a1622c64e071f92b66f34..3e8fe380f676fc93538a75650aa23e9034409614 100644
+index e0e57b91abde69f37ce7e5c0dd8e1f9efc67069f..fc3963247a1751b2576aaf476529d2ffe2bdf72e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3344,6 +3344,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3310,6 +3310,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index 6c2c9c2e0599fbe03f6a1622c64e071f92b66f34..3e8fe380f676fc93538a75650aa23e90
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3434,10 +3441,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3400,10 +3407,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                          }
                      }
                      // CraftBukkit end
diff --git a/patches/server/0704-Improve-scoreboard-entries.patch b/patches/server/0690-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0704-Improve-scoreboard-entries.patch
rename to patches/server/0690-Improve-scoreboard-entries.patch
diff --git a/patches/server/0705-Entity-powdered-snow-API.patch b/patches/server/0691-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0705-Entity-powdered-snow-API.patch
rename to patches/server/0691-Entity-powdered-snow-API.patch
diff --git a/patches/server/0706-Add-API-for-item-entity-health.patch b/patches/server/0692-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0706-Add-API-for-item-entity-health.patch
rename to patches/server/0692-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0707-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0693-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0707-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0693-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0708-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0694-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 93%
rename from patches/server/0708-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0694-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 1a1afc823..00fea74b7 100644
--- a/patches/server/0708-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0694-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
@@ -27,7 +27,7 @@ Co-authored-by: Zach Brown <zach@zachbr.io>
 Co-authored-by: Madeline Miller <mnmiller1@me.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 4342bc4535ea812fef3fab56917e5de15947c42d..be74adc86f0ca467f3b59e7b57fd47a8f381d86e 100644
+index 0dbdcd443fe8a299119ea5ba3acb1a0412856184..3dfe79684f662ac7cae4583bfe03a633438b4df7 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -159,15 +159,15 @@ public class PistonBaseBlock extends DirectionalBlock {
@@ -55,7 +55,7 @@ index 4342bc4535ea812fef3fab56917e5de15947c42d..be74adc86f0ca467f3b59e7b57fd47a8
              // PAIL: checkME - what happened to setTypeAndData?
              // CraftBukkit end
              world.blockEvent(pos, this, b0, enumdirection.get3DDataValue());
-@@ -250,6 +250,13 @@ public class PistonBaseBlock extends DirectionalBlock {
+@@ -244,6 +244,13 @@ public class PistonBaseBlock extends DirectionalBlock {
  
              BlockState iblockdata2 = (BlockState) ((BlockState) Blocks.MOVING_PISTON.defaultBlockState().setValue(MovingPistonBlock.FACING, enumdirection)).setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
  
@@ -67,9 +67,9 @@ index 4342bc4535ea812fef3fab56917e5de15947c42d..be74adc86f0ca467f3b59e7b57fd47a8
 +            }
 +            // Paper end - Fix sticky pistons and BlockPistonRetractEvent
              world.setBlock(pos, iblockdata2, 20);
-             world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata2, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true)); // Paper - Protect Bedrock and End Portal/Frames from being destroyed; diff on change
+             world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata2, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true));
              world.blockUpdated(pos, iblockdata2.getBlock());
-@@ -276,6 +283,13 @@ public class PistonBaseBlock extends DirectionalBlock {
+@@ -270,6 +277,13 @@ public class PistonBaseBlock extends DirectionalBlock {
                      if (type == 1 && !iblockdata3.isAir() && PistonBaseBlock.isPushable(iblockdata3, world, blockposition1, enumdirection.getOpposite(), false, enumdirection) && (iblockdata3.getPistonPushReaction() == PushReaction.NORMAL || iblockdata3.is(Blocks.PISTON) || iblockdata3.is(Blocks.STICKY_PISTON))) {
                          this.moveBlocks(world, pos, enumdirection, false);
                      } else {
diff --git a/patches/server/0709-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0695-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0709-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0695-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0710-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0696-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0710-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0696-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0711-Fix-bees-aging-inside-hives.patch b/patches/server/0697-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0711-Fix-bees-aging-inside-hives.patch
rename to patches/server/0697-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0712-Bucketable-API.patch b/patches/server/0698-Bucketable-API.patch
similarity index 100%
rename from patches/server/0712-Bucketable-API.patch
rename to patches/server/0698-Bucketable-API.patch
diff --git a/patches/server/0713-Validate-usernames.patch b/patches/server/0699-Validate-usernames.patch
similarity index 97%
rename from patches/server/0713-Validate-usernames.patch
rename to patches/server/0699-Validate-usernames.patch
index 230d95c9d..6b8a929eb 100644
--- a/patches/server/0713-Validate-usernames.patch
+++ b/patches/server/0699-Validate-usernames.patch
@@ -26,7 +26,7 @@ index d4658328eeecb1c9e3e25eec14dea07e9e2a8b74..ebda34825bbd10145a81d54c345e31c2
          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 385a2abff1660ed892a498e1d3283eb3b9fc4310..89e745736e6b53223cbab9dd63456ace43757f75 100644
+index 89c91072a6b50b2b917d8a21510d9b5daa5d6005..3daa5cce3cfb438ef63f60ec84f3f54271fcdfe7 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/0714-Make-water-animal-spawn-height-configurable.patch b/patches/server/0700-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0714-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0700-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0715-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0715-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 2c7897ae7..3d0f5cf41 100644
--- a/patches/server/0715-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6f2fcf39835d8a8b7408a39a511a2a9ee1e31248..497cc9729faceccaa43ac0a39ec75674507b1567 100644
+index 88645ffa12f630daf9bd74bb5848ed9dd23d0c1f..20790203d6ceeacc13506469b64140d7f6adfd6a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -596,7 +596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -593,7 +593,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
              LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey);
  
diff --git a/patches/server/0716-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0702-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0716-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0702-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0717-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0703-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0717-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0703-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0718-Multiple-Entries-with-Scoreboards.patch b/patches/server/0704-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0718-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0704-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0719-Reset-placed-block-on-exception.patch b/patches/server/0705-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0719-Reset-placed-block-on-exception.patch
rename to patches/server/0705-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0720-Add-configurable-height-for-slime-spawn.patch b/patches/server/0706-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0720-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0706-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0721-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0707-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0721-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0707-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0722-Multi-Block-Change-API-Implementation.patch b/patches/server/0708-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0722-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0708-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0723-Fix-NotePlayEvent.patch b/patches/server/0709-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0723-Fix-NotePlayEvent.patch
rename to patches/server/0709-Fix-NotePlayEvent.patch
diff --git a/patches/server/0724-Freeze-Tick-Lock-API.patch b/patches/server/0710-Freeze-Tick-Lock-API.patch
similarity index 87%
rename from patches/server/0724-Freeze-Tick-Lock-API.patch
rename to patches/server/0710-Freeze-Tick-Lock-API.patch
index 3dea21d29..e05f9c4f5 100644
--- a/patches/server/0724-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0710-Freeze-Tick-Lock-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3e8fe380f676fc93538a75650aa23e9034409614..6f1bd75c5bd38ac198290e05ceb2d9cf7fc0fbf1 100644
+index fc3963247a1751b2576aaf476529d2ffe2bdf72e..b4c184fa88ab66bda3e801cbaa87e94567050ae8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -408,6 +408,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -406,6 +406,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
      private UUID originWorld;
@@ -16,7 +16,7 @@ index 3e8fe380f676fc93538a75650aa23e9034409614..6f1bd75c5bd38ac198290e05ceb2d9cf
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -839,7 +840,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -805,7 +806,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  this.setRemainingFireTicks(this.remainingFireTicks - 1);
              }
  
@@ -25,7 +25,7 @@ index 3e8fe380f676fc93538a75650aa23e9034409614..6f1bd75c5bd38ac198290e05ceb2d9cf
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2326,6 +2327,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2292,6 +2293,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (fromNetherPortal) {
                  nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index 3e8fe380f676fc93538a75650aa23e9034409614..6f1bd75c5bd38ac198290e05ceb2d9cf
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -2470,6 +2474,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2436,6 +2440,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
@@ -46,10 +46,10 @@ index 3e8fe380f676fc93538a75650aa23e9034409614..6f1bd75c5bd38ac198290e05ceb2d9cf
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fc965b9d51cc0c8fd5c0ea6440e4eae3eb50ed73..69afdbf5eac010f04b1a7f0c0b99bc7e0035fda1 100644
+index e0f70157655ab26f5c7330f305c3234f64f677d1..d45a58e09cf6e59dd147fc50bf36c9c20eafe6b1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3452,7 +3452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3451,7 +3451,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.level().getProfiler().pop();
          this.level().getProfiler().push("freezing");
diff --git a/patches/server/0725-More-PotionEffectType-API.patch b/patches/server/0711-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0725-More-PotionEffectType-API.patch
rename to patches/server/0711-More-PotionEffectType-API.patch
diff --git a/patches/server/0726-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0712-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0726-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0712-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0727-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0713-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0727-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0713-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0728-Add-missing-structure-set-seed-configs.patch b/patches/server/0714-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0728-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0714-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0729-Implement-regenerateChunk.patch b/patches/server/0715-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0729-Implement-regenerateChunk.patch
rename to patches/server/0715-Implement-regenerateChunk.patch
diff --git a/patches/server/0730-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0716-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0730-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0716-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0731-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0717-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0731-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0717-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0732-Add-GameEvent-tags.patch b/patches/server/0718-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0732-Add-GameEvent-tags.patch
rename to patches/server/0718-Add-GameEvent-tags.patch
diff --git a/patches/server/0733-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 87%
rename from patches/server/0733-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index ec13c5948..a2ce560cc 100644
--- a/patches/server/0733-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,10 +9,10 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 497cc9729faceccaa43ac0a39ec75674507b1567..02f2c0185324ffd0f6f0a832f75efec28f691915 100644
+index 20790203d6ceeacc13506469b64140d7f6adfd6a..3e18923079ed2def11d5d0b199b14275274e290e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1345,6 +1345,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1290,6 +1290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (super.pollTask()) {
              return true;
          } else {
@@ -20,7 +20,7 @@ index 497cc9729faceccaa43ac0a39ec75674507b1567..02f2c0185324ffd0f6f0a832f75efec2
              if (this.tickRateManager.isSprinting() || this.haveTime()) {
                  Iterator iterator = this.getAllLevels().iterator();
  
-@@ -1352,12 +1353,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1297,12 +1298,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ServerLevel worldserver = (ServerLevel) iterator.next();
  
                      if (worldserver.getChunkSource().pollTask()) {
diff --git a/patches/server/0734-Furnace-RecipesUsed-API.patch b/patches/server/0720-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0734-Furnace-RecipesUsed-API.patch
rename to patches/server/0720-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0735-Configurable-sculk-sensor-listener-range.patch b/patches/server/0721-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0735-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0721-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0736-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0722-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0736-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0722-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0737-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 94%
rename from patches/server/0737-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index f011e77e5..00af345d2 100644
--- a/patches/server/0737-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,10 +10,10 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 02f2c0185324ffd0f6f0a832f75efec28f691915..8bbf8f051b38c351cdfedac9dee346410ee08553 100644
+index 3e18923079ed2def11d5d0b199b14275274e290e..c577c0d0738ae25d6036c01cd88ed754baf5d7f2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -623,7 +623,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -620,7 +620,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.commandStorage = new CommandStorage(worldpersistentdata);
              } else {
                  ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(11);
diff --git a/patches/server/0738-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0724-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 93%
rename from patches/server/0738-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0724-Put-world-into-worldlist-before-initing-the-world.patch
index d49cf1644..881551c75 100644
--- a/patches/server/0738-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0724-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,10 +7,10 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8bbf8f051b38c351cdfedac9dee346410ee08553..a3cf92b539f6a0b3d80c61d7b81632c8673560b6 100644
+index c577c0d0738ae25d6036c01cd88ed754baf5d7f2..febf45127a9891823d939d43d0f3a05b7d79914a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -635,9 +635,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -632,9 +632,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
  
              worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
diff --git a/patches/server/0739-Fix-Entity-Position-Desync.patch b/patches/server/0725-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0739-Fix-Entity-Position-Desync.patch
rename to patches/server/0725-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0740-Custom-Potion-Mixes.patch b/patches/server/0726-Custom-Potion-Mixes.patch
similarity index 97%
rename from patches/server/0740-Custom-Potion-Mixes.patch
rename to patches/server/0726-Custom-Potion-Mixes.patch
index 7cd640da4..655c72481 100644
--- a/patches/server/0740-Custom-Potion-Mixes.patch
+++ b/patches/server/0726-Custom-Potion-Mixes.patch
@@ -32,17 +32,17 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a3cf92b539f6a0b3d80c61d7b81632c8673560b6..f5c551a0d6a63c4a28169052cb7c8c6d0b688dda 100644
+index febf45127a9891823d939d43d0f3a05b7d79914a..96780b3a1a2f19b768f737202bdae5c80ac5bf98 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2142,6 +2142,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2087,6 +2087,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
 +            net.minecraft.world.item.alchemy.PotionBrewing.reload(); // Paper - Custom Potion Mixes
-             // Paper start
-             if (Thread.currentThread() != this.serverThread) {
-                 return;
+             this.getPlayerList().saveAll();
+             this.getPlayerList().reloadResources();
+             this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
 diff --git a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
 index ad012400d76c263bf26cfa07e2e24f26dc32276b..054555c6b9c61243b1f14139b5c0eb2579403707 100644
 --- a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
diff --git a/patches/server/0741-Force-close-world-loading-screen.patch b/patches/server/0727-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0741-Force-close-world-loading-screen.patch
rename to patches/server/0727-Force-close-world-loading-screen.patch
index 3ad6dd68d..713e4db4a 100644
--- a/patches/server/0741-Force-close-world-loading-screen.patch
+++ b/patches/server/0727-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 89e745736e6b53223cbab9dd63456ace43757f75..ec0c53a86c9e76f8c5bbd0eed8f7c7fa1d31a804 100644
+index 3daa5cce3cfb438ef63f60ec84f3f54271fcdfe7..ab01a3af073a7bf3fcda9595929afabb80e0a4da 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/0742-Fix-falling-block-spawn-methods.patch b/patches/server/0728-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0742-Fix-falling-block-spawn-methods.patch
rename to patches/server/0728-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0743-Expose-furnace-minecart-push-values.patch b/patches/server/0729-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0743-Expose-furnace-minecart-push-values.patch
rename to patches/server/0729-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0744-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0730-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0744-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0730-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0745-More-Projectile-API.patch b/patches/server/0731-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0745-More-Projectile-API.patch
rename to patches/server/0731-More-Projectile-API.patch
diff --git a/patches/server/0746-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0732-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0746-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0732-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0747-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0733-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0747-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0733-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0748-Implement-getComputedBiome-API.patch b/patches/server/0734-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0748-Implement-getComputedBiome-API.patch
rename to patches/server/0734-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0749-Make-some-itemstacks-nonnull.patch b/patches/server/0735-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0749-Make-some-itemstacks-nonnull.patch
rename to patches/server/0735-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0750-Implement-enchantWithLevels-API.patch b/patches/server/0736-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0750-Implement-enchantWithLevels-API.patch
rename to patches/server/0736-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0751-Fix-saving-in-unloadWorld.patch b/patches/server/0737-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0751-Fix-saving-in-unloadWorld.patch
rename to patches/server/0737-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0752-Buffer-OOB-setBlock-calls.patch b/patches/server/0738-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0752-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0738-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0753-Add-TameableDeathMessageEvent.patch b/patches/server/0739-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0753-Add-TameableDeathMessageEvent.patch
rename to patches/server/0739-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0754-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0740-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0754-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0740-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0755-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0741-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0755-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0741-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0756-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0742-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 85%
rename from patches/server/0756-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0742-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 8a0081b8a..da00ce288 100644
--- a/patches/server/0756-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0742-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6f1bd75c5bd38ac198290e05ceb2d9cf7fc0fbf1..1c72365643ea807c56f5f0b7484c06252acb1b6e 100644
+index b4c184fa88ab66bda3e801cbaa87e94567050ae8..a0bd8a9ac362b5131ada29fc999a02003d47f990 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2660,7 +2660,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2626,7 +2626,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean startRiding(Entity entity, boolean force) {
diff --git a/patches/server/0757-cache-resource-keys.patch b/patches/server/0743-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0757-cache-resource-keys.patch
rename to patches/server/0743-cache-resource-keys.patch
diff --git a/patches/server/0758-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0744-Allow-changing-the-EnderDragon-podium.patch
similarity index 100%
rename from patches/server/0758-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0744-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0759-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0745-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0759-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0745-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0760-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0746-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0760-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0746-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0761-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0747-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0761-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0747-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0762-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0748-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 87%
rename from patches/server/0762-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0748-Use-username-instead-of-display-name-in-PlayerList-g.patch
index ebddad6ea..fc6cbe6eb 100644
--- a/patches/server/0762-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0748-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 ec0c53a86c9e76f8c5bbd0eed8f7c7fa1d31a804..c0ffcca75509b1ccee155c799ad8fbdfa657db26 100644
+index ab01a3af073a7bf3fcda9595929afabb80e0a4da..6dca7b3f5b7f94fd3e2e6a829922b58d81a7e5f5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1449,7 +1449,7 @@ public abstract class PlayerList {
+@@ -1448,7 +1448,7 @@ public abstract class PlayerList {
      // CraftBukkit start
      public ServerStatsCounter getPlayerStats(ServerPlayer entityhuman) {
          ServerStatsCounter serverstatisticmanager = entityhuman.getStats();
diff --git a/patches/server/0763-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0749-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0763-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0749-Pass-ServerLevel-for-gamerule-callbacks.patch
index 8e0d1d576..58d97ba7c 100644
--- a/patches/server/0763-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0749-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index bb3acbe0ad049703245c51a92539376811365eb2..30b9685963ffc620846c220d1fff3fda834f1ffa 100644
+index 3cc0aa9fa1ba11d85ce07013de86ad6f89c52f67..46708de7fac39928f52119343fc05cb877235b05 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  
-             //DedicatedServer.LOGGER.info("Done ({})! For help, type \"help\"", s); // Paper moved to after init
+             DedicatedServer.LOGGER.info("Done ({})! For help, type \"help\"", s);
              if (dedicatedserverproperties.announcePlayerAchievements != null) {
 -                ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, this);
 +                ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, null); // Paper - Pass ServerLevel for gamerule callbacks
diff --git a/patches/server/0764-Expand-PlayerItemDamageEvent.patch b/patches/server/0750-Expand-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0764-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0750-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0765-WorldCreator-keepSpawnLoaded.patch b/patches/server/0751-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0765-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0751-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0766-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0752-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0766-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0752-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0767-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0753-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0767-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0753-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0768-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0754-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0768-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0754-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0769-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0755-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0769-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0755-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0770-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0756-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0770-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0756-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0771-Add-PlayerStopUsingItemEvent.patch b/patches/server/0757-Add-PlayerStopUsingItemEvent.patch
similarity index 85%
rename from patches/server/0771-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0757-Add-PlayerStopUsingItemEvent.patch
index a13ae5457..1e8db058a 100644
--- a/patches/server/0771-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0757-Add-PlayerStopUsingItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 69afdbf5eac010f04b1a7f0c0b99bc7e0035fda1..6b561cb21497f214b82d8d91affb79ce1f63fbad 100644
+index d45a58e09cf6e59dd147fc50bf36c9c20eafe6b1..c14699d0deb19b8d92fb72132ecc7cd5e99ec2b8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4025,6 +4025,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4024,6 +4024,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      public void releaseUsingItem() {
          if (!this.useItem.isEmpty()) {
diff --git a/patches/server/0772-Don-t-tick-markers.patch b/patches/server/0758-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0772-Don-t-tick-markers.patch
rename to patches/server/0758-Don-t-tick-markers.patch
diff --git a/patches/server/0773-Expand-FallingBlock-API.patch b/patches/server/0759-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0773-Expand-FallingBlock-API.patch
rename to patches/server/0759-Expand-FallingBlock-API.patch
diff --git a/patches/server/0774-Do-not-accept-invalid-client-settings.patch b/patches/server/0760-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0774-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0760-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0775-Add-support-for-Proxy-Protocol.patch b/patches/server/0761-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0775-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0761-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0776-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0762-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0776-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0762-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0777-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0763-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0777-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0763-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0778-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0764-Sanitize-sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0778-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0764-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0779-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0765-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0779-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0765-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0780-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0766-Prevent-entity-loading-causing-async-lookups.patch
similarity index 95%
rename from patches/server/0780-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0766-Prevent-entity-loading-causing-async-lookups.patch
index 8742952c5..9961e95b8 100644
--- a/patches/server/0780-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0766-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1c72365643ea807c56f5f0b7484c06252acb1b6e..3b23d1e1c1fb76e8931952846aa9f9d34584cd67 100644
+index a0bd8a9ac362b5131ada29fc999a02003d47f990..b0822dcc819a4001e8a6db83ec6931b44a2b040b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -802,6 +802,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -768,6 +768,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public void baseTick() {
          this.level().getProfiler().push("entityBaseTick");
diff --git a/patches/server/0781-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0767-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 87%
rename from patches/server/0781-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0767-Throw-exception-on-world-create-while-being-ticked.patch
index be42f8546..8af401907 100644
--- a/patches/server/0781-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0767-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,18 +7,18 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f5c551a0d6a63c4a28169052cb7c8c6d0b688dda..d42d9b38a9334e1e2b83fde671757ec191898c4b 100644
+index 96780b3a1a2f19b768f737202bdae5c80ac5bf98..44f5d7b359f172521be30c464d7acf6881dbeef0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     public volatile Thread shutdownThread; // Paper
-     public volatile boolean abnormalExit = false; // Paper
+@@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     // Spigot end
+     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
+     public static long currentTickLong = 0L; // Paper - track current tick as a long
 +    public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1562,7 +1563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1507,7 +1508,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getFunctions().tick();
          MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
          this.profiler.popPush("levels");
@@ -27,7 +27,7 @@ index f5c551a0d6a63c4a28169052cb7c8c6d0b688dda..d42d9b38a9334e1e2b83fde671757ec1
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
-@@ -1594,6 +1595,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1539,6 +1540,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Perf: Optimize time updates
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
@@ -36,7 +36,7 @@ index f5c551a0d6a63c4a28169052cb7c8c6d0b688dda..d42d9b38a9334e1e2b83fde671757ec1
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-@@ -1632,6 +1635,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1577,6 +1580,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
diff --git a/patches/server/0782-Dont-resent-entity-on-art-update.patch b/patches/server/0768-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0782-Dont-resent-entity-on-art-update.patch
rename to patches/server/0768-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0783-Add-WardenAngerChangeEvent.patch b/patches/server/0769-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0783-Add-WardenAngerChangeEvent.patch
rename to patches/server/0769-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0784-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0770-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0784-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0770-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0785-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0771-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0785-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0771-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0786-Nameable-Banner-API.patch b/patches/server/0772-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0786-Nameable-Banner-API.patch
rename to patches/server/0772-Nameable-Banner-API.patch
diff --git a/patches/server/0787-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0773-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0787-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0773-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0788-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0774-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0788-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0774-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0789-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0775-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0789-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0775-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0790-Add-Player-getFishHook.patch b/patches/server/0776-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0790-Add-Player-getFishHook.patch
rename to patches/server/0776-Add-Player-getFishHook.patch
diff --git a/patches/server/0791-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0777-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0791-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0777-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0792-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0778-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 96%
rename from patches/server/0792-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0778-Add-various-missing-EntityDropItemEvent-calls.patch
index 66a606bb9..ad72730ee 100644
--- a/patches/server/0792-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0778-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3b23d1e1c1fb76e8931952846aa9f9d34584cd67..4617730a47c44a00f62131d977ad2ca24424dcb6 100644
+index b0822dcc819a4001e8a6db83ec6931b44a2b040b..7c57dccea6a5b960dc805b24908d1e099ed77bfd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2571,6 +2571,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2537,6 +2537,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
  
              entityitem.setDefaultPickUpDelay();
diff --git a/patches/server/0793-Fix-Bee-flower-NPE.patch b/patches/server/0779-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0793-Fix-Bee-flower-NPE.patch
rename to patches/server/0779-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0794-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0780-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0794-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0780-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0795-More-Teleport-API.patch b/patches/server/0781-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0795-More-Teleport-API.patch
rename to patches/server/0781-More-Teleport-API.patch
diff --git a/patches/server/0796-Add-EntityPortalReadyEvent.patch b/patches/server/0782-Add-EntityPortalReadyEvent.patch
similarity index 88%
rename from patches/server/0796-Add-EntityPortalReadyEvent.patch
rename to patches/server/0782-Add-EntityPortalReadyEvent.patch
index 2ddddcf34..6f0e3bc92 100644
--- a/patches/server/0796-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0782-Add-EntityPortalReadyEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4617730a47c44a00f62131d977ad2ca24424dcb6..0ab98129e5d3e09046b76938a7246a89602b95a9 100644
+index 7c57dccea6a5b960dc805b24908d1e099ed77bfd..eb8d1a04887a38142d9695dc96a46d76e26cf866 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2912,6 +2912,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2878,6 +2878,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
                      this.level().getProfiler().push("portal");
                      this.portalTime = i;
@@ -22,7 +22,7 @@ index 4617730a47c44a00f62131d977ad2ca24424dcb6..0ab98129e5d3e09046b76938a7246a89
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -2919,6 +2926,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2885,6 +2892,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0797-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0783-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0797-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0783-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0798-Send-block-entities-after-destroy-prediction.patch b/patches/server/0784-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0798-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0784-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0799-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0785-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 98%
rename from patches/server/0799-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0785-Warn-on-plugins-accessing-faraway-chunks.patch
index a68f5b7ce..7148c5665 100644
--- a/patches/server/0799-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0785-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6309ab0373e7f64c7f63a55d43ff4e54d4542332..d21667480e585c7a124e9c53b4a22fa1a8115082 100644
+index a9f963ba9306b840a3d97c9a39fc81b09340065f..d84e1f2f085e83ff394e8dfe8bf42add64c9ee6d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -444,7 +444,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0800-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0786-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0800-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0786-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0801-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0787-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0801-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0787-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0802-Collision-API.patch b/patches/server/0788-Collision-API.patch
similarity index 100%
rename from patches/server/0802-Collision-API.patch
rename to patches/server/0788-Collision-API.patch
diff --git a/patches/server/0803-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0789-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0803-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0789-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0804-Block-Ticking-API.patch b/patches/server/0790-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0804-Block-Ticking-API.patch
rename to patches/server/0790-Block-Ticking-API.patch
diff --git a/patches/server/0805-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0791-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0805-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0791-Add-Velocity-IP-Forwarding-Support.patch
index cd339cb4f..3518ceb44 100644
--- a/patches/server/0805-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0791-Add-Velocity-IP-Forwarding-Support.patch
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..3c31ff3330c2e925e205c0c9ff4f0b83
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 30b9685963ffc620846c220d1fff3fda834f1ffa..6de6dad36203479677a29ad61e21bc369d4e5513 100644
+index 46708de7fac39928f52119343fc05cb877235b05..9e0c5bb92fb45cab7d78c5ad631c64170d48729f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0806-Add-NamespacedKey-biome-methods.patch b/patches/server/0792-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0806-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0792-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0807-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0793-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 78%
rename from patches/server/0807-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0793-Fix-plugin-loggers-on-server-shutdown.patch
index a85156624..1dae8c159 100644
--- a/patches/server/0807-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0793-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,19 +37,19 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d42d9b38a9334e1e2b83fde671757ec191898c4b..8d39cce9f938260817f00f42326771be8ff0fbaf 100644
+index 44f5d7b359f172521be30c464d7acf6881dbeef0..681acc1ec995d9dbd5cfd30445b967093a3e4466 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
-         } catch (Exception e) {
-         }
-+        io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
-         this.onServerExit();
-         // Paper end - move final shutdown items here
-     }
+@@ -1212,6 +1212,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 } catch (Exception ignored) {
+                 }
+                 // CraftBukkit end
++                io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
+                 this.onServerExit();
+             }
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 68b849321757493c64e874b5a2c5d5357a52d698..5ad5b54e977af7dc86c2505f7ccdc77422adb33b 100644
+index b4975e80c1929826feb880526b41b2c871ac8c8f..9c762121ae5a30dc94a91765b33cb73a8215b19a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0808-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0794-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 94%
rename from patches/server/0808-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0794-Stop-large-look-changes-from-crashing-the-server.patch
index fec57d27e..e7ec6dc35 100644
--- a/patches/server/0808-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0794-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6b561cb21497f214b82d8d91affb79ce1f63fbad..fca8970baaf7dea9397024f8c1aa2a044f7b721c 100644
+index c14699d0deb19b8d92fb72132ecc7cd5e99ec2b8..626012f925ae7e7e99fe86f4d57e6b063fe14904 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3056,37 +3056,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3055,37 +3055,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.level().getProfiler().pop();
          this.level().getProfiler().push("rangeChecks");
  
diff --git a/patches/server/0809-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0795-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0809-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0795-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0810-Missing-eating-regain-reason.patch b/patches/server/0796-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0810-Missing-eating-regain-reason.patch
rename to patches/server/0796-Missing-eating-regain-reason.patch
diff --git a/patches/server/0811-Missing-effect-cause.patch b/patches/server/0797-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0811-Missing-effect-cause.patch
rename to patches/server/0797-Missing-effect-cause.patch
diff --git a/patches/server/0812-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0798-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0812-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0798-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0813-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0799-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0813-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0799-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0814-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0800-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0814-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0800-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0815-Configurable-chat-thread-limit.patch b/patches/server/0801-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0815-Configurable-chat-thread-limit.patch
rename to patches/server/0801-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0816-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0802-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0816-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0802-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0817-fix-Jigsaw-block-kicking-user.patch b/patches/server/0803-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0817-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0803-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0818-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0804-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0818-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0804-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0819-Add-getDrops-to-BlockState.patch b/patches/server/0805-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0819-Add-getDrops-to-BlockState.patch
rename to patches/server/0805-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0820-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0806-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0820-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0806-Fix-a-bunch-of-vanilla-bugs.patch
index 152d11762..6bf37750f 100644
--- a/patches/server/0820-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0806-Fix-a-bunch-of-vanilla-bugs.patch
@@ -113,10 +113,10 @@ index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb1
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index dd16f13ca44cda3051a38085f6de117a475ce797..879a07656954fa2492db19a5fa158571de538a4f 100644
+index fea9355a25ab42f81504f90be7b3448044fa76dd..c164e222e1eaeee06cacf0c46edc32e41694b852 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -894,7 +894,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -814,7 +814,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end - Cache chunk status on disk
  
@@ -173,7 +173,7 @@ index c24701ed78824dc5377f8517dedf6a5aeff0614d..a38cda0029af022eccb12c12f1652fa8
              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 c0ffcca75509b1ccee155c799ad8fbdfa657db26..56242bc33ed435e3ab06d7c7bebc05c255538633 100644
+index 6dca7b3f5b7f94fd3e2e6a829922b58d81a7e5f5..48211cdc96aab8db73a097f6899d7a9408595bf4 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 {
diff --git a/patches/server/0821-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0807-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0821-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0807-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0822-Fix-custom-piglin-loved-items.patch b/patches/server/0808-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0822-Fix-custom-piglin-loved-items.patch
rename to patches/server/0808-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0823-EntityPickupItemEvent-fixes.patch b/patches/server/0809-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0823-EntityPickupItemEvent-fixes.patch
rename to patches/server/0809-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0824-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0810-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0824-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0810-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0825-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0811-Add-PlayerInventorySlotChangeEvent.patch
similarity index 97%
rename from patches/server/0825-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0811-Add-PlayerInventorySlotChangeEvent.patch
index 9fcf5ded6..08eb69274 100644
--- a/patches/server/0825-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0811-Add-PlayerInventorySlotChangeEvent.patch
@@ -35,7 +35,7 @@ index b43baee9a03f17801712e8a1af3317e1297248ab..de80b618efcf9f0ceae40ed0b53d3436
              @Override
              public void dataChanged(AbstractContainerMenu handler, int property, int value) {}
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 7d7b60a5c27a620b570dc5e72bb0b4c7963ca4d4..3e0de232b9f89887fd10e9bbe6de89dfe23e61ea 100644
+index 94fe6bd403222049e4e7a407bb6ca99bcaab6acb..399b2f4ddb7e9ef26fbc5e83f3b77c46d3868814 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -302,7 +302,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0826-Elder-Guardian-appearance-API.patch b/patches/server/0812-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0826-Elder-Guardian-appearance-API.patch
rename to patches/server/0812-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0827-Allow-changing-bed-s-occupied-property.patch b/patches/server/0813-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0827-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0813-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0828-Add-entity-knockback-API.patch b/patches/server/0814-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0828-Add-entity-knockback-API.patch
rename to patches/server/0814-Add-entity-knockback-API.patch
diff --git a/patches/server/0829-Detect-headless-JREs.patch b/patches/server/0815-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0829-Detect-headless-JREs.patch
rename to patches/server/0815-Detect-headless-JREs.patch
diff --git a/patches/server/0830-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0816-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0830-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0816-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0831-Add-EntityToggleSitEvent.patch b/patches/server/0817-Add-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0831-Add-EntityToggleSitEvent.patch
rename to patches/server/0817-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0832-Add-fire-tick-delay-option.patch b/patches/server/0818-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0832-Add-fire-tick-delay-option.patch
rename to patches/server/0818-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0833-Add-Moving-Piston-API.patch b/patches/server/0819-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0833-Add-Moving-Piston-API.patch
rename to patches/server/0819-Add-Moving-Piston-API.patch
diff --git a/patches/server/0834-Ignore-impossible-spawn-tick.patch b/patches/server/0820-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0834-Ignore-impossible-spawn-tick.patch
rename to patches/server/0820-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0835-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0821-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0835-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0821-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0836-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0822-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0836-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0822-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0837-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 92%
rename from patches/server/0837-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 7b4cc4c7a..c3bb8f020 100644
--- a/patches/server/0837-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0ab98129e5d3e09046b76938a7246a89602b95a9..df64101be3440828479ef4afeb70140eb4bdd9da 100644
+index eb8d1a04887a38142d9695dc96a46d76e26cf866..eb416aa2ca3c905692fa82cc29ec5eb32dee79a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3191,6 +3191,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3157,6 +3157,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
diff --git a/patches/server/0838-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0824-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0838-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0824-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0839-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0825-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0839-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0825-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0840-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0826-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0840-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0826-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0841-Add-Player-Warden-Warning-API.patch b/patches/server/0827-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0841-Add-Player-Warden-Warning-API.patch
rename to patches/server/0827-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0842-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0828-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0842-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0828-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0843-Add-paper-dumplisteners-command.patch b/patches/server/0829-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0843-Add-paper-dumplisteners-command.patch
rename to patches/server/0829-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0844-check-global-player-list-where-appropriate.patch b/patches/server/0830-check-global-player-list-where-appropriate.patch
similarity index 96%
rename from patches/server/0844-check-global-player-list-where-appropriate.patch
rename to patches/server/0830-check-global-player-list-where-appropriate.patch
index 9e3e8c00b..196e9b5c8 100644
--- a/patches/server/0844-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0830-check-global-player-list-where-appropriate.patch
@@ -24,10 +24,10 @@ index 528901e658cf553de0580bcff21e42740b5d0cd4..a15bdf56c32b16c143c3060dc7d5f615
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fca8970baaf7dea9397024f8c1aa2a044f7b721c..39a6823a2fef8c3907a39fc611489e07cdf6d1e1 100644
+index 626012f925ae7e7e99fe86f4d57e6b063fe14904..c7ece2c998b5abefc8d571e4b1ad0008dfe0733a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3678,7 +3678,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3677,7 +3677,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void onItemPickup(ItemEntity item) {
diff --git a/patches/server/0845-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0831-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0845-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0831-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0846-ItemStack-damage-API.patch b/patches/server/0832-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0846-ItemStack-damage-API.patch
rename to patches/server/0832-ItemStack-damage-API.patch
diff --git a/patches/server/0847-Friction-API.patch b/patches/server/0833-Friction-API.patch
similarity index 98%
rename from patches/server/0847-Friction-API.patch
rename to patches/server/0833-Friction-API.patch
index d1a8023c7..9b4390f60 100644
--- a/patches/server/0847-Friction-API.patch
+++ b/patches/server/0833-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 39a6823a2fef8c3907a39fc611489e07cdf6d1e1..89b2977e848afb6ff577382d69616be40fd28a75 100644
+index c7ece2c998b5abefc8d571e4b1ad0008dfe0733a..3ef0b5b1e105c973e8b135f504581625256545f9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0848-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0834-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0848-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0834-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0849-Fix-player-kick-on-shutdown.patch b/patches/server/0835-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0849-Fix-player-kick-on-shutdown.patch
rename to patches/server/0835-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0850-Sync-offhand-slot-in-menus.patch b/patches/server/0836-Sync-offhand-slot-in-menus.patch
similarity index 97%
rename from patches/server/0850-Sync-offhand-slot-in-menus.patch
rename to patches/server/0836-Sync-offhand-slot-in-menus.patch
index ac269b60c..3035b7f2e 100644
--- a/patches/server/0850-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0836-Sync-offhand-slot-in-menus.patch
@@ -26,7 +26,7 @@ index de80b618efcf9f0ceae40ed0b53d3436afca27b8..46a69ef6794065e144e4948ad165a1ea
              public void sendSlotChange(AbstractContainerMenu handler, int slot, ItemStack stack) {
                  ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(handler.containerId, handler.incrementStateId(), slot, stack));
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 3e0de232b9f89887fd10e9bbe6de89dfe23e61ea..cdd23fb468f30bff52fdf8555b6106f13d0f5552 100644
+index 399b2f4ddb7e9ef26fbc5e83f3b77c46d3868814..24caa1cf91cd50a5972238119aca1f85ec2b3d2b 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -200,6 +200,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0851-Player-Entity-Tracking-Events.patch b/patches/server/0837-Player-Entity-Tracking-Events.patch
similarity index 87%
rename from patches/server/0851-Player-Entity-Tracking-Events.patch
rename to patches/server/0837-Player-Entity-Tracking-Events.patch
index 258f23746..adab6a787 100644
--- a/patches/server/0851-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0837-Player-Entity-Tracking-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 879a07656954fa2492db19a5fa158571de538a4f..4a597dd278947c7992d3c09e0813780689cbd9ab 100644
+index c164e222e1eaeee06cacf0c46edc32e41694b852..39c8f3c694904905f946d30ea4b149c8c0545989 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1405,7 +1405,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1271,7 +1271,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // CraftBukkit end
                  if (flag) {
                      if (this.seenBy.add(player.connection)) {
@@ -21,10 +21,10 @@ index 879a07656954fa2492db19a5fa158571de538a4f..4a597dd278947c7992d3c09e08137806
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index df64101be3440828479ef4afeb70140eb4bdd9da..c6cddb7099cf713e41b8a2478b562285e2aae3f0 100644
+index eb416aa2ca3c905692fa82cc29ec5eb32dee79a6..e8fab882d8668f4afc565356b7beb0bebe8d5faf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3918,7 +3918,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3884,7 +3884,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public void startSeenByPlayer(ServerPlayer player) {}
  
diff --git a/patches/server/0852-Limit-pet-look-distance.patch b/patches/server/0838-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0852-Limit-pet-look-distance.patch
rename to patches/server/0838-Limit-pet-look-distance.patch
diff --git a/patches/server/0853-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0839-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0853-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0839-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0854-fix-Instruments.patch b/patches/server/0840-fix-Instruments.patch
similarity index 100%
rename from patches/server/0854-fix-Instruments.patch
rename to patches/server/0840-fix-Instruments.patch
diff --git a/patches/server/0855-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0841-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 91%
rename from patches/server/0855-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0841-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 187a68ae3..e57df1504 100644
--- a/patches/server/0855-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0841-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve inlining for some hot BlockBehavior and FluidState
 
 
 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 d1d00b9a078ee1f5a6c5dd51c2f0409d12c85c26..42a086dcebcdba6ce19a8d0e77ba88ba91d63669 100644
+index aa15d65f69f89da97cecd47c3458cd3b4937055f..a274d0c3b4cceb2688a41ac1c3fbaa1a03704224 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
-@@ -995,15 +995,15 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -989,15 +989,15 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.shapeExceedsCube; // Paper - moved into shape cache init
          }
  
@@ -28,7 +28,7 @@ index d1d00b9a078ee1f5a6c5dd51c2f0409d12c85c26..42a086dcebcdba6ce19a8d0e77ba88ba
              return this.isAir;
          }
  
-@@ -1087,7 +1087,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1081,7 +1081,7 @@ public abstract class BlockBehaviour implements FeatureElement {
              }
          }
  
@@ -37,7 +37,7 @@ index d1d00b9a078ee1f5a6c5dd51c2f0409d12c85c26..42a086dcebcdba6ce19a8d0e77ba88ba
              return this.canOcclude;
          }
  
-@@ -1295,11 +1295,11 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1289,11 +1289,11 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.getBlock().builtInRegistryHolder().is(key);
          }
  
diff --git a/patches/server/0856-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0842-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0856-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0842-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0857-Add-BlockLockCheckEvent.patch b/patches/server/0843-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0857-Add-BlockLockCheckEvent.patch
rename to patches/server/0843-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0858-Add-Sneaking-API-for-Entities.patch b/patches/server/0844-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0858-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0844-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0859-Improve-logging-and-errors.patch b/patches/server/0845-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0859-Improve-logging-and-errors.patch
rename to patches/server/0845-Improve-logging-and-errors.patch
diff --git a/patches/server/0860-Improve-PortalEvents.patch b/patches/server/0846-Improve-PortalEvents.patch
similarity index 89%
rename from patches/server/0860-Improve-PortalEvents.patch
rename to patches/server/0846-Improve-PortalEvents.patch
index 663ad158f..9e612b388 100644
--- a/patches/server/0860-Improve-PortalEvents.patch
+++ b/patches/server/0846-Improve-PortalEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c6cddb7099cf713e41b8a2478b562285e2aae3f0..3c9e58f033932bc6c2fad33cd54107952c19b1f2 100644
+index e8fab882d8668f4afc565356b7beb0bebe8d5faf..085471073643d851e3b08e2282ab37a64ebd732d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3576,7 +3576,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3542,7 +3542,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          Location enter = bukkitEntity.getLocation();
          Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
diff --git a/patches/server/0861-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0847-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0861-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0847-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0862-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0848-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0862-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0848-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0863-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0849-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0863-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0849-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0864-Flying-Fall-Damage.patch b/patches/server/0850-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0864-Flying-Fall-Damage.patch
rename to patches/server/0850-Flying-Fall-Damage.patch
diff --git a/patches/server/0865-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0851-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 98%
rename from patches/server/0865-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0851-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index b5625b776..51892eae9 100644
--- a/patches/server/0865-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0851-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -41,10 +41,10 @@ index 8bde8c581796ed11809b80b9a30a33df86116745..f339475185645f7be30963e4f980ce81
  
      public DamageSource outOfBorder() {
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 299583b1eb72cfdb4771ba0755fd71f2135484c1..4d51baab29b1a913c3efef2cb4ab0cac6c8cf38a 100644
+index 5097d9f1a3ab4e49e1899ede1742436357b0ad91..4aadf445daee88cc849929783eeddfa4aa005581 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -368,7 +368,7 @@ public class Explosion {
+@@ -367,7 +367,7 @@ public class Explosion {
                  bukkitBlocks = event.blockList();
                  this.yield = event.getYield();
              } else {
diff --git a/patches/server/0866-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 86%
rename from patches/server/0866-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 8bef62036..1f0a9d6d1 100644
--- a/patches/server/0866-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3c9e58f033932bc6c2fad33cd54107952c19b1f2..128c21c6fada9de2569e97f3a03decf2d36649c8 100644
+index 085471073643d851e3b08e2282ab37a64ebd732d..9c998f4a9c73a807930e5b106d2ff6cc2d6afe77 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1126,7 +1126,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1092,7 +1092,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      }
  
                      if (!bl.getType().isAir()) {
diff --git a/patches/server/0867-config-for-disabling-entity-tag-tags.patch b/patches/server/0853-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0867-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0853-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0868-Use-single-player-info-update-packet-on-join.patch b/patches/server/0854-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0868-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0854-Use-single-player-info-update-packet-on-join.patch
index a16546c0e..e68ff316b 100644
--- a/patches/server/0868-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0854-Use-single-player-info-update-packet-on-join.patch
@@ -18,7 +18,7 @@ index 07850cf4117f05bfbd96a4f02fd57db1566f90af..50f2c11d98dc4e8aa2e6f577fc802279
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 56242bc33ed435e3ab06d7c7bebc05c255538633..571354de840bce6fe86f45a1ba38ef923228f27a 100644
+index 48211cdc96aab8db73a097f6899d7a9408595bf4..14bcf8b155139dcfe3b397b3b516402b3c05e09c 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 {
diff --git a/patches/server/0869-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0855-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 92%
rename from patches/server/0869-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0855-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 049130cd1..2aa84cc8e 100644
--- a/patches/server/0869-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0855-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,10 +22,10 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 89b2977e848afb6ff577382d69616be40fd28a75..32f147ff4c5c889d8ce3c11d5b0c5274f2774248 100644
+index 3ef0b5b1e105c973e8b135f504581625256545f9..bf611c86fc095d9e9a6087d5436ddc3511835398 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1611,7 +1611,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1610,7 +1610,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.level().getCraftServer().getPluginManager().callEvent(event);
  
              if (!event.isCancelled()) {
diff --git a/patches/server/0870-Win-Screen-API.patch b/patches/server/0856-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0870-Win-Screen-API.patch
rename to patches/server/0856-Win-Screen-API.patch
diff --git a/patches/server/0871-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0857-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0871-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0857-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0872-Fix-force-opening-enchantment-tables.patch b/patches/server/0858-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0872-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0858-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0873-Add-Entity-Body-Yaw-API.patch b/patches/server/0859-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0873-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0859-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0874-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0860-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0874-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0860-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0875-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0861-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 83%
rename from patches/server/0875-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0861-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 91148395b..0b06f11a1 100644
--- a/patches/server/0875-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0861-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d21667480e585c7a124e9c53b4a22fa1a8115082..9464d79b8adb5099c4ba4400e5fa8ae6ce7be500 100644
+index d84e1f2f085e83ff394e8dfe8bf42add64c9ee6d..898a7bf653e4d213104eb339ea4bc30bc9b26455 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -554,6 +554,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -550,6 +550,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
              }
diff --git a/patches/server/0876-Add-EntityFertilizeEggEvent.patch b/patches/server/0862-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0876-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0862-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0877-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0863-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0877-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0863-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0878-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0864-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0878-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0864-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0879-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0865-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0879-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0865-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0880-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0866-Fix-advancement-triggers-for-entity-damage.patch
similarity index 93%
rename from patches/server/0880-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0866-Fix-advancement-triggers-for-entity-damage.patch
index 712823f2d..3a1d3cc88 100644
--- a/patches/server/0880-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0866-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,10 +23,10 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 32f147ff4c5c889d8ce3c11d5b0c5274f2774248..722273f0307a920365d3b2ca2879e5fc8cc5a398 100644
+index bf611c86fc095d9e9a6087d5436ddc3511835398..5e796702aca0024044b445e1dca05794e439fa44 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2302,7 +2302,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2301,7 +2301,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  // Duplicate triggers if blocking
                  if (event.getDamage(DamageModifier.BLOCKING) < 0) {
                      if (this instanceof ServerPlayer) {
@@ -35,7 +35,7 @@ index 32f147ff4c5c889d8ce3c11d5b0c5274f2774248..722273f0307a920365d3b2ca2879e5fc
                          f2 = (float) -event.getDamage(DamageModifier.BLOCKING);
                          if (f2 > 0.0F && f2 < 3.4028235E37F) {
                              ((ServerPlayer) this).awardStat(Stats.DAMAGE_BLOCKED_BY_SHIELD, Math.round(originalDamage * 10.0F));
-@@ -2310,7 +2310,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2309,7 +2309,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      }
  
                      if (damagesource.getEntity() instanceof ServerPlayer) {
diff --git a/patches/server/0881-Fix-text-display-error-on-spawn.patch b/patches/server/0867-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0881-Fix-text-display-error-on-spawn.patch
rename to patches/server/0867-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0882-Fix-inventories-returning-null-Locations.patch b/patches/server/0868-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0882-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0868-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0883-Add-Shearable-API.patch b/patches/server/0869-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0883-Add-Shearable-API.patch
rename to patches/server/0869-Add-Shearable-API.patch
diff --git a/patches/server/0884-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0870-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0884-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0870-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0885-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0871-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0885-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0871-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0886-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0872-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0886-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0872-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0887-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0873-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0887-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0873-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0888-remove-duplicate-animate-packet-for-records.patch b/patches/server/0874-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0888-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0874-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0889-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0875-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0889-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0875-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0890-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0876-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0890-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0876-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0891-Use-array-for-gamerule-storage.patch b/patches/server/0877-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0891-Use-array-for-gamerule-storage.patch
rename to patches/server/0877-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0892-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0878-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0892-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0878-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0893-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0879-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0893-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0879-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0894-Add-Mob-Experience-reward-API.patch b/patches/server/0880-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0894-Add-Mob-Experience-reward-API.patch
rename to patches/server/0880-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0895-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0881-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0895-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0881-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0896-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0882-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0896-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0882-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0897-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0883-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0897-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0883-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0898-More-accurate-isInOpenWater-impl.patch b/patches/server/0884-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0898-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0884-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0899-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0885-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0899-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0885-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0900-Expand-PlayerItemMendEvent.patch b/patches/server/0886-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0900-Expand-PlayerItemMendEvent.patch
rename to patches/server/0886-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0901-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0887-Refresh-ProjectileSource-for-projectiles.patch
similarity index 96%
rename from patches/server/0901-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0887-Refresh-ProjectileSource-for-projectiles.patch
index 685db14db..db03e91e7 100644
--- a/patches/server/0901-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0887-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,10 +14,10 @@ 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 128c21c6fada9de2569e97f3a03decf2d36649c8..1a6d5af5a9cd91617696c5bc91d9a4d97ec617c4 100644
+index 9c998f4a9c73a807930e5b106d2ff6cc2d6afe77..9fa04f43b527a1796cb849fa7ac03619dd9e19da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -385,6 +385,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -383,6 +383,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public boolean inWorld = false;
      public boolean generation;
      public int maxAirTicks = this.getDefaultMaxAirSupply(); // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
diff --git a/patches/server/0902-Add-transient-modifier-API.patch b/patches/server/0888-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0902-Add-transient-modifier-API.patch
rename to patches/server/0888-Add-transient-modifier-API.patch
diff --git a/patches/server/0903-Fix-block-place-logic.patch b/patches/server/0889-Fix-block-place-logic.patch
similarity index 96%
rename from patches/server/0903-Fix-block-place-logic.patch
rename to patches/server/0889-Fix-block-place-logic.patch
index c6a2251a6..1402b7780 100644
--- a/patches/server/0903-Fix-block-place-logic.patch
+++ b/patches/server/0889-Fix-block-place-logic.patch
@@ -41,10 +41,10 @@ index 0e9d515381a673e683b63a12c1a9e79a5eedd80b..096eb30dcfdd62b1d946891f7480e9d9
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9464d79b8adb5099c4ba4400e5fa8ae6ce7be500..94c553295538c5c27783b11fc9449fead5fca70b 100644
+index 898a7bf653e4d213104eb339ea4bc30bc9b26455..5a1d53bf288069040837995e72ef0f16b79f9ecc 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -669,17 +669,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -665,17 +665,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0904-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0890-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0904-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0890-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0905-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0891-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0905-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0891-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0906-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0892-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0906-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0892-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0907-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0893-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0907-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0893-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0908-Fix-sniffer-removeExploredLocation.patch b/patches/server/0894-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0908-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0894-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0909-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0895-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0909-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0895-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0911-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0896-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0911-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0896-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0912-Properly-cancel-usable-items.patch b/patches/server/0897-Properly-cancel-usable-items.patch
similarity index 96%
rename from patches/server/0912-Properly-cancel-usable-items.patch
rename to patches/server/0897-Properly-cancel-usable-items.patch
index dba24348b..f99bb170d 100644
--- a/patches/server/0912-Properly-cancel-usable-items.patch
+++ b/patches/server/0897-Properly-cancel-usable-items.patch
@@ -46,10 +46,10 @@ index d2916743981c6632957ab8bed5ae7a2334c5646b..33bdfb66f36cce5e89be1a0de8b5a334
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 722273f0307a920365d3b2ca2879e5fc8cc5a398..93eecdc6322dfc6161fbb80828d338aa4a311640 100644
+index 5e796702aca0024044b445e1dca05794e439fa44..825e586af663b363645586470b53e92e38774bce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3814,6 +3814,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3813,6 +3813,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
      }
  
diff --git a/patches/server/0913-Add-event-for-player-editing-sign.patch b/patches/server/0898-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0913-Add-event-for-player-editing-sign.patch
rename to patches/server/0898-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0914-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0899-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0914-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0899-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0915-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0900-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0915-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0900-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0916-Add-option-to-disable-block-updates.patch b/patches/server/0901-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0916-Add-option-to-disable-block-updates.patch
rename to patches/server/0901-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0917-Call-missing-BlockDispenseEvent.patch b/patches/server/0902-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0917-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0902-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0918-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0903-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 84%
rename from patches/server/0918-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0903-Don-t-load-chunks-for-supporting-block-checks.patch
index a6777bb19..dec88dbbc 100644
--- a/patches/server/0918-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0903-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1a6d5af5a9cd91617696c5bc91d9a4d97ec617c4..fe61f868c595dedbc6ac9e2640c950436813151c 100644
+index 9fa04f43b527a1796cb849fa7ac03619dd9e19da..fda3aa0c11d86270e96d345cf8a8b249f817dfa3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1284,7 +1284,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1250,7 +1250,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      protected BlockPos getOnPos(float offset) {
diff --git a/patches/server/0919-Optimize-player-lookups-for-beacons.patch b/patches/server/0904-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0919-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0904-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0920-Add-Sign-getInteractableSideFor.patch b/patches/server/0905-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0920-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0905-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0921-Array-backed-synched-entity-data.patch b/patches/server/0906-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0921-Array-backed-synched-entity-data.patch
rename to patches/server/0906-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0922-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0907-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0922-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0907-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0923-Fix-BanList-API.patch b/patches/server/0908-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0923-Fix-BanList-API.patch
rename to patches/server/0908-Fix-BanList-API.patch
diff --git a/patches/server/0924-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0909-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0924-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0909-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0925-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0910-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0925-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0910-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0910-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0910-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
deleted file mode 100644
index e0a566756..000000000
--- a/patches/server/0910-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 18 Jun 2023 13:48:11 +0100
-Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate
- the BFS lookup cache because potatos
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5ad5b54e977af7dc86c2505f7ccdc77422adb33b..62d9737a8d36d4863ffd7853ba290ef83c759687 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -368,6 +368,7 @@ public class Main {
-             tryPreloadClass(net.minecraft.world.level.lighting.LayerLightEventListener.DummyLightLayerEventListener.class.getName());
-             tryPreloadClass(net.minecraft.world.level.lighting.LayerLightEventListener.class.getName());
-             tryPreloadClass(net.minecraft.util.ExceptionCollector.class.getName());
-+            tryPreloadClass(io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData.class.getName()); // Paper - Prepopulate BFS lookup for potatos
-             // Paper end
-         }
-     }
diff --git a/patches/server/0926-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0911-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0926-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0911-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0927-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0912-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0927-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0912-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0928-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0913-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0928-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0913-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0929-Add-whitelist-events.patch b/patches/server/0914-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0929-Add-whitelist-events.patch
rename to patches/server/0914-Add-whitelist-events.patch
diff --git a/patches/server/0930-Implement-PlayerFailMoveEvent.patch b/patches/server/0915-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0930-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0915-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0931-Folia-scheduler-and-owned-region-API.patch b/patches/server/0916-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0931-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0916-Folia-scheduler-and-owned-region-API.patch
index 85e5d959c..09b41d704 100644
--- a/patches/server/0931-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0916-Folia-scheduler-and-owned-region-API.patch
@@ -1148,10 +1148,10 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8d39cce9f938260817f00f42326771be8ff0fbaf..fe9a5820d82e5563b53d949af060e80cc7a259f6 100644
+index 681acc1ec995d9dbd5cfd30445b967093a3e4466..6ee3eb03967f020d96e4770b71ae39df3e69a79c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1558,6 +1558,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1503,6 +1503,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper
@@ -1173,7 +1173,7 @@ index 8d39cce9f938260817f00f42326771be8ff0fbaf..fe9a5820d82e5563b53d949af060e80c
          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 571354de840bce6fe86f45a1ba38ef923228f27a..982a9e5cba5b37e58c71a8339e05703e9f351a57 100644
+index 14bcf8b155139dcfe3b397b3b516402b3c05e09c..67e044a2c71833704357e5b3d46b4e7f8891e995 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,10 +1185,10 @@ index 571354de840bce6fe86f45a1ba38ef923228f27a..982a9e5cba5b37e58c71a8339e05703e
          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 fe61f868c595dedbc6ac9e2640c950436813151c..03bc38ef6a31e762a2db9e1993e064eb1656a986 100644
+index fda3aa0c11d86270e96d345cf8a8b249f817dfa3..c709049deccc8218d603382e4f628e493a99c5ae 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -248,11 +248,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public @org.jetbrains.annotations.Nullable net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
      public CraftEntity getBukkitEntity() {
          if (this.bukkitEntity == null) {
@@ -1213,7 +1213,7 @@ index fe61f868c595dedbc6ac9e2640c950436813151c..03bc38ef6a31e762a2db9e1993e064eb
      @Override
      public CommandSender getBukkitSender(CommandSourceStack wrapper) {
          return this.getBukkitEntity();
-@@ -4543,6 +4555,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4509,6 +4521,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              return;
          }
          // Paper end - rewrite chunk system
@@ -1221,7 +1221,7 @@ index fe61f868c595dedbc6ac9e2640c950436813151c..03bc38ef6a31e762a2db9e1993e064eb
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4553,12 +4566,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4519,12 +4532,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
          if (reason != RemovalReason.UNLOADED_TO_CHUNK) this.getPassengers().forEach(Entity::stopRiding); // Paper - chunk system - don't adjust passenger state when unloading, it's just not safe (and messes with our logic in entity chunk unload)
          this.levelCallback.onRemove(reason);
diff --git a/patches/server/0932-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0917-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0932-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0917-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0933-API-for-updating-recipes-on-clients.patch b/patches/server/0918-API-for-updating-recipes-on-clients.patch
similarity index 95%
rename from patches/server/0933-API-for-updating-recipes-on-clients.patch
rename to patches/server/0918-API-for-updating-recipes-on-clients.patch
index 93e1ca4c5..9907707ea 100644
--- a/patches/server/0933-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0918-API-for-updating-recipes-on-clients.patch
@@ -5,10 +5,10 @@ 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 982a9e5cba5b37e58c71a8339e05703e9f351a57..86c1bb0d324cb070b1dbab8222913d4b46c4a94a 100644
+index 67e044a2c71833704357e5b3d46b4e7f8891e995..02aaa2abd1815bc8505a09033025cf64bc4662b2 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 {
+@@ -1544,6 +1544,13 @@ public abstract class PlayerList {
      }
  
      public void reloadResources() {
@@ -22,7 +22,7 @@ index 982a9e5cba5b37e58c71a8339e05703e9f351a57..86c1bb0d324cb070b1dbab8222913d4b
          // CraftBukkit start
          /*Iterator iterator = this.advancements.values().iterator();
  
-@@ -1560,7 +1567,15 @@ public abstract class PlayerList {
+@@ -1559,7 +1566,15 @@ public abstract class PlayerList {
          }
          // CraftBukkit end
  
diff --git a/patches/server/0934-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0919-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0934-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0919-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0935-Only-capture-actual-tree-growth.patch b/patches/server/0920-Only-capture-actual-tree-growth.patch
similarity index 97%
rename from patches/server/0935-Only-capture-actual-tree-growth.patch
rename to patches/server/0920-Only-capture-actual-tree-growth.patch
index f48c3370a..07c756c7c 100644
--- a/patches/server/0935-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0920-Only-capture-actual-tree-growth.patch
@@ -29,10 +29,10 @@ index e14d928e8bf484c61f2687621623942a27f30db1..0fd5decb0790423aba80a7c1e55ce39a
                      }
                      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 94c553295538c5c27783b11fc9449fead5fca70b..0b2e7e098ad0d8250156a6277491676357e0b1db 100644
+index 5a1d53bf288069040837995e72ef0f16b79f9ecc..8fac839ea8131060a29c326a9530a21fbf47dfa3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1494,4 +1494,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1489,4 +1489,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return range <= 0 ? 64.0 * 64.0 : range * range; // 64 is taken from default in ServerLevel#levelEvent
      }
      // Paper end - respect global sound events gamerule
diff --git a/patches/server/0936-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0921-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0936-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0921-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0937-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0922-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0937-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0922-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0938-Use-correct-seed-on-api-world-load.patch b/patches/server/0923-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0938-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0923-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0939-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0924-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0939-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0924-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0940-Cache-map-ids-on-item-frames.patch b/patches/server/0925-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0940-Cache-map-ids-on-item-frames.patch
rename to patches/server/0925-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0941-Fix-custom-statistic-criteria-creation.patch b/patches/server/0926-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0941-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0926-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0942-Bandaid-fix-for-Effect.patch b/patches/server/0927-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0942-Bandaid-fix-for-Effect.patch
rename to patches/server/0927-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0943-SculkCatalyst-bloom-API.patch b/patches/server/0928-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0943-SculkCatalyst-bloom-API.patch
rename to patches/server/0928-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0944-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0929-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0944-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0929-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0945-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 97%
rename from patches/server/0945-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 2b706086e..7b4c5d79f 100644
--- a/patches/server/0945-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4a597dd278947c7992d3c09e0813780689cbd9ab..ebf69ec2830a3e3121707fd958f31180d361d9d0 100644
+index 39c8f3c694904905f946d30ea4b149c8c0545989..5d85bcfe98134d37ee7b1180734426c28ff3af8f 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
+@@ -306,8 +306,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
diff --git a/patches/server/0946-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0931-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0946-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0931-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0947-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0932-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0947-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0932-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0948-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0933-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 98%
rename from patches/server/0948-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0933-Properly-handle-BlockBreakEvent-isDropItems.patch
index 07e3ba592..37f0ede13 100644
--- a/patches/server/0948-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0933-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -39,10 +39,10 @@ index a0ab721a01faccf216259c46e6d6f638426732c2..2d4a770ec7c0737eee6f06b32958716d
              BeehiveBlockEntity tileentitybeehive = (BeehiveBlockEntity) blockEntity;
  
 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 af62781cc96354c87aa63d4f03f9e25b81959081..6ec04bf5cd1f7f2e74d86daa95209bd2f2124b91 100644
+index 9120b4a70dbf84f19480b952658414e16d2c23c1..660ede322b4f4ccad241820d8ffd4540ebb18fbc 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -423,10 +423,18 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -410,10 +410,18 @@ public class Block extends BlockBehaviour implements ItemLike {
          return this.defaultBlockState();
      }
  
diff --git a/patches/server/0949-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0934-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0949-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0934-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0950-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0935-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 91%
rename from patches/server/0950-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0935-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 1695f7f67..6498bc26d 100644
--- a/patches/server/0950-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0935-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ebf69ec2830a3e3121707fd958f31180d361d9d0..815fb04fb2d14d0cea14a2b3509e81b383bbdbda 100644
+index 5d85bcfe98134d37ee7b1180734426c28ff3af8f..32bbea0e65176d3a05ed02ce5351f7fea00bf53f 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1415,6 +1415,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1281,6 +1281,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z;
                  double d2 = d0 * d0;
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
diff --git a/patches/server/0951-Add-Listing-API-for-Player.patch b/patches/server/0936-Add-Listing-API-for-Player.patch
similarity index 99%
rename from patches/server/0951-Add-Listing-API-for-Player.patch
rename to patches/server/0936-Add-Listing-API-for-Player.patch
index f16c9fe8f..dc3116153 100644
--- a/patches/server/0951-Add-Listing-API-for-Player.patch
+++ b/patches/server/0936-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 86c1bb0d324cb070b1dbab8222913d4b46c4a94a..947cb3b24d6e379b080f3de8cd4ea60e0ca457e4 100644
+index 02aaa2abd1815bc8505a09033025cf64bc4662b2..17573871e13affb72e282da02eaba395808b3d9d 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/0952-Configurable-Region-Compression-Format.patch b/patches/server/0937-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0952-Configurable-Region-Compression-Format.patch
rename to patches/server/0937-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0953-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0938-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0953-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0938-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0954-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0939-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0954-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0939-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0955-Expand-Pose-API.patch b/patches/server/0940-Expand-Pose-API.patch
similarity index 90%
rename from patches/server/0955-Expand-Pose-API.patch
rename to patches/server/0940-Expand-Pose-API.patch
index dfd883c86..c4bdb8c63 100644
--- a/patches/server/0955-Expand-Pose-API.patch
+++ b/patches/server/0940-Expand-Pose-API.patch
@@ -5,10 +5,10 @@ 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 03bc38ef6a31e762a2db9e1993e064eb1656a986..e9df37e802a982d9332a40a7f889206440ac1cc2 100644
+index c709049deccc8218d603382e4f628e493a99c5ae..633a709d3f7768dce644affc4ce9b75711e971f1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -420,6 +420,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      @javax.annotation.Nullable
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
@@ -16,7 +16,7 @@ index 03bc38ef6a31e762a2db9e1993e064eb1656a986..e9df37e802a982d9332a40a7f8892064
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -706,6 +707,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -672,6 +673,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public void onClientRemoval() {}
  
      public void setPose(net.minecraft.world.entity.Pose pose) {
diff --git a/patches/server/0956-More-DragonBattle-API.patch b/patches/server/0941-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0956-More-DragonBattle-API.patch
rename to patches/server/0941-More-DragonBattle-API.patch
diff --git a/patches/server/0957-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0942-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0957-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0942-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0958-Add-PlayerPickItemEvent.patch b/patches/server/0943-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/0958-Add-PlayerPickItemEvent.patch
rename to patches/server/0943-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0959-Allow-trident-custom-damage.patch b/patches/server/0944-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0959-Allow-trident-custom-damage.patch
rename to patches/server/0944-Allow-trident-custom-damage.patch
diff --git a/patches/server/0960-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0945-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0960-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0945-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0961-Optimize-nearest-structure-border-iteration.patch b/patches/server/0946-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0961-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0946-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0962-Implement-OfflinePlayer-isConnected.patch b/patches/server/0947-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/0962-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0947-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0963-Fix-inventory-desync.patch b/patches/server/0948-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0963-Fix-inventory-desync.patch
rename to patches/server/0948-Fix-inventory-desync.patch
diff --git a/patches/server/0964-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0949-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/0964-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0949-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0965-Configure-sniffer-egg-hatch-time.patch b/patches/server/0950-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0965-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0950-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0966-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0951-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0966-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0951-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0967-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0952-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 94%
rename from patches/server/0967-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0952-Skip-POI-finding-if-stuck-in-vehicle.patch
index 62f6c025a..e0235836a 100644
--- a/patches/server/0967-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0952-Skip-POI-finding-if-stuck-in-vehicle.patch
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..abcc3ef59475ac170fd10b4dd4a4f3371faf17e0 100644
+index 9fd6cf0c98cbf6300ef23d4aab32a6110aeba665..a0799baca3ae05ef1ff818abfe6a53d28fd99246 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 @@ -47,6 +47,7 @@ public class AcquirePoi {
diff --git a/patches/server/0968-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0953-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 96%
rename from patches/server/0968-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0953-Add-slot-sanity-checks-in-container-clicks.patch
index 351246e50..ccb4411a2 100644
--- a/patches/server/0968-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0953-Add-slot-sanity-checks-in-container-clicks.patch
@@ -22,7 +22,7 @@ index 70941e46dd15db9d221b505577511cd0295ba603..9342efcb855dce5cced227b15356df09
                                  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 cdd23fb468f30bff52fdf8555b6106f13d0f5552..4183afe565a46ebc52ff520b046fef405e3b22f7 100644
+index 24caa1cf91cd50a5972238119aca1f85ec2b3d2b..75f836f07c66dbf71017ef0b7697851353d0f2e1 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/0969-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0954-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0969-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0954-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0970-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0955-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0970-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0955-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0971-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0956-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/0971-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0956-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0972-Fix-spigot-s-Forced-Stats.patch b/patches/server/0957-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0972-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0957-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0973-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0958-Add-missing-InventoryHolders-to-inventories.patch
similarity index 99%
rename from patches/server/0973-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0958-Add-missing-InventoryHolders-to-inventories.patch
index 2a79e00b7..c189f4b7d 100644
--- a/patches/server/0973-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0958-Add-missing-InventoryHolders-to-inventories.patch
@@ -57,10 +57,10 @@ 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 4183afe565a46ebc52ff520b046fef405e3b22f7..48f634a7521d31c1e9dfd3cfc83139d428dbd37a 100644
+index 75f836f07c66dbf71017ef0b7697851353d0f2e1..eef0d3c59f0ce6e89033a5e228d31b63339c2773 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 {
+@@ -993,4 +993,15 @@ public abstract class AbstractContainerMenu {
          this.stateId = this.stateId + 1 & 32767;
          return this.stateId;
      }
diff --git a/patches/server/0974-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0959-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/0974-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0959-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0975-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0960-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0975-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0960-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0976-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0961-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/0976-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/0961-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/0977-Fix-SuspiciousStewMeta.patch b/patches/server/0962-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/0977-Fix-SuspiciousStewMeta.patch
rename to patches/server/0962-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/0978-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0963-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0978-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0963-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0979-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0964-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0979-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0964-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0980-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0965-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0980-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0965-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0981-Fix-missing-map-initialize-event-call.patch b/patches/server/0966-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/0981-Fix-missing-map-initialize-event-call.patch
rename to patches/server/0966-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0982-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0967-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/0982-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/0967-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0983-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/0968-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/0983-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/0968-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/0984-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/0969-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/0984-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/0969-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/0985-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0970-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/0985-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/0970-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0986-Add-player-idle-duration-API.patch b/patches/server/0971-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/0986-Add-player-idle-duration-API.patch
rename to patches/server/0971-Add-player-idle-duration-API.patch
diff --git a/patches/server/0987-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0972-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 85%
rename from patches/server/0987-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/0972-Don-t-check-if-we-can-see-non-visible-entities.patch
index 3bc977431..f646d9df5 100644
--- a/patches/server/0987-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0972-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,10 +5,10 @@ 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 815fb04fb2d14d0cea14a2b3509e81b383bbdbda..303ab1ea6747bb71adbd3a09e419b2677c9b8c5f 100644
+index 32bbea0e65176d3a05ed02ce5351f7fea00bf53f..fa29444c43925eabe5c26cafaefb46ebb246b006 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1426,7 +1426,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1292,7 +1292,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // Paper end - Configurable entity tracking range by Y
  
                  // CraftBukkit start - respect vanish API
diff --git a/patches/server/0988-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0973-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/0988-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/0973-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0989-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0974-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/0989-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/0974-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0990-Optimize-VarInts.patch b/patches/server/0975-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/0990-Optimize-VarInts.patch
rename to patches/server/0975-Optimize-VarInts.patch
diff --git a/patches/server/0991-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0976-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/0991-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/0976-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0992-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0977-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/0992-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/0977-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0993-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0978-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 88%
rename from patches/server/0993-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/0978-Broadcast-take-item-packets-with-collector-as-source.patch
index 91ef80895..bcd63d3b6 100644
--- a/patches/server/0993-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0978-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 93eecdc6322dfc6161fbb80828d338aa4a311640..3bedc89be56dddb858d40c155a8137665bbf3726 100644
+index 825e586af663b363645586470b53e92e38774bce..e11eb4b3796debeadde58e43d9176aef029228bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3704,7 +3704,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3703,7 +3703,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      public void take(Entity item, int count) {
          if (!item.isRemoved() && !this.level().isClientSide && (item instanceof ItemEntity || item instanceof AbstractArrow || item instanceof ExperienceOrb)) {
diff --git a/patches/server/0994-Expand-LingeringPotion-API.patch b/patches/server/0979-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/0994-Expand-LingeringPotion-API.patch
rename to patches/server/0979-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0995-Add-MaterialTagsTest.patch b/patches/server/0980-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/0995-Add-MaterialTagsTest.patch
rename to patches/server/0980-Add-MaterialTagsTest.patch
diff --git a/patches/server/0996-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0981-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/0996-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/0981-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0997-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0982-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/0997-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/0982-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0998-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0983-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/0998-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/0983-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0999-Add-UUID-attribute-modifier-API.patch b/patches/server/0984-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/0999-Add-UUID-attribute-modifier-API.patch
rename to patches/server/0984-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1000-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0985-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/1000-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/0985-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1001-Lazily-create-LootContext-for-criterions.patch b/patches/server/0986-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1001-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/0986-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1002-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0987-Don-t-fire-sync-events-during-worldgen.patch
similarity index 97%
rename from patches/server/1002-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/0987-Don-t-fire-sync-events-during-worldgen.patch
index bf0a1af39..600c45af2 100644
--- a/patches/server/1002-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0987-Don-t-fire-sync-events-during-worldgen.patch
@@ -31,10 +31,10 @@ index 9e8f47ab8b337a43760d781852348e4bddbb46d9..0c4c20ce794dd7e12cf1712dccc975bf
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e9df37e802a982d9332a40a7f889206440ac1cc2..ec5a7f44b379a10c61f152eb57641994d382b017 100644
+index 633a709d3f7768dce644affc4ce9b75711e971f1..da52068d063f5dd978454e3b516384df25eb204b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -712,7 +712,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -678,7 +678,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          if (pose == this.getPose()) {
              return;
          }
@@ -68,7 +68,7 @@ index a6e20b5ee4fe1841dfc2350264b5935b968fe3f3..9da8d56ff3768fb37d1ab89300da4eca
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3bedc89be56dddb858d40c155a8137665bbf3726..18004cc231804220aa63e41389a8caffcc434d66 100644
+index e11eb4b3796debeadde58e43d9176aef029228bd..228e8233caf3653d6411e4d85e5dcfd6a012b40f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1134,6 +1134,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1003-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0988-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/1003-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/0988-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1004-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0989-Restore-vanilla-entity-drops-behavior.patch
similarity index 98%
rename from patches/server/1004-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/0989-Restore-vanilla-entity-drops-behavior.patch
index 8d807f67c..df93739ba 100644
--- a/patches/server/1004-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0989-Restore-vanilla-entity-drops-behavior.patch
@@ -50,10 +50,10 @@ index 361541e8c152a9311634411d434cc29ec87c17e2..bd1a53e2ce2644681c23f8cf678afa2a
          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 ec5a7f44b379a10c61f152eb57641994d382b017..f2f8bc9f8f55a43174acd9c5e841fb9a7d1b8065 100644
+index da52068d063f5dd978454e3b516384df25eb204b..3d7c6d38dba3e74bc0b868ee5efb7cc80bc0352c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2575,6 +2575,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2541,6 +2541,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      @Nullable
      public ItemEntity spawnAtLocation(ItemStack stack, float yOffset) {
@@ -79,7 +79,7 @@ index ec5a7f44b379a10c61f152eb57641994d382b017..f2f8bc9f8f55a43174acd9c5e841fb9a
          if (stack.isEmpty()) {
              return null;
          } else if (this.level().isClientSide) {
-@@ -2582,14 +2601,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2548,14 +2567,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -104,7 +104,7 @@ index ec5a7f44b379a10c61f152eb57641994d382b017..f2f8bc9f8f55a43174acd9c5e841fb9a
              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 18004cc231804220aa63e41389a8caffcc434d66..563b30aca4a1dd04e298db3b9252904740422203 100644
+index 228e8233caf3653d6411e4d85e5dcfd6a012b40f..5741fb18e9538c161c8516de6322b2e4dbe2cb4d 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 {
diff --git a/patches/server/1005-Add-Structure-check-API.patch b/patches/server/0990-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/1005-Add-Structure-check-API.patch
rename to patches/server/0990-Add-Structure-check-API.patch
diff --git a/patches/server/1006-Dont-resend-blocks-on-interactions.patch b/patches/server/0991-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/1006-Dont-resend-blocks-on-interactions.patch
rename to patches/server/0991-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/1007-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/0992-Keep-previous-behavior-for-setResourcePack.patch
similarity index 100%
rename from patches/server/1007-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/0992-Keep-previous-behavior-for-setResourcePack.patch
diff --git a/patches/server/1008-properly-read-and-store-sus-effect-duration.patch b/patches/server/0993-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/1008-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/0993-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/1009-Use-correct-max-stack-size-in-crafter.patch b/patches/server/0994-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/1009-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/0994-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/1010-add-more-scoreboard-API.patch b/patches/server/0995-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/1010-add-more-scoreboard-API.patch
rename to patches/server/0995-add-more-scoreboard-API.patch
diff --git a/patches/server/1011-Improve-Registry.patch b/patches/server/0996-Improve-Registry.patch
similarity index 100%
rename from patches/server/1011-Improve-Registry.patch
rename to patches/server/0996-Improve-Registry.patch
diff --git a/patches/server/1012-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 96%
rename from patches/server/1012-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 3a2aaebbf..ecdce557f 100644
--- a/patches/server/1012-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -26,10 +26,10 @@ index 3fec07b250a8f145e30c8c41888e47d2a3c902e1..2ddd033e1c3a2e5c8950b93c83849192
                  x = to.getX();
                  y = to.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 563b30aca4a1dd04e298db3b9252904740422203..b920f72e659956cc2d2d44743caddb0136d467e4 100644
+index 5741fb18e9538c161c8516de6322b2e4dbe2cb4d..ec495c0080e15b1baeeb57cd7c80d2e6b06e7d2e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4186,7 +4186,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4185,7 +4185,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      if (!(this instanceof ServerPlayer)) {
                          EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), d3, d4, d5), new Location(this.level().getWorld(), d0, d6, d2));
                          this.level().getCraftServer().getPluginManager().callEvent(teleport);
diff --git a/patches/server/1013-Add-experience-points-API.patch b/patches/server/0998-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/1013-Add-experience-points-API.patch
rename to patches/server/0998-Add-experience-points-API.patch
diff --git a/patches/server/1014-Add-missing-InventoryType.patch b/patches/server/0999-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/1014-Add-missing-InventoryType.patch
rename to patches/server/0999-Add-missing-InventoryType.patch
diff --git a/patches/server/1015-Add-drops-to-shear-events.patch b/patches/server/1000-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/1015-Add-drops-to-shear-events.patch
rename to patches/server/1000-Add-drops-to-shear-events.patch
diff --git a/patches/server/1016-Add-PlayerShieldDisableEvent.patch b/patches/server/1001-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/1016-Add-PlayerShieldDisableEvent.patch
rename to patches/server/1001-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/1017-Add-HiddenPotionEffect-API.patch b/patches/server/1002-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1017-Add-HiddenPotionEffect-API.patch
rename to patches/server/1002-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1018-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1003-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/1018-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/1003-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/1019-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1004-fix-ItemMeta-removing-CustomModelData.patch
similarity index 100%
rename from patches/server/1019-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/1004-fix-ItemMeta-removing-CustomModelData.patch
diff --git a/patches/server/1020-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1005-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/1020-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/1005-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/1021-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1006-Properly-handle-experience-dropping-on-block-break.patch
similarity index 92%
rename from patches/server/1021-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/1006-Properly-handle-experience-dropping-on-block-break.patch
index e2efaa8c2..cba115444 100644
--- a/patches/server/1021-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/1006-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,10 +7,10 @@ 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 0b2e7e098ad0d8250156a6277491676357e0b1db..e5944ff3c1118e57c9e7a14cbb5181b2d7f7a79a 100644
+index 8fac839ea8131060a29c326a9530a21fbf47dfa3..25ed0f62058fa531d8bf9cf1e8fb99651ee46a67 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -734,7 +734,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -730,7 +730,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (drop) {
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
@@ -21,10 +21,10 @@ index 0b2e7e098ad0d8250156a6277491676357e0b1db..e5944ff3c1118e57c9e7a14cbb5181b2
  
              boolean flag1 = this.setBlock(pos, fluid.createLegacyBlock(), 3, maxUpdateDepth);
 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 6ec04bf5cd1f7f2e74d86daa95209bd2f2124b91..68b94b4ebd710f3ab18f397d9dfa0ef5b8f182e0 100644
+index 660ede322b4f4ccad241820d8ffd4540ebb18fbc..63217d3db86b467f3358730eb8b9b3c941558bab 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -333,23 +333,31 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -320,23 +320,31 @@ public class Block extends BlockBehaviour implements ItemLike {
              for (net.minecraft.world.item.ItemStack drop : net.minecraft.world.level.block.Block.getDrops(state, world.getMinecraftWorld(), pos, blockEntity)) {
                  items.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(drop));
              }
@@ -58,7 +58,7 @@ index 6ec04bf5cd1f7f2e74d86daa95209bd2f2124b91..68b94b4ebd710f3ab18f397d9dfa0ef5
          }
  
      }
-@@ -433,7 +441,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -420,7 +428,7 @@ public class Block extends BlockBehaviour implements ItemLike {
          player.awardStat(Stats.BLOCK_MINED.get(this));
          player.causeFoodExhaustion(0.005F, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.BLOCK_MINED); // CraftBukkit - EntityExhaustionEvent
          if (includeDrops) { // Paper - fix drops not preventing stats/food exhaustion
@@ -68,10 +68,10 @@ index 6ec04bf5cd1f7f2e74d86daa95209bd2f2124b91..68b94b4ebd710f3ab18f397d9dfa0ef5
      }
  
 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 42a086dcebcdba6ce19a8d0e77ba88ba91d63669..7ba5d00516dc310355d08dda955c934fe26786ee 100644
+index a274d0c3b4cceb2688a41ac1c3fbaa1a03704224..4c6ab71c3222ce03edd70abef35c71398d885c13 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
-@@ -1203,6 +1203,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1197,6 +1197,7 @@ public abstract class BlockBehaviour implements FeatureElement {
  
          public void spawnAfterBreak(ServerLevel world, BlockPos pos, ItemStack tool, boolean dropExperience) {
              this.getBlock().spawnAfterBreak(this.asState(), world, pos, tool, dropExperience);
diff --git a/patches/server/1022-Fixup-NamespacedKey-handling.patch b/patches/server/1007-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/1022-Fixup-NamespacedKey-handling.patch
rename to patches/server/1007-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/1023-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 95%
rename from patches/server/1023-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 82f9b1f9d..b72c50ec1 100644
--- a/patches/server/1023-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,10 +18,10 @@ index 3c4ac79c094dc2fff7de94150a34b7bf814ac0de..38b56923a642afc1cb411480ba03cc78
      @VisibleForTesting
      static long encode(double value) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 303ab1ea6747bb71adbd3a09e419b2677c9b8c5f..90393101fddd54f60b0b173beffd8650ad23349e 100644
+index fa29444c43925eabe5c26cafaefb46ebb246b006..370747aefba28dbfce59f45d303d47db9bfceb42 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1409,10 +1409,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1275,10 +1275,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          public void updatePlayer(ServerPlayer player) {
              org.spigotmc.AsyncCatcher.catchOp("player tracker update"); // Spigot
              if (player != this.entity) {
diff --git a/patches/server/1024-Write-SavedData-IO-async.patch b/patches/server/1009-Write-SavedData-IO-async.patch
similarity index 100%
rename from patches/server/1024-Write-SavedData-IO-async.patch
rename to patches/server/1009-Write-SavedData-IO-async.patch
diff --git a/patches/server/0358-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1010-Optimize-Collision-to-not-load-chunks.patch
similarity index 95%
rename from patches/server/0358-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/1010-Optimize-Collision-to-not-load-chunks.patch
index 43cbe7752..107416519 100644
--- a/patches/server/0358-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/1010-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 81acbabe942de6f1716e384dc4e9cbd451f0a535..37b53bfe58689f498a48ad5e0e59d98462ccdd7f 100644
+index 17573871e13affb72e282da02eaba395808b3d9d..f168c9bb2fa3ca5b3168fb4c420a77e5bba6185b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -820,6 +820,7 @@ public abstract class PlayerList {
+@@ -935,6 +935,7 @@ public abstract class PlayerList {
          entityplayer1.setShiftKeyDown(false);
          entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
  
@@ -26,10 +26,10 @@ index 81acbabe942de6f1716e384dc4e9cbd451f0a535..37b53bfe58689f498a48ad5e0e59d984
              // CraftBukkit end
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9efddedbe5feebf2f91eb674a9224054dba6cff3..538931a474841e7efae505f5aeae58715108da1b 100644
+index 3d7c6d38dba3e74bc0b868ee5efb7cc80bc0352c..c20a9fb40a2c3f555096299de662b5488c00ee26 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -240,6 +240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -241,6 +241,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
diff --git a/patches/server/0360-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1011-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 93%
rename from patches/server/0360-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/1011-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 70dff6f0d..e43e1e88f 100644
--- a/patches/server/0360-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/1011-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
@@ -7,20 +7,28 @@ Optimise the stream.anyMatch statement to move to a bitset
 where we can replace the call with a single bitwise operation.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
-index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..4379b9948f1eecfe6fd7dea98e298ad5f761019a 100644
+index 16f9a98b8a939e5ca7e2dc04f87134a7ed66736b..54a2ce8c7069e91a939fe03de4349385705b0c67 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
-@@ -4,7 +4,8 @@ import java.util.EnumSet;
+@@ -4,7 +4,16 @@ import java.util.EnumSet;
  import net.minecraft.util.Mth;
  
  public abstract class Goal {
 -    private final EnumSet<Goal.Flag> flags = EnumSet.noneOf(Goal.Flag.class);
 +    private final EnumSet<Goal.Flag> flags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
 +    private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<net.minecraft.world.entity.ai.goal.Goal.Flag> goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
++
++    // Paper start - remove streams from pathfindergoalselector; make sure types are not empty
++    public Goal() {
++        if (this.goalTypes.size() == 0) {
++            this.goalTypes.addUnchecked(Flag.UNKNOWN_BEHAVIOR);
++        }
++    }
++    // Paper end - remove streams from pathfindergoalselector
  
      public abstract boolean canUse();
  
-@@ -30,8 +31,10 @@ public abstract class Goal {
+@@ -30,8 +39,13 @@ public abstract class Goal {
      }
  
      public void setFlags(EnumSet<Goal.Flag> controls) {
@@ -29,11 +37,14 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..4379b9948f1eecfe6fd7dea98e298ad5
 +        // Paper start - remove streams from pathfindergoalselector
 +        this.goalTypes.clear();
 +        this.goalTypes.addAllUnchecked(controls);
++        if (this.goalTypes.size() == 0) {
++            this.goalTypes.addUnchecked(Flag.UNKNOWN_BEHAVIOR);
++        }
 +        // Paper end - remove streams from pathfindergoalselector
      }
  
      @Override
-@@ -39,8 +42,10 @@ public abstract class Goal {
+@@ -39,8 +53,10 @@ public abstract class Goal {
          return this.getClass().getSimpleName();
      }
  
diff --git a/patches/server/0361-Improved-Watchdog-Support.patch b/patches/server/1012-Improved-Watchdog-Support.patch
similarity index 90%
rename from patches/server/0361-Improved-Watchdog-Support.patch
rename to patches/server/1012-Improved-Watchdog-Support.patch
index 426ef801d..cc36f13c7 100644
--- a/patches/server/0361-Improved-Watchdog-Support.patch
+++ b/patches/server/1012-Improved-Watchdog-Support.patch
@@ -59,10 +59,10 @@ index 6aaed8e8bf8c721fc834da5c76ac72a4c3e92458..4b002e8b75d117b726b0de274a76d359
          // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution of requests on the
          // bStats backend. To circumvent this problem, we introduce some randomness into the initial and second delay.
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index a9a0248b1bd1ac454064e977b61f9b7d80962ff8..059b1a0bf048af6a28c322f35da3d3cbbe426546 100644
+index 6f2452de76e8f5fcc1367066e0e753740764eb98..e047dee632022abfe05865d1e71838be8d5d053a 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -233,6 +233,7 @@ public class CrashReport {
+@@ -234,6 +234,7 @@ public class CrashReport {
      }
  
      public static CrashReport forThrowable(Throwable cause, String title) {
@@ -71,7 +71,7 @@ index a9a0248b1bd1ac454064e977b61f9b7d80962ff8..059b1a0bf048af6a28c322f35da3d3cb
              cause = cause.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f865f72b1c 100644
+index 6ee3eb03967f020d96e4770b71ae39df3e69a79c..69b3d89a352fe5cfd51e2e566c9fa4dfbd765263 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -297,7 +297,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -83,9 +83,9 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
      // CraftBukkit end
      // Spigot start
      public static final int TPS = 20;
-@@ -308,6 +308,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
+@@ -309,6 +309,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static long currentTickLong = 0L; // Paper - track current tick as a long
+     public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
 +    public volatile Thread shutdownThread; // Paper
 +    public volatile boolean abnormalExit = false; // Paper
@@ -93,18 +93,18 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
-@@ -914,6 +917,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
+@@ -928,6 +931,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
+     private boolean hasLoggedStop = false; // Paper - Debugging
 +    public volatile boolean hasFullyShutdown = false; // Paper
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -928,6 +932,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             if (this.hasStopped) return;
+@@ -943,6 +947,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.hasStopped = true;
          }
+         if (!hasLoggedStop && isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
 +        // Paper start - kill main thread, and kill it hard
 +        shutdownThread = Thread.currentThread();
 +        org.spigotmc.WatchdogThread.doStop(); // Paper
@@ -121,7 +121,7 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -981,7 +998,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -997,7 +1014,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getProfileCache().save(false); // Paper
          }
          // Spigot end
@@ -137,12 +137,13 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
 +            net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
 +        } catch (Exception e) {
 +        }
++        io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
 +        this.onServerExit();
 +        // Paper end - move final shutdown items here
      }
  
      public String getLocalIp() {
-@@ -1076,6 +1106,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1094,6 +1125,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void runServer() {
          try {
@@ -150,7 +151,7 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
              if (!this.initServer()) {
                  throw new IllegalStateException("Failed to initialize server");
              }
-@@ -1085,6 +1116,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1103,6 +1135,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -169,7 +170,7 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( this.recentTps, 20 );
              long tickSection = Util.getNanos(), curTime, tickCount = 1; // Paper
-@@ -1163,6 +1206,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1181,6 +1225,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
          } catch (Throwable throwable) {
@@ -182,7 +183,7 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
              CrashReport crashreport = MinecraftServer.constructOrExtractCrashReport(throwable);
  
-@@ -1187,14 +1236,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1205,15 +1255,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.services.profileCache().clearExecutor();
                  }
  
@@ -195,12 +196,14 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
+-                io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
 -                this.onServerExit();
++                //io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
 +                //this.onServerExit(); // Paper - moved into stop
              }
  
          }
-@@ -1263,6 +1312,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1282,6 +1332,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public TickTask wrapRunnable(Runnable runnable) {
@@ -213,10 +216,10 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
          return new TickTask(this.tickCount, runnable);
      }
  
-@@ -2047,7 +2102,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
+@@ -2107,7 +2163,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
+             net.minecraft.world.item.alchemy.PotionBrewing.reload(); // Paper - Custom Potion Mixes
 -            this.getPlayerList().saveAll();
 +            // Paper start
 +            if (Thread.currentThread() != this.serverThread) {
@@ -231,19 +234,19 @@ index 5cb0f93bc7d4495e65674c22de2ebd8854c696fe..570c163e4a56206d1cf259ee1ffcb6f8
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3779e02083fb41e93248aed27a9214be88167e5a..0e2978b6e4f03932c4ebdf1309d20454b9130132 100644
+index 9e0c5bb92fb45cab7d78c5ad631c64170d48729f..6de6dad36203479677a29ad61e21bc369d4e5513 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -269,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -309,7 +309,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              long j = Util.getNanos() - i;
              String s = String.format(Locale.ROOT, "%.3fs", (double) j / 1.0E9D);
  
 -            DedicatedServer.LOGGER.info("Done ({})! For help, type \"help\"", s);
 +            //DedicatedServer.LOGGER.info("Done ({})! For help, type \"help\"", s); // Paper moved to after init
              if (dedicatedserverproperties.announcePlayerAchievements != null) {
-                 ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, this);
+                 ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, null); // Paper - Pass ServerLevel for gamerule callbacks
              }
-@@ -397,7 +397,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -437,7 +437,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // this.remoteStatusListener.stop(); // Paper - don't wait for remote connections
          }
  
@@ -253,7 +256,7 @@ index 3779e02083fb41e93248aed27a9214be88167e5a..0e2978b6e4f03932c4ebdf1309d20454
      }
  
      @Override
-@@ -778,7 +779,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -818,7 +819,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      @Override
      public void stopServer() {
          super.stopServer();
@@ -263,10 +266,10 @@ index 3779e02083fb41e93248aed27a9214be88167e5a..0e2978b6e4f03932c4ebdf1309d20454
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 201331acd9fae6af27f44c072379c48485b3be07..54a82f30fd8a4712bcf7ffeccab8ce3075f55f83 100644
+index f168c9bb2fa3ca5b3168fb4c420a77e5bba6185b..947cb3b24d6e379b080f3de8cd4ea60e0ca457e4 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 {
+@@ -613,7 +613,7 @@ public abstract class PlayerList {
          this.cserver.getPluginManager().callEvent(playerQuitEvent);
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
@@ -288,10 +291,10 @@ index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb89
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7cf24513f2e09c72742bdb0d7866103f983027b5..43c5316fde139f92ebe9c0db38ccd8dad0402975 100644
+index 25ed0f62058fa531d8bf9cf1e8fb99651ee46a67..1e78a00ab36362ff7650410ed2af1a822613de4f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -912,6 +912,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -940,6 +940,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
@@ -300,7 +303,7 @@ index 7cf24513f2e09c72742bdb0d7866103f983027b5..43c5316fde139f92ebe9c0db38ccd8da
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 796aa86e12cf9062b3467a3678c895af5ad626fe..4891073602609fc2709715460e0675a7cc2a4cdd 100644
+index 9e01a22df54492d9c8e9f9defd84014dc109514b..d85ed706703e50f76df8db414827ccd41a5985d9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1176,6 +1176,7 @@ public class LevelChunk extends ChunkAccess {
@@ -312,10 +315,10 @@ index 796aa86e12cf9062b3467a3678c895af5ad626fe..4891073602609fc2709715460e0675a7
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5030b865c84d84ed5be9f4987a7f0a829b8ea1e5..78e007b15699fc83a3fcc2e2767209387444f0e5 100644
+index 9c762121ae5a30dc94a91765b33cb73a8215b19a..6542155faa881d06e5db6c8f42823842e787b904 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -179,6 +179,36 @@ public class Main {
+@@ -186,6 +186,36 @@ public class Main {
  
          OptionSet options = null;
  
@@ -352,7 +355,7 @@ index 5030b865c84d84ed5be9f4987a7f0a829b8ea1e5..78e007b15699fc83a3fcc2e276720938
          try {
              options = parser.parse(args);
          } catch (joptsimple.OptionException ex) {
-@@ -289,8 +319,64 @@ public class Main {
+@@ -296,8 +326,65 @@ public class Main {
              } catch (Throwable t) {
                  t.printStackTrace();
              }
@@ -398,6 +401,7 @@ index 5030b865c84d84ed5be9f4987a7f0a829b8ea1e5..78e007b15699fc83a3fcc2e276720938
 +            tryPreloadClass(net.minecraft.world.level.lighting.LayerLightEventListener.DummyLightLayerEventListener.class.getName());
 +            tryPreloadClass(net.minecraft.world.level.lighting.LayerLightEventListener.class.getName());
 +            tryPreloadClass(net.minecraft.util.ExceptionCollector.class.getName());
++            tryPreloadClass(io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData.class.getName());
 +            // Paper end
 +        }
 +    }
@@ -451,7 +455,7 @@ index c6e8441e299f477ddb22c1ce2618710763978f1a..e8e93538dfd71de86515d9405f728db1
              }
          }
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 051b9e3a5d29a5840d596468e3ddd013bedc8da3..631457374fda492776f4af0515cee2e43a934d2c 100644
+index e3b262add194a126e731c68e68f3139a00cacacb..da7d5efd76c9ef92e9ce22860fec791890a687be 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -138,7 +138,7 @@ public class RestartCommand extends Command
@@ -464,7 +468,7 @@ index 051b9e3a5d29a5840d596468e3ddd013bedc8da3..631457374fda492776f4af0515cee2e4
          String[] split = restartScript.split( " " );
          if ( split.length > 0 && new File( split[0] ).isFile() )
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 230d55820778e84c1c8aa2b013ae0e5e35568ea1..5ca863aa1859922fa359eba32539229db40e5b98 100644
+index a15749bcfb2b36a31801cb1a26b7181ce304e0ee..dca163ff5436f1007383c8261cac1ac7c0613f23 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -11,6 +11,7 @@ import org.bukkit.Bukkit;
@@ -528,7 +532,7 @@ index 230d55820778e84c1c8aa2b013ae0e5e35568ea1..5ca863aa1859922fa359eba32539229d
                  break;
                  } // Paper end
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index ea4e2161c0bd43884055cc6b8d70b2139f70e720..266b4e6fb3988b5848021c83fdc68e342c70b188 100644
+index 32e64b3866bdd1489a90339bda2268adafbb15de..675cd61221e807aadf28322b46c3daa1370241b5 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,5 +1,5 @@
diff --git a/patches/server/0378-Optimize-Voxel-Shape-Merging.patch b/patches/server/1013-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0378-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/1013-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0391-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1014-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 90%
rename from patches/server/0391-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/1014-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 9c31c335b..86d6309f5 100644
--- a/patches/server/0391-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/1014-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b1fdfae75aeea78ca77987e40242bf498447bc08..cf81854facadaf3c1f860bcaaf69db463a31b0c9 100644
+index 4aadf445daee88cc849929783eeddfa4aa005581..4d51baab29b1a913c3efef2cb4ab0cac6c8cf38a 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -191,6 +191,7 @@ public class Explosion {
@@ -25,10 +25,10 @@ index b1fdfae75aeea78ca77987e40242bf498447bc08..cf81854facadaf3c1f860bcaaf69db46
  
                              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 43c5316fde139f92ebe9c0db38ccd8dad0402975..92f250b9cc965a433dc9b9de1f9bfeb2acf4363e 100644
+index 1e78a00ab36362ff7650410ed2af1a822613de4f..e5944ff3c1118e57c9e7a14cbb5181b2d7f7a79a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -520,6 +520,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -545,6 +545,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
@@ -40,7 +40,7 @@ index 43c5316fde139f92ebe9c0db38ccd8dad0402975..92f250b9cc965a433dc9b9de1f9bfeb2
              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 89a62fbeeb78c864938a1cea84178478c6dc1b34..5e5199b50847958f7abc6d8e42cfb6806df8421f 100644
+index 63217d3db86b467f3358730eb8b9b3c941558bab..68b94b4ebd710f3ab18f397d9dfa0ef5b8f182e0 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 {
@@ -64,7 +64,7 @@ index 89a62fbeeb78c864938a1cea84178478c6dc1b34..5e5199b50847958f7abc6d8e42cfb680
      public co.aikar.timings.Timing getTiming() {
          if (timing == null) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index b3732a6246a2b011e36c5c35fa2ac7749e75db16..e4a3c937950b26e81b89d6ddcf3d6c2794ed934d 100644
+index 3dfe79684f662ac7cae4583bfe03a633438b4df7..be74adc86f0ca467f3b59e7b57fd47a8f381d86e 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -212,6 +212,12 @@ public class PistonBaseBlock extends DirectionalBlock {
@@ -80,16 +80,16 @@ index b3732a6246a2b011e36c5c35fa2ac7749e75db16..e4a3c937950b26e81b89d6ddcf3d6c27
          BlockState iblockdata1 = (BlockState) state.setValue(PistonBaseBlock.EXTENDED, true);
  
          if (!world.isClientSide) {
-@@ -245,7 +251,7 @@ public class PistonBaseBlock extends DirectionalBlock {
-             BlockState iblockdata2 = (BlockState) ((BlockState) Blocks.MOVING_PISTON.defaultBlockState().setValue(MovingPistonBlock.FACING, enumdirection)).setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
- 
+@@ -252,7 +258,7 @@ public class PistonBaseBlock extends DirectionalBlock {
+             }
+             // Paper end - Fix sticky pistons and BlockPistonRetractEvent
              world.setBlock(pos, iblockdata2, 20);
 -            world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata2, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true));
 +            world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata2, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true)); // Paper - Protect Bedrock and End Portal/Frames from being destroyed; diff on change
              world.blockUpdated(pos, iblockdata2.getBlock());
              iblockdata2.updateNeighbourShapes(world, pos, 2);
              if (this.isSticky) {
-@@ -274,7 +280,14 @@ public class PistonBaseBlock extends DirectionalBlock {
+@@ -288,7 +294,14 @@ public class PistonBaseBlock extends DirectionalBlock {
                      }
                  }
              } else {
@@ -106,10 +106,10 @@ index b3732a6246a2b011e36c5c35fa2ac7749e75db16..e4a3c937950b26e81b89d6ddcf3d6c27
  
              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 7e4264f87a0f81db71d49dbede32a1bad87f7ca8..2d1062d2b0412180cc08765ecf9b0a071983c06a 100644
+index 4c6ab71c3222ce03edd70abef35c71398d885c13..7ba5d00516dc310355d08dda955c934fe26786ee 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 {
+@@ -189,7 +189,7 @@ public abstract class BlockBehaviour implements FeatureElement {
      /** @deprecated */
      @Deprecated
      public void onExplosionHit(BlockState state, Level world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> stackMerger) {
@@ -118,7 +118,7 @@ index 7e4264f87a0f81db71d49dbede32a1bad87f7ca8..2d1062d2b0412180cc08765ecf9b0a07
              Block block = state.getBlock();
              boolean flag = explosion.getIndirectSourceEntity() instanceof Player;
  
-@@ -278,7 +278,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -285,7 +285,7 @@ public abstract class BlockBehaviour implements FeatureElement {
      /** @deprecated */
      @Deprecated
      public boolean canBeReplaced(BlockState state, BlockPlaceContext context) {
@@ -127,7 +127,7 @@ index 7e4264f87a0f81db71d49dbede32a1bad87f7ca8..2d1062d2b0412180cc08765ecf9b0a07
      }
  
      /** @deprecated */
-@@ -958,6 +958,12 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -965,6 +965,12 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.legacySolid;
          }
  
@@ -140,7 +140,7 @@ index 7e4264f87a0f81db71d49dbede32a1bad87f7ca8..2d1062d2b0412180cc08765ecf9b0a07
          public boolean isValidSpawn(BlockGetter world, BlockPos pos, EntityType<?> type) {
              return this.getBlock().properties.isValidSpawn.test(this.asState(), world, pos, type);
          }
-@@ -1061,7 +1067,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1068,7 +1074,7 @@ public abstract class BlockBehaviour implements FeatureElement {
          }
  
          public PushReaction getPistonPushReaction() {
diff --git a/patches/server/0405-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1015-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 96%
rename from patches/server/0405-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/1015-Use-distance-map-to-optimise-entity-tracker.patch
index c3ef95a6a..03063e59b 100644
--- a/patches/server/0405-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1015-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5f3f24ce3 100644
+index 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650ad23349e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -146,6 +146,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -124,7 +124,7 @@ index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5
      }
  
      // Paper start
-@@ -925,17 +1005,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -943,17 +1023,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public void move(ServerPlayer player) {
@@ -143,7 +143,7 @@ index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5
  
          SectionPos sectionposition = player.getLastSectionPos();
          SectionPos sectionposition1 = SectionPos.of((EntityAccess) player);
-@@ -1012,7 +1082,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1030,7 +1100,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
                      entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
                      this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
@@ -152,7 +152,7 @@ index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5
                      if (entity instanceof ServerPlayer) {
                          ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -1056,9 +1126,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1074,9 +1144,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          entity.tracker = null; // Paper - We're no longer tracked
      }
  
@@ -192,7 +192,7 @@ index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
-@@ -1208,6 +1306,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1226,6 +1324,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.lastSectionPos = SectionPos.of((EntityAccess) entity);
          }
  
@@ -236,7 +236,7 @@ index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index be9b96f6b725c53aec5c67c8387305d52da3acfd..f51453bd3018667aa491c9b64b6f9c4d5c703d7a 100644
+index c20a9fb40a2c3f555096299de662b5488c00ee26..199624dee66e0d47d110ee077646111cbdf2ccbd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
@@ -247,10 +247,10 @@ index be9b96f6b725c53aec5c67c8387305d52da3acfd..f51453bd3018667aa491c9b64b6f9c4d
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.server.level.ServerPlayer;
-@@ -487,6 +488,38 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
- 
-     public boolean updatingSectionStatus = false;
-     // Paper end
+@@ -533,6 +534,38 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+         this.teleportTo(worldserver, null);
+     }
+     // Paper end - make end portalling safe
 +    // Paper start - optimise entity tracking
 +    final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
 +
diff --git a/patches/server/0412-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1016-Optimize-Bit-Operations-by-inlining.patch
similarity index 99%
rename from patches/server/0412-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/1016-Optimize-Bit-Operations-by-inlining.patch
index 8544e7a4e..269787b9e 100644
--- a/patches/server/0412-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1016-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 3b3d81886d50ee6510ff366e11817a578c645089..50ba9e57d60df7308f7445540b3f412a0edf6065 100644
+index 541cef99113af865b995af2cfb7a1e4724dd8878..e17fa30966dea2836fb791becd032fc7d5cc2611 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-Remove-streams-from-hot-code.patch b/patches/server/1017-Remove-streams-from-hot-code.patch
similarity index 99%
rename from patches/server/0417-Remove-streams-from-hot-code.patch
rename to patches/server/1017-Remove-streams-from-hot-code.patch
index cbf894f94..75a38173c 100644
--- a/patches/server/0417-Remove-streams-from-hot-code.patch
+++ b/patches/server/1017-Remove-streams-from-hot-code.patch
@@ -7,7 +7,7 @@ Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 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 419eadbe31b86b7192fd7a63268d547705e7c7ce..281b5cf91135984a37ad013614c910f7d4d2fee3 100644
+index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab86fa7fd72 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
 @@ -52,7 +52,7 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
diff --git a/patches/server/0443-Eigencraft-redstone-implementation.patch b/patches/server/1018-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0443-Eigencraft-redstone-implementation.patch
rename to patches/server/1018-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0473-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1019-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0473-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/1019-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0494-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1020-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 98%
rename from patches/server/0494-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/1020-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 23c6573d8..14c24b80b 100644
--- a/patches/server/0494-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/1020-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -37,10 +37,10 @@ index 9bc5a9592cabe087effc03e5347ea1d75794960b..4e6c2f6b2e54a4c126e9a026b9cad05c
              CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
          }
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 52e57fa3b25dce10c17682964cbd4bcb4c130dc6..1465dbc29fc34bfe6ebb53e95fa6a4cbf2127a6c 100644
+index eef0d3c59f0ce6e89033a5e228d31b63339c2773..48f634a7521d31c1e9dfd3cfc83139d428dbd37a 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -760,6 +760,14 @@ public abstract class AbstractContainerMenu {
+@@ -768,6 +768,14 @@ public abstract class AbstractContainerMenu {
      public abstract boolean stillValid(Player player);
  
      protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast) {
@@ -55,7 +55,7 @@ index 52e57fa3b25dce10c17682964cbd4bcb4c130dc6..1465dbc29fc34bfe6ebb53e95fa6a4cb
          boolean flag1 = false;
          int k = startIndex;
  
-@@ -782,18 +790,27 @@ public abstract class AbstractContainerMenu {
+@@ -790,18 +798,27 @@ public abstract class AbstractContainerMenu {
  
                  slot = (Slot) this.slots.get(k);
                  itemstack1 = slot.getItem();
@@ -83,7 +83,7 @@ index 52e57fa3b25dce10c17682964cbd4bcb4c130dc6..1465dbc29fc34bfe6ebb53e95fa6a4cb
                          flag1 = true;
                      }
                  }
-@@ -824,14 +841,33 @@ public abstract class AbstractContainerMenu {
+@@ -832,14 +849,33 @@ public abstract class AbstractContainerMenu {
  
                  slot = (Slot) this.slots.get(k);
                  itemstack1 = slot.getItem();
diff --git a/patches/server/0625-Improve-boat-collision-performance.patch b/patches/server/1021-Improve-boat-collision-performance.patch
similarity index 91%
rename from patches/server/0625-Improve-boat-collision-performance.patch
rename to patches/server/1021-Improve-boat-collision-performance.patch
index 18d0eec23..083f40bc9 100644
--- a/patches/server/0625-Improve-boat-collision-performance.patch
+++ b/patches/server/1021-Improve-boat-collision-performance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve boat collision performance
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 765e4bc00a0526aab6e263dae7233f63f7f31498..eb80741b313daab36dcfeb1079eb0fbb19614904 100644
+index edf937591abf62416bd692e40b7b7a6badbe877d..b40864e41e1506884fdefefbf3cf4833a8f706c3 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -121,6 +121,7 @@ public class Util {
@@ -17,10 +17,10 @@ index 765e4bc00a0526aab6e263dae7233f63f7f31498..eb80741b313daab36dcfeb1079eb0fbb
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8673e4eff6bd66b5cdf0fc6101aa9ff9c226dbfe..36ffb7f61e2e29a67c069336f251172130dda207 100644
+index ec495c0080e15b1baeeb57cd7c80d2e6b06e7d2e..b920f72e659956cc2d2d44743caddb0136d467e4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1413,7 +1413,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1437,7 +1437,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  if (!source.is(DamageTypeTags.IS_PROJECTILE)) {
                      Entity entity = source.getDirectEntity();
  
@@ -29,7 +29,7 @@ index 8673e4eff6bd66b5cdf0fc6101aa9ff9c226dbfe..36ffb7f61e2e29a67c069336f2511721
                          LivingEntity entityliving = (LivingEntity) entity;
  
                          this.blockUsingShield(entityliving);
-@@ -1507,11 +1507,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1531,11 +1531,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
  
                  if (entity1 != null && !source.is(DamageTypeTags.NO_KNOCKBACK)) {
@@ -44,7 +44,7 @@ index 8673e4eff6bd66b5cdf0fc6101aa9ff9c226dbfe..36ffb7f61e2e29a67c069336f2511721
                          d0 = (Math.random() - Math.random()) * 0.01D;
                      }
  
-@@ -2241,7 +2242,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2265,7 +2266,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
                  Entity entity = damagesource.getDirectEntity();
  
diff --git a/patches/server/0659-Optimise-general-POI-access.patch b/patches/server/1022-Optimise-general-POI-access.patch
similarity index 99%
rename from patches/server/0659-Optimise-general-POI-access.patch
rename to patches/server/1022-Optimise-general-POI-access.patch
index a92e0b765..499482538 100644
--- a/patches/server/0659-Optimise-general-POI-access.patch
+++ b/patches/server/1022-Optimise-general-POI-access.patch
@@ -841,10 +841,10 @@ index 0000000000000000000000000000000000000000..69be1761b3b5ba7b496c1c10a4db897e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index 9fd6cf0c98cbf6300ef23d4aab32a6110aeba665..d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6 100644
+index a0799baca3ae05ef1ff818abfe6a53d28fd99246..abcc3ef59475ac170fd10b4dd4a4f3371faf17e0 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -62,7 +62,11 @@ public class AcquirePoi {
+@@ -63,7 +63,11 @@ public class AcquirePoi {
                                  return true;
                              }
                          };
diff --git a/patches/server/0660-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1023-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 97%
rename from patches/server/0660-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/1023-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8..52bdb3212 100644
--- a/patches/server/0660-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1023-Custom-table-implementation-for-blockstate-state-loo.patch
@@ -246,7 +246,7 @@ index 89ba12d44865ecddebabbc39c769af4cd8c82702..5f285d190186a2ff5a61d05070593e1d
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java
-index bf7ed22094ac92a152e522bafccffb9589f84343..591ee974391c465be0e523e2da0f176436a7d567 100644
+index 8da64429eaf083578c672cd34f52dd42389ff396..bdd7d9c80eda872496272e46d8772634e44e622a 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java
 @@ -7,6 +7,13 @@ import java.util.Optional;
@@ -264,7 +264,7 @@ index bf7ed22094ac92a152e522bafccffb9589f84343..591ee974391c465be0e523e2da0f1764
          super(name, Boolean.class);
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-index 2d69d1c17f734ee38667d51e6fd0a268211ec595..034b2618aa178c003c34eb621c6beb7c30958a38 100644
+index 0a7a6c0e7635d0ada101074d4229df7edc6dd31b..e658d0b1a025192b48090e865b082ac4d99088d4 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
 @@ -15,6 +15,15 @@ public class EnumProperty<T extends Enum<T> & StringRepresentable> extends Prope
@@ -299,7 +299,7 @@ index 2d69d1c17f734ee38667d51e6fd0a268211ec595..034b2618aa178c003c34eb621c6beb7c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java
-index 33268d953b30d384564eee6dfab2a37fa722e465..dfeec6c580963e4a6f907e1344e2265d39326027 100644
+index cbe6e4579cc55a427dd8f8fe403478faf6d35b8f..765b1092d50608d479bbbe09c457999790ecf42c 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java
 @@ -11,6 +11,16 @@ public class IntegerProperty extends Property<Integer> {
@@ -320,7 +320,7 @@ index 33268d953b30d384564eee6dfab2a37fa722e465..dfeec6c580963e4a6f907e1344e2265d
          super(name, Integer.class);
          if (min < 0) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
-index 66b8e23d799adaf872233ea44c54330d75135544..9d4faa3da8d62028074ce25f4a728e9ba5281428 100644
+index 08c2e4ba9147fbea41e0fce26ad20586832a525b..1d8c3f2e57aa9b0830cf7cfb6354fcf636e9c74b 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 @@ -24,6 +24,17 @@ public abstract class Property<T extends Comparable<T>> {
diff --git a/patches/server/1025-Execute-chunk-tasks-mid-tick.patch b/patches/server/1024-Execute-chunk-tasks-mid-tick.patch
similarity index 98%
rename from patches/server/1025-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/1024-Execute-chunk-tasks-mid-tick.patch
index 1cb6d89d1..5f51c7bab 100644
--- a/patches/server/1025-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1024-Execute-chunk-tasks-mid-tick.patch
@@ -19,10 +19,10 @@ index 7a4234abf620b8394307fa01913bc00215a64e23..4b467f1af93452d13829f756d55dee18
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fe9a5820d82e5563b53d949af060e80cc7a259f6..9f4fc17622dd78b7c455de0bc2d8b772cc030024 100644
+index 69b3d89a352fe5cfd51e2e566c9fa4dfbd765263..8817f62324bcf8367bd6d4486e6ed99caf547f4f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1352,8 +1352,79 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1353,8 +1353,79 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return flag;
      }
  
diff --git a/patches/server/1026-Optimise-random-block-ticking.patch b/patches/server/1025-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/1026-Optimise-random-block-ticking.patch
rename to patches/server/1025-Optimise-random-block-ticking.patch
diff --git a/patches/server/1027-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1026-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/1027-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/1026-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1028-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1027-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/1028-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/1027-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1029-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch
similarity index 99%
rename from patches/server/1029-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/1028-Detail-more-information-in-watchdog-dumps.patch
index 46a806a47..9a4b5cb35 100644
--- a/patches/server/1029-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 88f8821aba04adb23b11531a93f395381a0e4ce7..2d4830b4b7df1516c75de1fefd6f8176
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f2f8bc9f8f55a43174acd9c5e841fb9a7d1b8065..ab8cbf4a3fabeaeab71f5323068dd700d6e6666a 100644
+index 199624dee66e0d47d110ee077646111cbdf2ccbd..1242487930b28fce587114a51a4da3cf9086b762 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1051,7 +1051,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1030-Collision-optimisations.patch b/patches/server/1029-Collision-optimisations.patch
similarity index 99%
rename from patches/server/1030-Collision-optimisations.patch
rename to patches/server/1029-Collision-optimisations.patch
index 374f174e4..34a9d55c9 100644
--- a/patches/server/1030-Collision-optimisations.patch
+++ b/patches/server/1029-Collision-optimisations.patch
@@ -2214,7 +2214,7 @@ index 947cb3b24d6e379b080f3de8cd4ea60e0ca457e4..5a932f329f67fd01a263b9536cbfb1c9
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ab8cbf4a3fabeaeab71f5323068dd700d6e6666a..554fc0d4e791a98a46216714f0fb07e178ddabe4 100644
+index 1242487930b28fce587114a51a4da3cf9086b762..5bccb05967ac48175d6c45a7d19f83b1f61e5de9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1237,9 +1237,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1031-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1030-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/1031-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/1030-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1032-Fix-tripwire-state-inconsistency.patch b/patches/server/1031-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/1032-Fix-tripwire-state-inconsistency.patch
rename to patches/server/1031-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/1033-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1032-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/1033-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/1032-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1034-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1033-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/1034-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/1033-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1035-optimize-dirt-and-snow-spreading.patch b/patches/server/1034-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/1035-optimize-dirt-and-snow-spreading.patch
rename to patches/server/1034-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1036-Properly-resend-entities.patch b/patches/server/1035-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/1036-Properly-resend-entities.patch
rename to patches/server/1035-Properly-resend-entities.patch
diff --git a/patches/server/1037-Optimize-Hoppers.patch b/patches/server/1036-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/1037-Optimize-Hoppers.patch
rename to patches/server/1036-Optimize-Hoppers.patch
index f6f81b43e..c6e56308a 100644
--- a/patches/server/1037-Optimize-Hoppers.patch
+++ b/patches/server/1036-Optimize-Hoppers.patch
@@ -50,10 +50,10 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9f4fc17622dd78b7c455de0bc2d8b772cc030024..093d9fa59fce871ba1d592482f7fc6616fd9b1ac 100644
+index 8817f62324bcf8367bd6d4486e6ed99caf547f4f..8c6962029ae04285351e5f16ab4c010cd28f486a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1686,6 +1686,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1687,6 +1687,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
diff --git a/patches/server/1038-Improve-performance-of-mass-crafts.patch b/patches/server/1037-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1038-Improve-performance-of-mass-crafts.patch
rename to patches/server/1037-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1039-Actually-optimise-explosions.patch b/patches/server/1038-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1039-Actually-optimise-explosions.patch
rename to patches/server/1038-Actually-optimise-explosions.patch
diff --git a/patches/server/1040-Optimise-chunk-tick-iteration.patch b/patches/server/1039-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1040-Optimise-chunk-tick-iteration.patch
rename to patches/server/1039-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1041-Lag-compensation-ticks.patch b/patches/server/1040-Lag-compensation-ticks.patch
similarity index 94%
rename from patches/server/1041-Lag-compensation-ticks.patch
rename to patches/server/1040-Lag-compensation-ticks.patch
index b874637e1..7c7208dcd 100644
--- a/patches/server/1041-Lag-compensation-ticks.patch
+++ b/patches/server/1040-Lag-compensation-ticks.patch
@@ -8,20 +8,18 @@ Areas affected by lag comepnsation:
  - Eating food items
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 093d9fa59fce871ba1d592482f7fc6616fd9b1ac..49ab2773658a2c6fababa316707762a8e2b19c58 100644
+index 8c6962029ae04285351e5f16ab4c010cd28f486a..c0ae62a5e9af48e7778b37d64aeef7e069256d4c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -311,6 +311,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-     public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
-+    // Paper start - lag compensation
-+    public static final long SERVER_INIT = System.nanoTime();
-+    // Paper end - lag compensation
++    public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1685,6 +1688,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1686,6 +1687,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
diff --git a/patches/server/1042-Optimise-nearby-player-retrieval.patch b/patches/server/1041-Optimise-nearby-player-retrieval.patch
similarity index 100%
rename from patches/server/1042-Optimise-nearby-player-retrieval.patch
rename to patches/server/1041-Optimise-nearby-player-retrieval.patch
diff --git a/scripts/moveback.py b/scripts/moveback.py
index 744f101a1..ee8d04838 100644
--- a/scripts/moveback.py
+++ b/scripts/moveback.py
@@ -3,7 +3,7 @@ import sys
 
 # Use inside of server patch dir
 # py ../../scripts/moveback.py ''
-patch_target = 1038 # TODO: Update this
+patch_target = 1009 # TODO: Update this
 
 
 def increment_number(filename):