From 902691b636614df08ba407823109b44be47f2277 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:21:20 -0700
Subject: [PATCH] Apply last patch

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

diff --git a/patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 84%
rename from patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
index 05af350a50..8babab18ba 100644
--- a/patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,21 +6,13 @@ 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 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218bb96a97e9 100644
+index 8d8bb430e44d7608a8aa44c7feb41797b8bbfb06..8c8f4829c32d469d983b8d07a33670455cd5713d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -71,6 +71,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
- import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
- import net.minecraft.network.protocol.game.DebugPackets;
- import io.papermc.paper.util.MCUtil;
-+import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.progress.ChunkProgressListener;
- import net.minecraft.server.network.ServerPlayerConnection;
- import net.minecraft.util.CsvOutput;
-@@ -170,6 +171,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobSpawnMap; // this map is absent from updateMaps since it's controlled at the start of the chunkproviderserver tick
-     public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerChunkTickRangeMap;
-     // Paper end - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
+@@ -157,6 +157,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<>();
 +    // Paper start - use distance map to optimise tracker
 +    public static boolean isLegacyTrackingEntity(Entity entity) {
 +        return entity.isLegacyTrackingEntity;
@@ -35,13 +27,13 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
 +    }
 +
 +    private int convertSpigotRangeToVanilla(final int vanilla) {
-+        return MinecraftServer.getServer().getScaledTrackingDistance(vanilla);
++        return net.minecraft.server.MinecraftServer.getServer().getScaledTrackingDistance(vanilla);
 +    }
 +    // Paper end - use distance map to optimise tracker
  
      void addPlayerToDistanceMaps(ServerPlayer player) {
-         this.playerChunkManager.addPlayer(player); // Paper - replace chunk loader
-@@ -182,6 +200,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         this.level.playerChunkLoader.addPlayer(player); // Paper - replace chunk loader
+@@ -168,6 +185,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
@@ -56,7 +48,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
      }
  
      void removePlayerFromDistanceMaps(ServerPlayer player) {
-@@ -196,6 +222,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -178,6 +203,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.playerMobDistanceMap.remove(player);
          }
          // Paper end - per player mob spawning
@@ -68,7 +60,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
      }
  
      void updateMaps(ServerPlayer player) {
-@@ -209,6 +240,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -190,6 +220,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
@@ -83,7 +75,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
      }
      // Paper end
      // Paper start
-@@ -295,6 +334,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -276,6 +314,45 @@ 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
@@ -126,10 +118,10 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
 +            this.playerEntityTrackerTrackMaps[ordinal] = new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets);
 +        }
 +        // Paper end - use distance map to optimise entity tracker
-         // Paper start - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
-         this.playerChunkTickRangeMap = new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets,
-             (ServerPlayer player, int rangeX, int rangeZ, int currPosX, int currPosZ, int prevPosX, int prevPosZ,
-@@ -1001,17 +1079,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+ 
+     protected ChunkGenerator generator() {
+@@ -960,17 +1037,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public void move(ServerPlayer player) {
@@ -148,7 +140,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
  
          int i = SectionPos.blockToSectionCoord(player.getBlockX());
          int j = SectionPos.blockToSectionCoord(player.getBlockZ());
-@@ -1110,7 +1178,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1054,7 +1121,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);
@@ -157,7 +149,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
                      if (entity instanceof ServerPlayer) {
                          ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -1154,7 +1222,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1098,7 +1165,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          entity.tracker = null; // Paper - We're no longer tracked
      }
  
@@ -195,9 +187,9 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
-@@ -1261,46 +1359,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         }));
-         // Paper end
+@@ -1200,46 +1297,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ 
+         player.trackChunk(chunk.getPos(), (Packet) cachedDataPacket.getValue());
          DebugPackets.sendPoiPacketsForChunk(this.level, chunk.getPos());
 -        List<Entity> list = Lists.newArrayList();
 -        List<Entity> list1 = Lists.newArrayList();
@@ -243,7 +235,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
  
      }
  
-@@ -1355,6 +1414,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1294,6 +1352,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.lastSectionPos = SectionPos.of((EntityAccess) entity);
          }
  
@@ -287,7 +279,7 @@ index 4b7c39595302a738e6d4a1749473ef9c81f84fea..503a642165f6f1292c07e8a9e618218b
              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 04a388bd3a89a27f0b75134ef781b5e22da633de..2c9a829c3376e8767627fc94bb063486c7d0d81c 100644
+index 909d0c96840724033bd907560db46d4cbb7f41aa..a9a845f6a7967d306ec935c4f32414053da591f0 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;
@@ -298,7 +290,7 @@ index 04a388bd3a89a27f0b75134ef781b5e22da633de..2c9a829c3376e8767627fc94bb063486
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.server.level.ServerPlayer;
-@@ -477,6 +478,38 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -481,6 +482,38 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public boolean updatingSectionStatus = false;
      // Paper end
@@ -338,22 +330,10 @@ index 04a388bd3a89a27f0b75134ef781b5e22da633de..2c9a829c3376e8767627fc94bb063486
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 71225959e1b17974374b1fb998de573ea55d85a4..6ac5de214d0da921d0d0c822e7063f6738788cac 100644
+index 172d231adecf043f9f06b7f5e0365ae82327998d..8fca15099952626ee537f5ce3eefdfaa6518dc1b 100644
 --- a/src/main/java/org/spigotmc/TrackingRange.java
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
-@@ -25,6 +25,7 @@ public class TrackingRange
-         {
-             return defaultRange;
-         }
-+        if (entity instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon) return defaultRange; // Paper - enderdragon is exempt
-         SpigotWorldConfig config = entity.level.spigotConfig;
-         if ( entity instanceof ServerPlayer )
-         {
-@@ -51,8 +52,48 @@ public class TrackingRange
-             return config.displayTrackingRange;
-         } else
-         {
--            if (entity instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon) return ((net.minecraft.server.level.ServerLevel)(entity.getCommandSenderWorld())).getChunkSource().chunkMap.getEffectiveViewDistance(); // Paper - enderdragon is exempt
+@@ -55,4 +55,45 @@ public class TrackingRange
              return config.otherTrackingRange;
          }
      }
