From 81c5901c674e6ee89dbfed4848c9eb645bfb0f16 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 22 Sep 2023 16:26:10 -0700
Subject: [PATCH] re-add distance map patch

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

diff --git a/patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 84%
rename from patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
index ee2cad7d7d..2c626c1a90 100644
--- a/patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,10 +6,10 @@ 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 dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43bc2900b23 100644
+index 463a82f08b7848a4b8a4eb89b201a6e8424c6831..e2b4567a8abc5a6217f4926733c6749edd83029d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -157,6 +157,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -148,6 +148,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      // Paper start - distance maps
      private final com.destroystokyo.paper.util.misc.PooledLinkedHashSets<ServerPlayer> pooledLinkedPlayerHashSets = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets<>();
@@ -33,7 +33,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
  
      void addPlayerToDistanceMaps(ServerPlayer player) {
          this.level.playerChunkLoader.addPlayer(player); // Paper - replace chunk loader
-@@ -168,6 +185,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -159,6 +176,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.playerMobDistanceMap.add(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
          }
          // Paper end - per player mob spawning
@@ -48,7 +48,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
  
      void removePlayerFromDistanceMaps(ServerPlayer player) {
-@@ -178,6 +203,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -169,6 +194,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.playerMobDistanceMap.remove(player);
          }
          // Paper end - per player mob spawning
@@ -60,7 +60,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
  
      void updateMaps(ServerPlayer player) {
-@@ -190,6 +220,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -182,6 +212,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.playerMobDistanceMap.update(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
          }
          // Paper end - per player mob spawning
@@ -75,7 +75,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
      // Paper end
      // Paper start
-@@ -276,6 +314,48 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -268,6 +306,48 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.regionManagers.add(this.dataRegionManager);
          // Paper end
          this.playerMobDistanceMap = this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets) : null; // Paper
@@ -124,7 +124,7 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
      }
  
      protected ChunkGenerator generator() {
-@@ -960,17 +1040,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -936,17 +1016,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public void move(ServerPlayer player) {
@@ -141,9 +141,9 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
 -        }
 +        // Paper - delay this logic for the entity tracker tick, no need to duplicate it
  
-         int i = SectionPos.blockToSectionCoord(player.getBlockX());
-         int j = SectionPos.blockToSectionCoord(player.getBlockZ());
-@@ -1054,7 +1124,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         SectionPos sectionposition = player.getLastSectionPos();
+         SectionPos sectionposition1 = SectionPos.of((EntityAccess) player);
+@@ -1023,7 +1093,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 dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
                      if (entity instanceof ServerPlayer) {
                          ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -1098,7 +1168,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1067,7 +1137,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          entity.tracker = null; // Paper - We're no longer tracked
      }
  
@@ -187,58 +187,10 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
 +            return;
 +        }
 +        // Paper end - optimized tracker
+         // Paper - replaced by PlayerChunkLoader
+ 
          List<ServerPlayer> list = Lists.newArrayList();
-         List<ServerPlayer> list1 = this.level.players();
-         ObjectIterator objectiterator = this.entityMap.values().iterator();
-@@ -1205,46 +1305,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         }));
-         // Paper end
-         DebugPackets.sendPoiPacketsForChunk(this.level, chunk.getPos());
--        List<Entity> list = Lists.newArrayList();
--        List<Entity> list1 = Lists.newArrayList();
--        ObjectIterator objectiterator = this.entityMap.values().iterator();
--
--        while (objectiterator.hasNext()) {
--            ChunkMap.TrackedEntity playerchunkmap_entitytracker = (ChunkMap.TrackedEntity) objectiterator.next();
--            Entity entity = playerchunkmap_entitytracker.entity;
--
--            if (entity != player && entity.chunkPosition().equals(chunk.getPos())) {
--                playerchunkmap_entitytracker.updatePlayer(player);
--                if (entity instanceof Mob && ((Mob) entity).getLeashHolder() != null) {
--                    list.add(entity);
--                }
--
--                if (!entity.getPassengers().isEmpty()) {
--                    list1.add(entity);
--                }
--            }
--        }
--
--        Iterator iterator;
--        Entity entity1;
--
--        if (!list.isEmpty()) {
--            iterator = list.iterator();
--
--            while (iterator.hasNext()) {
--                entity1 = (Entity) iterator.next();
--                player.connection.send(new ClientboundSetEntityLinkPacket(entity1, ((Mob) entity1).getLeashHolder()));
--            }
--        }
--
--        if (!list1.isEmpty()) {
--            iterator = list1.iterator();
--
--            while (iterator.hasNext()) {
--                entity1 = (Entity) iterator.next();
--                player.connection.send(new ClientboundSetPassengersPacket(entity1));
--            }
--        }
-+        // Paper - no longer needed - this was used to account for clients bugging out since they needed a chunk to store entities, but they no longer need a chunk
- 
-     }
- 
-@@ -1299,6 +1360,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1219,6 +1319,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.lastSectionPos = SectionPos.of((EntityAccess) entity);
          }
  
@@ -282,10 +234,10 @@ index dadf403ac91887f0fae87889170deb6d5732cbc1..52d9d0f2366f292c56eee9fe241cb43b
              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 ce4b2ec2ad6138b754ced976521d1c73eb4193a8..c99d24008792b07d5e2984261215de944482006b 100644
+index 1d2dd9b8ae43f22d875cb530130118df247b87dc..b80e8f05a8f99cc912904470c31092faad0717da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -57,6 +57,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
+@@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
  import net.minecraft.network.syncher.SynchedEntityData;
  import net.minecraft.resources.ResourceKey;
  import net.minecraft.resources.ResourceLocation;
