From ea1f33cf9aafb5fafc877456f722371ea2ab78a8 Mon Sep 17 00:00:00 2001
From: Jamie <jamie@sootmc.net>
Date: Thu, 17 Aug 2023 21:51:34 +0100
Subject: [PATCH] Delete patch to fix PaperMC/Paper#9612 (#9621)

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

diff --git a/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
deleted file mode 100644
index e0627ff0bc3a..000000000000
--- a/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 1 Jul 2020 03:12:06 -0400
-Subject: [PATCH] Clean up duplicated GameProfile Properties
-
-We had a bug where we accidently cloned properties resulting in skulls
-growing to large sizes and preventing login.
-
-This now automatically cleans up the extra properties.
-
-diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 7bc60901297d27d88efb401d02b4bc06d8b28874..6dac24354192bea79a4b9eb721543110826790b2 100644
---- a/src/main/java/net/minecraft/nbt/NbtUtils.java
-+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -94,7 +94,8 @@ public final class NbtUtils {
-                 for(String string2 : compoundTag.getAllKeys()) {
-                     ListTag listTag = compoundTag.getList(string2, 10);
- 
--                    for(int i = 0; i < listTag.size(); ++i) {
-+                    if (listTag.size() == 0) continue; // Paper - remove duplicate properties
-+                    for (int i = listTag.size() - 1; i < listTag.size(); ++i) { // Paper - remove duplicate properties
-                         CompoundTag compoundTag2 = listTag.getCompound(i);
-                         String string3 = compoundTag2.getString("Value");
-                         if (compoundTag2.contains("Signature", 8)) {
-diff --git a/src/main/java/net/minecraft/world/item/PlayerHeadItem.java b/src/main/java/net/minecraft/world/item/PlayerHeadItem.java
-index 98465d012357b76103d73952527c43c317d0f1bd..4969353e3a02ad70d973ae8780d018710f2462a3 100644
---- a/src/main/java/net/minecraft/world/item/PlayerHeadItem.java
-+++ b/src/main/java/net/minecraft/world/item/PlayerHeadItem.java
-@@ -53,6 +53,18 @@ public class PlayerHeadItem extends StandingAndWallBlockItem {
-             });
-             // CraftBukkit start
-         } else {
-+            // Paper start - clean up old duplicated properties
-+            CompoundTag properties = nbt.getCompound("SkullOwner").getCompound("Properties");
-+            for (String key : properties.getAllKeys()) {
-+                net.minecraft.nbt.ListTag values = properties.getList(key, 10);
-+                if (values.size() > 1) {
-+                    net.minecraft.nbt.Tag texture = values.get(values.size() - 1);
-+                    values = new net.minecraft.nbt.ListTag();
-+                    values.add(texture);
-+                    properties.put(key, values);
-+                }
-+            }
-+            // Paper end
-             net.minecraft.nbt.ListTag textures = nbt.getCompound("SkullOwner").getCompound("Properties").getList("textures", 10); // Safe due to method contracts
-             for (int i = 0; i < textures.size(); i++) {
-                 if (textures.get(i) instanceof CompoundTag && !((CompoundTag) textures.get(i)).contains("Signature", 8) && ((CompoundTag) textures.get(i)).getString("Value").trim().isEmpty()) {
diff --git a/patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0429-Remove-some-streams-from-structures.patch b/patches/server/0428-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0429-Remove-some-streams-from-structures.patch
rename to patches/server/0428-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0431-Support-components-in-ItemMeta.patch b/patches/server/0430-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0431-Support-components-in-ItemMeta.patch
rename to patches/server/0430-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0433-Add-entity-liquid-API.patch b/patches/server/0432-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0433-Add-entity-liquid-API.patch
rename to patches/server/0432-Add-entity-liquid-API.patch
diff --git a/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch
similarity index 97%
rename from patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0433-Update-itemstack-legacy-name-and-lore.patch
index 09c79dec7327..d9936812c284 100644
--- a/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7d80eded30109982fd3a1b815ba5dff4b699689a..dcb01c399d2b30d907bfc51584215d9300b6d23e 100644
+index 0caf3eeb7984e842f7a0bdfed3021d0b231a0dd0..ee274fb9c8292a807e438902cc5d7f49c30d6627 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -171,6 +171,44 @@ public final class ItemStack {
diff --git a/patches/server/0435-Spawn-player-in-correct-world-on-login.patch b/patches/server/0434-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0435-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0434-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0436-Add-PrepareResultEvent.patch b/patches/server/0435-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0436-Add-PrepareResultEvent.patch
rename to patches/server/0435-Add-PrepareResultEvent.patch
diff --git a/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0441-Fix-SPIGOT-5989.patch b/patches/server/0440-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0441-Fix-SPIGOT-5989.patch
rename to patches/server/0440-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0445-Fix-some-rails-connecting-improperly.patch b/patches/server/0444-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0445-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0444-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0448-Brand-support.patch b/patches/server/0447-Brand-support.patch
similarity index 97%
rename from patches/server/0448-Brand-support.patch
rename to patches/server/0447-Brand-support.patch
index 4dec7182335f..ccf552be2b41 100644
--- a/patches/server/0448-Brand-support.patch
+++ b/patches/server/0447-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f3cd16845d5ea265666f5535b7f893e0a9d0fcf..a37a29d771511b960c6c033b649833c223f40990 100644
+index 2f0fb75a35a1fa45614621da9e24cec6e842b693..a10e4d99bd7e6588cd09d17ebcc3e68f05b9e87b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -304,6 +304,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0448-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0448-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0450-Don-t-require-FACING-data.patch b/patches/server/0449-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0450-Don-t-require-FACING-data.patch
rename to patches/server/0449-Don-t-require-FACING-data.patch
diff --git a/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0450-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/0450-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0452-Add-moon-phase-API.patch b/patches/server/0451-Add-moon-phase-API.patch
similarity index 90%
rename from patches/server/0452-Add-moon-phase-API.patch
rename to patches/server/0451-Add-moon-phase-API.patch
index ce85e5101a1f..afc9659d9898 100644
--- a/patches/server/0452-Add-moon-phase-API.patch
+++ b/patches/server/0451-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 4dc5c75d1fa0748b6e7e95d90b92a865b2f6362e..0452a59d6eec947589b4791c977327046f7b0d6e 100644
+index 91fbc67eefea473211b99e4338f6464f58dc5592..b5981001d8ad4d6c79b965be9a446352971b0d29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -980,4 +980,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0453-Prevent-headless-pistons-from-being-created.patch b/patches/server/0452-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/0452-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0454-Add-BellRingEvent.patch b/patches/server/0453-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0454-Add-BellRingEvent.patch
rename to patches/server/0453-Add-BellRingEvent.patch
diff --git a/patches/server/0455-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0454-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/0454-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0456-Buffer-joins-to-world.patch b/patches/server/0455-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0456-Buffer-joins-to-world.patch
rename to patches/server/0455-Buffer-joins-to-world.patch
diff --git a/patches/server/0457-Eigencraft-redstone-implementation.patch b/patches/server/0456-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0457-Eigencraft-redstone-implementation.patch
rename to patches/server/0456-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0457-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/0457-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/0458-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/0458-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0460-Add-more-Evoker-API.patch b/patches/server/0459-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0460-Add-more-Evoker-API.patch
rename to patches/server/0459-Add-more-Evoker-API.patch
diff --git a/patches/server/0461-Add-methods-to-get-translation-keys.patch b/patches/server/0460-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0461-Add-methods-to-get-translation-keys.patch
rename to patches/server/0460-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0463-Cache-block-data-strings.patch b/patches/server/0462-Cache-block-data-strings.patch
similarity index 97%
rename from patches/server/0463-Cache-block-data-strings.patch
rename to patches/server/0462-Cache-block-data-strings.patch
index 2e4525b8b8b0..d706e7fb92cf 100644
--- a/patches/server/0463-Cache-block-data-strings.patch
+++ b/patches/server/0462-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56e98ea2964c2779537ac607b7c4677bc695d92a..0ed8add0a2acec7d109f9687b7d77967a7ccdf3e 100644
+index f704725928b0ec05ffff554901e7558ef8f308d6..1a8bc8d508202012130441397fe1a404fb1357fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2049,6 +2049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 98%
rename from patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index e0e77707804a..ef545c89fb64 100644
--- a/patches/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f43de26f3d757dc14572c2d42dd8b6694e9fb0a..4341fdd364194690a4f2329bbf4415c455a144bf 100644
+index a10e4d99bd7e6588cd09d17ebcc3e68f05b9e87b..d7696d0bf090adb403e9461c93f0649585985d50 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -762,7 +762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 97%
rename from patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch
index 18fdf7d70492..e5751542de09 100644
--- a/patches/server/0465-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 55a3035516552f4d429ae5f36bacb1b4c4d5666c..b0d2038cf2622c8ee7f810026ed735ff954d7ad0 100644
+index 63208cf28a7ea005f9f328281676ed113ae23a00..f4cda5fbf12c59dc1ecec4aac6719837444382e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -461,6 +461,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0466-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0467-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index aa382e5af5b7..fef92e82e8e1 100644
--- a/patches/server/0468-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ 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 4cac7ae766e71fedfd2be8d17741ffd40ae1cee4..b8f49e7b8727c757950a74c834eed4871de0e4ce 100644
+index fca862584439c87b049af4cdd9f79fe4ee30ea40..71d2557e6e244384042ce3b13cc6e3008227399d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4433,4 +4433,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0469-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0469-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0470-Entity-isTicking.patch b/patches/server/0469-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0470-Entity-isTicking.patch
rename to patches/server/0469-Entity-isTicking.patch
diff --git a/patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 94%
rename from patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index b72f225a3868..09f5a8019073 100644
--- a/patches/server/0471-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0ed8add0a2acec7d109f9687b7d77967a7ccdf3e..412e5db21a83e9ca6ba5aa0d457507ce51176ebc 100644
+index 1a8bc8d508202012130441397fe1a404fb1357fd..8ca3bb41307f1f7ba1b1340981cc37e331fa9388 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2132,13 +2132,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0472-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0472-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0473-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch
index 21916150736a..c9807796cc21 100644
--- a/patches/server/0474-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4341fdd364194690a4f2329bbf4415c455a144bf..7d70b03b7b5e283ce5cbeb99d2cb61a48cc70932 100644
+index d7696d0bf090adb403e9461c93f0649585985d50..87f3ac68e8e60ac8c890280d491c326a1575f810 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -569,9 +569,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0475-Optimise-getType-calls.patch b/patches/server/0474-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0475-Optimise-getType-calls.patch
rename to patches/server/0474-Optimise-getType-calls.patch
diff --git a/patches/server/0476-Villager-resetOffers.patch b/patches/server/0475-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0476-Villager-resetOffers.patch
rename to patches/server/0475-Villager-resetOffers.patch
diff --git a/patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0477-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0478-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0478-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0479-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0478-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0479-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0478-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0480-Player-elytra-boost-API.patch b/patches/server/0479-Player-elytra-boost-API.patch
similarity index 94%
rename from patches/server/0480-Player-elytra-boost-API.patch
rename to patches/server/0479-Player-elytra-boost-API.patch
index ef7bc9f98c6f..4cce8bd16989 100644
--- a/patches/server/0480-Player-elytra-boost-API.patch
+++ b/patches/server/0479-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a407bb7854f8a100fbf52f2268c3f1e5531c9bf5..09c1fc712e6913c338132770e616bb00f2c291d6 100644
+index d5f03bd485403fd2222bba0dbbf37e438b99ef28..5179e70d91bdbf2f466e15ade3466f30e8a3fe2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -624,6 +624,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0481-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0480-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0481-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0480-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0482-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0483-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0482-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0483-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0482-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0484-Add-ignore-discounts-API.patch b/patches/server/0483-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0484-Add-ignore-discounts-API.patch
rename to patches/server/0483-Add-ignore-discounts-API.patch
diff --git a/patches/server/0485-Toggle-for-removing-existing-dragon.patch b/patches/server/0484-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0485-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0484-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0486-Fix-client-lag-on-advancement-loading.patch b/patches/server/0485-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0486-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0485-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0487-Item-no-age-no-player-pickup.patch b/patches/server/0486-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0487-Item-no-age-no-player-pickup.patch
rename to patches/server/0486-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0488-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0489-Beacon-API-custom-effect-ranges.patch b/patches/server/0488-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0489-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0488-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0490-Add-API-for-quit-reason.patch b/patches/server/0489-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0490-Add-API-for-quit-reason.patch
rename to patches/server/0489-Add-API-for-quit-reason.patch
index f58db3c97218..0cfdf221ae58 100644
--- a/patches/server/0490-Add-API-for-quit-reason.patch
+++ b/patches/server/0489-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index e087b62f88157d57eb037feb0d39c076b286f755..0b81878a951643af1ce785b3adcca9b3
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
      public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7d70b03b7b5e283ce5cbeb99d2cb61a48cc70932..c6a1e8246ac22e83121cb17eee8e00ab1dd48306 100644
+index 87f3ac68e8e60ac8c890280d491c326a1575f810..a82b911450feb011cc8776a0dece478bb94d4221 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -509,6 +509,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0492-Expose-world-spawn-angle.patch b/patches/server/0491-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0492-Expose-world-spawn-angle.patch
rename to patches/server/0491-Expose-world-spawn-angle.patch
diff --git a/patches/server/0493-Add-Destroy-Speed-API.patch b/patches/server/0492-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0493-Add-Destroy-Speed-API.patch
rename to patches/server/0492-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0495-Add-LivingEntity-clearActiveItem.patch b/patches/server/0494-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0495-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0494-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0496-Add-PlayerItemCooldownEvent.patch b/patches/server/0495-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0496-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0495-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0498-More-lightning-API.patch b/patches/server/0497-More-lightning-API.patch
similarity index 100%
rename from patches/server/0498-More-lightning-API.patch
rename to patches/server/0497-More-lightning-API.patch
diff --git a/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch
index dac4a4af6fe8..cf434759e90b 100644
--- a/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ 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 a0718a0cc2ed15a5350b1ee77747d93c6a92048d..57b85654c5af2e3c3681e3a03c11d5a02703749d 100644
+index 73a2ddf2806ea1e1826d553b7d13cf4d58be43fc..01c5a986d7d5c87cb7bf574a2f59e57dd5b347e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2049,6 +2049,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0500-Added-missing-default-perms-for-commands.patch b/patches/server/0499-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0500-Added-missing-default-perms-for-commands.patch
rename to patches/server/0499-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0501-Add-PlayerShearBlockEvent.patch b/patches/server/0500-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0501-Add-PlayerShearBlockEvent.patch
rename to patches/server/0500-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0503-Limit-recipe-packets.patch b/patches/server/0502-Limit-recipe-packets.patch
similarity index 96%
rename from patches/server/0503-Limit-recipe-packets.patch
rename to patches/server/0502-Limit-recipe-packets.patch
index 2b8a90f80199..ab3ff245f332 100644
--- a/patches/server/0503-Limit-recipe-packets.patch
+++ b/patches/server/0502-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 25a01e0a6dc87bc5785d1ede6a7344fcdc9daf7e..e1999066bb12d39a03dca00f99618045b2cee471 100644
+index a82b911450feb011cc8776a0dece478bb94d4221..9f9db1234a8b14fbb53a1293f0ffe2b51d652c5e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -268,6 +268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0504-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0503-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0504-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0503-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0505-Player-Chunk-Load-Unload-Events.patch b/patches/server/0504-Player-Chunk-Load-Unload-Events.patch
similarity index 94%
rename from patches/server/0505-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0504-Player-Chunk-Load-Unload-Events.patch
index 06e072f1b007..0706058aa67c 100644
--- a/patches/server/0505-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0504-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index abde8074da754667d65f3894097ad2255c97f3f0..fa9c1f323ef372c8a8210118eae0558da58c3c4e 100644
+index 0b81878a951643af1ce785b3adcca9b3eec7f1c3..4581bdf4525c05df235e47ab772fbf5c5f2d6b50 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2232,11 +2232,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0507-Expose-LivingEntity-hurt-direction.patch b/patches/server/0506-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0507-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0506-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0511-Implement-TargetHitEvent.patch b/patches/server/0510-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0511-Implement-TargetHitEvent.patch
rename to patches/server/0510-Implement-TargetHitEvent.patch
diff --git a/patches/server/0512-MC-4-Fix-item-position-desync.patch b/patches/server/0511-MC-4-Fix-item-position-desync.patch
similarity index 96%
rename from patches/server/0512-MC-4-Fix-item-position-desync.patch
rename to patches/server/0511-MC-4-Fix-item-position-desync.patch
index 9cc14419e4ca..8d6bf2c087b2 100644
--- a/patches/server/0512-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0511-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ 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 57b85654c5af2e3c3681e3a03c11d5a02703749d..7d244133234c35f8f5f3769d8fd8aacba9a65998 100644
+index 01c5a986d7d5c87cb7bf574a2f59e57dd5b347e2..1bca9f5d58c5adfff3610ab1e7296de3647adaec 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4221,6 +4221,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0513-Additional-Block-Material-API-s.patch b/patches/server/0512-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0513-Additional-Block-Material-API-s.patch
rename to patches/server/0512-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0514-Fix-harming-potion-dupe.patch b/patches/server/0513-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0514-Fix-harming-potion-dupe.patch
rename to patches/server/0513-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0516-Cache-burn-durations.patch b/patches/server/0515-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0516-Cache-burn-durations.patch
rename to patches/server/0515-Cache-burn-durations.patch
diff --git a/patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch
similarity index 97%
rename from patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch
index 9637f2fe59b6..0cb82384efc1 100644
--- a/patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c1636c313994dc4b3ae4c19fc66137bd080a501c..ec1d92a71518b9329e81f12bc8ccef846fefc168 100644
+index 9f9db1234a8b14fbb53a1293f0ffe2b51d652c5e..d0fee1a4d728213a6b0c9bf9f26101d1a5bbec9f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1839,7 +1839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0521-Zombie-API-breaking-doors.patch b/patches/server/0520-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0521-Zombie-API-breaking-doors.patch
rename to patches/server/0520-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0522-Fix-nerfed-slime-when-splitting.patch b/patches/server/0521-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0522-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0521-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0523-Add-EntityLoadCrossbowEvent.patch b/patches/server/0522-Add-EntityLoadCrossbowEvent.patch
similarity index 96%
rename from patches/server/0523-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0522-Add-EntityLoadCrossbowEvent.patch
index b535c7b3fde4..07e5946fbfc7 100644
--- a/patches/server/0523-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0522-Add-EntityLoadCrossbowEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityLoadCrossbowEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 9bea5e94c246d843f3d67680ffb57075bd9d3467..a433910fb4d0bd8d7b6b0d66c8fc88d62a0e4879 100644
+index ba570f1c9654e1004e068a1efe2118f36c954505..eede02c3f125d230af537bb67bebed9b88f7d1b4 100644
 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
 +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
 @@ -89,7 +89,14 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
diff --git a/patches/server/0524-Added-WorldGameRuleChangeEvent.patch b/patches/server/0523-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0524-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0523-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0525-Added-ServerResourcesReloadedEvent.patch b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0525-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0524-Added-ServerResourcesReloadedEvent.patch
index 4ba0ccdc24ec..2d4965470aaf 100644
--- a/patches/server/0525-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 412e5db21a83e9ca6ba5aa0d457507ce51176ebc..d29b66d9db69309087ee2eac2561ab2fcd797eb8 100644
+index 8ca3bb41307f1f7ba1b1340981cc37e331fa9388..676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0527-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0526-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0527-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0526-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0528-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0527-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0528-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0527-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0529-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0529-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0530-Configurable-door-breaking-difficulty.patch b/patches/server/0529-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0530-Configurable-door-breaking-difficulty.patch
rename to patches/server/0529-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0531-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0530-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0531-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0530-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0532-Remove-stale-POIs.patch b/patches/server/0531-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0532-Remove-stale-POIs.patch
rename to patches/server/0531-Remove-stale-POIs.patch
diff --git a/patches/server/0533-Fix-villager-boat-exploit.patch b/patches/server/0532-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0533-Fix-villager-boat-exploit.patch
rename to patches/server/0532-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0534-Add-sendOpLevel-API.patch b/patches/server/0533-Add-sendOpLevel-API.patch
similarity index 95%
rename from patches/server/0534-Add-sendOpLevel-API.patch
rename to patches/server/0533-Add-sendOpLevel-API.patch
index 31675a5b7b44..4957f3439eac 100644
--- a/patches/server/0534-Add-sendOpLevel-API.patch
+++ b/patches/server/0533-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 13e2fb9e48ed8722b68b2ce2994d9d84bb22cee4..600bb44d97b477960108ea8cd84a8e73
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b21e27a3b3f8907a8239ccc071c291479c7fa027..d27c4b7a9db3b3970858eeacecabcc7926ff3ed8 100644
+index 4a363ffbf6ee527b1eaea00e41b3387cb31e70a2..f4ac6130d1112fb908cfd61698207b81d182b492 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -638,6 +638,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0535-TODO-Registry-Modification-API.patch b/patches/server/0534-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0535-TODO-Registry-Modification-API.patch
rename to patches/server/0534-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0536-Add-StructuresLocateEvent.patch b/patches/server/0535-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0536-Add-StructuresLocateEvent.patch
rename to patches/server/0535-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0536-Collision-option-for-requiring-a-player-participant.patch
similarity index 96%
rename from patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0536-Collision-option-for-requiring-a-player-participant.patch
index c03d27744da3..61d03c322a51 100644
--- a/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0536-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ 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 7d244133234c35f8f5f3769d8fd8aacba9a65998..5f93c2fa9be835825d9a3c5fbd85ab285eced34d 100644
+index 1bca9f5d58c5adfff3610ab1e7296de3647adaec..3d1cde6740e2b68d8d6e372cb52a6485fc3f7316 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1919,6 +1919,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0540-Make-schedule-command-per-world.patch b/patches/server/0539-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0540-Make-schedule-command-per-world.patch
rename to patches/server/0539-Make-schedule-command-per-world.patch
diff --git a/patches/server/0541-Configurable-max-leash-distance.patch b/patches/server/0540-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0541-Configurable-max-leash-distance.patch
rename to patches/server/0540-Configurable-max-leash-distance.patch
diff --git a/patches/server/0542-Implement-BlockPreDispenseEvent.patch b/patches/server/0541-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0542-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0541-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0547-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0546-Reset-shield-blocking-on-dimension-change.patch
similarity index 89%
rename from patches/server/0547-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0546-Reset-shield-blocking-on-dimension-change.patch
index 7e226b9e49a6..64630d789dd2 100644
--- a/patches/server/0547-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0546-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fa9c1f323ef372c8a8210118eae0558da58c3c4e..fba3ac571fafd5c738d0dcfd5492112817c443e3 100644
+index 4581bdf4525c05df235e47ab772fbf5c5f2d6b50..03bb3c6a7cca2c5363d8c4a8836fea865b571df0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1240,6 +1240,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0548-add-DragonEggFormEvent.patch b/patches/server/0547-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0548-add-DragonEggFormEvent.patch
rename to patches/server/0547-add-DragonEggFormEvent.patch
diff --git a/patches/server/0549-EntityMoveEvent.patch b/patches/server/0548-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0549-EntityMoveEvent.patch
rename to patches/server/0548-EntityMoveEvent.patch
index bd77503cfca1..84cb2613cfa2 100644
--- a/patches/server/0549-EntityMoveEvent.patch
+++ b/patches/server/0548-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d29b66d9db69309087ee2eac2561ab2fcd797eb8..5ac0773a375d833f141f1a1754ca8a0661a0499b 100644
+index 676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87..5a4437f4244ad7243e82a231b0206910384e5db8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1504,6 +1504,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0551-Inline-shift-direction-fields.patch b/patches/server/0550-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0551-Inline-shift-direction-fields.patch
rename to patches/server/0550-Inline-shift-direction-fields.patch
diff --git a/patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0554-living-entity-allow-attribute-registration.patch b/patches/server/0553-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0554-living-entity-allow-attribute-registration.patch
rename to patches/server/0553-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0555-fix-dead-slime-setSize-invincibility.patch b/patches/server/0554-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0555-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0554-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0557-Expose-Tracked-Players.patch b/patches/server/0556-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0557-Expose-Tracked-Players.patch
rename to patches/server/0556-Expose-Tracked-Players.patch
diff --git a/patches/server/0558-Remove-streams-from-SensorNearest.patch b/patches/server/0557-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0558-Remove-streams-from-SensorNearest.patch
rename to patches/server/0557-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0558-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0558-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0560-Improve-ServerGUI.patch b/patches/server/0559-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0560-Improve-ServerGUI.patch
rename to patches/server/0559-Improve-ServerGUI.patch
diff --git a/patches/server/0561-fix-converting-txt-to-json-file.patch b/patches/server/0560-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0561-fix-converting-txt-to-json-file.patch
rename to patches/server/0560-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0562-Add-worldborder-events.patch b/patches/server/0561-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0562-Add-worldborder-events.patch
rename to patches/server/0561-Add-worldborder-events.patch
diff --git a/patches/server/0563-added-PlayerNameEntityEvent.patch b/patches/server/0562-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0563-added-PlayerNameEntityEvent.patch
rename to patches/server/0562-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0564-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0563-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0564-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0563-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0565-Add-recipe-to-cook-events.patch b/patches/server/0564-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0565-Add-recipe-to-cook-events.patch
rename to patches/server/0564-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0566-Add-Block-isValidTool.patch b/patches/server/0565-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0566-Add-Block-isValidTool.patch
rename to patches/server/0565-Add-Block-isValidTool.patch
diff --git a/patches/server/0567-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0566-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0567-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0566-Allow-using-signs-inside-spawn-protection.patch
index 29a0c08e206b..c7d1ee178c8e 100644
--- a/patches/server/0567-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0566-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ec1d92a71518b9329e81f12bc8ccef846fefc168..bf80dda7cb227f56a3a38bbd821e2ec57bcbcec6 100644
+index d0fee1a4d728213a6b0c9bf9f26101d1a5bbec9f..a384a212431326d22ca3d08dfbebe4f22e829434 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1831,7 +1831,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0568-Expand-world-key-API.patch b/patches/server/0567-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0568-Expand-world-key-API.patch
rename to patches/server/0567-Expand-world-key-API.patch
index 8ab718d7fdc1..fcc4f943d85c 100644
--- a/patches/server/0568-Expand-world-key-API.patch
+++ b/patches/server/0567-Expand-world-key-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0452a59d6eec947589b4791c977327046f7b0d6e..f50d48d737aa7a6561a8868a607a68dc39c51042 100644
+index b5981001d8ad4d6c79b965be9a446352971b0d29..0624ba7f1f5b352a5730b6b4736b24998af0ad2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -986,5 +986,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0568-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0568-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0570-Item-Rarity-API.patch b/patches/server/0569-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0570-Item-Rarity-API.patch
rename to patches/server/0569-Item-Rarity-API.patch
diff --git a/patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0570-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0570-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0572-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
similarity index 92%
rename from patches/server/0572-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
index 8c9015910376..5588a9fe185b 100644
--- a/patches/server/0572-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ac0773a375d833f141f1a1754ca8a0661a0499b..39dd0ef9af89d4a752f101740ae58797fb2adc4d 100644
+index 5a4437f4244ad7243e82a231b0206910384e5db8..974cb4108f11394d7b7dbb270cae93aefe4e5511 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0572-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0572-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index f3a44549e3fc..9b9bd73b92a3 100644
--- a/patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0572-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bf80dda7cb227f56a3a38bbd821e2ec57bcbcec6..36ca9558a4c8d40e7220b69f0ae0a65ffe74eaee 100644
+index a384a212431326d22ca3d08dfbebe4f22e829434..cff72f44445db49de5ec12b47499bb1b2050ee03 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1292,7 +1292,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0574-Expose-protocol-version.patch b/patches/server/0573-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0574-Expose-protocol-version.patch
rename to patches/server/0573-Expose-protocol-version.patch
diff --git a/patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0575-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0575-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0577-Add-bypass-host-check.patch b/patches/server/0576-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0577-Add-bypass-host-check.patch
rename to patches/server/0576-Add-bypass-host-check.patch
diff --git a/patches/server/0578-Set-area-affect-cloud-rotation.patch b/patches/server/0577-Set-area-affect-cloud-rotation.patch
similarity index 92%
rename from patches/server/0578-Set-area-affect-cloud-rotation.patch
rename to patches/server/0577-Set-area-affect-cloud-rotation.patch
index 90f20e722078..30ba5d84bd92 100644
--- a/patches/server/0578-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0577-Set-area-affect-cloud-rotation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index f50d48d737aa7a6561a8868a607a68dc39c51042..5a17e89435a02c9b25e0891b83e82b2ed1ff8ee5 100644
+index 0624ba7f1f5b352a5730b6b4736b24998af0ad2a..42b6369015cdfea983b1489f7b99428eaa8c62a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -952,6 +952,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0578-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 90%
rename from patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0578-add-isDeeplySleeping-to-HumanEntity.patch
index 28dad086f797..6661444a0c68 100644
--- a/patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0578-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a8aa176b8afd45fada9529d4d0b92000299faf1b..329e0586ec4ea44b6a8f4b72a69041aa7cd01ced 100644
+index 8d1bbc1ac3dbc10e940a0715ebfa1d5a2674b303..3f64d57b7d92820226c323d1d560432f5c27e650 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -133,6 +133,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0579-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0579-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0580-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0580-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0581-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0581-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0582-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0582-fix-PlayerItemHeldEvent-firing-twice.patch
index 8f552e3404dc..6f14fbd85121 100644
--- a/patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0582-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 36ca9558a4c8d40e7220b69f0ae0a65ffe74eaee..25eefd856fb228b939b6ee4ae87f676e7419d9f4 100644
+index cff72f44445db49de5ec12b47499bb1b2050ee03..ab295581a05686a9cd6c2397a7d4b8f32c098ba9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2045,6 +2045,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0584-Added-PlayerDeepSleepEvent.patch b/patches/server/0583-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0584-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0583-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0585-More-World-API.patch b/patches/server/0584-More-World-API.patch
similarity index 100%
rename from patches/server/0585-More-World-API.patch
rename to patches/server/0584-More-World-API.patch
diff --git a/patches/server/0586-Added-PlayerBedFailEnterEvent.patch b/patches/server/0585-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0586-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0585-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0587-Entity-load-save-limit-per-chunk.patch b/patches/server/0586-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0587-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0586-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0589-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0590-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0589-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch
index de60d4f0b2bb..8b3baa5f4cec 100644
--- a/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 89478496379ee8cf1653670a74e16201e030419b..aef114a256e048cd6c0c20a861d6fbfe61a7d1cf 100644
+index ab295581a05686a9cd6c2397a7d4b8f32c098ba9..9cf8d415d0499f8d6b87d4a7c9be7ff51c3cd5af 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2790,7 +2790,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0592-Add-Channel-initialization-listeners.patch b/patches/server/0591-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0592-Add-Channel-initialization-listeners.patch
rename to patches/server/0591-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0594-Add-more-WanderingTrader-API.patch b/patches/server/0593-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0594-Add-more-WanderingTrader-API.patch
rename to patches/server/0593-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0594-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0595-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0594-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0598-Inventory-close.patch b/patches/server/0597-Inventory-close.patch
similarity index 100%
rename from patches/server/0598-Inventory-close.patch
rename to patches/server/0597-Inventory-close.patch
diff --git a/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0600-Fix-CraftPotionBrewer-cache.patch b/patches/server/0599-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0600-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0599-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0601-Add-basic-Datapack-API.patch b/patches/server/0600-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0601-Add-basic-Datapack-API.patch
rename to patches/server/0600-Add-basic-Datapack-API.patch
diff --git a/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0601-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0602-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0601-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch
similarity index 99%
rename from patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch
index 947735fe790d..d0bab7793494 100644
--- a/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch
@@ -131,7 +131,7 @@ index c256423e9dc9d1837b847da44fb2920c58842c8b..0cb9803e30702de1cc530c1205fe9bbb
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aef114a256e048cd6c0c20a861d6fbfe61a7d1cf..14d8f37af21f2d7fb892c705c9da38ade0c88c41 100644
+index 9cf8d415d0499f8d6b87d4a7c9be7ff51c3cd5af..6fbed22273227d159797bd38ab4c1705180559f3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2799,7 +2799,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0604-ItemStack-repair-check-API.patch b/patches/server/0603-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0604-ItemStack-repair-check-API.patch
rename to patches/server/0603-ItemStack-repair-check-API.patch
diff --git a/patches/server/0605-More-Enchantment-API.patch b/patches/server/0604-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0605-More-Enchantment-API.patch
rename to patches/server/0604-More-Enchantment-API.patch
diff --git a/patches/server/0606-Move-range-check-for-block-placing-up.patch b/patches/server/0605-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0606-Move-range-check-for-block-placing-up.patch
rename to patches/server/0605-Move-range-check-for-block-placing-up.patch
index bffb7846e385..a46d1ca83511 100644
--- a/patches/server/0606-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0605-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 363e16f3d8069d2828cd7437c7aed4cccccd9002..5156aed4bc166898aa1cbc30d70b802d0b2ac4b7 100644
+index 6fbed22273227d159797bd38ab4c1705180559f3..b245e87adb867e84f13b13863183f70ab889802b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1817,6 +1817,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
index b3ba746299bc..5b70a6d72918 100644
--- a/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
@@ -275,7 +275,7 @@ index 98385550084c9f975e494668961bac6ccb0700ab..1147044f2c4c2e9510cb6e5c38b6abe8
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aa23f1c88d91b9476c276e644572c20c17b3855c..5fa98801e2e64d4e2d948af5f131ed32b96c0510 100644
+index 974cb4108f11394d7b7dbb270cae93aefe4e5511..8843939070d4155ef3457a90548cee1f19debb2f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -552,11 +552,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0608-Add-Mob-lookAt-API.patch b/patches/server/0607-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0608-Add-Mob-lookAt-API.patch
rename to patches/server/0607-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0609-Add-Unix-domain-socket-support.patch b/patches/server/0608-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0609-Add-Unix-domain-socket-support.patch
rename to patches/server/0608-Add-Unix-domain-socket-support.patch
index 594680e9a322..e5c081c0e53b 100644
--- a/patches/server/0609-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0608-Add-Unix-domain-socket-support.patch
@@ -91,7 +91,7 @@ index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f5
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5156aed4bc166898aa1cbc30d70b802d0b2ac4b7..0f8c29375790599f75d3d4535a417bafba916396 100644
+index b245e87adb867e84f13b13863183f70ab889802b..6205a08aca97b2e8bba9c06e399f700023a08ab2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2633,6 +2633,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0610-Add-EntityInsideBlockEvent.patch b/patches/server/0609-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0610-Add-EntityInsideBlockEvent.patch
rename to patches/server/0609-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0611-Attributes-API-for-item-defaults.patch b/patches/server/0610-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0611-Attributes-API-for-item-defaults.patch
rename to patches/server/0610-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0613-More-Lidded-Block-API.patch b/patches/server/0612-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0613-More-Lidded-Block-API.patch
rename to patches/server/0612-More-Lidded-Block-API.patch
diff --git a/patches/server/0614-Limit-item-frame-cursors-on-maps.patch b/patches/server/0613-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0614-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0613-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0615-Add-PlayerKickEvent-causes.patch b/patches/server/0614-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0615-Add-PlayerKickEvent-causes.patch
rename to patches/server/0614-Add-PlayerKickEvent-causes.patch
index 6114805b907f..9d308fed42f0 100644
--- a/patches/server/0615-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0614-Add-PlayerKickEvent-causes.patch
@@ -36,7 +36,7 @@ index b5f54ee82905e3e6ab5bfde35ab625f5feeb1393..c0a80824a0307ea673805015119cc834
  
          public boolean shouldDisconnect() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5fa98801e2e64d4e2d948af5f131ed32b96c0510..09617ff2716b8e75380421e9a19c145806602151 100644
+index 8843939070d4155ef3457a90548cee1f19debb2f..e4cf95705ac73d7333628d2659caec444b750420 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2151,7 +2151,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -88,7 +88,7 @@ index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb6
                  return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason);
              }, true);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5bca0a32de3355dd472fde02b0ddf3055a42ab0c..63aa0a4bc2fe0011c7e4e9736993dec52fc4e43e 100644
+index 6205a08aca97b2e8bba9c06e399f700023a08ab2..47dafff9552ded18780f5a059768f9dbb7a69ba8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -364,7 +364,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0616-Add-PufferFishStateChangeEvent.patch b/patches/server/0615-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0616-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0615-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0620-Add-BellRevealRaiderEvent.patch b/patches/server/0619-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0620-Add-BellRevealRaiderEvent.patch
rename to patches/server/0619-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0621-Fix-invulnerable-end-crystals.patch b/patches/server/0620-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0621-Fix-invulnerable-end-crystals.patch
rename to patches/server/0620-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0621-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0622-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0621-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0623-Fix-dangerous-end-portal-logic.patch b/patches/server/0622-Fix-dangerous-end-portal-logic.patch
similarity index 97%
rename from patches/server/0623-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0622-Fix-dangerous-end-portal-logic.patch
index 8c79c6982591..46f623d255f8 100644
--- a/patches/server/0623-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0622-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ 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 5f93c2fa9be835825d9a3c5fbd85ab285eced34d..205be31a06f97678aea0da06bc13f5a18b6eb903 100644
+index 3d1cde6740e2b68d8d6e372cb52a6485fc3f7316..e3024f2fff1cd8de618216a42716da8caf37d5be 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -515,6 +515,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0625-Make-item-validations-configurable.patch b/patches/server/0624-Make-item-validations-configurable.patch
similarity index 97%
rename from patches/server/0625-Make-item-validations-configurable.patch
rename to patches/server/0624-Make-item-validations-configurable.patch
index 00627de2242a..3f5b80b14af2 100644
--- a/patches/server/0625-Make-item-validations-configurable.patch
+++ b/patches/server/0624-Make-item-validations-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index cf928745c36af0e6fa0a95e177395c5fb1aa821a..2a08b1ac6e9aac81012997637b4cad59f0f1125a 100644
+index 5d72d2c6fcab478121eb9b4216cf79532b58299e..88c899e323eb554febe191ac7df678bbdfde08dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -88,11 +88,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
diff --git a/patches/server/0626-Line-Of-Sight-Changes.patch b/patches/server/0625-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0626-Line-Of-Sight-Changes.patch
rename to patches/server/0625-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0627-add-per-world-spawn-limits.patch b/patches/server/0626-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0627-add-per-world-spawn-limits.patch
rename to patches/server/0626-add-per-world-spawn-limits.patch
diff --git a/patches/server/0628-Fix-potions-splash-events.patch b/patches/server/0627-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0628-Fix-potions-splash-events.patch
rename to patches/server/0627-Fix-potions-splash-events.patch
diff --git a/patches/server/0629-Add-more-LimitedRegion-API.patch b/patches/server/0628-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0629-Add-more-LimitedRegion-API.patch
rename to patches/server/0628-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 94%
rename from patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 07077c14b333..4633203da6d0 100644
--- a/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a340a190b223efb6fafba3c7c9e996818709d6e9..7d5de33442fe4ba53c51cc7356323622c2c3022f 100644
+index 0162c504673f5809b28ca58177773c005460f039..e100534a676bd950513f3b9217e4949b65f20960 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2294,7 +2294,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0631-Missing-Entity-API.patch b/patches/server/0630-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0631-Missing-Entity-API.patch
rename to patches/server/0630-Missing-Entity-API.patch
diff --git a/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index f7d9bc80b7f8..d46f441bde02 100644
--- a/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bc609a16fed44f0a96025fb3b75eec039107338c..e7d8f3521de27ef6886f4ed2affd0066e55c9de1 100644
+index 47dafff9552ded18780f5a059768f9dbb7a69ba8..d69c4cccc1a26284bfb3a12a332df85ee14a4906 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1211,7 +1211,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 98%
rename from patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch
index 6db45da44f68..915947a5046c 100644
--- a/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch
@@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..01a2bc1feec808790bb93618ce46adb9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 4b9d326458fb3029f19e58b77ef0156b26b9c88b..0521240dddde12d78cc05deda7fac11690f5d155 100644
+index 7e4fbf3cd57c74b61cec75c02eb35756a243de17..e34f7426df5d6c94fcc4101b28702e6c1d9fccff 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -275,7 +275,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0636-Adds-PlayerArmSwingEvent.patch b/patches/server/0635-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0636-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0635-Adds-PlayerArmSwingEvent.patch
index f83880d1351f..1709c951b55d 100644
--- a/patches/server/0636-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0635-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e7d8f3521de27ef6886f4ed2affd0066e55c9de1..c0c74f9b851bacc4079bc156b80bc7e2950c45e3 100644
+index d69c4cccc1a26284bfb3a12a332df85ee14a4906..fff82d1fde56ff8ca564b3209877dedc0b384c20 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2500,7 +2500,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch
index ea5bf61f8125..65321f7218d4 100644
--- a/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index e100534a676bd950513f3b9217e4949b65f20960..0a25e2bb95fa249fa5cde1a174702bb3
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c0c74f9b851bacc4079bc156b80bc7e2950c45e3..5ed9ab2e261d64234c388d4bfdc27d31cf112117 100644
+index fff82d1fde56ff8ca564b3209877dedc0b384c20..3c6e4819065786c89773476edf89b5d88db8559d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -516,7 +516,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0638-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0639-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0638-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch
similarity index 94%
rename from patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0639-Don-t-apply-cramming-damage-to-players.patch
index a423c75fc207..27268bcd9ea5 100644
--- a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 478dbba3519f8d2fdd4b203756403761ccad553b..deaf1fcb189ba1382f2b52d12afa12463874f7ec 100644
+index 0a25e2bb95fa249fa5cde1a174702bb311a45171..eaa1b300870f3bbf5a34cb99e6af116b7c244628 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -100,6 +100,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0643-Stinger-API.patch b/patches/server/0642-Stinger-API.patch
similarity index 93%
rename from patches/server/0643-Stinger-API.patch
rename to patches/server/0642-Stinger-API.patch
index 2ff2986a81a0..06a76158c008 100644
--- a/patches/server/0643-Stinger-API.patch
+++ b/patches/server/0642-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index afcf10fa6a4446698cd00ac94dded0f61297880c..dc82cc9f6ab09224a82c2a03e9e49b8f1f527733 100644
+index 92578adeab74b53e2001262986f883913aa15f05..df1ac9a3e3a3551a798432ded2ba90a3c11db72f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0645-Add-System.out-err-catcher.patch b/patches/server/0644-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0645-Add-System.out-err-catcher.patch
rename to patches/server/0644-Add-System.out-err-catcher.patch
diff --git a/patches/server/0646-Fix-test-not-bootstrapping.patch b/patches/server/0645-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0646-Fix-test-not-bootstrapping.patch
rename to patches/server/0645-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0648-Improve-boat-collision-performance.patch b/patches/server/0647-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0648-Improve-boat-collision-performance.patch
rename to patches/server/0647-Improve-boat-collision-performance.patch
diff --git a/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
index 9dccdbeb2bf2..812b682bf971 100644
--- a/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5ed9ab2e261d64234c388d4bfdc27d31cf112117..d4f989c409d16864ffc0535afed546a2a7325ffc 100644
+index 3c6e4819065786c89773476edf89b5d88db8559d..75ea5d01a515dcc604a1414d7261887ca71b243e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -433,7 +433,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0651-Add-PlayerSetSpawnEvent.patch b/patches/server/0650-Add-PlayerSetSpawnEvent.patch
similarity index 99%
rename from patches/server/0651-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0650-Add-PlayerSetSpawnEvent.patch
index ab8aa299791f..3b0c94b6e21c 100644
--- a/patches/server/0651-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0650-Add-PlayerSetSpawnEvent.patch
@@ -187,7 +187,7 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f94fa71039ebd0e638745a0cd7ca86b98ecb9b5e..56418e69c8872f99efced7ca504274697db65eaa 100644
+index 04979441a1e654d978b858acb2219da6615ed8a6..0e753ae3a5db5406d779371bcb5c791bdf93c261 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1321,9 +1321,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
similarity index 90%
rename from patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
index 80e615822e36..fb65af2e4dce 100644
--- a/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index f578bfa3a2ae7f29999f9e551f687ae820bbbb80..e0477658849c9e9c6aebed621e8b11c32db86af8 100644
+index d1bcc1f9816826391b7ba7c79e3b1c2c013933de..12820b5f8a3da042f04787b36cc6b6c7d15f803f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -76,7 +76,7 @@ public class ServerEntity {
diff --git a/patches/server/0654-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0654-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0653-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0655-Added-EntityDamageItemEvent.patch b/patches/server/0654-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0655-Added-EntityDamageItemEvent.patch
rename to patches/server/0654-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0656-Optimize-indirect-passenger-iteration.patch b/patches/server/0655-Optimize-indirect-passenger-iteration.patch
similarity index 96%
rename from patches/server/0656-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0655-Optimize-indirect-passenger-iteration.patch
index d9ce7834c43d..9648fe809d49 100644
--- a/patches/server/0656-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0655-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ 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 205be31a06f97678aea0da06bc13f5a18b6eb903..f99feb964e4da1bcb49fc643e207115fe4c3c68b 100644
+index e3024f2fff1cd8de618216a42716da8caf37d5be..7802d3d9274c9083a89b9f62441194e8a0d8975b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3882,20 +3882,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 93%
rename from patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
index 88b526e1cf5a..4cb10a6ef341 100644
--- a/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index e0477658849c9e9c6aebed621e8b11c32db86af8..f56291dae2fdf4b54dd673e1b98dc39a94f42a9e 100644
+index 12820b5f8a3da042f04787b36cc6b6c7d15f803f..f8b3d633e788c3d6cb5b53e606fa798a42582460 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -114,7 +114,7 @@ public class ServerEntity {
diff --git a/patches/server/0658-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0658-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0657-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0659-Clear-bucket-NBT-after-dispense.patch b/patches/server/0658-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0659-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0658-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0661-Add-BlockBreakBlockEvent.patch b/patches/server/0660-Add-BlockBreakBlockEvent.patch
similarity index 98%
rename from patches/server/0661-Add-BlockBreakBlockEvent.patch
rename to patches/server/0660-Add-BlockBreakBlockEvent.patch
index 83bda7fe5981..7dcc487c07a4 100644
--- a/patches/server/0661-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0660-Add-BlockBreakBlockEvent.patch
@@ -33,7 +33,7 @@ index 36b196c8834c4eb873bfca0b12f1fc2b421ea071..9522e646529f3d849471931b4b3c0d13
      public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
          if (world instanceof ServerLevel) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 9abae63e06c1dde9b8434d32bac8798808428d10..9b3d253c4224410719bf778a4688fce13c12069d 100644
+index e14967a745c21ff48a88fa0f22cc296a73b43d92..8125c334c54d41ad731bbc3481662b0cf0afee51 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -401,7 +401,7 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0663-More-CommandBlock-API.patch b/patches/server/0662-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0663-More-CommandBlock-API.patch
rename to patches/server/0662-More-CommandBlock-API.patch
diff --git a/patches/server/0664-Add-missing-team-sidebar-display-slots.patch b/patches/server/0663-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0664-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0663-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0665-Add-back-EntityPortalExitEvent.patch b/patches/server/0664-Add-back-EntityPortalExitEvent.patch
similarity index 97%
rename from patches/server/0665-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0664-Add-back-EntityPortalExitEvent.patch
index 02d6cbd9473b..2e93344df1d7 100644
--- a/patches/server/0665-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0664-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ 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 7802d3d9274c9083a89b9f62441194e8a0d8975b..060fbc163b0ee8fc0baa4e18d18d25830353e0a9 100644
+index 7802d3d9274c9083a89b9f62441194e8a0d8975b..f7a97ac4eb851f35275cfeb4717f0f69dda4336e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3329,6 +3329,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0667-Get-entity-default-attributes.patch b/patches/server/0666-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0667-Get-entity-default-attributes.patch
rename to patches/server/0666-Get-entity-default-attributes.patch
diff --git a/patches/server/0668-Left-handed-API.patch b/patches/server/0667-Left-handed-API.patch
similarity index 100%
rename from patches/server/0668-Left-handed-API.patch
rename to patches/server/0667-Left-handed-API.patch
diff --git a/patches/server/0669-Add-more-advancement-API.patch b/patches/server/0668-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0669-Add-more-advancement-API.patch
rename to patches/server/0668-Add-more-advancement-API.patch
diff --git a/patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0671-Add-critical-damage-API.patch b/patches/server/0670-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0671-Add-critical-damage-API.patch
rename to patches/server/0670-Add-critical-damage-API.patch
diff --git a/patches/server/0672-Fix-issues-with-mob-conversion.patch b/patches/server/0671-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0672-Fix-issues-with-mob-conversion.patch
rename to patches/server/0671-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0673-Add-isCollidable-methods-to-various-places.patch b/patches/server/0672-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0673-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0672-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0674-Goat-ram-API.patch b/patches/server/0673-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0674-Goat-ram-API.patch
rename to patches/server/0673-Goat-ram-API.patch
diff --git a/patches/server/0675-Add-API-for-resetting-a-single-score.patch b/patches/server/0674-Add-API-for-resetting-a-single-score.patch
similarity index 91%
rename from patches/server/0675-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0674-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9e0..0983cd3cdfe5 100644
--- a/patches/server/0675-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0674-Add-API-for-resetting-a-single-score.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add API for resetting a single score
 It was only possible to reset all scores for a specific entry, instead of resetting only specific scores.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-index 2c4ffed5e828f051c44f494a8ed599a8197d7450..3b26793b67282c3a20c023b9c13a2a9b54d5d932 100644
+index 024c138082d68291db161a9ca3d233ef27788097..e5898f391e18fe5da9affd9321d1f34bba0af2d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 @@ -68,4 +68,12 @@ final class CraftScore implements Score {
diff --git a/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0677-Vanilla-command-permission-fixes.patch b/patches/server/0676-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0677-Vanilla-command-permission-fixes.patch
rename to patches/server/0676-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 51a8fd461113..8df11691d375 100644
--- a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index e809a959d69197ecdec768a2d4f348c73c0d5b9a..0f6d4f80677c54a94a1bbfb861a3bcce
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c06e81d5448364154d9fb4fb68c1867d04daeb97..1511d45eb61e72e73bc17cfe03fbb6c22f9dd128 100644
+index 59e02bd5b49e0c900d049a1f1927316d45910768..ce2972c62f91724f6a9e56c8103fba219f7a60bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1615,6 +1615,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0679-Fix-GameProfileCache-concurrency.patch b/patches/server/0678-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0679-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0678-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch
similarity index 98%
rename from patches/server/0680-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0679-Improve-and-expand-AsyncCatcher.patch
index 8cffa38f71a9..9b4cc3bf89fd 100644
--- a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d4f989c409d16864ffc0535afed546a2a7325ffc..03d75644a2f2a76022bb8f18d64ccbd35fc93d4a 100644
+index 75ea5d01a515dcc604a1414d7261887ca71b243e..c534dadb3414c487fd3afbf7be71bfcbf55d66ab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1658,6 +1658,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -166,7 +166,7 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index dc82cc9f6ab09224a82c2a03e9e49b8f1f527733..c29067c513531b819e4d48cd8cab3ed036ae1668 100644
+index df1ac9a3e3a3551a798432ded2ba90a3c11db72f..17bb9318262b04c2005bec23bcaf05f3ed06c7db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0682-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0682-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0681-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0683-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0683-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0682-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0684-Optimise-general-POI-access.patch b/patches/server/0683-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0684-Optimise-general-POI-access.patch
rename to patches/server/0683-Optimise-general-POI-access.patch
diff --git a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 99%
rename from patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 9039a81a52f4..2cd6a73f9c04 100644
--- a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -333,7 +333,7 @@ index 3f5d572994bc8b3f1e106105dc0bb202ad005b8c..5c5fe2087a7617324ab8e18389e3ffa9
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1511d45eb61e72e73bc17cfe03fbb6c22f9dd128..7b8e06fc7e2d422ba0e996d6de3f769e995cc6e5 100644
+index ce2972c62f91724f6a9e56c8103fba219f7a60bb..6c00162847b59ffa3d1403b956545c57ba539139 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -273,6 +273,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0686-Optimise-chunk-tick-iteration.patch b/patches/server/0685-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0686-Optimise-chunk-tick-iteration.patch
rename to patches/server/0685-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
similarity index 98%
rename from patches/server/0687-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0686-Execute-chunk-tasks-mid-tick.patch
index e58dbbe39371..e5510c741da7 100644
--- a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..efbf77024d235d8af9f7efc938c17afd
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 09617ff2716b8e75380421e9a19c145806602151..ebd092a3f3c745b3a2f69fd72c04be7a2ab214a2 100644
+index e4cf95705ac73d7333628d2659caec444b750420..32fda33ff9684e08da6e7bee2eb0dc26ed701950 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1303,6 +1303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
similarity index 99%
rename from patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
index c676c7ba944d..f91efb026404 100644
--- a/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 1d0f87185a8a74394bc2da29828407fd4210754c..d6429d721116aac2a4df8d0b217e9efc
  
      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 7065d61551a88c04e2e1ba44448a7ae74ad7bf43..ac62a7f286832406390d9186b633974eb136061e 100644
+index 0d2506350e2c57044bf7c751627b6e0d76077e82..0e494502bc6d52f277d240d839e02b51fccf05fc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0691-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0691-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0692-Distance-manager-tick-timings.patch b/patches/server/0691-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0692-Distance-manager-tick-timings.patch
rename to patches/server/0691-Distance-manager-tick-timings.patch
diff --git a/patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0695-Add-packet-limiter-config.patch b/patches/server/0694-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0695-Add-packet-limiter-config.patch
rename to patches/server/0694-Add-packet-limiter-config.patch
diff --git a/patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0699-Time-scoreboard-search.patch b/patches/server/0698-Time-scoreboard-search.patch
similarity index 96%
rename from patches/server/0699-Time-scoreboard-search.patch
rename to patches/server/0698-Time-scoreboard-search.patch
index 5c5417edeb47..6c89e1afaf2e 100644
--- a/patches/server/0699-Time-scoreboard-search.patch
+++ b/patches/server/0698-Time-scoreboard-search.patch
@@ -19,7 +19,7 @@ index 670dcfa32d003870091b75937f1603a5ac9fa7d1..112029cb275d45dced60807820f1bfe9
      public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index 6fcb2356b471c5a61faa0813a891c3898683d01f..7674939964894a56ce495e47d400cbf12cd0475b 100644
+index afc43b52698db4bf7d89a576c2cbca0ddc9e04e2..500f2eb0df5a07637cd278c263e95592b0037eb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager {
diff --git a/patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 94%
rename from patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
index d2497585ecab..3f4a16e8ce64 100644
--- a/patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index f56291dae2fdf4b54dd673e1b98dc39a94f42a9e..57d3249c8b18f34245389b1f828e927becafc10c 100644
+index f8b3d633e788c3d6cb5b53e606fa798a42582460..e7c0d214abbad1f300049f790ae54e7ea488e150 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -180,7 +180,7 @@ public class ServerEntity {
diff --git a/patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0702-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0701-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0702-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0701-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0704-Optimise-random-block-ticking.patch b/patches/server/0703-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0704-Optimise-random-block-ticking.patch
rename to patches/server/0703-Optimise-random-block-ticking.patch
diff --git a/patches/server/0705-Optimise-non-flush-packet-sending.patch b/patches/server/0704-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0705-Optimise-non-flush-packet-sending.patch
rename to patches/server/0704-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0706-Optimise-nearby-player-lookups.patch b/patches/server/0705-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0706-Optimise-nearby-player-lookups.patch
rename to patches/server/0705-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0707-Remove-streams-for-villager-AI.patch b/patches/server/0706-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0707-Remove-streams-for-villager-AI.patch
rename to patches/server/0706-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
index 68267b57bc1e..0fdcb3a4ff19 100644
--- a/patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index dcfa0d630286e854474854add012138830aa389f..102955438ce339c403a5c0a7409bcf1894293c44 100644
+index a24d682d77682c8421ed1e37be3905b2a5c8aff9..a62f151047f90ef1db278192b29b3bd3213d4d46 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -41,6 +41,11 @@ dependencies {
diff --git a/patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index b27c7a7e6eae..74f172007970 100644
--- a/patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 03d75644a2f2a76022bb8f18d64ccbd35fc93d4a..bf854ded3a13bbabb78ec521c1a1ac12195dc383 100644
+index c534dadb3414c487fd3afbf7be71bfcbf55d66ab..bcf93ca2dacbd527db8b17f4e1a7d1836ae493f7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -849,6 +849,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0715-Ensure-valid-vehicle-status.patch b/patches/server/0714-Ensure-valid-vehicle-status.patch
similarity index 90%
rename from patches/server/0715-Ensure-valid-vehicle-status.patch
rename to patches/server/0714-Ensure-valid-vehicle-status.patch
index f96c46691ecd..b93e7048fc2d 100644
--- a/patches/server/0715-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0714-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7b8e06fc7e2d422ba0e996d6de3f769e995cc6e5..5aa34babd53900fb5f7cf973628751ecec64172d 100644
+index 6c00162847b59ffa3d1403b956545c57ba539139..52dba7fad11a7280137ade67983e594487e20891 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -568,7 +568,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0718-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0717-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0718-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0717-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0719-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0718-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0719-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0718-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0720-Preserve-overstacked-loot.patch b/patches/server/0719-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0720-Preserve-overstacked-loot.patch
rename to patches/server/0719-Preserve-overstacked-loot.patch
diff --git a/patches/server/0721-Update-head-rotation-in-missing-places.patch b/patches/server/0720-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0721-Update-head-rotation-in-missing-places.patch
rename to patches/server/0720-Update-head-rotation-in-missing-places.patch
index 377d26ab3fdb..25a0828fd052 100644
--- a/patches/server/0721-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0720-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ 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 b421f4f8f32dd3df97ba465e6d865d23fc0afda8..e6ec85bb667cf1c7618402bfc2e6fc194706c368 100644
+index 0e494502bc6d52f277d240d839e02b51fccf05fc..61a3f7984e798191c74e85a514ca1ecde70e03ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1903,6 +1903,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0722-prevent-unintended-light-block-manipulation.patch b/patches/server/0721-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0722-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0721-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0723-Fix-CraftCriteria-defaults-map.patch b/patches/server/0722-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0723-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0722-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0724-Fix-upstreams-block-state-factories.patch b/patches/server/0723-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0724-Fix-upstreams-block-state-factories.patch
rename to patches/server/0723-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0726-Configurable-feature-seeds.patch b/patches/server/0725-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0726-Configurable-feature-seeds.patch
rename to patches/server/0725-Configurable-feature-seeds.patch
diff --git a/patches/server/0727-Add-root-admin-user-detection.patch b/patches/server/0726-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0727-Add-root-admin-user-detection.patch
rename to patches/server/0726-Add-root-admin-user-detection.patch
diff --git a/patches/server/0728-Always-allow-item-changing-in-Fireball.patch b/patches/server/0727-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0728-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0727-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0729-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0729-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0730-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0730-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0731-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0731-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0732-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0732-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0733-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0733-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
index ee0b7d16fb60..499949ee80a7 100644
--- a/patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 24f0d61a2fa9ac95dd26443a978209b53baf10b1..31fa0f4fbf195d0db7a89a060b1cc4fd
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bf854ded3a13bbabb78ec521c1a1ac12195dc383..3a59cbb7fdd9b5fc75ed850d049caecf47b600b8 100644
+index bcf93ca2dacbd527db8b17f4e1a7d1836ae493f7..33a7ff327b7ba69fde0ce39bcf347892479ae479 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2714,8 +2714,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0735-Fix-Spigot-growth-modifiers.patch b/patches/server/0734-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0735-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0734-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0737-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0736-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0737-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0736-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0738-Optimize-HashMapPalette.patch b/patches/server/0737-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0738-Optimize-HashMapPalette.patch
rename to patches/server/0737-Optimize-HashMapPalette.patch
diff --git a/patches/server/0739-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0739-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0740-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0740-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch
index d938d4927720..4acd15fccd43 100644
--- a/patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a59cbb7fdd9b5fc75ed850d049caecf47b600b8..60950d7d3ef288da4e3ea9a6cde3e31c06d33557 100644
+index 33a7ff327b7ba69fde0ce39bcf347892479ae479..c89c6c9f315756dc46f253a155d34bb229eca21c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -649,7 +649,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0742-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0742-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0743-Add-more-Campfire-API.patch b/patches/server/0742-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0743-Add-more-Campfire-API.patch
rename to patches/server/0742-Add-more-Campfire-API.patch
diff --git a/patches/server/0744-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0744-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0745-Fix-tripwire-state-inconsistency.patch b/patches/server/0744-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0745-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0744-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0746-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0745-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0746-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0745-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0747-Improve-scoreboard-entries.patch b/patches/server/0746-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0747-Improve-scoreboard-entries.patch
rename to patches/server/0746-Improve-scoreboard-entries.patch
diff --git a/patches/server/0748-Entity-powdered-snow-API.patch b/patches/server/0747-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0748-Entity-powdered-snow-API.patch
rename to patches/server/0747-Entity-powdered-snow-API.patch
diff --git a/patches/server/0749-Add-API-for-item-entity-health.patch b/patches/server/0748-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0749-Add-API-for-item-entity-health.patch
rename to patches/server/0748-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0750-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0750-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0751-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0751-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0752-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0752-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0753-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0753-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0754-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0754-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0755-Fix-bees-aging-inside-hives.patch b/patches/server/0754-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0755-Fix-bees-aging-inside-hives.patch
rename to patches/server/0754-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0756-Bucketable-API.patch b/patches/server/0755-Bucketable-API.patch
similarity index 100%
rename from patches/server/0756-Bucketable-API.patch
rename to patches/server/0755-Bucketable-API.patch
diff --git a/patches/server/0757-Validate-usernames.patch b/patches/server/0756-Validate-usernames.patch
similarity index 100%
rename from patches/server/0757-Validate-usernames.patch
rename to patches/server/0756-Validate-usernames.patch
diff --git a/patches/server/0758-Make-water-animal-spawn-height-configurable.patch b/patches/server/0757-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0758-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0757-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 63f9d7fecc6a..2d9896694754 100644
--- a/patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ebd092a3f3c745b3a2f69fd72c04be7a2ab214a2..91a66fb66e9df5d5878315afa9d357a388e6e837 100644
+index 32fda33ff9684e08da6e7bee2eb0dc26ed701950..5dd0602cab15e7f063f9ef182bb179356e50012b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -562,7 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0760-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0760-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0761-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0761-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0762-Multiple-Entries-with-Scoreboards.patch b/patches/server/0761-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0762-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0761-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0763-Reset-placed-block-on-exception.patch b/patches/server/0762-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0763-Reset-placed-block-on-exception.patch
rename to patches/server/0762-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0764-Add-configurable-height-for-slime-spawn.patch b/patches/server/0763-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0764-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0763-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0765-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0765-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0766-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0765-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0766-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0765-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0767-Kick-on-main-for-illegal-chat.patch b/patches/server/0766-Kick-on-main-for-illegal-chat.patch
similarity index 96%
rename from patches/server/0767-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0766-Kick-on-main-for-illegal-chat.patch
index 08406201d714..a4ebe0685206 100644
--- a/patches/server/0767-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0766-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60950d7d3ef288da4e3ea9a6cde3e31c06d33557..aeabaa196d5347dd070e9132fd869e00c9792276 100644
+index c89c6c9f315756dc46f253a155d34bb229eca21c..661a5ee162829a060284a870e1704f615cc768ac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2167,7 +2167,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0768-Multi-Block-Change-API-Implementation.patch b/patches/server/0767-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0768-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0767-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0769-Fix-NotePlayEvent.patch b/patches/server/0768-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0769-Fix-NotePlayEvent.patch
rename to patches/server/0768-Fix-NotePlayEvent.patch
diff --git a/patches/server/0770-Freeze-Tick-Lock-API.patch b/patches/server/0769-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0770-Freeze-Tick-Lock-API.patch
rename to patches/server/0769-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0771-Dolphin-API.patch b/patches/server/0770-Dolphin-API.patch
similarity index 100%
rename from patches/server/0771-Dolphin-API.patch
rename to patches/server/0770-Dolphin-API.patch
diff --git a/patches/server/0772-More-PotionEffectType-API.patch b/patches/server/0771-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0772-More-PotionEffectType-API.patch
rename to patches/server/0771-More-PotionEffectType-API.patch
diff --git a/patches/server/0773-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0773-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0774-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0774-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0775-Add-missing-structure-set-seed-configs.patch b/patches/server/0774-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0775-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0774-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0776-Implement-regenerateChunk.patch b/patches/server/0775-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0776-Implement-regenerateChunk.patch
rename to patches/server/0775-Implement-regenerateChunk.patch
diff --git a/patches/server/0777-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0777-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0778-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0778-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0779-Add-GameEvent-tags.patch b/patches/server/0778-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0779-Add-GameEvent-tags.patch
rename to patches/server/0778-Add-GameEvent-tags.patch
diff --git a/patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 45ac694a2ba7..5d99b78f0694 100644
--- a/patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 91a66fb66e9df5d5878315afa9d357a388e6e837..934e948bb112bcfc69e656ac4c6a97f0a72d7b74 100644
+index 5dd0602cab15e7f063f9ef182bb179356e50012b..e9210402d0dfb7c15d44ba868fdf47ca98875ab4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1306,6 +1306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0781-Furnace-RecipesUsed-API.patch b/patches/server/0780-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0781-Furnace-RecipesUsed-API.patch
rename to patches/server/0780-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0782-Configurable-sculk-sensor-listener-range.patch b/patches/server/0781-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0782-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0781-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0783-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0782-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0783-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0782-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 964a6c913e7f..63745d522fc7 100644
--- a/patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 934e948bb112bcfc69e656ac4c6a97f0a72d7b74..a9240274b903f23a5d0b2414b3bc7a984845b6cd 100644
+index e9210402d0dfb7c15d44ba868fdf47ca98875ab4..1c401b5ee78a52e16e469be77abfa830152cb5f5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -589,7 +589,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 95%
rename from patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
index 8642fd9b7217..48bbd69c7b66 100644
--- a/patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a9240274b903f23a5d0b2414b3bc7a984845b6cd..9b720d3407802eac986c2044892d5b70455aedfb 100644
+index 1c401b5ee78a52e16e469be77abfa830152cb5f5..e2eaa10a5d3cc3aa703f0d1406b5065327130861 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -601,9 +601,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0786-Fix-Entity-Position-Desync.patch b/patches/server/0785-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0786-Fix-Entity-Position-Desync.patch
rename to patches/server/0785-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0787-Custom-Potion-Mixes.patch b/patches/server/0786-Custom-Potion-Mixes.patch
similarity index 99%
rename from patches/server/0787-Custom-Potion-Mixes.patch
rename to patches/server/0786-Custom-Potion-Mixes.patch
index aa329b141155..5eba0abefd4f 100644
--- a/patches/server/0787-Custom-Potion-Mixes.patch
+++ b/patches/server/0786-Custom-Potion-Mixes.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..6b0bed550763f34e18c9e92f9a47ec0c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9b720d3407802eac986c2044892d5b70455aedfb..910523399b1fae64808b292cfb45bed56719fcb3 100644
+index e2eaa10a5d3cc3aa703f0d1406b5065327130861..e52936ce703b9c95f85a41b90fb3cb3df8a04fce 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2058,6 +2058,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0788-Force-close-world-loading-screen.patch b/patches/server/0787-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0788-Force-close-world-loading-screen.patch
rename to patches/server/0787-Force-close-world-loading-screen.patch
diff --git a/patches/server/0789-Fix-falling-block-spawn-methods.patch b/patches/server/0788-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0789-Fix-falling-block-spawn-methods.patch
rename to patches/server/0788-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0790-Expose-furnace-minecart-push-values.patch b/patches/server/0789-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0790-Expose-furnace-minecart-push-values.patch
rename to patches/server/0789-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0791-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0791-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0792-More-Projectile-API.patch b/patches/server/0791-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0792-More-Projectile-API.patch
rename to patches/server/0791-More-Projectile-API.patch
diff --git a/patches/server/0793-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0793-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index f2d111af4d19..c62ee957ebf9 100644
--- a/patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aeabaa196d5347dd070e9132fd869e00c9792276..655dc1cda9a498466ffef68d41bde5030dfe53c3 100644
+index 661a5ee162829a060284a870e1704f615cc768ac..21c7cf0af2cc65f1f0275f4089326cdcfd94ec90 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -578,6 +578,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0795-Implement-getComputedBiome-API.patch b/patches/server/0794-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0795-Implement-getComputedBiome-API.patch
rename to patches/server/0794-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0796-Make-some-itemstacks-nonnull.patch b/patches/server/0795-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0796-Make-some-itemstacks-nonnull.patch
rename to patches/server/0795-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0797-Implement-enchantWithLevels-API.patch b/patches/server/0796-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0797-Implement-enchantWithLevels-API.patch
rename to patches/server/0796-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0798-Fix-saving-in-unloadWorld.patch b/patches/server/0797-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0798-Fix-saving-in-unloadWorld.patch
rename to patches/server/0797-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0799-Buffer-OOB-setBlock-calls.patch b/patches/server/0798-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0799-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0798-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0800-Add-TameableDeathMessageEvent.patch b/patches/server/0799-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0800-Add-TameableDeathMessageEvent.patch
rename to patches/server/0799-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0801-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0801-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0802-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0802-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0803-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0803-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0804-Guard-against-invalid-entity-positions.patch b/patches/server/0803-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0804-Guard-against-invalid-entity-positions.patch
rename to patches/server/0803-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0805-cache-resource-keys.patch b/patches/server/0804-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0805-cache-resource-keys.patch
rename to patches/server/0804-cache-resource-keys.patch
diff --git a/patches/server/0806-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0806-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0807-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0807-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0808-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0808-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 93%
rename from patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch
index 4ee90b688a6b..96752e75e9f7 100644
--- a/patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ccd169ceb0e90eeb5debd1d7e6a00a0b7d8578e..842f9e9b1e1f1026f78fb69c6941896e565fde02 100644
+index 21c7cf0af2cc65f1f0275f4089326cdcfd94ec90..82154172b5d1452512587c9c7c6c897cfd6c2d40 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3345,7 +3345,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0810-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0810-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0811-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0811-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 99%
rename from patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
index 45d23775a9a5..4c1f68c7759b 100644
--- a/patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index 9a45921cbb1e7a39e6ef46cc93c14766ee8229ad..8115cf64a30b6438721769df6045e1b7
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 842f9e9b1e1f1026f78fb69c6941896e565fde02..569dcb7175dd0269c5ab7ea48fe7a56115f1281c 100644
+index 82154172b5d1452512587c9c7c6c897cfd6c2d40..85c328440db5aac79622a7ebf76c99affd2203d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2908,7 +2908,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0813-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0813-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0814-WorldCreator-keepSpawnLoaded.patch b/patches/server/0813-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0814-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0813-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0819-Add-PlayerStopUsingItemEvent.patch b/patches/server/0818-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0819-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0818-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0820-FallingBlock-auto-expire-setting.patch b/patches/server/0819-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0820-FallingBlock-auto-expire-setting.patch
rename to patches/server/0819-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0821-Don-t-tick-markers.patch b/patches/server/0820-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0821-Don-t-tick-markers.patch
rename to patches/server/0820-Don-t-tick-markers.patch
diff --git a/patches/server/0822-Do-not-accept-invalid-client-settings.patch b/patches/server/0821-Do-not-accept-invalid-client-settings.patch
similarity index 93%
rename from patches/server/0822-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0821-Do-not-accept-invalid-client-settings.patch
index 5212f1f462b1..bef1ad5d2587 100644
--- a/patches/server/0822-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0821-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 569dcb7175dd0269c5ab7ea48fe7a56115f1281c..595735875e8ffba672d17f08df11c101e640c807 100644
+index 85c328440db5aac79622a7ebf76c99affd2203d3..bb36a5c934252ce11c2705e676ecb943d362fcd4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3487,6 +3487,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0823-Add-support-for-Proxy-Protocol.patch b/patches/server/0822-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0823-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0822-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 97%
rename from patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
index fbdcc9b82f5f..2bc0648f5256 100644
--- a/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 910523399b1fae64808b292cfb45bed56719fcb3..66bb92ca535b559d3bca89b9bc841f8f842b7e07 100644
+index e52936ce703b9c95f85a41b90fb3cb3df8a04fce..dbeede822e4534b487d30772280eaac1d5c966f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0829-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0829-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0831-Dont-resent-entity-on-art-update.patch b/patches/server/0830-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0831-Dont-resent-entity-on-art-update.patch
rename to patches/server/0830-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0832-Add-WardenAngerChangeEvent.patch b/patches/server/0831-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0832-Add-WardenAngerChangeEvent.patch
rename to patches/server/0831-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0835-Nameable-Banner-API.patch b/patches/server/0834-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0835-Nameable-Banner-API.patch
rename to patches/server/0834-Nameable-Banner-API.patch
diff --git a/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 94%
rename from patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch
index 4a218bdcb8e3..3db604742591 100644
--- a/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aae750e2b6067a8fccff7e70b3b0422bd609904a..ae7e333ff9da224422b61b3b8c2d409144f18b9d 100644
+index bb36a5c934252ce11c2705e676ecb943d362fcd4..0a5ab47ecbfa4c7d1653fdc4b918387a1389f42e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2037,7 +2037,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0840-Add-Player-getFishHook.patch b/patches/server/0839-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0840-Add-Player-getFishHook.patch
rename to patches/server/0839-Add-Player-getFishHook.patch
diff --git a/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 94%
rename from patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch
index b47f885404db..25669d24d8c6 100644
--- a/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae7e333ff9da224422b61b3b8c2d409144f18b9d..7b42f4be71566f9d91496ae05177e5d5f398ac9a 100644
+index 0a5ab47ecbfa4c7d1653fdc4b918387a1389f42e..e8f40d5baec146262385f14f9b2e028f47c3ac6d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2295,7 +2295,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0844-Fix-Bee-flower-NPE.patch b/patches/server/0843-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0844-Fix-Bee-flower-NPE.patch
rename to patches/server/0843-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 3b8b7829602b..61310edc9424 100644
--- a/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7b42f4be71566f9d91496ae05177e5d5f398ac9a..81ba625e01dad1373ef7d5377bb28f9f0b0ae34e 100644
+index e8f40d5baec146262385f14f9b2e028f47c3ac6d..502ee7d0629b2b2e9b2513beb9b4e2fee3e6966f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2536,7 +2536,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0846-More-Teleport-API.patch b/patches/server/0845-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0846-More-Teleport-API.patch
rename to patches/server/0845-More-Teleport-API.patch
index 38009f852467..782c5a3664c1 100644
--- a/patches/server/0846-More-Teleport-API.patch
+++ b/patches/server/0845-More-Teleport-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 81ba625e01dad1373ef7d5377bb28f9f0b0ae34e..9a5ec7667b99ab271ff9824d3f250c11d5836ac3 100644
+index 502ee7d0629b2b2e9b2513beb9b4e2fee3e6966f..12b7cc8bb261888e8686b8fdd1db9cf44f1dbb65 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1713,11 +1713,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0847-Add-EntityPortalReadyEvent.patch b/patches/server/0846-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0847-Add-EntityPortalReadyEvent.patch
rename to patches/server/0846-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0849-Send-block-entities-after-destroy-prediction.patch b/patches/server/0848-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0849-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0848-Send-block-entities-after-destroy-prediction.patch
index 6c5d93fca78f..99d0cf630815 100644
--- a/patches/server/0849-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0848-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9a5ec7667b99ab271ff9824d3f250c11d5836ac3..11e37de9481d82bcc9de4aae82a04acd6659f869 100644
+index 12b7cc8bb261888e8686b8fdd1db9cf44f1dbb65..7bb601078ef3a983d1807246b91b669ae5d5a8e4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1859,8 +1859,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0852-Add-missing-BlockFadeEvents.patch b/patches/server/0851-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0852-Add-missing-BlockFadeEvents.patch
rename to patches/server/0851-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0853-Collision-API.patch b/patches/server/0852-Collision-API.patch
similarity index 100%
rename from patches/server/0853-Collision-API.patch
rename to patches/server/0852-Collision-API.patch
diff --git a/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0855-Block-Ticking-API.patch b/patches/server/0854-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0855-Block-Ticking-API.patch
rename to patches/server/0854-Block-Ticking-API.patch
diff --git a/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0858-Add-NamespacedKey-biome-methods.patch b/patches/server/0857-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0858-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0857-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
index fc9d24016013..0b4cd0a831a9 100644
--- a/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 66bb92ca535b559d3bca89b9bc841f8f842b7e07..c5f3dc74888919e82e2ffbb8d648b7640aa6b690 100644
+index dbeede822e4534b487d30772280eaac1d5c966f9..365bcfcf667ffa76253b1db5cd06a96e0f3679d5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -998,6 +998,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0862-Missing-eating-regain-reason.patch b/patches/server/0861-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0862-Missing-eating-regain-reason.patch
rename to patches/server/0861-Missing-eating-regain-reason.patch
diff --git a/patches/server/0863-Missing-effect-cause.patch b/patches/server/0862-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0863-Missing-effect-cause.patch
rename to patches/server/0862-Missing-effect-cause.patch
diff --git a/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0865-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0866-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0865-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0867-Configurable-chat-thread-limit.patch b/patches/server/0866-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0867-Configurable-chat-thread-limit.patch
rename to patches/server/0866-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0869-fix-Jigsaw-block-kicking-user.patch b/patches/server/0868-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0869-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0868-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0871-Add-getDrops-to-BlockState.patch b/patches/server/0870-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0871-Add-getDrops-to-BlockState.patch
rename to patches/server/0870-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0874-Fix-custom-piglin-loved-items.patch b/patches/server/0873-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0874-Fix-custom-piglin-loved-items.patch
rename to patches/server/0873-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0875-EntityPickupItemEvent-fixes.patch b/patches/server/0874-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0875-EntityPickupItemEvent-fixes.patch
rename to patches/server/0874-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0878-Elder-Guardian-appearance-API.patch b/patches/server/0877-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0878-Elder-Guardian-appearance-API.patch
rename to patches/server/0877-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0879-Allow-changing-bed-s-occupied-property.patch b/patches/server/0878-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0879-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0878-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0880-Add-entity-knockback-API.patch b/patches/server/0879-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0880-Add-entity-knockback-API.patch
rename to patches/server/0879-Add-entity-knockback-API.patch
diff --git a/patches/server/0881-Detect-headless-JREs.patch b/patches/server/0880-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0881-Detect-headless-JREs.patch
rename to patches/server/0880-Detect-headless-JREs.patch
diff --git a/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0883-optimized-dirt-and-snow-spreading.patch b/patches/server/0882-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0883-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0882-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0884-Added-EntityToggleSitEvent.patch b/patches/server/0883-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0884-Added-EntityToggleSitEvent.patch
rename to patches/server/0883-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0885-Add-fire-tick-delay-option.patch b/patches/server/0884-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0885-Add-fire-tick-delay-option.patch
rename to patches/server/0884-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0886-Add-Moving-Piston-API.patch b/patches/server/0885-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0886-Add-Moving-Piston-API.patch
rename to patches/server/0885-Add-Moving-Piston-API.patch
diff --git a/patches/server/0887-Ignore-impossible-spawn-tick.patch b/patches/server/0886-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0887-Ignore-impossible-spawn-tick.patch
rename to patches/server/0886-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0891-Prevent-compass-from-loading-chunks.patch b/patches/server/0890-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0891-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0890-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0891-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0892-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0891-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0895-Add-Player-Warden-Warning-API.patch b/patches/server/0894-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0895-Add-Player-Warden-Warning-API.patch
rename to patches/server/0894-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0897-Add-paper-dumplisteners-command.patch b/patches/server/0896-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0897-Add-paper-dumplisteners-command.patch
rename to patches/server/0896-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0898-check-global-player-list-where-appropriate.patch b/patches/server/0897-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0898-check-global-player-list-where-appropriate.patch
rename to patches/server/0897-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0900-ItemStack-damage-API.patch b/patches/server/0899-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0900-ItemStack-damage-API.patch
rename to patches/server/0899-ItemStack-damage-API.patch
diff --git a/patches/server/0901-Friction-API.patch b/patches/server/0900-Friction-API.patch
similarity index 100%
rename from patches/server/0901-Friction-API.patch
rename to patches/server/0900-Friction-API.patch
diff --git a/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0903-Fix-player-kick-on-shutdown.patch b/patches/server/0902-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0903-Fix-player-kick-on-shutdown.patch
rename to patches/server/0902-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0904-Sync-offhand-slot-in-menus.patch b/patches/server/0903-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0904-Sync-offhand-slot-in-menus.patch
rename to patches/server/0903-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0905-Player-Entity-Tracking-Events.patch b/patches/server/0904-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0905-Player-Entity-Tracking-Events.patch
rename to patches/server/0904-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0906-Limit-pet-look-distance.patch b/patches/server/0905-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0906-Limit-pet-look-distance.patch
rename to patches/server/0905-Limit-pet-look-distance.patch
diff --git a/patches/server/0907-Properly-resend-entities.patch b/patches/server/0906-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0907-Properly-resend-entities.patch
rename to patches/server/0906-Properly-resend-entities.patch
index 1f77d5ced5c9..0692d5c71bd2 100644
--- a/patches/server/0907-Properly-resend-entities.patch
+++ b/patches/server/0906-Properly-resend-entities.patch
@@ -82,7 +82,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..15add3f4dfd718ec09bb1db4f2222346
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 11e37de9481d82bcc9de4aae82a04acd6659f869..afdef7501e6071932d569657d60a39305f5ca4be 100644
+index 7bb601078ef3a983d1807246b91b669ae5d5a8e4..dbc93883b8529b0aab3ea21ddd466bc8c3739351 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2805,7 +2805,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0909-fix-Instruments.patch b/patches/server/0908-fix-Instruments.patch
similarity index 100%
rename from patches/server/0909-fix-Instruments.patch
rename to patches/server/0908-fix-Instruments.patch
diff --git a/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0912-Add-BlockLockCheckEvent.patch b/patches/server/0911-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0912-Add-BlockLockCheckEvent.patch
rename to patches/server/0911-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0913-Add-Sneaking-API-for-Entities.patch b/patches/server/0912-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0913-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0912-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0914-Improve-logging-and-errors.patch b/patches/server/0913-Improve-logging-and-errors.patch
similarity index 97%
rename from patches/server/0914-Improve-logging-and-errors.patch
rename to patches/server/0913-Improve-logging-and-errors.patch
index 92d8022a6d4a..be32ff3b2095 100644
--- a/patches/server/0914-Improve-logging-and-errors.patch
+++ b/patches/server/0913-Improve-logging-and-errors.patch
@@ -22,7 +22,7 @@ index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c78
              Properties properties;
              Properties properties1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4aa5ff559cbb46b7badbc960f782ed4035a5e495..4d13bfc159ad5cdf60db25ad19ff6f37c6d16924 100644
+index dbc93883b8529b0aab3ea21ddd466bc8c3739351..d7a4e200853f4eb980f1ea4a5c6a338039979cf1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3622,7 +3622,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0915-Improve-PortalEvents.patch b/patches/server/0914-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0915-Improve-PortalEvents.patch
rename to patches/server/0914-Improve-PortalEvents.patch
diff --git a/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 92%
rename from patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch
index 1a4d7c4c10ca..241343c4cc7a 100644
--- a/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d2ca3ae49a85a91773510ca93d60b9b098e39ba..4947265c3b7a9da8782be3ae8d35ef99c5836e81 100644
+index d7a4e200853f4eb980f1ea4a5c6a338039979cf1..4434cad1a854fb514245c4afb3e3d469efb223f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2259,7 +2259,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0919-Flying-Fall-Damage.patch b/patches/server/0918-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0919-Flying-Fall-Damage.patch
rename to patches/server/0918-Flying-Fall-Damage.patch
diff --git a/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0922-config-for-disabling-entity-tag-tags.patch b/patches/server/0921-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0922-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0921-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0923-Use-single-player-info-update-packet-on-join.patch b/patches/server/0922-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0923-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0922-Use-single-player-info-update-packet-on-join.patch
index ab4a8bb1c52c..d359b7fc8b8e 100644
--- a/patches/server/0923-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0922-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d05c4c34777a33240e4e8f985d6bca76ed45d7f3..460baa53e365b1da3680ba3e0e8b8f4b94a75fc4 100644
+index 4434cad1a854fb514245c4afb3e3d469efb223f9..ce13cd909e50fcc1b63c0a515f18fd1fbd4f6aea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3637,7 +3637,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0925-Win-Screen-API.patch b/patches/server/0924-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0925-Win-Screen-API.patch
rename to patches/server/0924-Win-Screen-API.patch
diff --git a/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0927-Fix-force-opening-enchantment-tables.patch b/patches/server/0926-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0927-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0926-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0928-Add-Entity-Body-Yaw-API.patch b/patches/server/0927-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0928-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0927-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0931-Add-EntityFertilizeEggEvent.patch b/patches/server/0930-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0931-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0930-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0936-Fix-text-display-error-on-spawn.patch b/patches/server/0935-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0936-Fix-text-display-error-on-spawn.patch
rename to patches/server/0935-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0938-Add-Shearable-API.patch b/patches/server/0937-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0938-Add-Shearable-API.patch
rename to patches/server/0937-Add-Shearable-API.patch
diff --git a/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0941-Optimize-Hoppers.patch b/patches/server/0940-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0941-Optimize-Hoppers.patch
rename to patches/server/0940-Optimize-Hoppers.patch
index 6265c6bf6aed..1d70f3b9b5a9 100644
--- a/patches/server/0941-Optimize-Hoppers.patch
+++ b/patches/server/0940-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c5f3dc74888919e82e2ffbb8d648b7640aa6b690..80cf4852e4010eeeadaf920ab927a40df0179b40 100644
+index 365bcfcf667ffa76253b1db5cd06a96e0f3679d5..ae9b78c4e321eb811ee87e1827d3684371977609 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1522,6 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0943-Treat-sequence-violations-like-they-should-be.patch
similarity index 91%
rename from patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0943-Treat-sequence-violations-like-they-should-be.patch
index c73068144db5..6a9d447d4824 100644
--- a/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0943-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c072cccb0a80019ce2f6c9e73f965ca26f8bc42c..54ea5cfdb6fba3c66349b80e21e66b44c4dbba53 100644
+index ce13cd909e50fcc1b63c0a515f18fd1fbd4f6aea..4b8a1dd566601059f77b61b8df0c6ba8d211fed3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2129,6 +2129,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0945-remove-duplicate-animate-packet-for-records.patch b/patches/server/0944-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0945-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0944-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 452362a8c48d..ad196376985f 100644
--- a/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 23e0e6937e28f09271a4ec7c35e0076a576cf3d3..4aa8b483841028fbcc43f9ed47730881
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 82a63452e73ac146d2a8d9bfdd030d6aa4d42080..4e0bef1456cbeee6574b7581576cbb882878722e 100644
+index 4b8a1dd566601059f77b61b8df0c6ba8d211fed3..3876bcddb3ab69aee1feb0fe19cb343e097a6824 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -298,6 +298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0948-Use-array-for-gamerule-storage.patch b/patches/server/0947-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0948-Use-array-for-gamerule-storage.patch
rename to patches/server/0947-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0951-Add-Mob-Experience-reward-API.patch b/patches/server/0950-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0951-Add-Mob-Experience-reward-API.patch
rename to patches/server/0950-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0955-More-accurate-isInOpenWater-impl.patch b/patches/server/0954-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0955-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0954-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0959-Expand-PlayerItemMendEvent.patch b/patches/server/0958-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0959-Expand-PlayerItemMendEvent.patch
rename to patches/server/0958-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0961-Add-transient-modifier-API.patch b/patches/server/0960-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0961-Add-transient-modifier-API.patch
rename to patches/server/0960-Add-transient-modifier-API.patch
diff --git a/patches/server/0962-Fix-block-place-logic.patch b/patches/server/0961-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0962-Fix-block-place-logic.patch
rename to patches/server/0961-Fix-block-place-logic.patch
diff --git a/patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0964-Call-BlockGrowEvent-for-the-pitcher-crop.patch
similarity index 100%
rename from patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch
rename to patches/server/0964-Call-BlockGrowEvent-for-the-pitcher-crop.patch
diff --git a/patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0968-Fix-sniffer-removeExploredLocation.patch b/patches/server/0967-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0968-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0967-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch b/patches/server/0970-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0971-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0970-Folia-scheduler-and-owned-region-API.patch
index e8429bc2d494..ab71cbe00dc9 100644
--- a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0970-Folia-scheduler-and-owned-region-API.patch
@@ -1121,7 +1121,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 80cf4852e4010eeeadaf920ab927a40df0179b40..3238cbcba567b1242c77e41f6b6f19a8d157fb4e 100644
+index ae9b78c4e321eb811ee87e1827d3684371977609..435f5ee3388f5da93df938c43ea2578f7d586407 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1479,6 +1479,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0973-Properly-Cancel-Usable-Items.patch b/patches/server/0972-Properly-Cancel-Usable-Items.patch
similarity index 97%
rename from patches/server/0973-Properly-Cancel-Usable-Items.patch
rename to patches/server/0972-Properly-Cancel-Usable-Items.patch
index 3ec9d65f4f2b..54a1a3dca476 100644
--- a/patches/server/0973-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0972-Properly-Cancel-Usable-Items.patch
@@ -34,7 +34,7 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ee70536cfb621702388bd13dddf08f0224ba6bb..75bd92e1d40588d3bc40fa7837943eec9f2062a6 100644
+index 3876bcddb3ab69aee1feb0fe19cb343e097a6824..f61b6e0eea4132347ced3c7c18d027337f8e6b15 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2031,6 +2031,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0974-Add-event-for-player-editing-sign.patch b/patches/server/0973-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0974-Add-event-for-player-editing-sign.patch
rename to patches/server/0973-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0974-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0974-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0976-Improve-command-function-perm-level-checks.patch b/patches/server/0975-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0976-Improve-command-function-perm-level-checks.patch
rename to patches/server/0975-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0977-Add-option-to-disable-block-updates.patch b/patches/server/0976-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0977-Add-option-to-disable-block-updates.patch
rename to patches/server/0976-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0978-Call-missing-BlockDispenseEvent.patch b/patches/server/0977-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0978-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0977-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0980-Optimize-player-lookups-for-beacons.patch b/patches/server/0979-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0980-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0979-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0981-Add-Sign-getInteractableSideFor.patch b/patches/server/0980-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0981-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0980-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0982-Array-backed-synched-entity-data.patch b/patches/server/0981-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0982-Array-backed-synched-entity-data.patch
rename to patches/server/0981-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0983-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0982-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0983-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0982-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0983-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0983-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0985-Fix-BanList-API.patch b/patches/server/0984-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0985-Fix-BanList-API.patch
rename to patches/server/0984-Fix-BanList-API.patch
diff --git a/patches/server/0986-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0985-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0985-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0986-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0986-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0987-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0987-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0989-Don-t-tick-signs.patch b/patches/server/0988-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0989-Don-t-tick-signs.patch
rename to patches/server/0988-Don-t-tick-signs.patch
diff --git a/patches/server/0990-Configurable-Region-Compression-Format.patch b/patches/server/0989-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0990-Configurable-Region-Compression-Format.patch
rename to patches/server/0989-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0990-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0990-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0992-Add-whitelist-events.patch b/patches/server/0991-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0992-Add-whitelist-events.patch
rename to patches/server/0991-Add-whitelist-events.patch
diff --git a/patches/server/0993-Implement-PlayerFailMoveEvent.patch b/patches/server/0992-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0993-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0992-Implement-PlayerFailMoveEvent.patch
index 6d03ed35db75..6b40e03c8eff 100644
--- a/patches/server/0993-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0992-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..80e050603e36134754136a8ee2bd14624f976e91 100644
+index f61b6e0eea4132347ced3c7c18d027337f8e6b15..721243ebf0fb126cf5c0de76c6bd990807f097f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1406,8 +1406,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0993-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0993-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0995-API-for-updating-recipes-on-clients.patch b/patches/server/0994-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0995-API-for-updating-recipes-on-clients.patch
rename to patches/server/0994-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0996-Only-capture-actual-tree-growth.patch b/patches/server/0995-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0996-Only-capture-actual-tree-growth.patch
rename to patches/server/0995-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0997-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0996-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0997-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0996-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0998-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0997-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0998-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0997-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0999-Use-correct-seed-on-api-world-load.patch b/patches/server/0998-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0999-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0998-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/1000-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0999-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/1000-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0999-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/1001-Cache-map-ids-on-item-frames.patch b/patches/server/1000-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/1001-Cache-map-ids-on-item-frames.patch
rename to patches/server/1000-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/1002-Fix-custom-statistic-criteria-creation.patch b/patches/server/1001-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/1002-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/1001-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/1003-Bandaid-fix-for-Effect.patch b/patches/server/1002-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/1003-Bandaid-fix-for-Effect.patch
rename to patches/server/1002-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/1004-SculkCatalyst-bloom-API.patch b/patches/server/1003-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/1004-SculkCatalyst-bloom-API.patch
rename to patches/server/1003-SculkCatalyst-bloom-API.patch