diff --git a/patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0414-Improve-Arrow-API.patch b/patches/server/0415-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0414-Improve-Arrow-API.patch
rename to patches/server/0415-Improve-Arrow-API.patch
diff --git a/patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0417-Add-permission-for-command-blocks.patch b/patches/server/0418-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0417-Add-permission-for-command-blocks.patch
rename to patches/server/0418-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 87%
rename from patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
index 33c025a1f1..8532475e71 100644
--- a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0419-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 909d0c96840724033bd907560db46d4cbb7f41aa..09d25fd53e7b8323531b42331065c0be55116331 100644
+index a9a845f6a7967d306ec935c4f32414053da591f0..886db1055c69f2b0ce7a5bf61e53d3b1119d2c19 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 909d0c96840724033bd907560db46d4cbb7f41aa..09d25fd53e7b8323531b42331065c0be
      }
  
      protected AABB makeBoundingBox() {
-@@ -4174,6 +4174,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4207,6 +4207,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -31,7 +31,7 @@ index 909d0c96840724033bd907560db46d4cbb7f41aa..09d25fd53e7b8323531b42331065c0be
          // 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());
-@@ -4197,6 +4202,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4230,6 +4235,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0420-Paper-dumpitem-command.patch b/patches/server/0421-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0420-Paper-dumpitem-command.patch
rename to patches/server/0421-Paper-dumpitem-command.patch
diff --git a/patches/server/0421-Improve-Legacy-Component-serialization-size.patch b/patches/server/0422-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0421-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0422-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0423-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0422-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0423-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0424-incremental-chunk-and-player-saving.patch b/patches/server/0425-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0424-incremental-chunk-and-player-saving.patch
rename to patches/server/0425-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0425-Support-old-UUID-format-for-NBT.patch b/patches/server/0426-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0425-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0426-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0426-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0426-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0428-Remove-some-streams-from-structures.patch b/patches/server/0429-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0428-Remove-some-streams-from-structures.patch
rename to patches/server/0429-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0430-Support-components-in-ItemMeta.patch b/patches/server/0431-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0430-Support-components-in-ItemMeta.patch
rename to patches/server/0431-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0432-Add-entity-liquid-API.patch b/patches/server/0433-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0432-Add-entity-liquid-API.patch
rename to patches/server/0433-Add-entity-liquid-API.patch
diff --git a/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0433-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0434-Spawn-player-in-correct-world-on-login.patch b/patches/server/0435-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0434-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0435-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0435-Add-PrepareResultEvent.patch b/patches/server/0436-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0435-Add-PrepareResultEvent.patch
rename to patches/server/0436-Add-PrepareResultEvent.patch
diff --git a/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0440-Fix-SPIGOT-5989.patch b/patches/server/0441-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0440-Fix-SPIGOT-5989.patch
rename to patches/server/0441-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0444-Fix-some-rails-connecting-improperly.patch b/patches/server/0445-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0444-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0445-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0447-Brand-support.patch b/patches/server/0448-Brand-support.patch
similarity index 100%
rename from patches/server/0447-Brand-support.patch
rename to patches/server/0448-Brand-support.patch
diff --git a/patches/server/0448-Add-setMaxPlayers-API.patch b/patches/server/0449-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0448-Add-setMaxPlayers-API.patch
rename to patches/server/0449-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0450-Don-t-require-FACING-data.patch b/patches/server/0451-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0450-Don-t-require-FACING-data.patch
rename to patches/server/0451-Don-t-require-FACING-data.patch
diff --git a/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0452-Add-moon-phase-API.patch b/patches/server/0453-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0452-Add-moon-phase-API.patch
rename to patches/server/0453-Add-moon-phase-API.patch
diff --git a/patches/server/0453-Prevent-headless-pistons-from-being-created.patch b/patches/server/0454-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0453-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0454-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0454-Add-BellRingEvent.patch b/patches/server/0455-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0454-Add-BellRingEvent.patch
rename to patches/server/0455-Add-BellRingEvent.patch
diff --git a/patches/server/0455-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0456-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0455-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0456-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0456-Buffer-joins-to-world.patch b/patches/server/0457-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0456-Buffer-joins-to-world.patch
rename to patches/server/0457-Buffer-joins-to-world.patch
diff --git a/patches/server/0457-Eigencraft-redstone-implementation.patch b/patches/server/0458-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0457-Eigencraft-redstone-implementation.patch
rename to patches/server/0458-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0459-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0459-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0460-Fix-CraftTeam-null-check.patch b/patches/server/0461-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0460-Fix-CraftTeam-null-check.patch
rename to patches/server/0461-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0461-Add-more-Evoker-API.patch b/patches/server/0462-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0461-Add-more-Evoker-API.patch
rename to patches/server/0462-Add-more-Evoker-API.patch
diff --git a/patches/server/0462-Add-methods-to-get-translation-keys.patch b/patches/server/0463-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0462-Add-methods-to-get-translation-keys.patch
rename to patches/server/0463-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0463-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0464-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0463-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0464-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0464-Cache-block-data-strings.patch b/patches/server/0465-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0464-Cache-block-data-strings.patch
rename to patches/server/0465-Cache-block-data-strings.patch
diff --git a/patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 95%
rename from patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 226e7682e7..ef5be15ed7 100644
--- a/patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,10 +31,10 @@ index 600758b91ed8197ef615368e1ef5315dfa9666c6..e178effe00488139a250937a17144f77
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 09d25fd53e7b8323531b42331065c0be55116331..9bbd29f226b651afeb0db9e012b5e01da53df69b 100644
+index 886db1055c69f2b0ce7a5bf61e53d3b1119d2c19..d3088ffcf5f92ff5c49fe8b25292ef176ac6c3f3 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 09d25fd53e7b8323531b42331065c0be55116331..9bbd29f226b651afeb0db9e012b5e01d
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1823,6 +1824,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1856,6 +1857,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/0466-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0467-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0466-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0467-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0467-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0468-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0467-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0468-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0469-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0469-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0470-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0470-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 7196ebdbd3..361f28f1ff 100644
--- a/patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0470-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 9bbd29f226b651afeb0db9e012b5e01da53df69b..444407332d2663384b75769f701f8bf368bd4ed1 100644
+index d3088ffcf5f92ff5c49fe8b25292ef176ac6c3f3..93a8ff684cf88ee7693ed308020d02cb18ded06f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4411,4 +4411,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4444,4 +4444,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0470-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0471-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0470-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0471-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0471-Entity-isTicking.patch b/patches/server/0472-Entity-isTicking.patch
similarity index 89%
rename from patches/server/0471-Entity-isTicking.patch
rename to patches/server/0472-Entity-isTicking.patch
index f6c27ab25f..4ff9de14be 100644
--- a/patches/server/0471-Entity-isTicking.patch
+++ b/patches/server/0472-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 444407332d2663384b75769f701f8bf368bd4ed1..bae55a65fbd8c270395c9b56d129814fb1614520 100644
+index 93a8ff684cf88ee7693ed308020d02cb18ded06f..13459fec2555049dccc9b0437d42fd28f823dc46 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4416,5 +4416,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4449,5 +4449,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0472-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0473-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0472-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0473-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0473-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0474-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0473-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0474-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0474-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0475-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0474-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0475-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0476-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0476-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0476-Optimise-getType-calls.patch b/patches/server/0477-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0476-Optimise-getType-calls.patch
rename to patches/server/0477-Optimise-getType-calls.patch
diff --git a/patches/server/0477-Villager-resetOffers.patch b/patches/server/0478-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0477-Villager-resetOffers.patch
rename to patches/server/0478-Villager-resetOffers.patch
diff --git a/patches/server/0478-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0479-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0478-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0479-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0479-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0480-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0479-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0480-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0480-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0481-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0480-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0481-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0481-Player-elytra-boost-API.patch b/patches/server/0482-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0481-Player-elytra-boost-API.patch
rename to patches/server/0482-Player-elytra-boost-API.patch
diff --git a/patches/server/0482-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0483-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0482-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0483-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0483-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0484-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0483-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0484-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0484-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0485-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0484-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0485-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0485-Add-ignore-discounts-API.patch b/patches/server/0486-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0485-Add-ignore-discounts-API.patch
rename to patches/server/0486-Add-ignore-discounts-API.patch
diff --git a/patches/server/0486-Toggle-for-removing-existing-dragon.patch b/patches/server/0487-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0486-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0487-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0487-Fix-client-lag-on-advancement-loading.patch b/patches/server/0488-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0487-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0488-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0488-Item-no-age-no-player-pickup.patch b/patches/server/0489-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0488-Item-no-age-no-player-pickup.patch
rename to patches/server/0489-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0489-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0490-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0489-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0490-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0490-Beacon-API-custom-effect-ranges.patch b/patches/server/0491-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0490-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0491-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0491-Add-API-for-quit-reason.patch b/patches/server/0492-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0491-Add-API-for-quit-reason.patch
rename to patches/server/0492-Add-API-for-quit-reason.patch
diff --git a/patches/server/0492-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0493-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0492-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0493-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0493-Expose-world-spawn-angle.patch b/patches/server/0494-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0493-Expose-world-spawn-angle.patch
rename to patches/server/0494-Expose-world-spawn-angle.patch
diff --git a/patches/server/0494-Add-Destroy-Speed-API.patch b/patches/server/0495-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0494-Add-Destroy-Speed-API.patch
rename to patches/server/0495-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0496-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0496-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0496-Add-LivingEntity-clearActiveItem.patch b/patches/server/0497-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0496-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0497-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0497-Add-PlayerItemCooldownEvent.patch b/patches/server/0498-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0497-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0498-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0498-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0499-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0498-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0499-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0499-More-lightning-API.patch b/patches/server/0500-More-lightning-API.patch
similarity index 100%
rename from patches/server/0499-More-lightning-API.patch
rename to patches/server/0500-More-lightning-API.patch
diff --git a/patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0501-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0501-Climbing-should-not-bypass-cramming-gamerule.patch
index aa8f094a05..225c8b73c5 100644
--- a/patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0501-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 bae55a65fbd8c270395c9b56d129814fb1614520..01ab92e1e0c316ef262ea53a4b534dbd71052f7a 100644
+index 13459fec2555049dccc9b0437d42fd28f823dc46..75c54f74290d98606661b74b14757c5731cdf848 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2016,6 +2016,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2049,6 +2049,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean isPushable() {
diff --git a/patches/server/0501-Added-missing-default-perms-for-commands.patch b/patches/server/0502-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0501-Added-missing-default-perms-for-commands.patch
rename to patches/server/0502-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0502-Add-PlayerShearBlockEvent.patch b/patches/server/0503-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0502-Add-PlayerShearBlockEvent.patch
rename to patches/server/0503-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0503-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0504-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0503-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0504-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0504-Limit-recipe-packets.patch b/patches/server/0505-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0504-Limit-recipe-packets.patch
rename to patches/server/0505-Limit-recipe-packets.patch
diff --git a/patches/server/0505-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0506-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0505-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0506-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0506-Player-Chunk-Load-Unload-Events.patch b/patches/server/0507-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0506-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0507-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0507-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0508-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0507-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0508-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0508-Expose-LivingEntity-hurt-direction.patch b/patches/server/0509-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0508-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0509-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0510-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0510-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0510-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0511-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0510-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0511-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0511-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0512-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0511-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0512-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0512-Implement-TargetHitEvent.patch b/patches/server/0513-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0512-Implement-TargetHitEvent.patch
rename to patches/server/0513-Implement-TargetHitEvent.patch
diff --git a/patches/server/0513-MC-4-Fix-item-position-desync.patch b/patches/server/0514-MC-4-Fix-item-position-desync.patch
similarity index 93%
rename from patches/server/0513-MC-4-Fix-item-position-desync.patch
rename to patches/server/0514-MC-4-Fix-item-position-desync.patch
index b7970f998b..f226056cc2 100644
--- a/patches/server/0513-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0514-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 5ca3ad7b3d7606accd0a58b3c708fadb349608f7..4b6e0fe2fabcc55007fd8979e81f66df
  
      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 01ab92e1e0c316ef262ea53a4b534dbd71052f7a..6d255ef2b70840933639338cf0bc10fc130d8f9d 100644
+index 75c54f74290d98606661b74b14757c5731cdf848..76955c2bc82a9daa4bec780989bff2f1a168a85e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4199,6 +4199,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4232,6 +4232,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0514-Additional-Block-Material-API-s.patch b/patches/server/0515-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0514-Additional-Block-Material-API-s.patch
rename to patches/server/0515-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0515-Fix-harming-potion-dupe.patch b/patches/server/0516-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0515-Fix-harming-potion-dupe.patch
rename to patches/server/0516-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0516-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0517-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0516-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0517-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0517-Cache-burn-durations.patch b/patches/server/0518-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0517-Cache-burn-durations.patch
rename to patches/server/0518-Cache-burn-durations.patch
diff --git a/patches/server/0518-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0519-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0518-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0519-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0519-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0520-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0519-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0520-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0520-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0521-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0520-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0521-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0522-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0522-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0522-Zombie-API-breaking-doors.patch b/patches/server/0523-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0522-Zombie-API-breaking-doors.patch
rename to patches/server/0523-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0523-Fix-nerfed-slime-when-splitting.patch b/patches/server/0524-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0523-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0524-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0524-Add-EntityLoadCrossbowEvent.patch b/patches/server/0525-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0524-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0525-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0525-Added-WorldGameRuleChangeEvent.patch b/patches/server/0526-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0525-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0526-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0526-Added-ServerResourcesReloadedEvent.patch b/patches/server/0527-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0526-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0527-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0527-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0528-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0527-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0528-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0529-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0528-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0529-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0529-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0530-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0529-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0530-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0530-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0531-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0530-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0531-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0531-Configurable-door-breaking-difficulty.patch b/patches/server/0532-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0531-Configurable-door-breaking-difficulty.patch
rename to patches/server/0532-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0532-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0533-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0532-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0533-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0534-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0534-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0534-Remove-stale-POIs.patch b/patches/server/0535-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0534-Remove-stale-POIs.patch
rename to patches/server/0535-Remove-stale-POIs.patch
diff --git a/patches/server/0535-Fix-villager-boat-exploit.patch b/patches/server/0536-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0535-Fix-villager-boat-exploit.patch
rename to patches/server/0536-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0536-Add-sendOpLevel-API.patch b/patches/server/0537-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0536-Add-sendOpLevel-API.patch
rename to patches/server/0537-Add-sendOpLevel-API.patch
diff --git a/patches/server/0537-TODO-Registry-Modification-API.patch b/patches/server/0538-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0537-TODO-Registry-Modification-API.patch
rename to patches/server/0538-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0538-Add-StructuresLocateEvent.patch b/patches/server/0539-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0538-Add-StructuresLocateEvent.patch
rename to patches/server/0539-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0539-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0540-Collision-option-for-requiring-a-player-participant.patch
similarity index 94%
rename from patches/server/0539-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0540-Collision-option-for-requiring-a-player-participant.patch
index 135964c856..c99dd0c6e5 100644
--- a/patches/server/0539-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0540-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 6d255ef2b70840933639338cf0bc10fc130d8f9d..39e237e14768f86f03bfc2a9b8fdf53f2077ad6b 100644
+index 76955c2bc82a9daa4bec780989bff2f1a168a85e..a500f4becd7f97038734b460c33832388f5ca17a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1886,6 +1886,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1919,6 +1919,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/0540-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0541-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0540-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0541-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0541-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0542-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0541-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0542-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0542-Make-schedule-command-per-world.patch b/patches/server/0543-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0542-Make-schedule-command-per-world.patch
rename to patches/server/0543-Make-schedule-command-per-world.patch
diff --git a/patches/server/0543-Configurable-max-leash-distance.patch b/patches/server/0544-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0543-Configurable-max-leash-distance.patch
rename to patches/server/0544-Configurable-max-leash-distance.patch
diff --git a/patches/server/0544-Implement-BlockPreDispenseEvent.patch b/patches/server/0545-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0544-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0545-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0545-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0546-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0545-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0546-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0546-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0547-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0546-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0547-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0547-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0548-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0547-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0548-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0549-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0549-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0549-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0550-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0549-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0550-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0550-add-DragonEggFormEvent.patch b/patches/server/0551-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0550-add-DragonEggFormEvent.patch
rename to patches/server/0551-add-DragonEggFormEvent.patch
diff --git a/patches/server/0551-EntityMoveEvent.patch b/patches/server/0552-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0551-EntityMoveEvent.patch
rename to patches/server/0552-EntityMoveEvent.patch
diff --git a/patches/server/0552-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0553-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0552-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0553-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0553-Inline-shift-direction-fields.patch b/patches/server/0554-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0553-Inline-shift-direction-fields.patch
rename to patches/server/0554-Inline-shift-direction-fields.patch
diff --git a/patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0555-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0555-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0555-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0556-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0555-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0556-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0556-living-entity-allow-attribute-registration.patch b/patches/server/0557-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0556-living-entity-allow-attribute-registration.patch
rename to patches/server/0557-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0557-fix-dead-slime-setSize-invincibility.patch b/patches/server/0558-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0557-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0558-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0558-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0559-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0558-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0559-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0559-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0560-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0559-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0560-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0560-Expose-Tracked-Players.patch b/patches/server/0561-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0560-Expose-Tracked-Players.patch
rename to patches/server/0561-Expose-Tracked-Players.patch
diff --git a/patches/server/0561-Remove-streams-from-SensorNearest.patch b/patches/server/0562-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0561-Remove-streams-from-SensorNearest.patch
rename to patches/server/0562-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0562-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0562-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0563-Improve-ServerGUI.patch b/patches/server/0564-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0563-Improve-ServerGUI.patch
rename to patches/server/0564-Improve-ServerGUI.patch
diff --git a/patches/server/0564-fix-converting-txt-to-json-file.patch b/patches/server/0565-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0564-fix-converting-txt-to-json-file.patch
rename to patches/server/0565-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0565-Add-worldborder-events.patch b/patches/server/0566-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0565-Add-worldborder-events.patch
rename to patches/server/0566-Add-worldborder-events.patch
diff --git a/patches/server/0566-added-PlayerNameEntityEvent.patch b/patches/server/0567-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0566-added-PlayerNameEntityEvent.patch
rename to patches/server/0567-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0567-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0568-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0567-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0568-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0568-Add-recipe-to-cook-events.patch b/patches/server/0569-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0568-Add-recipe-to-cook-events.patch
rename to patches/server/0569-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0569-Add-Block-isValidTool.patch b/patches/server/0570-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0569-Add-Block-isValidTool.patch
rename to patches/server/0570-Add-Block-isValidTool.patch
diff --git a/patches/server/0570-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0571-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0570-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0571-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0571-Expand-world-key-API.patch b/patches/server/0572-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0571-Expand-world-key-API.patch
rename to patches/server/0572-Expand-world-key-API.patch
diff --git a/patches/server/0572-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0572-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0573-Item-Rarity-API.patch b/patches/server/0574-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0573-Item-Rarity-API.patch
rename to patches/server/0574-Item-Rarity-API.patch
diff --git a/patches/server/0574-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0574-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0575-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0576-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0575-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0576-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0576-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0576-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0577-Expose-protocol-version.patch b/patches/server/0578-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0577-Expose-protocol-version.patch
rename to patches/server/0578-Expose-protocol-version.patch
diff --git a/patches/server/0578-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0579-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0578-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0579-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0579-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0579-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0580-Add-bypass-host-check.patch b/patches/server/0581-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0580-Add-bypass-host-check.patch
rename to patches/server/0581-Add-bypass-host-check.patch
diff --git a/patches/server/0581-Set-area-affect-cloud-rotation.patch b/patches/server/0582-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0581-Set-area-affect-cloud-rotation.patch
rename to patches/server/0582-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0582-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0583-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0582-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0583-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0583-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0584-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0583-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0584-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0584-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0585-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0584-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0585-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0585-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0586-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0585-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0586-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0586-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0586-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0587-Added-PlayerDeepSleepEvent.patch b/patches/server/0588-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0587-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0588-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0588-More-World-API.patch b/patches/server/0589-More-World-API.patch
similarity index 100%
rename from patches/server/0588-More-World-API.patch
rename to patches/server/0589-More-World-API.patch
diff --git a/patches/server/0589-Added-PlayerBedFailEnterEvent.patch b/patches/server/0590-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0589-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0590-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0590-Entity-load-save-limit-per-chunk.patch b/patches/server/0591-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0590-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0591-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0591-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0592-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0591-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0592-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0592-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0592-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0593-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0594-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0593-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0594-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0594-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0594-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0595-Add-Channel-initialization-listeners.patch b/patches/server/0596-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0595-Add-Channel-initialization-listeners.patch
rename to patches/server/0596-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0596-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0597-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0596-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0597-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0597-Add-more-WanderingTrader-API.patch b/patches/server/0598-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0597-Add-more-WanderingTrader-API.patch
rename to patches/server/0598-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0598-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0599-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0598-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0599-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0599-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0599-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0600-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0600-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0601-Inventory-close.patch b/patches/server/0602-Inventory-close.patch
similarity index 100%
rename from patches/server/0601-Inventory-close.patch
rename to patches/server/0602-Inventory-close.patch
diff --git a/patches/server/0602-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0602-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0603-Fix-CraftPotionBrewer-cache.patch b/patches/server/0604-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0603-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0604-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0604-Add-basic-Datapack-API.patch b/patches/server/0605-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0604-Add-basic-Datapack-API.patch
rename to patches/server/0605-Add-basic-Datapack-API.patch
diff --git a/patches/server/0605-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0606-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0605-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0606-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0606-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0606-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0607-ItemStack-repair-check-API.patch b/patches/server/0608-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0607-ItemStack-repair-check-API.patch
rename to patches/server/0608-ItemStack-repair-check-API.patch
diff --git a/patches/server/0608-More-Enchantment-API.patch b/patches/server/0609-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0608-More-Enchantment-API.patch
rename to patches/server/0609-More-Enchantment-API.patch
diff --git a/patches/server/0609-Move-range-check-for-block-placing-up.patch b/patches/server/0610-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0609-Move-range-check-for-block-placing-up.patch
rename to patches/server/0610-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0610-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0611-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0610-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0611-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0611-Add-Mob-lookAt-API.patch b/patches/server/0612-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0611-Add-Mob-lookAt-API.patch
rename to patches/server/0612-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0612-Add-Unix-domain-socket-support.patch b/patches/server/0613-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0612-Add-Unix-domain-socket-support.patch
rename to patches/server/0613-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0613-Add-EntityInsideBlockEvent.patch b/patches/server/0614-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0613-Add-EntityInsideBlockEvent.patch
rename to patches/server/0614-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0614-Attributes-API-for-item-defaults.patch b/patches/server/0615-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0614-Attributes-API-for-item-defaults.patch
rename to patches/server/0615-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0615-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0615-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0616-More-Lidded-Block-API.patch b/patches/server/0617-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0616-More-Lidded-Block-API.patch
rename to patches/server/0617-More-Lidded-Block-API.patch
diff --git a/patches/server/0617-Limit-item-frame-cursors-on-maps.patch b/patches/server/0618-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0617-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0618-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0618-Add-PlayerKickEvent-causes.patch b/patches/server/0619-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0618-Add-PlayerKickEvent-causes.patch
rename to patches/server/0619-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0619-Add-PufferFishStateChangeEvent.patch b/patches/server/0620-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0619-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0620-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0620-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0620-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0621-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0621-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0622-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0622-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0623-Add-BellRevealRaiderEvent.patch b/patches/server/0624-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0623-Add-BellRevealRaiderEvent.patch
rename to patches/server/0624-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0624-Fix-invulnerable-end-crystals.patch b/patches/server/0625-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0624-Fix-invulnerable-end-crystals.patch
rename to patches/server/0625-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0625-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0626-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0625-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0626-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0626-Fix-dangerous-end-portal-logic.patch b/patches/server/0627-Fix-dangerous-end-portal-logic.patch
similarity index 90%
rename from patches/server/0626-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0627-Fix-dangerous-end-portal-logic.patch
index cfb3e53f8e..79d4ba5f81 100644
--- a/patches/server/0626-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0627-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 39e237e14768f86f03bfc2a9b8fdf53f2077ad6b..7b7946244d496891bc43ef6ea126c1fa52551138 100644
+index a500f4becd7f97038734b460c33832388f5ca17a..5277a260f1734051033159ebe2e4af18d48b2097 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 39e237e14768f86f03bfc2a9b8fdf53f2077ad6b..7b7946244d496891bc43ef6ea126c1fa
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -2817,6 +2847,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2850,6 +2880,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0627-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0627-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0628-Make-item-validations-configurable.patch b/patches/server/0629-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0628-Make-item-validations-configurable.patch
rename to patches/server/0629-Make-item-validations-configurable.patch
diff --git a/patches/server/0629-Line-Of-Sight-Changes.patch b/patches/server/0630-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0629-Line-Of-Sight-Changes.patch
rename to patches/server/0630-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0630-add-per-world-spawn-limits.patch b/patches/server/0631-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0630-add-per-world-spawn-limits.patch
rename to patches/server/0631-add-per-world-spawn-limits.patch
diff --git a/patches/server/0631-Fix-potions-splash-events.patch b/patches/server/0632-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0631-Fix-potions-splash-events.patch
rename to patches/server/0632-Fix-potions-splash-events.patch
diff --git a/patches/server/0632-Add-more-LimitedRegion-API.patch b/patches/server/0633-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0632-Add-more-LimitedRegion-API.patch
rename to patches/server/0633-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0633-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0634-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0633-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0634-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0634-Missing-Entity-Behavior-API.patch b/patches/server/0635-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0634-Missing-Entity-Behavior-API.patch
rename to patches/server/0635-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0635-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0635-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0636-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0636-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0637-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0637-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0638-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0639-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0638-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0639-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0639-Adds-PlayerArmSwingEvent.patch b/patches/server/0640-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0639-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0640-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0640-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0640-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0641-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0641-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0642-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0643-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0642-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0643-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0643-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0644-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0643-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0644-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0644-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0644-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0645-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0645-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0646-Stinger-API.patch b/patches/server/0647-Stinger-API.patch
similarity index 100%
rename from patches/server/0646-Stinger-API.patch
rename to patches/server/0647-Stinger-API.patch
diff --git a/patches/server/0647-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0647-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0648-Add-System.out-err-catcher.patch b/patches/server/0649-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0648-Add-System.out-err-catcher.patch
rename to patches/server/0649-Add-System.out-err-catcher.patch
diff --git a/patches/server/0649-Fix-test-not-bootstrapping.patch b/patches/server/0650-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0649-Fix-test-not-bootstrapping.patch
rename to patches/server/0650-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0650-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0650-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0651-Improve-boat-collision-performance.patch b/patches/server/0652-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0651-Improve-boat-collision-performance.patch
rename to patches/server/0652-Improve-boat-collision-performance.patch
diff --git a/patches/server/0652-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0652-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0653-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0653-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0654-Add-PlayerSetSpawnEvent.patch b/patches/server/0655-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0654-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0655-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0655-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0655-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0656-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0657-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0656-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0657-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0657-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0658-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0657-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0658-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0658-Added-EntityDamageItemEvent.patch b/patches/server/0659-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0658-Added-EntityDamageItemEvent.patch
rename to patches/server/0659-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0659-Optimize-indirect-passenger-iteration.patch b/patches/server/0660-Optimize-indirect-passenger-iteration.patch
similarity index 90%
rename from patches/server/0659-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0660-Optimize-indirect-passenger-iteration.patch
index 99dfb9b2de..8df21dc37e 100644
--- a/patches/server/0659-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0660-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 7b7946244d496891bc43ef6ea126c1fa52551138..dcc695cc296f5a6bc152a1b68c583188756aaf0c 100644
+index 5277a260f1734051033159ebe2e4af18d48b2097..2a37fe43ef749cfa7fe7afc8899b4922fff73d86 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3860,20 +3860,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3893,20 +3893,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index 7b7946244d496891bc43ef6ea126c1fa52551138..dcc695cc296f5a6bc152a1b68c583188
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3890,6 +3904,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3923,6 +3937,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0660-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0660-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0661-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0662-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0661-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0662-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0662-Clear-bucket-NBT-after-dispense.patch b/patches/server/0663-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0662-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0663-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0663-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0663-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0664-Add-BlockBreakBlockEvent.patch b/patches/server/0665-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0664-Add-BlockBreakBlockEvent.patch
rename to patches/server/0665-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0665-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0665-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0666-More-CommandBlock-API.patch b/patches/server/0667-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0666-More-CommandBlock-API.patch
rename to patches/server/0667-More-CommandBlock-API.patch
diff --git a/patches/server/0667-Add-missing-team-sidebar-display-slots.patch b/patches/server/0668-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0667-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0668-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0668-Add-back-EntityPortalExitEvent.patch b/patches/server/0669-Add-back-EntityPortalExitEvent.patch
similarity index 93%
rename from patches/server/0668-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0669-Add-back-EntityPortalExitEvent.patch
index b4c8ce79ba..f5cef8ac0f 100644
--- a/patches/server/0668-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0669-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 dcc695cc296f5a6bc152a1b68c583188756aaf0c..c406aa0e6d3832262da7aa9c70d5da450381b63e 100644
+index 2a37fe43ef749cfa7fe7afc8899b4922fff73d86..79909f65fbfeb156d3669d31571466a6aa7ce65e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3307,6 +3307,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3340,6 +3340,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -32,7 +32,7 @@ index dcc695cc296f5a6bc152a1b68c583188756aaf0c..c406aa0e6d3832262da7aa9c70d5da45
                  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);
-@@ -3326,8 +3343,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3359,8 +3376,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0669-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0669-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0670-Get-entity-default-attributes.patch b/patches/server/0671-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0670-Get-entity-default-attributes.patch
rename to patches/server/0671-Get-entity-default-attributes.patch
diff --git a/patches/server/0671-Left-handed-API.patch b/patches/server/0672-Left-handed-API.patch
similarity index 100%
rename from patches/server/0671-Left-handed-API.patch
rename to patches/server/0672-Left-handed-API.patch
diff --git a/patches/server/0672-Add-more-advancement-API.patch b/patches/server/0673-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0672-Add-more-advancement-API.patch
rename to patches/server/0673-Add-more-advancement-API.patch
diff --git a/patches/server/0673-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0673-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0674-Add-critical-damage-API.patch b/patches/server/0675-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0674-Add-critical-damage-API.patch
rename to patches/server/0675-Add-critical-damage-API.patch
diff --git a/patches/server/0675-Fix-issues-with-mob-conversion.patch b/patches/server/0676-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0675-Fix-issues-with-mob-conversion.patch
rename to patches/server/0676-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0676-Add-isCollidable-methods-to-various-places.patch b/patches/server/0677-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0676-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0677-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0677-Goat-ram-API.patch b/patches/server/0678-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0677-Goat-ram-API.patch
rename to patches/server/0678-Goat-ram-API.patch
diff --git a/patches/server/0678-Add-API-for-resetting-a-single-score.patch b/patches/server/0679-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0678-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0679-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0679-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch
similarity index 96%
rename from patches/server/0679-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch
index 37130f2b5f..f5b6d863d8 100644
--- a/patches/server/0679-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0680-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 c406aa0e6d3832262da7aa9c70d5da450381b63e..19fc6ce5a3b87ea4a7e538c3718c130cb38e6ee6 100644
+index 79909f65fbfeb156d3669d31571466a6aa7ce65e..89dd6c49d661d156a0443db4853ccf04dd5cdc14 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2105,6 +2105,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2138,6 +2138,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  
diff --git a/patches/server/0680-Vanilla-command-permission-fixes.patch b/patches/server/0681-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0680-Vanilla-command-permission-fixes.patch
rename to patches/server/0681-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0681-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0681-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0682-Fix-GameProfileCache-concurrency.patch b/patches/server/0683-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0682-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0683-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0683-Improve-and-expand-AsyncCatcher.patch b/patches/server/0684-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0683-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0684-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0684-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0684-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0685-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0686-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0685-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0686-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0686-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0687-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0686-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0687-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0687-Optimise-general-POI-access.patch b/patches/server/0688-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0687-Optimise-general-POI-access.patch
rename to patches/server/0688-Optimise-general-POI-access.patch
diff --git a/patches/server/0688-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 95%
rename from patches/server/0688-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index bef625b150..f895b71f44 100644
--- a/patches/server/0688-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -42,13 +42,13 @@ index c5389e7f3665c06e487dfde3200b7e229694fbd2..4164204ba80f68a768de0ed1721c6447
      private final com.destroystokyo.paper.util.maplist.ReferenceList<ServerPlayer> playersSentChunkTo = new com.destroystokyo.paper.util.maplist.ReferenceList<>();
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8d8bb430e44d7608a8aa44c7feb41797b8bbfb06..f400f95309a22a4bfcef899c39e9589105e6a6f0 100644
+index 8c8f4829c32d469d983b8d07a33670455cd5713d..f3dc5f6d92ce365e302eeffa511438fc234eeca2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -157,12 +157,24 @@ 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<>();
+@@ -174,12 +174,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         return net.minecraft.server.MinecraftServer.getServer().getScaledTrackingDistance(vanilla);
+     }
+     // Paper end - use distance map to optimise tracker
 +    // Paper start - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
 +    // A note about the naming used here:
 +    // Previously, mojang used a "spawn range" of 8 for controlling both ticking and