diff --git a/patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 87%
rename from patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch
index 572985f135..8b83857172 100644
--- a/patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b5cf68633 100644
+index b80e8f05a8f99cc912904470c31092faad0717da..f2faddf78b5ea591f66d92d9e0f2b7984a3c2124 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -688,8 +688,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -721,8 +721,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setPos(double x, double y, double z) {
@@ -19,7 +19,7 @@ index 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b
      }
  
      protected AABB makeBoundingBox() {
-@@ -4190,6 +4190,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4223,6 +4223,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -31,7 +31,7 @@ index 1d2dd9b8ae43f22d875cb530130118df247b87dc..d4d151fd8b500e32ca5c0f866bd28d3b
          // 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());
-@@ -4213,6 +4218,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4246,6 +4251,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0417-Paper-dumpitem-command.patch b/patches/server/0418-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0417-Paper-dumpitem-command.patch
rename to patches/server/0418-Paper-dumpitem-command.patch
diff --git a/patches/server/0418-Improve-Legacy-Component-serialization-size.patch b/patches/server/0419-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0418-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0419-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0419-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0420-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0419-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0420-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0421-incremental-chunk-and-player-saving.patch b/patches/server/0422-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0421-incremental-chunk-and-player-saving.patch
rename to patches/server/0422-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0422-Support-old-UUID-format-for-NBT.patch b/patches/server/0423-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0422-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0423-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0424-Remove-some-streams-from-structures.patch b/patches/server/0425-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0424-Remove-some-streams-from-structures.patch
rename to patches/server/0425-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0426-Support-components-in-ItemMeta.patch b/patches/server/0427-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0426-Support-components-in-ItemMeta.patch
rename to patches/server/0427-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0428-Add-entity-liquid-API.patch b/patches/server/0429-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0428-Add-entity-liquid-API.patch
rename to patches/server/0429-Add-entity-liquid-API.patch
diff --git a/patches/server/0429-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0429-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0430-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0430-Spawn-player-in-correct-world-on-login.patch b/patches/server/0431-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0430-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0431-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0431-Add-PrepareResultEvent.patch b/patches/server/0432-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0431-Add-PrepareResultEvent.patch
rename to patches/server/0432-Add-PrepareResultEvent.patch
diff --git a/patches/server/0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0433-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0433-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0434-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0434-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0435-Fix-SPIGOT-5989.patch b/patches/server/0436-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0435-Fix-SPIGOT-5989.patch
rename to patches/server/0436-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0440-Fix-some-rails-connecting-improperly.patch b/patches/server/0441-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0440-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0441-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0441-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0441-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0442-Brand-support.patch b/patches/server/0443-Brand-support.patch
similarity index 100%
rename from patches/server/0442-Brand-support.patch
rename to patches/server/0443-Brand-support.patch
diff --git a/patches/server/0443-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0443-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0444-Don-t-require-FACING-data.patch b/patches/server/0445-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0444-Don-t-require-FACING-data.patch
rename to patches/server/0445-Don-t-require-FACING-data.patch
diff --git a/patches/server/0445-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0445-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0446-Add-moon-phase-API.patch b/patches/server/0447-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0446-Add-moon-phase-API.patch
rename to patches/server/0447-Add-moon-phase-API.patch
diff --git a/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0448-Prevent-headless-pistons-from-being-created.patch b/patches/server/0449-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0448-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0449-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0449-Add-BellRingEvent.patch b/patches/server/0450-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0449-Add-BellRingEvent.patch
rename to patches/server/0450-Add-BellRingEvent.patch
diff --git a/patches/server/0450-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0451-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0450-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0451-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0451-Buffer-joins-to-world.patch b/patches/server/0452-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0451-Buffer-joins-to-world.patch
rename to patches/server/0452-Buffer-joins-to-world.patch
diff --git a/patches/server/0452-Eigencraft-redstone-implementation.patch b/patches/server/0453-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0452-Eigencraft-redstone-implementation.patch
rename to patches/server/0453-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0453-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0453-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0454-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0454-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0455-Add-more-Evoker-API.patch b/patches/server/0456-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0455-Add-more-Evoker-API.patch
rename to patches/server/0456-Add-more-Evoker-API.patch
diff --git a/patches/server/0456-Add-methods-to-get-translation-keys.patch b/patches/server/0457-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0456-Add-methods-to-get-translation-keys.patch
rename to patches/server/0457-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0457-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0457-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0458-Cache-block-data-strings.patch b/patches/server/0459-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0458-Cache-block-data-strings.patch
rename to patches/server/0459-Cache-block-data-strings.patch
diff --git a/patches/server/0459-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 95%
rename from patches/server/0459-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 4f37fd06da..f32aaa0597 100644
--- a/patches/server/0459-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,10 +31,10 @@ index 1cf17df6cad66c4b27e1636f365024c9e1e080f1..e7d584a4a5618c8d70ed7b74bc94b6c2
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d4d151fd8b500e32ca5c0f866bd28d3b5cf68633..b0a73ddd7438b9ecd4462638f9f784d796c62c6c 100644
+index f2faddf78b5ea591f66d92d9e0f2b7984a3c2124..2d416d0d657667d857794bafa315c720dee9762a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -159,6 +159,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -42,7 +42,7 @@ index d4d151fd8b500e32ca5c0f866bd28d3b5cf68633..b0a73ddd7438b9ecd4462638f9f784d7
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1831,6 +1832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1864,6 +1865,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
diff --git a/patches/server/0460-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0460-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0461-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0461-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0462-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0462-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0463-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0463-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 472afd4a88..bf3e245379 100644
--- a/patches/server/0463-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0464-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 b0a73ddd7438b9ecd4462638f9f784d796c62c6c..71dc4112cb932c6b1305f0f22e99f069517cac08 100644
+index 2d416d0d657667d857794bafa315c720dee9762a..c78df4fc62a347455f8d7b3aa186344863915ab3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4439,4 +4439,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4472,4 +4472,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0464-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0464-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0465-Entity-isTicking.patch b/patches/server/0466-Entity-isTicking.patch
similarity index 89%
rename from patches/server/0465-Entity-isTicking.patch
rename to patches/server/0466-Entity-isTicking.patch
index 4ef8d10eca..47abc6ed88 100644
--- a/patches/server/0465-Entity-isTicking.patch
+++ b/patches/server/0466-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 71dc4112cb932c6b1305f0f22e99f069517cac08..cfdc8c37d41473300ca9a8c251e27cb2a07ca4c7 100644
+index c78df4fc62a347455f8d7b3aa186344863915ab3..658e47bf5aff1e56462cc3f0a87eeb7349654176 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4444,5 +4444,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4477,5 +4477,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0466-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0466-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0467-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0467-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0468-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0468-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0469-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0469-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0470-Optimise-getType-calls.patch b/patches/server/0471-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0470-Optimise-getType-calls.patch
rename to patches/server/0471-Optimise-getType-calls.patch
diff --git a/patches/server/0471-Villager-resetOffers.patch b/patches/server/0472-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0471-Villager-resetOffers.patch
rename to patches/server/0472-Villager-resetOffers.patch
diff --git a/patches/server/0472-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0472-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0473-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0473-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0474-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0475-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0474-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0475-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0475-Player-elytra-boost-API.patch b/patches/server/0476-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0475-Player-elytra-boost-API.patch
rename to patches/server/0476-Player-elytra-boost-API.patch
diff --git a/patches/server/0476-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0476-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0478-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0478-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0479-Add-ignore-discounts-API.patch b/patches/server/0480-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0479-Add-ignore-discounts-API.patch
rename to patches/server/0480-Add-ignore-discounts-API.patch
diff --git a/patches/server/0480-Toggle-for-removing-existing-dragon.patch b/patches/server/0481-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0480-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0481-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0481-Fix-client-lag-on-advancement-loading.patch b/patches/server/0482-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0481-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0482-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0482-Item-no-age-no-player-pickup.patch b/patches/server/0483-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0482-Item-no-age-no-player-pickup.patch
rename to patches/server/0483-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0484-Beacon-API-custom-effect-ranges.patch b/patches/server/0485-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0484-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0485-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0485-Add-API-for-quit-reason.patch b/patches/server/0486-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0485-Add-API-for-quit-reason.patch
rename to patches/server/0486-Add-API-for-quit-reason.patch
diff --git a/patches/server/0486-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0486-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0487-Expose-world-spawn-angle.patch b/patches/server/0488-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0487-Expose-world-spawn-angle.patch
rename to patches/server/0488-Expose-world-spawn-angle.patch
diff --git a/patches/server/0488-Add-Destroy-Speed-API.patch b/patches/server/0489-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0488-Add-Destroy-Speed-API.patch
rename to patches/server/0489-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0490-Add-LivingEntity-clearActiveItem.patch b/patches/server/0491-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0490-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0491-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0491-Add-PlayerItemCooldownEvent.patch b/patches/server/0492-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0491-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0492-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0492-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0492-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0493-More-lightning-API.patch b/patches/server/0494-More-lightning-API.patch
similarity index 100%
rename from patches/server/0493-More-lightning-API.patch
rename to patches/server/0494-More-lightning-API.patch
diff --git a/patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
index 976626b644..6b6d655da6 100644
--- a/patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0495-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 cfdc8c37d41473300ca9a8c251e27cb2a07ca4c7..5705dd4c89c2e57540a2eaec0568e45e1947d8c6 100644
+index 658e47bf5aff1e56462cc3f0a87eeb7349654176..c35d22e4d54abcb16b7ec932729d2f177fd4a14b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2024,6 +2024,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2057,6 +2057,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean isPushable() {
diff --git a/patches/server/0495-Added-missing-default-perms-for-commands.patch b/patches/server/0496-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0495-Added-missing-default-perms-for-commands.patch
rename to patches/server/0496-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0496-Add-PlayerShearBlockEvent.patch b/patches/server/0497-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0496-Add-PlayerShearBlockEvent.patch
rename to patches/server/0497-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0497-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0498-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0497-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0498-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0498-Limit-recipe-packets.patch b/patches/server/0499-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0498-Limit-recipe-packets.patch
rename to patches/server/0499-Limit-recipe-packets.patch
diff --git a/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0499-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0500-Player-Chunk-Load-Unload-Events.patch b/patches/server/0501-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0500-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0501-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0502-Expose-LivingEntity-hurt-direction.patch b/patches/server/0503-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0502-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0503-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0506-Implement-TargetHitEvent.patch b/patches/server/0507-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0506-Implement-TargetHitEvent.patch
rename to patches/server/0507-Implement-TargetHitEvent.patch
diff --git a/patches/server/0507-MC-4-Fix-item-position-desync.patch b/patches/server/0508-MC-4-Fix-item-position-desync.patch
similarity index 93%
rename from patches/server/0507-MC-4-Fix-item-position-desync.patch
rename to patches/server/0508-MC-4-Fix-item-position-desync.patch
index 109b4ceace..3de6712684 100644
--- a/patches/server/0507-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0508-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270
  
      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 5705dd4c89c2e57540a2eaec0568e45e1947d8c6..0d96f40ca4d08197f101a31cca7e334525542565 100644
+index c35d22e4d54abcb16b7ec932729d2f177fd4a14b..3acaa05743373b818ba70a0229c6afe63bfd1a97 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4215,6 +4215,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4248,6 +4248,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0508-Additional-Block-Material-API-s.patch b/patches/server/0509-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0508-Additional-Block-Material-API-s.patch
rename to patches/server/0509-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0509-Fix-harming-potion-dupe.patch b/patches/server/0510-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0509-Fix-harming-potion-dupe.patch
rename to patches/server/0510-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0511-Cache-burn-durations.patch b/patches/server/0512-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0511-Cache-burn-durations.patch
rename to patches/server/0512-Cache-burn-durations.patch
diff --git a/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0516-Zombie-API-breaking-doors.patch b/patches/server/0517-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0516-Zombie-API-breaking-doors.patch
rename to patches/server/0517-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0517-Fix-nerfed-slime-when-splitting.patch b/patches/server/0518-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0517-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0518-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0518-Add-EntityLoadCrossbowEvent.patch b/patches/server/0519-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0518-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0519-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0519-Added-WorldGameRuleChangeEvent.patch b/patches/server/0520-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0519-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0520-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0520-Added-ServerResourcesReloadedEvent.patch b/patches/server/0521-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0520-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0521-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0522-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0523-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0525-Configurable-door-breaking-difficulty.patch b/patches/server/0526-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0525-Configurable-door-breaking-difficulty.patch
rename to patches/server/0526-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0526-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0527-Remove-stale-POIs.patch b/patches/server/0528-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0527-Remove-stale-POIs.patch
rename to patches/server/0528-Remove-stale-POIs.patch
diff --git a/patches/server/0528-Fix-villager-boat-exploit.patch b/patches/server/0529-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0528-Fix-villager-boat-exploit.patch
rename to patches/server/0529-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0529-Add-sendOpLevel-API.patch b/patches/server/0530-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0529-Add-sendOpLevel-API.patch
rename to patches/server/0530-Add-sendOpLevel-API.patch
diff --git a/patches/server/0530-TODO-Registry-Modification-API.patch b/patches/server/0531-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0530-TODO-Registry-Modification-API.patch
rename to patches/server/0531-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0531-Add-StructuresLocateEvent.patch b/patches/server/0532-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0531-Add-StructuresLocateEvent.patch
rename to patches/server/0532-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
similarity index 94%
rename from patches/server/0532-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
index ade169f618..efa1626720 100644
--- a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0533-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 0d96f40ca4d08197f101a31cca7e334525542565..027e4f9f9f3464af8f21cf1f67019aec15666c47 100644
+index 3acaa05743373b818ba70a0229c6afe63bfd1a97..6277b3a553a6fe65a11d678701cb4615ec3e3cc6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1894,6 +1894,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1927,6 +1927,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void push(Entity entity) {
          if (!this.isPassengerOfSameVehicle(entity)) {
              if (!entity.noPhysics && !this.noPhysics) {
diff --git a/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0535-Make-schedule-command-per-world.patch b/patches/server/0536-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0535-Make-schedule-command-per-world.patch
rename to patches/server/0536-Make-schedule-command-per-world.patch
diff --git a/patches/server/0536-Configurable-max-leash-distance.patch b/patches/server/0537-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0536-Configurable-max-leash-distance.patch
rename to patches/server/0537-Configurable-max-leash-distance.patch
diff --git a/patches/server/0537-Implement-BlockPreDispenseEvent.patch b/patches/server/0538-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0537-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0538-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0543-add-DragonEggFormEvent.patch b/patches/server/0544-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0543-add-DragonEggFormEvent.patch
rename to patches/server/0544-add-DragonEggFormEvent.patch
diff --git a/patches/server/0544-EntityMoveEvent.patch b/patches/server/0545-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0544-EntityMoveEvent.patch
rename to patches/server/0545-EntityMoveEvent.patch
diff --git a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0546-Inline-shift-direction-fields.patch b/patches/server/0547-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0546-Inline-shift-direction-fields.patch
rename to patches/server/0547-Inline-shift-direction-fields.patch
diff --git a/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0549-living-entity-allow-attribute-registration.patch b/patches/server/0550-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0549-living-entity-allow-attribute-registration.patch
rename to patches/server/0550-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0550-fix-dead-slime-setSize-invincibility.patch b/patches/server/0551-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0550-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0551-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0552-Expose-Tracked-Players.patch b/patches/server/0553-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0552-Expose-Tracked-Players.patch
rename to patches/server/0553-Expose-Tracked-Players.patch
diff --git a/patches/server/0553-Remove-streams-from-SensorNearest.patch b/patches/server/0554-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0553-Remove-streams-from-SensorNearest.patch
rename to patches/server/0554-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0554-Improve-ServerGUI.patch b/patches/server/0555-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0554-Improve-ServerGUI.patch
rename to patches/server/0555-Improve-ServerGUI.patch
diff --git a/patches/server/0555-fix-converting-txt-to-json-file.patch b/patches/server/0556-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0555-fix-converting-txt-to-json-file.patch
rename to patches/server/0556-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0556-Add-worldborder-events.patch b/patches/server/0557-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0556-Add-worldborder-events.patch
rename to patches/server/0557-Add-worldborder-events.patch
diff --git a/patches/server/0557-added-PlayerNameEntityEvent.patch b/patches/server/0558-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0557-added-PlayerNameEntityEvent.patch
rename to patches/server/0558-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0558-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0559-Add-recipe-to-cook-events.patch b/patches/server/0560-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0559-Add-recipe-to-cook-events.patch
rename to patches/server/0560-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0560-Add-Block-isValidTool.patch b/patches/server/0561-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0560-Add-Block-isValidTool.patch
rename to patches/server/0561-Add-Block-isValidTool.patch
diff --git a/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0562-Expand-world-key-API.patch b/patches/server/0563-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0562-Expand-world-key-API.patch
rename to patches/server/0563-Expand-world-key-API.patch
diff --git a/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0564-Item-Rarity-API.patch b/patches/server/0565-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0564-Item-Rarity-API.patch
rename to patches/server/0565-Item-Rarity-API.patch
diff --git a/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0566-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0568-Expose-protocol-version.patch b/patches/server/0569-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0568-Expose-protocol-version.patch
rename to patches/server/0569-Expose-protocol-version.patch
diff --git a/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0571-Add-bypass-host-check.patch b/patches/server/0572-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0571-Add-bypass-host-check.patch
rename to patches/server/0572-Add-bypass-host-check.patch
diff --git a/patches/server/0572-Set-area-affect-cloud-rotation.patch b/patches/server/0573-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0572-Set-area-affect-cloud-rotation.patch
rename to patches/server/0573-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0578-Added-PlayerDeepSleepEvent.patch b/patches/server/0579-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0578-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0579-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0579-More-World-API.patch b/patches/server/0580-More-World-API.patch
similarity index 100%
rename from patches/server/0579-More-World-API.patch
rename to patches/server/0580-More-World-API.patch
diff --git a/patches/server/0580-Added-PlayerBedFailEnterEvent.patch b/patches/server/0581-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0580-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0581-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0583-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0585-Add-Channel-initialization-listeners.patch b/patches/server/0586-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0585-Add-Channel-initialization-listeners.patch
rename to patches/server/0586-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0587-Add-more-WanderingTrader-API.patch b/patches/server/0588-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0587-Add-more-WanderingTrader-API.patch
rename to patches/server/0588-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0588-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0589-Entity-load-save-limit-per-chunk.patch b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0589-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0590-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0592-Inventory-close.patch b/patches/server/0593-Inventory-close.patch
similarity index 100%
rename from patches/server/0592-Inventory-close.patch
rename to patches/server/0593-Inventory-close.patch
diff --git a/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0594-Fix-CraftPotionBrewer-cache.patch b/patches/server/0595-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0594-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0595-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0595-Add-basic-Datapack-API.patch b/patches/server/0596-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0595-Add-basic-Datapack-API.patch
rename to patches/server/0596-Add-basic-Datapack-API.patch
diff --git a/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0598-ItemStack-repair-check-API.patch b/patches/server/0599-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0598-ItemStack-repair-check-API.patch
rename to patches/server/0599-ItemStack-repair-check-API.patch
diff --git a/patches/server/0599-More-Enchantment-API.patch b/patches/server/0600-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0599-More-Enchantment-API.patch
rename to patches/server/0600-More-Enchantment-API.patch
diff --git a/patches/server/0600-Move-range-check-for-block-placing-up.patch b/patches/server/0601-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0600-Move-range-check-for-block-placing-up.patch
rename to patches/server/0601-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0602-Add-Mob-lookAt-API.patch b/patches/server/0603-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0602-Add-Mob-lookAt-API.patch
rename to patches/server/0603-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0603-Add-Unix-domain-socket-support.patch b/patches/server/0604-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0603-Add-Unix-domain-socket-support.patch
rename to patches/server/0604-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0604-Add-EntityInsideBlockEvent.patch b/patches/server/0605-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0604-Add-EntityInsideBlockEvent.patch
rename to patches/server/0605-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0605-Attributes-API-for-item-defaults.patch b/patches/server/0606-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0605-Attributes-API-for-item-defaults.patch
rename to patches/server/0606-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0607-More-Lidded-Block-API.patch b/patches/server/0608-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0607-More-Lidded-Block-API.patch
rename to patches/server/0608-More-Lidded-Block-API.patch
diff --git a/patches/server/0608-Limit-item-frame-cursors-on-maps.patch b/patches/server/0609-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0608-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0609-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0609-Add-PlayerKickEvent-causes.patch b/patches/server/0610-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0609-Add-PlayerKickEvent-causes.patch
rename to patches/server/0610-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0610-Add-PufferFishStateChangeEvent.patch b/patches/server/0611-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0610-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0611-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0614-Add-BellRevealRaiderEvent.patch b/patches/server/0615-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0614-Add-BellRevealRaiderEvent.patch
rename to patches/server/0615-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0615-Fix-invulnerable-end-crystals.patch b/patches/server/0616-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0615-Fix-invulnerable-end-crystals.patch
rename to patches/server/0616-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0617-Fix-dangerous-end-portal-logic.patch b/patches/server/0618-Fix-dangerous-end-portal-logic.patch
similarity index 90%
rename from patches/server/0617-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0618-Fix-dangerous-end-portal-logic.patch
index c93cc3a95e..1929dc3d42 100644
--- a/patches/server/0617-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0618-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 027e4f9f9f3464af8f21cf1f67019aec15666c47..e2f96c7259df87687cd1f560e46c4fb34d78e126 100644
+index 6277b3a553a6fe65a11d678701cb4615ec3e3cc6..e18bb85e7035917f49f8cba20ad362a994e2336c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -482,6 +482,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     public boolean updatingSectionStatus = false;
-     // Paper end
+@@ -515,6 +515,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+         return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
+     }
+     // Paper end - optimise entity tracking
 +    // Paper start - make end portalling safe
 +    public BlockPos portalBlock;
 +    public ServerLevel portalWorld;
@@ -51,7 +51,7 @@ index 027e4f9f9f3464af8f21cf1f67019aec15666c47..e2f96c7259df87687cd1f560e46c4fb3
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -2838,6 +2868,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2871,6 +2901,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0619-Make-item-validations-configurable.patch b/patches/server/0620-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0619-Make-item-validations-configurable.patch
rename to patches/server/0620-Make-item-validations-configurable.patch
diff --git a/patches/server/0620-Line-Of-Sight-Changes.patch b/patches/server/0621-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0620-Line-Of-Sight-Changes.patch
rename to patches/server/0621-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0621-add-per-world-spawn-limits.patch b/patches/server/0622-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0621-add-per-world-spawn-limits.patch
rename to patches/server/0622-add-per-world-spawn-limits.patch
diff --git a/patches/server/0622-Fix-potions-splash-events.patch b/patches/server/0623-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0622-Fix-potions-splash-events.patch
rename to patches/server/0623-Fix-potions-splash-events.patch
diff --git a/patches/server/0623-Add-more-LimitedRegion-API.patch b/patches/server/0624-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0623-Add-more-LimitedRegion-API.patch
rename to patches/server/0624-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0625-Missing-Entity-API.patch b/patches/server/0626-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0625-Missing-Entity-API.patch
rename to patches/server/0626-Missing-Entity-API.patch
diff --git a/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0630-Adds-PlayerArmSwingEvent.patch b/patches/server/0631-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0630-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0631-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0637-Stinger-API.patch b/patches/server/0638-Stinger-API.patch
similarity index 100%
rename from patches/server/0637-Stinger-API.patch
rename to patches/server/0638-Stinger-API.patch
diff --git a/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0639-Add-System.out-err-catcher.patch b/patches/server/0640-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0639-Add-System.out-err-catcher.patch
rename to patches/server/0640-Add-System.out-err-catcher.patch
diff --git a/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0641-Improve-boat-collision-performance.patch b/patches/server/0642-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0641-Improve-boat-collision-performance.patch
rename to patches/server/0642-Improve-boat-collision-performance.patch
diff --git a/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0644-Add-PlayerSetSpawnEvent.patch b/patches/server/0645-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0644-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0645-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0648-Added-EntityDamageItemEvent.patch b/patches/server/0649-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0648-Added-EntityDamageItemEvent.patch
rename to patches/server/0649-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0649-Optimize-indirect-passenger-iteration.patch b/patches/server/0650-Optimize-indirect-passenger-iteration.patch
similarity index 90%
rename from patches/server/0649-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0650-Optimize-indirect-passenger-iteration.patch
index ea38b0fd48..66d74ff2bd 100644
--- a/patches/server/0649-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0650-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 e2f96c7259df87687cd1f560e46c4fb34d78e126..5dc20ea46909eac7bb02bc6594a614621b11cf63 100644
+index e18bb85e7035917f49f8cba20ad362a994e2336c..5c9af4e6278df2299383946c10fad5e54e7f7262 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3876,20 +3876,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3909,20 +3909,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index e2f96c7259df87687cd1f560e46c4fb34d78e126..5dc20ea46909eac7bb02bc6594a61462
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3906,6 +3920,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3939,6 +3953,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0652-Clear-bucket-NBT-after-dispense.patch b/patches/server/0653-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0652-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0653-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0654-Add-BlockBreakBlockEvent.patch b/patches/server/0655-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0654-Add-BlockBreakBlockEvent.patch
rename to patches/server/0655-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0656-More-CommandBlock-API.patch b/patches/server/0657-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0656-More-CommandBlock-API.patch
rename to patches/server/0657-More-CommandBlock-API.patch
diff --git a/patches/server/0657-Add-missing-team-sidebar-display-slots.patch b/patches/server/0658-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0657-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0658-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0658-Add-back-EntityPortalExitEvent.patch b/patches/server/0659-Add-back-EntityPortalExitEvent.patch
similarity index 93%
rename from patches/server/0658-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0659-Add-back-EntityPortalExitEvent.patch
index b349e583a2..9d6129eabe 100644
--- a/patches/server/0658-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0659-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 5dc20ea46909eac7bb02bc6594a614621b11cf63..3b7e54b4348f0486e43b4f7930ada0a16e989650 100644
+index 5c9af4e6278df2299383946c10fad5e54e7f7262..02b4736bc9f6f5ffb01ddc9db18c5efb9f67647e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3332,6 +3332,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3365,6 +3365,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -37,7 +37,7 @@ index 5dc20ea46909eac7bb02bc6594a614621b11cf63..3b7e54b4348f0486e43b4f7930ada0a1
                  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);
-@@ -3351,8 +3373,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3384,8 +3406,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0660-Get-entity-default-attributes.patch b/patches/server/0661-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0660-Get-entity-default-attributes.patch
rename to patches/server/0661-Get-entity-default-attributes.patch
diff --git a/patches/server/0661-Left-handed-API.patch b/patches/server/0662-Left-handed-API.patch
similarity index 100%
rename from patches/server/0661-Left-handed-API.patch
rename to patches/server/0662-Left-handed-API.patch
diff --git a/patches/server/0662-Add-more-advancement-API.patch b/patches/server/0663-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0662-Add-more-advancement-API.patch
rename to patches/server/0663-Add-more-advancement-API.patch
diff --git a/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0664-Add-critical-damage-API.patch b/patches/server/0665-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0664-Add-critical-damage-API.patch
rename to patches/server/0665-Add-critical-damage-API.patch
diff --git a/patches/server/0665-Fix-issues-with-mob-conversion.patch b/patches/server/0666-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0665-Fix-issues-with-mob-conversion.patch
rename to patches/server/0666-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0666-Add-isCollidable-methods-to-various-places.patch b/patches/server/0667-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0666-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0667-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0667-Goat-ram-API.patch b/patches/server/0668-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0667-Goat-ram-API.patch
rename to patches/server/0668-Goat-ram-API.patch
diff --git a/patches/server/0668-Add-API-for-resetting-a-single-score.patch b/patches/server/0669-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0668-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0669-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
similarity index 96%
rename from patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
index 4bbfe755cf..446c28c902 100644
--- a/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0670-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 3b7e54b4348f0486e43b4f7930ada0a16e989650..6512c3ca611233f7541c1d0119521e05f524615a 100644
+index 02b4736bc9f6f5ffb01ddc9db18c5efb9f67647e..30d0bd2590cd6f091076d3bb826e20c9ca710a1c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2113,6 +2113,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2146,6 +2146,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  
diff --git a/patches/server/0670-Vanilla-command-permission-fixes.patch b/patches/server/0671-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0670-Vanilla-command-permission-fixes.patch
rename to patches/server/0671-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0672-Fix-GameProfileCache-concurrency.patch b/patches/server/0673-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0672-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0673-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0673-Improve-and-expand-AsyncCatcher.patch b/patches/server/0674-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0673-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0674-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0676-Optimise-general-POI-access.patch b/patches/server/0677-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0676-Optimise-general-POI-access.patch
rename to patches/server/0677-Optimise-general-POI-access.patch
diff --git a/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0683-Time-scoreboard-search.patch b/patches/server/0684-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0683-Time-scoreboard-search.patch
rename to patches/server/0684-Time-scoreboard-search.patch
diff --git a/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0686-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0687-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
similarity index 87%
rename from patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
index 242ae5cd96..5f53b3e965 100644
--- a/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0688-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 463a82f08b7848a4b8a4eb89b201a6e8424c6831..93a2dfca4484d1bdfa00dfb2cf8d94314123aeb8 100644
+index e2b4567a8abc5a6217f4926733c6749edd83029d..6d89e10b33591bc09832064cfac7090cbabc4a8c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1210,7 +1210,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1310,7 +1310,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0689-Optimise-random-block-ticking.patch b/patches/server/0690-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0689-Optimise-random-block-ticking.patch
rename to patches/server/0690-Optimise-random-block-ticking.patch
diff --git a/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
similarity index 97%
rename from patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
index d3f1c95dc3..67aa30f645 100644
--- a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
@@ -122,10 +122,10 @@ index 7074c1e7d7d33dafc0e69f5ab2630e47b7ad1795..cbebd94026be140f4d0d913596e5a6d4
  
      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 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071f0f33267 100644
+index 30d0bd2590cd6f091076d3bb826e20c9ca710a1c..e8dd1f8b4f399624f134a814f4bd513db954021a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -991,7 +991,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.onGround;
      }
  
@@ -168,7 +168,7 @@ index 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
-@@ -1161,6 +1196,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1194,6 +1229,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.level().getProfiler().pop();
              }
          }