@@ -70,7 +70,7 @@ index 8d8bb430e44d7608a8aa44c7feb41797b8bbfb06..f400f95309a22a4bfcef899c39e95891
          // Paper start - per player mob spawning
          if (this.playerMobDistanceMap != null) {
              this.playerMobDistanceMap.add(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
-@@ -173,6 +185,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -198,6 +210,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      void removePlayerFromDistanceMaps(ServerPlayer player) {
          this.level.playerChunkLoader.removePlayer(player); // Paper - replace chunk loader
  
@@ -81,7 +81,7 @@ index 8d8bb430e44d7608a8aa44c7feb41797b8bbfb06..f400f95309a22a4bfcef899c39e95891
          // Paper start - per player mob spawning
          if (this.playerMobDistanceMap != null) {
              this.playerMobDistanceMap.remove(player);
-@@ -185,6 +201,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -215,6 +231,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          int chunkZ = MCUtil.getChunkCoordinate(player.getZ());
          // Note: players need to be explicitly added to distance maps before they can be updated
          this.level.playerChunkLoader.updatePlayer(player); // Paper - replace chunk loader
@@ -89,10 +89,10 @@ index 8d8bb430e44d7608a8aa44c7feb41797b8bbfb06..f400f95309a22a4bfcef899c39e95891
          // Paper start - per player mob spawning
          if (this.playerMobDistanceMap != null) {
              this.playerMobDistanceMap.update(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
-@@ -276,6 +293,38 @@ 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
+@@ -353,6 +370,38 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             this.playerEntityTrackerTrackMaps[ordinal] = new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets);
+         }
+         // Paper end - use distance map to optimise entity tracker
 +        // Paper start - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
 +        this.playerChunkTickRangeMap = new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets,
 +            (ServerPlayer player, int rangeX, int rangeZ, int currPosX, int currPosZ, int prevPosX, int prevPosZ,
@@ -128,7 +128,7 @@ index 8d8bb430e44d7608a8aa44c7feb41797b8bbfb06..f400f95309a22a4bfcef899c39e95891
      }
  
      protected ChunkGenerator generator() {
-@@ -850,43 +899,48 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -927,43 +976,48 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
  
diff --git a/patches/server/0689-Optimise-chunk-tick-iteration.patch b/patches/server/0690-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/0689-Optimise-chunk-tick-iteration.patch
rename to patches/server/0690-Optimise-chunk-tick-iteration.patch
index 5f8687c16c..1d3294751b 100644
--- a/patches/server/0689-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0690-Optimise-chunk-tick-iteration.patch
@@ -72,7 +72,7 @@ index 4164204ba80f68a768de0ed1721c6447b972a631..4ae1ba645d9fdc1eb6d5a3e4f8ceed9b
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f400f95309a22a4bfcef899c39e9589105e6a6f0..da2fa26ddb2b801feff962d96f488239058c4be7 100644
+index f3dc5f6d92ce365e302eeffa511438fc234eeca2..3184980e7de4fd41c4bfb8a808ab419354f15a32 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -115,6 +115,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
diff --git a/patches/server/0690-Execute-chunk-tasks-mid-tick.patch b/patches/server/0691-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0690-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0691-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0692-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0693-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0692-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0693-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
similarity index 97%
rename from patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
index 9b5d3c39f6..8ddf40397d 100644
--- a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
@@ -122,10 +122,10 @@ index 0b12c1f2fab60f5832ff6a968d3a4545f42042fc..25ffcafd27b0119301faf81817e3072c
  
      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 19fc6ce5a3b87ea4a7e538c3718c130cb38e6ee6..491917c05b894cf7486513ea7aabca7995ba47b0 100644
+index 89dd6c49d661d156a0443db4853ccf04dd5cdc14..c907d7fc0af72ac8b4e36a2a9496dee29cac787b 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 19fc6ce5a3b87ea4a7e538c3718c130cb38e6ee6..491917c05b894cf7486513ea7aabca79
          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 19fc6ce5a3b87ea4a7e538c3718c130cb38e6ee6..491917c05b894cf7486513ea7aabca79
      }
  
      private boolean isStateClimbable(BlockState state) {
-@@ -4197,7 +4239,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4230,7 +4272,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void setDeltaMovement(Vec3 velocity) {
@@ -192,7 +192,7 @@ index 19fc6ce5a3b87ea4a7e538c3718c130cb38e6ee6..491917c05b894cf7486513ea7aabca79
      }
  
      public void addDeltaMovement(Vec3 velocity) {
-@@ -4283,7 +4327,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4316,7 +4360,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/0694-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0695-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0694-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0695-Manually-inline-methods-in-BlockPosition.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-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0697-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0696-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0697-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0697-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0697-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0698-Add-packet-limiter-config.patch b/patches/server/0699-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0698-Add-packet-limiter-config.patch
rename to patches/server/0699-Add-packet-limiter-config.patch
diff --git a/patches/server/0699-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0699-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0700-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0701-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0700-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0701-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0701-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0702-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0701-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0702-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0702-Time-scoreboard-search.patch b/patches/server/0703-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0702-Time-scoreboard-search.patch
rename to patches/server/0703-Time-scoreboard-search.patch
diff --git a/patches/server/0703-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0704-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0703-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0704-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0704-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0705-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0704-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0705-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0705-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0706-Oprimise-map-impl-for-tracked-players.patch
similarity index 87%
rename from patches/server/0705-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0706-Oprimise-map-impl-for-tracked-players.patch
index dc2f958295..4cb36ff7ac 100644
--- a/patches/server/0705-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0706-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 da2fa26ddb2b801feff962d96f488239058c4be7..85d5f8b52cbdcf39c0d62c3005712aa5f0bdde93 100644
+index 3184980e7de4fd41c4bfb8a808ab419354f15a32..42b383e7f23747716c89eb2de8c042ff5c35de47 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1342,7 +1342,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1400,7 +1400,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0706-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0707-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0706-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0707-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0707-Optimise-random-block-ticking.patch b/patches/server/0708-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0707-Optimise-random-block-ticking.patch
rename to patches/server/0708-Optimise-random-block-ticking.patch
diff --git a/patches/server/0708-Optimise-non-flush-packet-sending.patch b/patches/server/0709-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0708-Optimise-non-flush-packet-sending.patch
rename to patches/server/0709-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0709-Optimise-nearby-player-lookups.patch b/patches/server/0710-Optimise-nearby-player-lookups.patch
similarity index 96%
rename from patches/server/0709-Optimise-nearby-player-lookups.patch
rename to patches/server/0710-Optimise-nearby-player-lookups.patch
index 925c3d4420..744a73eba6 100644
--- a/patches/server/0709-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0710-Optimise-nearby-player-lookups.patch
@@ -39,7 +39,7 @@ index 4ae1ba645d9fdc1eb6d5a3e4f8ceed9b4841e003..e2202389a2c4133a183cca59c4e909fc
      // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 85d5f8b52cbdcf39c0d62c3005712aa5f0bdde93..4f2d6dcbd2f2e94cb82f723f88cb020bf75a7ab9 100644
+index 42b383e7f23747716c89eb2de8c042ff5c35de47..9738a74103473af0b3351a654d8e58c3e73e7194 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -157,6 +157,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -55,15 +55,15 @@ index 85d5f8b52cbdcf39c0d62c3005712aa5f0bdde93..4f2d6dcbd2f2e94cb82f723f88cb020b
  
      // Paper start - distance maps
      private final com.destroystokyo.paper.util.misc.PooledLinkedHashSets<ServerPlayer> pooledLinkedPlayerHashSets = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets<>();
-@@ -183,6 +189,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             this.playerMobDistanceMap.add(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
+@@ -208,6 +214,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             trackMap.add(player, chunkX, chunkZ, Math.min(trackRange, io.papermc.paper.chunk.system.ChunkSystem.getSendViewDistance(player)));
          }
-         // Paper end - per player mob spawning
+         // Paper end - use distance map to optimise entity tracker
 +        this.playerGeneralAreaMap.add(player, chunkX, chunkZ, GENERAL_AREA_MAP_SQUARE_RADIUS); // Paper - optimise checkDespawn
      }
  
      void removePlayerFromDistanceMaps(ServerPlayer player) {
-@@ -192,6 +199,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -217,6 +224,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.playerMobSpawnMap.remove(player);
          this.playerChunkTickRangeMap.remove(player);
          // Paper end - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
@@ -71,15 +71,15 @@ index 85d5f8b52cbdcf39c0d62c3005712aa5f0bdde93..4f2d6dcbd2f2e94cb82f723f88cb020b
          // Paper start - per player mob spawning
          if (this.playerMobDistanceMap != null) {
              this.playerMobDistanceMap.remove(player);
-@@ -210,6 +218,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             this.playerMobDistanceMap.update(player, chunkX, chunkZ, io.papermc.paper.chunk.system.ChunkSystem.getTickViewDistance(player));
+@@ -248,6 +256,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             trackMap.update(player, chunkX, chunkZ, Math.min(trackRange, io.papermc.paper.chunk.system.ChunkSystem.getSendViewDistance(player)));
          }
-         // Paper end - per player mob spawning
+         // Paper end - use distance map to optimise entity tracker
 +        this.playerGeneralAreaMap.update(player, chunkX, chunkZ, GENERAL_AREA_MAP_SQUARE_RADIUS); // Paper - optimise checkDespawn
      }
      // Paper end
      // Paper start
-@@ -328,6 +337,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -405,6 +414,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  }
              });
          // Paper end - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
diff --git a/patches/server/0710-Remove-streams-for-villager-AI.patch b/patches/server/0711-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0710-Remove-streams-for-villager-AI.patch
rename to patches/server/0711-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0711-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0712-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0711-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0712-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0712-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0712-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0713-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0714-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0713-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0714-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0714-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0714-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0715-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0716-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0715-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0716-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0716-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0716-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0717-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0717-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0718-Ensure-valid-vehicle-status.patch b/patches/server/0719-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0718-Ensure-valid-vehicle-status.patch
rename to patches/server/0719-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0719-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0720-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0719-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0720-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0720-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0720-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0721-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0722-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0721-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0722-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0722-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0723-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0722-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0723-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0723-Preserve-overstacked-loot.patch b/patches/server/0724-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0723-Preserve-overstacked-loot.patch
rename to patches/server/0724-Preserve-overstacked-loot.patch
diff --git a/patches/server/0724-Update-head-rotation-in-missing-places.patch b/patches/server/0725-Update-head-rotation-in-missing-places.patch
similarity index 84%
rename from patches/server/0724-Update-head-rotation-in-missing-places.patch
rename to patches/server/0725-Update-head-rotation-in-missing-places.patch
index df1d255c89..682fe4b2b1 100644
--- a/patches/server/0724-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0725-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 491917c05b894cf7486513ea7aabca7995ba47b0..bab43ca2c6f7ce2c789dacb7b87e3faa2153968d 100644
+index c907d7fc0af72ac8b4e36a2a9496dee29cac787b..87d5b7a3d9cb406c37982419be4d112051946deb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1870,6 +1870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1903,6 +1903,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 491917c05b894cf7486513ea7aabca7995ba47b0..bab43ca2c6f7ce2c789dacb7b87e3faa
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1908,6 +1909,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1941,6 +1942,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();
diff --git a/patches/server/0725-prevent-unintended-light-block-manipulation.patch b/patches/server/0726-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0725-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0726-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0726-Fix-CraftCriteria-defaults-map.patch b/patches/server/0727-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0726-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0727-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0727-Fix-upstreams-block-state-factories.patch b/patches/server/0728-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0727-Fix-upstreams-block-state-factories.patch
rename to patches/server/0728-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0728-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0728-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0729-Configurable-feature-seeds.patch b/patches/server/0730-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0729-Configurable-feature-seeds.patch
rename to patches/server/0730-Configurable-feature-seeds.patch
diff --git a/patches/server/0730-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0730-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0731-Add-root-admin-user-detection.patch b/patches/server/0732-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0731-Add-root-admin-user-detection.patch
rename to patches/server/0732-Add-root-admin-user-detection.patch
diff --git a/patches/server/0732-Always-allow-item-changing-in-Fireball.patch b/patches/server/0733-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0732-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0733-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0733-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch
similarity index 85%
rename from patches/server/0733-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch
index 659cb6f222..910c13ba80 100644
--- a/patches/server/0733-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0734-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 bab43ca2c6f7ce2c789dacb7b87e3faa2153968d..a271840519cabf0bc4577bf5c715a0fe2a3eff0f 100644
+index 87d5b7a3d9cb406c37982419be4d112051946deb..a648b174ba00ba2e23cbbbd34fd397f295a06390 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/0734-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0735-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0734-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0735-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0735-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0736-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0735-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0736-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0736-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0737-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0736-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0737-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0737-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0738-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0737-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0738-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0738-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0738-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0739-Fix-Spigot-growth-modifiers.patch b/patches/server/0740-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0739-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0740-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0740-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0740-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0741-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0742-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0741-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0742-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0742-Add-player-health-update-API.patch b/patches/server/0743-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0742-Add-player-health-update-API.patch
rename to patches/server/0743-Add-player-health-update-API.patch
diff --git a/patches/server/0743-Optimize-HashMapPalette.patch b/patches/server/0744-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0743-Optimize-HashMapPalette.patch
rename to patches/server/0744-Optimize-HashMapPalette.patch
diff --git a/patches/server/0744-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0744-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0745-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0745-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 678bafe2a1..3fb67b4466 100644
--- a/patches/server/0745-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1215,10 +1215,10 @@ index 5f957a28e9d30144f724ebdc581d5f0b80bf6dc1..23ab7960120c1e2a76880f634787a089
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a271840519cabf0bc4577bf5c715a0fe2a3eff0f..bb04b3d97e2f8a50ab13b785902b97ffe7191971 100644
+index a648b174ba00ba2e23cbbbd34fd397f295a06390..53e1e4ffa51b5858417862e190f0bebd1e5d340c 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));
@@ -1266,7 +1266,7 @@ index a271840519cabf0bc4577bf5c715a0fe2a3eff0f..bb04b3d97e2f8a50ab13b785902b97ff
                      if (this.remainingFireTicks <= 0) {
                          this.setRemainingFireTicks(-this.getFireImmuneTicks());
                      }