@@ -182,7 +182,7 @@ index 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071
      }
  
      private boolean isStateClimbable(BlockState state) {
-@@ -4218,7 +4260,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4251,7 +4293,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setDeltaMovement(Vec3 velocity) {
@@ -192,7 +192,7 @@ index 6512c3ca611233f7541c1d0119521e05f524615a..c02d5e6efcc8d8403b02acb37acb4071
      }
  
      public void addDeltaMovement(Vec3 velocity) {
-@@ -4304,7 +4348,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4337,7 +4381,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
          // Paper end - fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
diff --git a/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0695-Distance-manager-tick-timings.patch b/patches/server/0696-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0695-Distance-manager-tick-timings.patch
rename to patches/server/0696-Distance-manager-tick-timings.patch
diff --git a/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0699-Add-packet-limiter-config.patch b/patches/server/0700-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0699-Add-packet-limiter-config.patch
rename to patches/server/0700-Add-packet-limiter-config.patch
diff --git a/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0701-Ensure-valid-vehicle-status.patch b/patches/server/0702-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0701-Ensure-valid-vehicle-status.patch
rename to patches/server/0702-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch b/patches/server/0705-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch
rename to patches/server/0705-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0706-Preserve-overstacked-loot.patch b/patches/server/0707-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0706-Preserve-overstacked-loot.patch
rename to patches/server/0707-Preserve-overstacked-loot.patch
diff --git a/patches/server/0707-Update-head-rotation-in-missing-places.patch b/patches/server/0708-Update-head-rotation-in-missing-places.patch
similarity index 84%
rename from patches/server/0707-Update-head-rotation-in-missing-places.patch
rename to patches/server/0708-Update-head-rotation-in-missing-places.patch
index d80dd0df5c..0db52c5538 100644
--- a/patches/server/0707-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0708-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 c02d5e6efcc8d8403b02acb37acb4071f0f33267..51d4870a563ab978b46c07a8e51e2b6849992269 100644
+index e8dd1f8b4f399624f134a814f4bd513db954021a..95039581fe8ed6787d262c330ab524683c464184 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1878,6 +1878,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1911,6 +1911,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index c02d5e6efcc8d8403b02acb37acb4071f0f33267..51d4870a563ab978b46c07a8e51e2b68
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1916,6 +1917,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1949,6 +1950,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();
diff --git a/patches/server/0708-prevent-unintended-light-block-manipulation.patch b/patches/server/0709-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0708-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0709-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0709-Fix-CraftCriteria-defaults-map.patch b/patches/server/0710-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0709-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0710-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0710-Fix-upstreams-block-state-factories.patch b/patches/server/0711-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0710-Fix-upstreams-block-state-factories.patch
rename to patches/server/0711-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0711-Configurable-feature-seeds.patch b/patches/server/0712-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0711-Configurable-feature-seeds.patch
rename to patches/server/0712-Configurable-feature-seeds.patch
diff --git a/patches/server/0712-Add-root-admin-user-detection.patch b/patches/server/0713-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0712-Add-root-admin-user-detection.patch
rename to patches/server/0713-Add-root-admin-user-detection.patch
diff --git a/patches/server/0713-Always-allow-item-changing-in-Fireball.patch b/patches/server/0714-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0713-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0714-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
similarity index 85%
rename from patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
index 24d15f8607..4e10c29d8e 100644
--- a/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0715-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 51d4870a563ab978b46c07a8e51e2b6849992269..4b135772f8346103c2e6e1473af95f0bfa9754ef 100644
+index 95039581fe8ed6787d262c330ab524683c464184..0312b0c46b941b7bbfd0bf13355f8bd2cf7bc7e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -754,7 +754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // 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/0715-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0720-Fix-Spigot-growth-modifiers.patch b/patches/server/0721-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0720-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0721-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0723-Optimize-HashMapPalette.patch b/patches/server/0724-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0723-Optimize-HashMapPalette.patch
rename to patches/server/0724-Optimize-HashMapPalette.patch
diff --git a/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0725-Collision-optimisations.patch b/patches/server/0726-Collision-optimisations.patch
similarity index 99%
rename from patches/server/0725-Collision-optimisations.patch
rename to patches/server/0726-Collision-optimisations.patch
index 213c56917e..d35216ec4f 100644
--- a/patches/server/0725-Collision-optimisations.patch
+++ b/patches/server/0726-Collision-optimisations.patch
@@ -2239,10 +2239,10 @@ index 965dd34bd9a23a2fb17e5800af3b294b75b1146a..c493f883940819913f0cecb5e374fe94
              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 4b135772f8346103c2e6e1473af95f0bfa9754ef..f91cbf742ee12f29cdebbd0a1481f0ea6db8d50b 100644
+index 0312b0c46b941b7bbfd0bf13355f8bd2cf7bc7e3..2a96f1161a340ab6a87902d9fceeda5281a9f977 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1177,9 +1177,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1210,9 +1210,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  float f = this.getBlockSpeedFactor();
  
                  this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
@@ -2290,7 +2290,7 @@ index 4b135772f8346103c2e6e1473af95f0bfa9754ef..f91cbf742ee12f29cdebbd0a1481f0ea
                      if (this.remainingFireTicks <= 0) {
                          this.setRemainingFireTicks(-this.getFireImmuneTicks());
                      }
-@@ -1359,32 +1394,86 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1392,32 +1427,86 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Vec3 collide(Vec3 movement) {
@@ -2393,7 +2393,7 @@ index 4b135772f8346103c2e6e1473af95f0bfa9754ef..f91cbf742ee12f29cdebbd0a1481f0ea
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -2586,11 +2675,70 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2619,11 +2708,70 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              float f = this.dimensions.width * 0.8F;
              AABB axisalignedbb = AABB.ofSize(this.getEyePosition(), (double) f, 1.0E-6D, (double) f);
  
diff --git a/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0728-Add-more-Campfire-API.patch b/patches/server/0729-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0728-Add-more-Campfire-API.patch
rename to patches/server/0729-Add-more-Campfire-API.patch
diff --git a/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0730-Fix-tripwire-state-inconsistency.patch b/patches/server/0731-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0730-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0731-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
similarity index 88%
rename from patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
index 9d024acb9a..b45a6ecc92 100644
--- a/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0732-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 f91cbf742ee12f29cdebbd0a1481f0ea6db8d50b..da8bd9746a3ddef673230c12370a34c8228aa0c7 100644
+index 2a96f1161a340ab6a87902d9fceeda5281a9f977..e746f1defd47e4f03a663a1b697c10b4616bdf72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3494,6 +3494,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3527,6 +3527,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index f91cbf742ee12f29cdebbd0a1481f0ea6db8d50b..da8bd9746a3ddef673230c12370a34c8
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3580,10 +3587,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3613,10 +3620,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
                          ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
                      }
diff --git a/patches/server/0732-Improve-scoreboard-entries.patch b/patches/server/0733-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0732-Improve-scoreboard-entries.patch
rename to patches/server/0733-Improve-scoreboard-entries.patch
diff --git a/patches/server/0733-Entity-powdered-snow-API.patch b/patches/server/0734-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0733-Entity-powdered-snow-API.patch
rename to patches/server/0734-Entity-powdered-snow-API.patch
diff --git a/patches/server/0734-Add-API-for-item-entity-health.patch b/patches/server/0735-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0734-Add-API-for-item-entity-health.patch
rename to patches/server/0735-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0740-Fix-bees-aging-inside-hives.patch b/patches/server/0741-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0740-Fix-bees-aging-inside-hives.patch
rename to patches/server/0741-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0741-Bucketable-API.patch b/patches/server/0742-Bucketable-API.patch
similarity index 100%
rename from patches/server/0741-Bucketable-API.patch
rename to patches/server/0742-Bucketable-API.patch
diff --git a/patches/server/0742-Validate-usernames.patch b/patches/server/0743-Validate-usernames.patch
similarity index 100%
rename from patches/server/0742-Validate-usernames.patch
rename to patches/server/0743-Validate-usernames.patch
diff --git a/patches/server/0743-Make-water-animal-spawn-height-configurable.patch b/patches/server/0744-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0743-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0744-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0747-Multiple-Entries-with-Scoreboards.patch b/patches/server/0748-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0747-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0748-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0748-Reset-placed-block-on-exception.patch b/patches/server/0749-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0748-Reset-placed-block-on-exception.patch
rename to patches/server/0749-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0749-Add-configurable-height-for-slime-spawn.patch b/patches/server/0750-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0749-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0750-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0752-Kick-on-main-for-illegal-chat.patch b/patches/server/0753-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0752-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0753-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0753-Multi-Block-Change-API-Implementation.patch b/patches/server/0754-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0753-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0754-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0754-Fix-NotePlayEvent.patch b/patches/server/0755-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0754-Fix-NotePlayEvent.patch
rename to patches/server/0755-Fix-NotePlayEvent.patch
diff --git a/patches/server/0755-Freeze-Tick-Lock-API.patch b/patches/server/0756-Freeze-Tick-Lock-API.patch
similarity index 91%
rename from patches/server/0755-Freeze-Tick-Lock-API.patch
rename to patches/server/0756-Freeze-Tick-Lock-API.patch
index bd658e6164..101d8b5dbd 100644
--- a/patches/server/0755-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0756-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 da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9b91b030c 100644
+index e746f1defd47e4f03a663a1b697c10b4616bdf72..70b69359002b283645ead0af0e1b1a7a9fb9a60c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
      private UUID originWorld;
@@ -16,7 +16,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -800,7 +801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -833,7 +834,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.setRemainingFireTicks(this.remainingFireTicks - 1);
              }
  
@@ -25,7 +25,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2400,6 +2401,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2433,6 +2434,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (fromNetherPortal) {
                  nbt.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2565,6 +2569,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2598,6 +2602,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
diff --git a/patches/server/0756-Dolphin-API.patch b/patches/server/0757-Dolphin-API.patch
similarity index 100%
rename from patches/server/0756-Dolphin-API.patch
rename to patches/server/0757-Dolphin-API.patch
diff --git a/patches/server/0757-More-PotionEffectType-API.patch b/patches/server/0758-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0757-More-PotionEffectType-API.patch
rename to patches/server/0758-More-PotionEffectType-API.patch
diff --git a/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0760-Add-missing-structure-set-seed-configs.patch b/patches/server/0761-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0760-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0761-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0761-Implement-regenerateChunk.patch b/patches/server/0762-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0761-Implement-regenerateChunk.patch
rename to patches/server/0762-Implement-regenerateChunk.patch
diff --git a/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0764-Add-GameEvent-tags.patch b/patches/server/0765-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0764-Add-GameEvent-tags.patch
rename to patches/server/0765-Add-GameEvent-tags.patch
diff --git a/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0766-Furnace-RecipesUsed-API.patch b/patches/server/0767-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0766-Furnace-RecipesUsed-API.patch
rename to patches/server/0767-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0767-Configurable-sculk-sensor-listener-range.patch b/patches/server/0768-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0767-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0768-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0771-Fix-Entity-Position-Desync.patch b/patches/server/0772-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0771-Fix-Entity-Position-Desync.patch
rename to patches/server/0772-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0772-Custom-Potion-Mixes.patch b/patches/server/0773-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0772-Custom-Potion-Mixes.patch
rename to patches/server/0773-Custom-Potion-Mixes.patch
diff --git a/patches/server/0773-Force-close-world-loading-screen.patch b/patches/server/0774-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0773-Force-close-world-loading-screen.patch
rename to patches/server/0774-Force-close-world-loading-screen.patch
diff --git a/patches/server/0774-Fix-falling-block-spawn-methods.patch b/patches/server/0775-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0774-Fix-falling-block-spawn-methods.patch
rename to patches/server/0775-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0775-Expose-furnace-minecart-push-values.patch b/patches/server/0776-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0775-Expose-furnace-minecart-push-values.patch
rename to patches/server/0776-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0777-More-Projectile-API.patch b/patches/server/0778-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0777-More-Projectile-API.patch
rename to patches/server/0778-More-Projectile-API.patch
diff --git a/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0780-Implement-getComputedBiome-API.patch b/patches/server/0781-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0780-Implement-getComputedBiome-API.patch
rename to patches/server/0781-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0781-Make-some-itemstacks-nonnull.patch b/patches/server/0782-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0781-Make-some-itemstacks-nonnull.patch
rename to patches/server/0782-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0782-Implement-enchantWithLevels-API.patch b/patches/server/0783-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0782-Implement-enchantWithLevels-API.patch
rename to patches/server/0783-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0783-Fix-saving-in-unloadWorld.patch b/patches/server/0784-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0783-Fix-saving-in-unloadWorld.patch
rename to patches/server/0784-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0784-Buffer-OOB-setBlock-calls.patch b/patches/server/0785-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0784-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0785-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0785-Add-TameableDeathMessageEvent.patch b/patches/server/0786-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0785-Add-TameableDeathMessageEvent.patch
rename to patches/server/0786-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 84%
rename from patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 585cb7a9ed..3f50688ea4 100644
--- a/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0789-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 a1e795810e7e49acf4959b9c88bed1f9b91b030c..b92cfb174d84c32d49786b3fd189b1602ff84ce1 100644
+index 70b69359002b283645ead0af0e1b1a7a9fb9a60c..7c6f9abfbe3528705766b94879a20b001f3a04ad 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2808,7 +2808,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2841,7 +2841,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean startRiding(Entity entity, boolean force) {
diff --git a/patches/server/0789-Guard-against-invalid-entity-positions.patch b/patches/server/0790-Guard-against-invalid-entity-positions.patch
similarity index 92%
rename from patches/server/0789-Guard-against-invalid-entity-positions.patch
rename to patches/server/0790-Guard-against-invalid-entity-positions.patch
index 52c77c6640..7291a8f765 100644
--- a/patches/server/0789-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0790-Guard-against-invalid-entity-positions.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b92cfb174d84c32d49786b3fd189b1602ff84ce1..cb2b6ac12a93e5080e3d408e9797c011b5dccd09 100644
+index 7c6f9abfbe3528705766b94879a20b001f3a04ad..2d61bb6337c2e6866134ad3f4a03b3b430b43f6b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4489,11 +4489,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4522,11 +4522,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
diff --git a/patches/server/0790-cache-resource-keys.patch b/patches/server/0791-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0790-cache-resource-keys.patch
rename to patches/server/0791-cache-resource-keys.patch
diff --git a/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0799-WorldCreator-keepSpawnLoaded.patch b/patches/server/0800-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0799-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0800-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0805-Add-PlayerStopUsingItemEvent.patch b/patches/server/0806-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0805-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0806-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0806-FallingBlock-auto-expire-setting.patch b/patches/server/0807-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0806-FallingBlock-auto-expire-setting.patch
rename to patches/server/0807-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0807-Don-t-tick-markers.patch b/patches/server/0808-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0807-Don-t-tick-markers.patch
rename to patches/server/0808-Don-t-tick-markers.patch
diff --git a/patches/server/0808-Do-not-accept-invalid-client-settings.patch b/patches/server/0809-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0808-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0809-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0809-Add-support-for-Proxy-Protocol.patch b/patches/server/0810-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0809-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0810-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
similarity index 95%
rename from patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
index 66bceb6dba..9619634c06 100644
--- a/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0815-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 cb2b6ac12a93e5080e3d408e9797c011b5dccd09..bca885b3632c06c51d7d68f9f3ee1964a41bfdf3 100644
+index 2d61bb6337c2e6866134ad3f4a03b3b430b43f6b..2fcada74f5329bd199c21886288925c48825f628 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -763,6 +763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public void baseTick() {
          this.level().getProfiler().push("entityBaseTick");
diff --git a/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0817-Dont-resent-entity-on-art-update.patch b/patches/server/0818-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0817-Dont-resent-entity-on-art-update.patch
rename to patches/server/0818-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0818-Add-WardenAngerChangeEvent.patch b/patches/server/0819-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0818-Add-WardenAngerChangeEvent.patch
rename to patches/server/0819-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0821-Nameable-Banner-API.patch b/patches/server/0822-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0821-Nameable-Banner-API.patch
rename to patches/server/0822-Nameable-Banner-API.patch
diff --git a/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0825-Add-Player-getFishHook.patch b/patches/server/0826-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0825-Add-Player-getFishHook.patch
rename to patches/server/0826-Add-Player-getFishHook.patch
diff --git a/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 96%
rename from patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
index c0e8d8fd0c..1435a766cb 100644
--- a/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0828-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 bca885b3632c06c51d7d68f9f3ee1964a41bfdf3..781b9c6d2f05535f67322ae6bdd1423c506ab7cd 100644
+index 2fcada74f5329bd199c21886288925c48825f628..e4d74b727cf03423a7af2415a6b2d17f1c698286 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2660,6 +2660,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2693,6 +2693,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              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/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0829-Fix-Bee-flower-NPE.patch b/patches/server/0830-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0829-Fix-Bee-flower-NPE.patch
rename to patches/server/0830-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0831-More-Teleport-API.patch b/patches/server/0832-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0831-More-Teleport-API.patch
rename to patches/server/0832-More-Teleport-API.patch
diff --git a/patches/server/0832-Add-EntityPortalReadyEvent.patch b/patches/server/0833-Add-EntityPortalReadyEvent.patch
similarity index 88%
rename from patches/server/0832-Add-EntityPortalReadyEvent.patch
rename to patches/server/0833-Add-EntityPortalReadyEvent.patch
index fe77c37130..3833407886 100644
--- a/patches/server/0832-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0833-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 781b9c6d2f05535f67322ae6bdd1423c506ab7cd..073bd0e905b258be835b5063ddd5d8d6bb17d106 100644
+index e4d74b727cf03423a7af2415a6b2d17f1c698286..696bf608dcf4369446137389f8ddd95fb3874e4e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3062,6 +3062,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3095,6 +3095,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
                      this.level().getProfiler().push("portal");
                      this.portalTime = i;
@@ -22,7 +22,7 @@ index 781b9c6d2f05535f67322ae6bdd1423c506ab7cd..073bd0e905b258be835b5063ddd5d8d6
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -3069,6 +3076,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3102,6 +3109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0834-Send-block-entities-after-destroy-prediction.patch b/patches/server/0835-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0834-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0835-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0838-Collision-API.patch b/patches/server/0839-Collision-API.patch
similarity index 100%
rename from patches/server/0838-Collision-API.patch
rename to patches/server/0839-Collision-API.patch
diff --git a/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0840-Block-Ticking-API.patch b/patches/server/0841-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0840-Block-Ticking-API.patch
rename to patches/server/0841-Block-Ticking-API.patch
diff --git a/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0843-Add-NamespacedKey-biome-methods.patch b/patches/server/0844-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0843-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0844-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0847-Missing-eating-regain-reason.patch b/patches/server/0848-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0847-Missing-eating-regain-reason.patch
rename to patches/server/0848-Missing-eating-regain-reason.patch
diff --git a/patches/server/0848-Missing-effect-cause.patch b/patches/server/0849-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0848-Missing-effect-cause.patch
rename to patches/server/0849-Missing-effect-cause.patch
diff --git a/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0852-Configurable-chat-thread-limit.patch b/patches/server/0853-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0852-Configurable-chat-thread-limit.patch
rename to patches/server/0853-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0854-fix-Jigsaw-block-kicking-user.patch b/patches/server/0855-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0854-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0855-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0856-Add-getDrops-to-BlockState.patch b/patches/server/0857-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0856-Add-getDrops-to-BlockState.patch
rename to patches/server/0857-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
index e5aa87e011..dea100019e 100644
--- a/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
@@ -111,10 +111,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 93a2dfca4484d1bdfa00dfb2cf8d94314123aeb8..8cda789284a30dab012bfda8f97409bdde861c7e 100644
+index 6d89e10b33591bc09832064cfac7090cbabc4a8c..f6d7e863b5e058e49802abdc57a33c4edbc83e26 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -825,7 +825,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -905,7 +905,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end
  
diff --git a/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0859-Fix-custom-piglin-loved-items.patch b/patches/server/0860-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0859-Fix-custom-piglin-loved-items.patch
rename to patches/server/0860-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0860-EntityPickupItemEvent-fixes.patch b/patches/server/0861-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0860-EntityPickupItemEvent-fixes.patch
rename to patches/server/0861-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0863-Elder-Guardian-appearance-API.patch b/patches/server/0864-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0863-Elder-Guardian-appearance-API.patch
rename to patches/server/0864-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0864-Allow-changing-bed-s-occupied-property.patch b/patches/server/0865-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0864-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0865-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0865-Add-entity-knockback-API.patch b/patches/server/0866-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0865-Add-entity-knockback-API.patch
rename to patches/server/0866-Add-entity-knockback-API.patch
diff --git a/patches/server/0866-Detect-headless-JREs.patch b/patches/server/0867-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0866-Detect-headless-JREs.patch
rename to patches/server/0867-Detect-headless-JREs.patch
diff --git a/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0868-optimized-dirt-and-snow-spreading.patch b/patches/server/0869-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0868-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0869-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0869-Added-EntityToggleSitEvent.patch b/patches/server/0870-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0869-Added-EntityToggleSitEvent.patch
rename to patches/server/0870-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0870-Add-fire-tick-delay-option.patch b/patches/server/0871-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0870-Add-fire-tick-delay-option.patch
rename to patches/server/0871-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0871-Add-Moving-Piston-API.patch b/patches/server/0872-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0871-Add-Moving-Piston-API.patch
rename to patches/server/0872-Add-Moving-Piston-API.patch
diff --git a/patches/server/0872-Ignore-impossible-spawn-tick.patch b/patches/server/0873-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0872-Ignore-impossible-spawn-tick.patch
rename to patches/server/0873-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 91%
rename from patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 60fdb149f3..b8a38b0133 100644
--- a/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0876-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 073bd0e905b258be835b5063ddd5d8d6bb17d106..dd0eb9ee56fb41e4488b76a51f9daf6875155c31 100644
+index 696bf608dcf4369446137389f8ddd95fb3874e4e..0579e78930faddd93afc324b1d11b51b94ddae6a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3341,6 +3341,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3374,6 +3374,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
diff --git a/patches/server/0876-Prevent-compass-from-loading-chunks.patch b/patches/server/0877-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0876-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0877-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0880-Add-Player-Warden-Warning-API.patch b/patches/server/0881-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0880-Add-Player-Warden-Warning-API.patch
rename to patches/server/0881-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0882-Add-paper-dumplisteners-command.patch b/patches/server/0883-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0882-Add-paper-dumplisteners-command.patch
rename to patches/server/0883-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0883-check-global-player-list-where-appropriate.patch b/patches/server/0884-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0883-check-global-player-list-where-appropriate.patch
rename to patches/server/0884-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0885-ItemStack-damage-API.patch b/patches/server/0886-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0885-ItemStack-damage-API.patch
rename to patches/server/0886-ItemStack-damage-API.patch
diff --git a/patches/server/0886-Friction-API.patch b/patches/server/0887-Friction-API.patch
similarity index 100%
rename from patches/server/0886-Friction-API.patch
rename to patches/server/0887-Friction-API.patch
diff --git a/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0888-Fix-player-kick-on-shutdown.patch b/patches/server/0889-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0888-Fix-player-kick-on-shutdown.patch
rename to patches/server/0889-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0889-Sync-offhand-slot-in-menus.patch b/patches/server/0890-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0889-Sync-offhand-slot-in-menus.patch
rename to patches/server/0890-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0890-Player-Entity-Tracking-Events.patch b/patches/server/0891-Player-Entity-Tracking-Events.patch
similarity index 91%
rename from patches/server/0890-Player-Entity-Tracking-Events.patch
rename to patches/server/0891-Player-Entity-Tracking-Events.patch
index 4427e68f26..aa8052ad66 100644
--- a/patches/server/0890-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0891-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 8cda789284a30dab012bfda8f97409bdde861c7e..3d5f992c2f4a8df1cf0db1c209e2cce19e214b8a 100644
+index f6d7e863b5e058e49802abdc57a33c4edbc83e26..94e85e208be6e54e399201ac8de71f6c720ce8f1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1282,9 +1282,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1418,9 +1418,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // CraftBukkit end
                  if (flag) {
                      if (this.seenBy.add(player.connection)) {
diff --git a/patches/server/0891-Limit-pet-look-distance.patch b/patches/server/0892-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0891-Limit-pet-look-distance.patch
rename to patches/server/0892-Limit-pet-look-distance.patch
diff --git a/patches/server/0892-Properly-resend-entities.patch b/patches/server/0893-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0892-Properly-resend-entities.patch
rename to patches/server/0893-Properly-resend-entities.patch
diff --git a/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0894-fix-Instruments.patch b/patches/server/0895-fix-Instruments.patch
similarity index 100%
rename from patches/server/0894-fix-Instruments.patch
rename to patches/server/0895-fix-Instruments.patch
diff --git a/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0897-Add-BlockLockCheckEvent.patch b/patches/server/0898-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0897-Add-BlockLockCheckEvent.patch
rename to patches/server/0898-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0898-Add-Sneaking-API-for-Entities.patch b/patches/server/0899-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0898-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0899-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0899-Improve-logging-and-errors.patch b/patches/server/0900-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0899-Improve-logging-and-errors.patch
rename to patches/server/0900-Improve-logging-and-errors.patch
diff --git a/patches/server/0900-Improve-PortalEvents.patch b/patches/server/0901-Improve-PortalEvents.patch
similarity index 89%
rename from patches/server/0900-Improve-PortalEvents.patch
rename to patches/server/0901-Improve-PortalEvents.patch
index 7e18628f60..8474e6e135 100644
--- a/patches/server/0900-Improve-PortalEvents.patch
+++ b/patches/server/0901-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 dd0eb9ee56fb41e4488b76a51f9daf6875155c31..e68b8d53cacf179050dbc9cbfd815be7159dc8bc 100644
+index 0579e78930faddd93afc324b1d11b51b94ddae6a..852282924903b7eeb01af81d99149ef10c653cc3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3724,7 +3724,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3757,7 +3757,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          Location enter = bukkitEntity.getLocation();
          Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
diff --git a/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 90%
rename from patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
index e15fbaed91..1373e84bd3 100644
--- a/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e68b8d53cacf179050dbc9cbfd815be7159dc8bc..ba9b6bf4ff7c23ca599e09ff2fcbf9ab5d270f5d 100644
+index 852282924903b7eeb01af81d99149ef10c653cc3..11e02265185b94236d96adb056d207bb53a2e27e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      @javax.annotation.Nullable
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
@@ -16,7 +16,7 @@ index e68b8d53cacf179050dbc9cbfd815be7159dc8bc..ba9b6bf4ff7c23ca599e09ff2fcbf9ab
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -1443,7 +1444,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1476,7 +1477,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  null, null
          );
  
diff --git a/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0904-Flying-Fall-Damage.patch b/patches/server/0905-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0904-Flying-Fall-Damage.patch
rename to patches/server/0905-Flying-Fall-Damage.patch
diff --git a/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 86%
rename from patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index d7b5ed8806..3348629059 100644
--- a/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0907-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 ba9b6bf4ff7c23ca599e09ff2fcbf9ab5d270f5d..7fae13799800478f6244eaaeed59956494b3323b 100644
+index 11e02265185b94236d96adb056d207bb53a2e27e..8eda278e47bfb8553c96b4f0cebbf66a7ced71e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1123,7 +1123,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      }
  
                      if (!bl.getType().isAir()) {
diff --git a/patches/server/0907-config-for-disabling-entity-tag-tags.patch b/patches/server/0908-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0907-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0908-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0908-Use-single-player-info-update-packet-on-join.patch b/patches/server/0909-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0908-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0909-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0910-Win-Screen-API.patch b/patches/server/0911-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0910-Win-Screen-API.patch
rename to patches/server/0911-Win-Screen-API.patch
diff --git a/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0912-Fix-force-opening-enchantment-tables.patch b/patches/server/0913-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0912-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0913-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0913-Add-Entity-Body-Yaw-API.patch b/patches/server/0914-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0913-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0914-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0916-Add-EntityFertilizeEggEvent.patch b/patches/server/0917-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0916-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0917-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0921-Fix-text-display-error-on-spawn.patch b/patches/server/0922-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0921-Fix-text-display-error-on-spawn.patch
rename to patches/server/0922-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0923-Add-Shearable-API.patch b/patches/server/0924-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0923-Add-Shearable-API.patch
rename to patches/server/0924-Add-Shearable-API.patch
diff --git a/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0925-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0926-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0925-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0926-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0926-Optimize-Hoppers.patch b/patches/server/0927-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0926-Optimize-Hoppers.patch
rename to patches/server/0927-Optimize-Hoppers.patch
diff --git a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0929-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch b/patches/server/0931-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0930-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0931-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0933-Use-array-for-gamerule-storage.patch b/patches/server/0934-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0933-Use-array-for-gamerule-storage.patch
rename to patches/server/0934-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0936-Add-Mob-Experience-reward-API.patch b/patches/server/0937-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0936-Add-Mob-Experience-reward-API.patch
rename to patches/server/0937-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0940-More-accurate-isInOpenWater-impl.patch b/patches/server/0941-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0940-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0941-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0943-Expand-PlayerItemMendEvent.patch b/patches/server/0944-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0943-Expand-PlayerItemMendEvent.patch
rename to patches/server/0944-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
similarity index 96%
rename from patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
index b01cf1a4b4..ad77537336 100644
--- a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0945-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 7fae13799800478f6244eaaeed59956494b3323b..2ec75c46f53331442d79ef30b7f8acb317f0143b 100644
+index 8eda278e47bfb8553c96b4f0cebbf66a7ced71e2..897f76731fdbb4f579254ce6510fcd22762a45c8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -381,6 +381,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean valid;
      public boolean generation;
      public int maxAirTicks = this.getDefaultMaxAirSupply(); // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
diff --git a/patches/server/0945-Add-transient-modifier-API.patch b/patches/server/0946-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0945-Add-transient-modifier-API.patch
rename to patches/server/0946-Add-transient-modifier-API.patch
diff --git a/patches/server/0946-Fix-block-place-logic.patch b/patches/server/0947-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0946-Fix-block-place-logic.patch
rename to patches/server/0947-Fix-block-place-logic.patch
diff --git a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch b/patches/server/0953-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0952-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0953-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0956-Properly-Cancel-Usable-Items.patch b/patches/server/0957-Properly-Cancel-Usable-Items.patch
similarity index 100%
rename from patches/server/0956-Properly-Cancel-Usable-Items.patch
rename to patches/server/0957-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0957-Add-event-for-player-editing-sign.patch b/patches/server/0958-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0957-Add-event-for-player-editing-sign.patch
rename to patches/server/0958-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0959-Improve-command-function-perm-level-checks.patch b/patches/server/0960-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0959-Improve-command-function-perm-level-checks.patch
rename to patches/server/0960-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0960-Add-option-to-disable-block-updates.patch b/patches/server/0961-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0960-Add-option-to-disable-block-updates.patch
rename to patches/server/0961-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0961-Call-missing-BlockDispenseEvent.patch b/patches/server/0962-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0961-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0962-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 84%
rename from patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
index 95854f4605..ffd91a8247 100644
--- a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0963-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 2ec75c46f53331442d79ef30b7f8acb317f0143b..ac7f1f317782a6c6ad41614fbe6c25498da63010 100644
+index 897f76731fdbb4f579254ce6510fcd22762a45c8..1c0d1da0ccdf29347fcc8591011cf3d30db7eec4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1323,7 +1323,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      protected BlockPos getOnPos(float offset) {
diff --git a/patches/server/0963-Optimize-player-lookups-for-beacons.patch b/patches/server/0964-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0963-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0964-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0964-Add-Sign-getInteractableSideFor.patch b/patches/server/0965-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0964-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0965-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0965-Array-backed-synched-entity-data.patch b/patches/server/0966-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0965-Array-backed-synched-entity-data.patch
rename to patches/server/0966-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0968-Fix-BanList-API.patch b/patches/server/0969-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0968-Fix-BanList-API.patch
rename to patches/server/0969-Fix-BanList-API.patch
diff --git a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0973-Don-t-tick-signs.patch b/patches/server/0974-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0973-Don-t-tick-signs.patch
rename to patches/server/0974-Don-t-tick-signs.patch
diff --git a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0975-Add-whitelist-events.patch b/patches/server/0976-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0975-Add-whitelist-events.patch
rename to patches/server/0976-Add-whitelist-events.patch
diff --git a/patches/server/0976-Implement-PlayerFailMoveEvent.patch b/patches/server/0977-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0976-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0977-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0977-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0978-Folia-scheduler-and-owned-region-API.patch
index a5b4d3ced8..4fe700e099 100644
--- a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
@@ -1158,10 +1158,10 @@ index 4cbb35cac2736c80cba2a72649c485a3ea8e920b..723a87701a44e379c80e6def91c5340e
          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 ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66bda4ad1b 100644
+index 1c0d1da0ccdf29347fcc8591011cf3d30db7eec4..9132d514574982f5012520031e82469e2c78fe55 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -245,11 +245,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public @Nullable Throwable addedToWorldStack; // Paper - entity debug
      public CraftEntity getBukkitEntity() {
          if (this.bukkitEntity == null) {
@@ -1186,7 +1186,7 @@ index ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66
      @Override
      public CommandSender getBukkitSender(CommandSourceStack wrapper) {
          return this.getBukkitEntity();
-@@ -4685,6 +4697,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4718,6 +4730,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
@@ -1194,7 +1194,7 @@ index ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4695,12 +4708,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4728,12 +4741,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          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/0978-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0979-API-for-updating-recipes-on-clients.patch b/patches/server/0980-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0979-API-for-updating-recipes-on-clients.patch
rename to patches/server/0980-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0981-Only-capture-actual-tree-growth.patch b/patches/server/0982-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0981-Only-capture-actual-tree-growth.patch
rename to patches/server/0982-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0984-Use-correct-seed-on-api-world-load.patch b/patches/server/0985-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0984-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0985-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0986-Cache-map-ids-on-item-frames.patch b/patches/server/0987-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0986-Cache-map-ids-on-item-frames.patch
rename to patches/server/0987-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch b/patches/server/0988-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0987-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0988-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0988-Bandaid-fix-for-Effect.patch b/patches/server/0989-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0988-Bandaid-fix-for-Effect.patch
rename to patches/server/0989-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0989-SculkCatalyst-bloom-API.patch b/patches/server/0990-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0989-SculkCatalyst-bloom-API.patch
rename to patches/server/0990-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 97%
rename from patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 5c6a1cc370..2fc87d7e76 100644
--- a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0992-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 3d5f992c2f4a8df1cf0db1c209e2cce19e214b8a..91549ce95c4829f2262ccddf51372b1c858da15c 100644
+index 94e85e208be6e54e399201ac8de71f6c720ce8f1..3450aec7094e9dc5c0ac9f2a1baca147792c5ed0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -313,8 +313,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -393,8 +393,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
      }
  
diff --git a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 90%
rename from patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
index a69e34ff7d..2070f08948 100644
--- a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0997-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 91549ce95c4829f2262ccddf51372b1c858da15c..dcf12bea1759d851d663896938ea101303ab63a5 100644
+index 3450aec7094e9dc5c0ac9f2a1baca147792c5ed0..0b9b3c0307a72280cd242f20e2f035cd875aa0da 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1293,6 +1293,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1429,6 +1429,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/0997-Add-Listing-API-for-Player.patch b/patches/server/0998-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0997-Add-Listing-API-for-Player.patch
rename to patches/server/0998-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0998-Configurable-Region-Compression-Format.patch b/patches/server/0999-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0998-Configurable-Region-Compression-Format.patch
rename to patches/server/0999-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1001-Expand-Pose-API.patch b/patches/server/1002-Expand-Pose-API.patch
similarity index 90%
rename from patches/server/1001-Expand-Pose-API.patch
rename to patches/server/1002-Expand-Pose-API.patch
index 509291831f..640a732bfc 100644
--- a/patches/server/1001-Expand-Pose-API.patch
+++ b/patches/server/1002-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 426023af3cbed9c17048e669c87a1c66bda4ad1b..f20ae9153b7098980ce6c0e75fcbbb4da652661b 100644
+index 9132d514574982f5012520031e82469e2c78fe55..a2ffbad37ac3807bed44a0198b0fc5e2745d298d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -416,6 +416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
      public boolean collidingWithWorldBorder; // Paper
@@ -16,7 +16,7 @@ index 426023af3cbed9c17048e669c87a1c66bda4ad1b..f20ae9153b7098980ce6c0e75fcbbb4d
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -668,6 +669,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -701,6 +702,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void onClientRemoval() {}
  
      public void setPose(net.minecraft.world.entity.Pose pose) {
diff --git a/patches/server/1002-More-DragonBattle-API.patch b/patches/server/1003-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/1002-More-DragonBattle-API.patch
rename to patches/server/1003-More-DragonBattle-API.patch
diff --git a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/1003-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1004-Add-PlayerPickItemEvent.patch b/patches/server/1005-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/1004-Add-PlayerPickItemEvent.patch
rename to patches/server/1005-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1005-Improve-performance-of-mass-crafts.patch b/patches/server/1006-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1005-Improve-performance-of-mass-crafts.patch
rename to patches/server/1006-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1006-Allow-trident-custom-damage.patch b/patches/server/1007-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/1006-Allow-trident-custom-damage.patch
rename to patches/server/1007-Allow-trident-custom-damage.patch
diff --git a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch b/patches/server/1009-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/1008-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/1009-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch b/patches/server/1010-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/1009-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1010-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1010-Fix-inventory-desync.patch b/patches/server/1011-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1010-Fix-inventory-desync.patch
rename to patches/server/1011-Fix-inventory-desync.patch
diff --git a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch b/patches/server/1013-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1012-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1013-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch b/patches/server/1020-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1019-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1020-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1023-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1022-Actually-optimise-explosions.patch
rename to patches/server/1023-Actually-optimise-explosions.patch