-@@ -1359,32 +1394,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1392,32 +1427,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      private Vec3 collide(Vec3 movement) {
@@ -1366,7 +1366,7 @@ index a271840519cabf0bc4577bf5c715a0fe2a3eff0f..bb04b3d97e2f8a50ab13b785902b97ff
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -2578,11 +2659,31 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2611,11 +2692,31 @@ 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/0746-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0746-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0747-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0747-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0748-Add-more-Campfire-API.patch b/patches/server/0749-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0748-Add-more-Campfire-API.patch
rename to patches/server/0749-Add-more-Campfire-API.patch
diff --git a/patches/server/0749-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0749-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0750-Fix-tripwire-state-inconsistency.patch b/patches/server/0751-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0750-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0751-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0751-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0752-Forward-CraftEntity-in-teleport-command.patch
similarity index 88%
rename from patches/server/0751-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0752-Forward-CraftEntity-in-teleport-command.patch
index a1f8b7e73b..2cbd423590 100644
--- a/patches/server/0751-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0752-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 bb04b3d97e2f8a50ab13b785902b97ffe7191971..11577de26052549c58cbf9eabf0ac14fca913f80 100644
+index 53e1e4ffa51b5858417862e190f0bebd1e5d340c..ef5e979d09df13660ac7893be1209c2c2b8a136c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3422,6 +3422,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3455,6 +3455,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index bb04b3d97e2f8a50ab13b785902b97ffe7191971..11577de26052549c58cbf9eabf0ac14f
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3503,10 +3510,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3536,10 +3543,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/0752-Improve-scoreboard-entries.patch b/patches/server/0753-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0752-Improve-scoreboard-entries.patch
rename to patches/server/0753-Improve-scoreboard-entries.patch
diff --git a/patches/server/0753-Entity-powdered-snow-API.patch b/patches/server/0754-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0753-Entity-powdered-snow-API.patch
rename to patches/server/0754-Entity-powdered-snow-API.patch
diff --git a/patches/server/0754-Add-API-for-item-entity-health.patch b/patches/server/0755-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0754-Add-API-for-item-entity-health.patch
rename to patches/server/0755-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0755-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0756-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0755-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0756-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0756-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0757-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0756-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0757-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0757-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0757-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0758-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0759-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0758-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0759-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0759-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0759-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0760-Fix-bees-aging-inside-hives.patch b/patches/server/0761-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0760-Fix-bees-aging-inside-hives.patch
rename to patches/server/0761-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0761-Bucketable-API.patch b/patches/server/0762-Bucketable-API.patch
similarity index 100%
rename from patches/server/0761-Bucketable-API.patch
rename to patches/server/0762-Bucketable-API.patch
diff --git a/patches/server/0762-Validate-usernames.patch b/patches/server/0763-Validate-usernames.patch
similarity index 100%
rename from patches/server/0762-Validate-usernames.patch
rename to patches/server/0763-Validate-usernames.patch
diff --git a/patches/server/0763-Make-water-animal-spawn-height-configurable.patch b/patches/server/0764-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0763-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0764-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0764-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0764-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0765-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0766-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0765-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0766-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0766-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0767-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0766-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0767-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0767-Multiple-Entries-with-Scoreboards.patch b/patches/server/0768-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0767-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0768-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0768-Reset-placed-block-on-exception.patch b/patches/server/0769-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0768-Reset-placed-block-on-exception.patch
rename to patches/server/0769-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0769-Add-configurable-height-for-slime-spawn.patch b/patches/server/0770-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0769-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0770-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0770-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0770-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0771-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0772-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0771-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0772-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0772-Kick-on-main-for-illegal-chat.patch b/patches/server/0773-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0772-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0773-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0773-Multi-Block-Change-API-Implementation.patch b/patches/server/0774-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0773-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0774-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0774-Fix-NotePlayEvent.patch b/patches/server/0775-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0774-Fix-NotePlayEvent.patch
rename to patches/server/0775-Fix-NotePlayEvent.patch
diff --git a/patches/server/0775-Freeze-Tick-Lock-API.patch b/patches/server/0776-Freeze-Tick-Lock-API.patch
similarity index 91%
rename from patches/server/0775-Freeze-Tick-Lock-API.patch
rename to patches/server/0776-Freeze-Tick-Lock-API.patch
index 6ff27e316e..e1abe2aef9 100644
--- a/patches/server/0775-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0776-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 11577de26052549c58cbf9eabf0ac14fca913f80..5f016f6a33dde0f0a1cdfbdfac09b3e11071c0cf 100644
+index ef5e979d09df13660ac7893be1209c2c2b8a136c..dc676cdabfa306a3975e25f981078ead317196c1 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 11577de26052549c58cbf9eabf0ac14fca913f80..5f016f6a33dde0f0a1cdfbdfac09b3e1
  
      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 11577de26052549c58cbf9eabf0ac14fca913f80..5f016f6a33dde0f0a1cdfbdfac09b3e1
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2384,6 +2385,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2417,6 +2418,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              if (fromNetherPortal) {
                  nbt.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index 11577de26052549c58cbf9eabf0ac14fca913f80..5f016f6a33dde0f0a1cdfbdfac09b3e1
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -2549,6 +2553,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2582,6 +2586,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/0776-Dolphin-API.patch b/patches/server/0777-Dolphin-API.patch
similarity index 100%
rename from patches/server/0776-Dolphin-API.patch
rename to patches/server/0777-Dolphin-API.patch
diff --git a/patches/server/0777-More-PotionEffectType-API.patch b/patches/server/0778-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0777-More-PotionEffectType-API.patch
rename to patches/server/0778-More-PotionEffectType-API.patch
diff --git a/patches/server/0778-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0778-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0779-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0779-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0780-Add-missing-structure-set-seed-configs.patch b/patches/server/0781-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0780-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0781-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0781-Implement-regenerateChunk.patch b/patches/server/0782-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0781-Implement-regenerateChunk.patch
rename to patches/server/0782-Implement-regenerateChunk.patch
diff --git a/patches/server/0782-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0783-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0782-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0783-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0783-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0783-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0784-Add-GameEvent-tags.patch b/patches/server/0785-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0784-Add-GameEvent-tags.patch
rename to patches/server/0785-Add-GameEvent-tags.patch
diff --git a/patches/server/0785-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0785-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0786-Furnace-RecipesUsed-API.patch b/patches/server/0787-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0786-Furnace-RecipesUsed-API.patch
rename to patches/server/0787-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0787-Configurable-sculk-sensor-listener-range.patch b/patches/server/0788-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0787-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0788-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0788-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0789-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0788-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0789-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0789-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0789-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0790-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0790-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0791-Fix-Entity-Position-Desync.patch b/patches/server/0792-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0791-Fix-Entity-Position-Desync.patch
rename to patches/server/0792-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0792-Custom-Potion-Mixes.patch b/patches/server/0793-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0792-Custom-Potion-Mixes.patch
rename to patches/server/0793-Custom-Potion-Mixes.patch
diff --git a/patches/server/0793-Force-close-world-loading-screen.patch b/patches/server/0794-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0793-Force-close-world-loading-screen.patch
rename to patches/server/0794-Force-close-world-loading-screen.patch
diff --git a/patches/server/0794-Fix-falling-block-spawn-methods.patch b/patches/server/0795-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0794-Fix-falling-block-spawn-methods.patch
rename to patches/server/0795-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0795-Expose-furnace-minecart-push-values.patch b/patches/server/0796-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0795-Expose-furnace-minecart-push-values.patch
rename to patches/server/0796-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0796-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0796-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0797-More-Projectile-API.patch b/patches/server/0798-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0797-More-Projectile-API.patch
rename to patches/server/0798-More-Projectile-API.patch
diff --git a/patches/server/0798-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0799-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0798-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0799-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0799-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0799-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0800-Implement-getComputedBiome-API.patch b/patches/server/0801-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0800-Implement-getComputedBiome-API.patch
rename to patches/server/0801-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0801-Make-some-itemstacks-nonnull.patch b/patches/server/0802-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0801-Make-some-itemstacks-nonnull.patch
rename to patches/server/0802-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0802-Implement-enchantWithLevels-API.patch b/patches/server/0803-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0802-Implement-enchantWithLevels-API.patch
rename to patches/server/0803-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0803-Fix-saving-in-unloadWorld.patch b/patches/server/0804-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0803-Fix-saving-in-unloadWorld.patch
rename to patches/server/0804-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0804-Buffer-OOB-setBlock-calls.patch b/patches/server/0805-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0804-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0805-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0805-Add-TameableDeathMessageEvent.patch b/patches/server/0806-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0805-Add-TameableDeathMessageEvent.patch
rename to patches/server/0806-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0806-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0806-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0807-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0808-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0807-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0808-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0808-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0809-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 88%
rename from patches/server/0808-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0809-Ensure-entity-passenger-world-matches-ridden-entity.patch
index bbc8f65116..f27bc852e9 100644
--- a/patches/server/0808-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0809-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 5f016f6a33dde0f0a1cdfbdfac09b3e11071c0cf..27c6575184016029b7d8d6ce98261b41cfe653fe 100644
+index dc676cdabfa306a3975e25f981078ead317196c1..a016fbe3d0ca0481d07eefc8fbd155aaf303ca05 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2811,6 +2811,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2844,6 +2844,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit
diff --git a/patches/server/0809-Guard-against-invalid-entity-positions.patch b/patches/server/0810-Guard-against-invalid-entity-positions.patch
similarity index 92%
rename from patches/server/0809-Guard-against-invalid-entity-positions.patch
rename to patches/server/0810-Guard-against-invalid-entity-positions.patch
index fbc6809a8f..4ee5d3edbb 100644
--- a/patches/server/0809-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0810-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 27c6575184016029b7d8d6ce98261b41cfe653fe..3bd5c2b5da7b5746414a0d7b48a9e9997fdcca43 100644
+index a016fbe3d0ca0481d07eefc8fbd155aaf303ca05..bdf5418b4b500a9156fe6cf399f2e052ada409db 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4427,11 +4427,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4460,11 +4460,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/0810-cache-resource-keys.patch b/patches/server/0811-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0810-cache-resource-keys.patch
rename to patches/server/0811-cache-resource-keys.patch
diff --git a/patches/server/0811-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0812-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0811-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0812-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0812-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0812-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0813-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0813-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0814-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0814-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0815-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0815-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0816-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0816-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0817-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0817-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0818-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0818-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0819-WorldCreator-keepSpawnLoaded.patch b/patches/server/0820-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0819-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0820-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0820-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0820-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0821-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0821-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0822-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0823-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0822-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0823-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0823-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0824-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0823-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0824-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0824-Add-PlayerStopUsingItemEvent.patch b/patches/server/0825-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0824-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0825-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0825-FallingBlock-auto-expire-setting.patch b/patches/server/0826-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0825-FallingBlock-auto-expire-setting.patch
rename to patches/server/0826-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0826-Don-t-tick-markers.patch b/patches/server/0827-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0826-Don-t-tick-markers.patch
rename to patches/server/0827-Don-t-tick-markers.patch
diff --git a/patches/server/0827-Do-not-accept-invalid-client-settings.patch b/patches/server/0828-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0827-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0828-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0828-Add-support-for-Proxy-Protocol.patch b/patches/server/0829-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0828-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0829-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0829-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0830-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0829-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0830-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0830-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0830-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0831-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0831-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0832-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0833-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0832-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0833-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0833-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0834-Prevent-entity-loading-causing-async-lookups.patch
similarity index 95%
rename from patches/server/0833-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0834-Prevent-entity-loading-causing-async-lookups.patch
index 74ed983b4f..06d9dea85e 100644
--- a/patches/server/0833-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0834-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 3bd5c2b5da7b5746414a0d7b48a9e9997fdcca43..542422839dc5f1759a6e26c8ca162598eb6d054f 100644
+index bdf5418b4b500a9156fe6cf399f2e052ada409db..b4f694174c6b1c8017122cfa6116f52f5ff924e3 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/0834-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0834-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0835-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0836-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0835-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0836-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0836-Dont-resent-entity-on-art-update.patch b/patches/server/0837-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0836-Dont-resent-entity-on-art-update.patch
rename to patches/server/0837-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0837-Add-WardenAngerChangeEvent.patch b/patches/server/0838-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0837-Add-WardenAngerChangeEvent.patch
rename to patches/server/0838-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0838-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0839-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0838-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0839-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0839-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0840-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0839-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0840-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0840-Nameable-Banner-API.patch b/patches/server/0841-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0840-Nameable-Banner-API.patch
rename to patches/server/0841-Nameable-Banner-API.patch
diff --git a/patches/server/0841-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0841-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0842-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0842-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0843-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0843-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0844-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0844-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0845-Add-Player-getFishHook.patch b/patches/server/0846-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0845-Add-Player-getFishHook.patch
rename to patches/server/0846-Add-Player-getFishHook.patch
diff --git a/patches/server/0846-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0846-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0847-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0848-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 96%
rename from patches/server/0847-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0848-Add-various-missing-EntityDropItemEvent-calls.patch
index 5e2a811447..29d67eb1c5 100644
--- a/patches/server/0847-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0848-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 542422839dc5f1759a6e26c8ca162598eb6d054f..dbb9cb96b1346658b274426f3e3bbeaa03cb7780 100644
+index b4f694174c6b1c8017122cfa6116f52f5ff924e3..2d576dd1e484641115ce73c22faad27f9e7bcc54 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2644,6 +2644,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2677,6 +2677,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/0848-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0848-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0849-Fix-Bee-flower-NPE.patch b/patches/server/0850-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0849-Fix-Bee-flower-NPE.patch
rename to patches/server/0850-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0850-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0850-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0851-More-Teleport-API.patch b/patches/server/0852-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0851-More-Teleport-API.patch
rename to patches/server/0852-More-Teleport-API.patch
diff --git a/patches/server/0852-Add-EntityPortalReadyEvent.patch b/patches/server/0853-Add-EntityPortalReadyEvent.patch
similarity index 88%
rename from patches/server/0852-Add-EntityPortalReadyEvent.patch
rename to patches/server/0853-Add-EntityPortalReadyEvent.patch
index d9db1e9115..8e0b2d6643 100644
--- a/patches/server/0852-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0853-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 dbb9cb96b1346658b274426f3e3bbeaa03cb7780..a1a090d3e9b2e656f56026391393156e7df55d9f 100644
+index 2d576dd1e484641115ce73c22faad27f9e7bcc54..b5751d0cfae442b1030b771e4a3afc42e566d76d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3000,6 +3000,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3033,6 +3033,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 dbb9cb96b1346658b274426f3e3bbeaa03cb7780..a1a090d3e9b2e656f56026391393156e
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -3007,6 +3014,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3040,6 +3047,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0853-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0854-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0853-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0854-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0854-Send-block-entities-after-destroy-prediction.patch b/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0854-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0855-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0855-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0855-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0856-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0857-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0856-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0857-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0857-Add-missing-BlockFadeEvents.patch b/patches/server/0858-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0857-Add-missing-BlockFadeEvents.patch
rename to patches/server/0858-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0858-Collision-API.patch b/patches/server/0859-Collision-API.patch
similarity index 100%
rename from patches/server/0858-Collision-API.patch
rename to patches/server/0859-Collision-API.patch
diff --git a/patches/server/0859-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0859-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0860-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0860-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0861-Block-Ticking-API.patch b/patches/server/0862-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0861-Block-Ticking-API.patch
rename to patches/server/0862-Block-Ticking-API.patch
diff --git a/patches/server/0862-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0862-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0863-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0863-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0864-Add-NamespacedKey-biome-methods.patch b/patches/server/0865-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0864-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0865-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0865-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0866-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0865-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0866-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0866-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0867-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0866-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0867-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0867-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0868-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0867-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0868-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0868-Missing-eating-regain-reason.patch b/patches/server/0869-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0868-Missing-eating-regain-reason.patch
rename to patches/server/0869-Missing-eating-regain-reason.patch
diff --git a/patches/server/0869-Missing-effect-cause.patch b/patches/server/0870-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0869-Missing-effect-cause.patch
rename to patches/server/0870-Missing-effect-cause.patch
diff --git a/patches/server/0870-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0871-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0870-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0871-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0871-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0871-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0872-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0873-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0872-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0873-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0873-Configurable-chat-thread-limit.patch b/patches/server/0874-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0873-Configurable-chat-thread-limit.patch
rename to patches/server/0874-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0874-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0874-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0875-fix-Jigsaw-block-kicking-user.patch b/patches/server/0876-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0875-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0876-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0876-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0877-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0876-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0877-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0877-Add-getDrops-to-BlockState.patch b/patches/server/0878-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0877-Add-getDrops-to-BlockState.patch
rename to patches/server/0878-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0878-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0878-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0879-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0879-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0880-Fix-custom-piglin-loved-items.patch b/patches/server/0881-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0880-Fix-custom-piglin-loved-items.patch
rename to patches/server/0881-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0881-EntityPickupItemEvent-fixes.patch b/patches/server/0882-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0881-EntityPickupItemEvent-fixes.patch
rename to patches/server/0882-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0882-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0882-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0883-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0884-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0883-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0884-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0884-Elder-Guardian-appearance-API.patch b/patches/server/0885-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0884-Elder-Guardian-appearance-API.patch
rename to patches/server/0885-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0885-Allow-changing-bed-s-occupied-property.patch b/patches/server/0886-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0885-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0886-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0886-Add-entity-knockback-API.patch b/patches/server/0887-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0886-Add-entity-knockback-API.patch
rename to patches/server/0887-Add-entity-knockback-API.patch
diff --git a/patches/server/0887-Detect-headless-JREs.patch b/patches/server/0888-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0887-Detect-headless-JREs.patch
rename to patches/server/0888-Detect-headless-JREs.patch
diff --git a/patches/server/0888-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0889-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0888-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0889-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0889-optimized-dirt-and-snow-spreading.patch b/patches/server/0890-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0889-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0890-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0890-Added-EntityToggleSitEvent.patch b/patches/server/0891-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0890-Added-EntityToggleSitEvent.patch
rename to patches/server/0891-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0891-Add-fire-tick-delay-option.patch b/patches/server/0892-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0891-Add-fire-tick-delay-option.patch
rename to patches/server/0892-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0892-Add-Moving-Piston-API.patch b/patches/server/0893-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0892-Add-Moving-Piston-API.patch
rename to patches/server/0893-Add-Moving-Piston-API.patch
diff --git a/patches/server/0893-Ignore-impossible-spawn-tick.patch b/patches/server/0894-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0893-Ignore-impossible-spawn-tick.patch
rename to patches/server/0894-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0894-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0895-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0894-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0895-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0895-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0895-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0896-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 91%
rename from patches/server/0896-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 9d084dc2a6..2aed8d8bb3 100644
--- a/patches/server/0896-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0897-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 a1a090d3e9b2e656f56026391393156e7df55d9f..9bb9fdfcb3326d8d72fe7d017e23fa71f10a3eb0 100644
+index b5751d0cfae442b1030b771e4a3afc42e566d76d..b0744d9b0fce0b4d01c728034e275d430d7933de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3275,6 +3275,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3308,6 +3308,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/0897-Prevent-compass-from-loading-chunks.patch b/patches/server/0898-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0897-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0898-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0898-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0899-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0898-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0899-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0899-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0899-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0900-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0900-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0901-Add-Player-Warden-Warning-API.patch b/patches/server/0902-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0901-Add-Player-Warden-Warning-API.patch
rename to patches/server/0902-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0902-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0902-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0903-Add-paper-dumplisteners-command.patch b/patches/server/0904-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0903-Add-paper-dumplisteners-command.patch
rename to patches/server/0904-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0904-check-global-player-list-where-appropriate.patch b/patches/server/0905-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0904-check-global-player-list-where-appropriate.patch
rename to patches/server/0905-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0905-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0905-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0906-ItemStack-damage-API.patch b/patches/server/0907-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0906-ItemStack-damage-API.patch
rename to patches/server/0907-ItemStack-damage-API.patch
diff --git a/patches/server/0907-Friction-API.patch b/patches/server/0908-Friction-API.patch
similarity index 100%
rename from patches/server/0907-Friction-API.patch
rename to patches/server/0908-Friction-API.patch
diff --git a/patches/server/0908-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0908-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0909-Fix-player-kick-on-shutdown.patch b/patches/server/0910-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0909-Fix-player-kick-on-shutdown.patch
rename to patches/server/0910-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0910-Sync-offhand-slot-in-menus.patch b/patches/server/0911-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0910-Sync-offhand-slot-in-menus.patch
rename to patches/server/0911-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0911-Player-Entity-Tracking-Events.patch b/patches/server/0912-Player-Entity-Tracking-Events.patch
similarity index 90%
rename from patches/server/0911-Player-Entity-Tracking-Events.patch
rename to patches/server/0912-Player-Entity-Tracking-Events.patch
index c7324f90f1..15dee0455c 100644
--- a/patches/server/0911-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0912-Player-Entity-Tracking-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9bb9fdfcb3326d8d72fe7d017e23fa71f10a3eb0..94a0e8fa63510ad4bb191a545c4aedeaa476fd72 100644
+index b0744d9b0fce0b4d01c728034e275d430d7933de..a36c5ce78efc98e5bd53db4b5509c58a06aa3de1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3997,9 +3997,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4030,9 +4030,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          EnchantmentHelper.doPostDamageEffects(attacker, target);
      }
  
diff --git a/patches/server/0912-Limit-pet-look-distance.patch b/patches/server/0913-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0912-Limit-pet-look-distance.patch
rename to patches/server/0913-Limit-pet-look-distance.patch
diff --git a/patches/server/0913-Properly-resend-entities.patch b/patches/server/0914-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0913-Properly-resend-entities.patch
rename to patches/server/0914-Properly-resend-entities.patch
diff --git a/patches/server/0914-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0914-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0915-fix-Instruments.patch b/patches/server/0916-fix-Instruments.patch
similarity index 100%
rename from patches/server/0915-fix-Instruments.patch
rename to patches/server/0916-fix-Instruments.patch
diff --git a/patches/server/0916-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0916-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0917-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0917-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0918-Improve-logging-and-errors.patch b/patches/server/0919-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0918-Improve-logging-and-errors.patch
rename to patches/server/0919-Improve-logging-and-errors.patch
diff --git a/patches/server/0919-Add-BlockLockCheckEvent.patch b/patches/server/0920-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0919-Add-BlockLockCheckEvent.patch
rename to patches/server/0920-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0920-Add-Sneaking-API-for-Entities.patch b/patches/server/0921-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0920-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0921-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0921-Improve-PortalEvents.patch b/patches/server/0922-Improve-PortalEvents.patch
similarity index 89%
rename from patches/server/0921-Improve-PortalEvents.patch
rename to patches/server/0922-Improve-PortalEvents.patch
index 183b2eb2b0..1f628c43d5 100644
--- a/patches/server/0921-Improve-PortalEvents.patch
+++ b/patches/server/0922-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 94a0e8fa63510ad4bb191a545c4aedeaa476fd72..99f9fe449d741c3f02551a7d66ce9c7de40c8e1d 100644
+index a36c5ce78efc98e5bd53db4b5509c58a06aa3de1..4358420693efccfc1203037cdcbf91f78331409a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3653,7 +3653,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3686,7 +3686,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/0922-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 91%
rename from patches/server/0922-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch
index 685868d1f0..9a76df29f8 100644
--- a/patches/server/0922-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0923-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 99f9fe449d741c3f02551a7d66ce9c7de40c8e1d..fe8dac452f573b824aa326567eb91c810ce2261f 100644
+index 4358420693efccfc1203037cdcbf91f78331409a..b1075e6ca16de57cb7a7b7caa1a4c0551767ec95 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 99f9fe449d741c3f02551a7d66ce9c7de40c8e1d..fe8dac452f573b824aa326567eb91c81
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -1436,7 +1437,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1469,7 +1470,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, this.level.paperConfig().chunks.preventMovingIntoUnloadedChunks,
                  false, false, null, null);
  
diff --git a/patches/server/0923-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0923-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0924-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0924-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0925-Flying-Fall-Damage.patch b/patches/server/0926-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0925-Flying-Fall-Damage.patch
rename to patches/server/0926-Flying-Fall-Damage.patch
diff --git a/patches/server/0926-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0926-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0927-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 86%
rename from patches/server/0927-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 003536c958..d170d979cb 100644
--- a/patches/server/0927-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0928-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 fe8dac452f573b824aa326567eb91c810ce2261f..ec6a98b59a1bd3f19259c3167a0eec30a49e226f 100644
+index b1075e6ca16de57cb7a7b7caa1a4c0551767ec95..21210830233e409b8757a78af4d3e128e51ebbde 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/0928-config-for-disabling-entity-tag-tags.patch b/patches/server/0929-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0928-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0929-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0929-Use-single-player-info-update-packet-on-join.patch b/patches/server/0930-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0929-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0930-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0930-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0930-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0931-Win-Screen-API.patch b/patches/server/0932-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0931-Win-Screen-API.patch
rename to patches/server/0932-Win-Screen-API.patch
diff --git a/patches/server/0932-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0932-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0933-Fix-force-opening-enchantment-tables.patch b/patches/server/0934-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0933-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0934-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0934-Add-Entity-Body-Yaw-API.patch b/patches/server/0935-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0934-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0935-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0935-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0935-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0936-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0936-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0937-Add-EntityFertilizeEggEvent.patch b/patches/server/0938-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0937-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0938-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0938-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0938-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0939-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0939-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0940-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0940-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0941-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0941-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0942-Fix-text-display-error-on-spawn.patch b/patches/server/0943-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0942-Fix-text-display-error-on-spawn.patch
rename to patches/server/0943-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0943-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0943-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0944-Add-Shearable-API.patch b/patches/server/0945-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0944-Add-Shearable-API.patch
rename to patches/server/0945-Add-Shearable-API.patch
diff --git a/patches/server/0945-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0945-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0946-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0946-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0947-Optimize-Hoppers.patch b/patches/server/0948-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0947-Optimize-Hoppers.patch
rename to patches/server/0948-Optimize-Hoppers.patch
diff --git a/patches/server/0948-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0949-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0948-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0949-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0949-Fix-api-checking-banned-ips.patch b/patches/server/0950-Fix-api-checking-banned-ips.patch
similarity index 100%
rename from patches/server/0949-Fix-api-checking-banned-ips.patch
rename to patches/server/0950-Fix-api-checking-banned-ips.patch
diff --git a/patches/server/0950-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0950-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0951-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0951-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0952-remove-duplicate-animate-packet-for-records.patch b/patches/server/0953-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0952-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0953-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0953-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0953-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0954-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0954-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0955-Use-array-for-gamerule-storage.patch b/patches/server/0956-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0955-Use-array-for-gamerule-storage.patch
rename to patches/server/0956-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0956-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0956-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0957-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0957-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0958-Add-Mob-Experience-reward-API.patch b/patches/server/0959-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0958-Add-Mob-Experience-reward-API.patch
rename to patches/server/0959-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0959-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0959-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0960-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0960-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0961-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0961-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0962-More-accurate-isInOpenWater-impl.patch b/patches/server/0963-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0962-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0963-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0963-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0963-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0964-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0964-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0965-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0965-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0966-Expand-PlayerItemMendEvent.patch b/patches/server/0967-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0966-Expand-PlayerItemMendEvent.patch
rename to patches/server/0967-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0967-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch
similarity index 96%
rename from patches/server/0967-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch
index 19ca3ce3f8..04eaeb9354 100644
--- a/patches/server/0967-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch
@@ -9,10 +9,10 @@ Previously, after the entity reloaded, Projectile#getShooter
 would return null, while the entity still had an owner.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec6a98b59a1bd3f19259c3167a0eec30a49e226f..81fdfe150845d57e82fb136af63424103197aebd 100644
+index 21210830233e409b8757a78af4d3e128e51ebbde..92202262eff01ae3bbeff0e6ebdcf26ad613c169 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/0968-Add-transient-modifier-API.patch b/patches/server/0969-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0968-Add-transient-modifier-API.patch
rename to patches/server/0969-Add-transient-modifier-API.patch
diff --git a/patches/server/0969-Fix-block-place-logic.patch b/patches/server/0970-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0969-Fix-block-place-logic.patch
rename to patches/server/0970-Fix-block-place-logic.patch