From c151c956e0a7fdd91e20e12cd678978cd2fd389f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 14 Jan 2024 13:33:47 +0100
Subject: [PATCH] Fixup AsyncPreLoginEvent patches Fixes #10165

---
 .../re-add-asm-dependency.patch               |   2 +-
 ...d-more-fields-to-AsyncPreLoginEvent.patch} | 111 ++++++++++++------
 ...-address-to-AsyncPlayerPreLoginEvent.patch |  50 --------
 ...close.patch => 0280-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...atch => 0282-Add-basic-Datapack-API.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |   0
 ... => 0284-ItemStack-repair-check-API.patch} |   0
 ....patch => 0285-More-Enchantment-API.patch} |   0
 ...PI.patch => 0286-Add-Mob-lookAt-API.patch} |   0
 ...ta.patch => 0287-ItemStack-editMeta.patch} |   0
 ... => 0288-Add-EntityInsideBlockEvent.patch} |   0
 ...89-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   0
 ...patch => 0291-More-Lidded-Block-API.patch} |   0
 ... => 0292-Add-PlayerKickEvent-causes.patch} |   2 +-
 ...0293-Add-PufferFishStateChangeEvent.patch} |   0
 ...h => 0294-Add-BellRevealRaiderEvent.patch} |   0
 ...95-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0296-Add-more-line-of-sight-methods.patch} |   0
 ... => 0297-Add-WaterBottleSplashEvent.patch} |   0
 ... => 0298-Add-more-LimitedRegion-API.patch} |   0
 ...PI.patch => 0299-Missing-Entity-API.patch} |   0
 ...ch => 0300-Adds-PlayerArmSwingEvent.patch} |   0
 ...dd-PlayerSignCommandPreprocessEvent.patch} |   0
 ...array-elements-in-command-arguments.patch} |   0
 ...inger-API.patch => 0303-Stinger-API.patch} |   0
 ...-to-contain-the-source-jars-in-stac.patch} |   0
 ...tch => 0305-Add-PlayerSetSpawnEvent.patch} |   0
 ...=> 0306-Added-EntityDamageItemEvent.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0309-Add-BlockBreakBlockEvent.patch} |   0
 ...pers-for-left-right-click-to-Action.patch} |   0
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0312-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0314-add-back-EntityPortalExitEvent.patch} |   0
 ...-find-targets-for-lightning-strikes.patch} |   2 +-
 ... 0316-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0317-Left-handed-API.patch} |   0
 ...tch => 0318-Add-critical-damage-API.patch} |   0
 ...ch => 0319-Add-more-advancement-API.patch} |   0
 ...0320-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   0
 ...-ram-API.patch => 0322-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...4-Add-Raw-Byte-Entity-Serialization.patch} |   0
 ...0325-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   0
 ...patch => 0327-Add-more-Campfire-API.patch} |   0
 ...ehicleCollisionEvent-HandlerList-up.patch} |   0
 ... => 0329-Improve-scoreboard-entries.patch} |   0
 ...ch => 0330-Entity-powdered-snow-API.patch} |   0
 ...0331-Add-API-for-item-entity-health.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...le-API.patch => 0333-Bucketable-API.patch} |   0
 ...-for-default-config-comment-parsing.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   0
 ...6-Multiple-Entries-with-Scoreboards.patch} |   0
 ...n-strange-EventHandler-return-types.patch} |   0
 ...Hostname-to-AsyncPlayerPreLoginEvent.patch |  61 ----------
 ...atch => 0338-Multi-Block-Change-API.patch} |   2 +-
 ...ent.patch => 0339-Fix-NotePlayEvent.patch} |   0
 ....patch => 0340-Freeze-Tick-Lock-API.patch} |   0
 ...lphin-API.patch => 0341-Dolphin-API.patch} |   0
 ...h => 0342-More-PotionEffectType-API.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   0
 ...h => 0344-Implement-regenerateChunk.patch} |   2 +-
 ...gs.patch => 0345-Add-GameEvent-tags.patch} |   0
 ...tch => 0346-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...s.patch => 0349-Custom-Potion-Mixes.patch} |   0
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...I.patch => 0351-More-Projectile-API.patch} |   0
 ...ch => 0352-Add-getComputedBiome-API.patch} |   0
 ...h => 0353-Add-enchantWithLevels-API.patch} |   0
 ... 0354-Add-TameableDeathMessageEvent.patch} |   0
 ...hange-the-podium-of-the-EnderDragon.patch} |   0
 ...-blockstate-in-EntityBreakDoorEvent.patch} |   0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0358-WorldCreator-keepSpawnLoaded.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...> 0360-Add-PlayerStopUsingItemEvent.patch} |   0
 ...tch => 0361-Expand-FallingBlock-API.patch} |   2 +-
 ...dd-method-isTickingWorlds-to-Bukkit.patch} |   0
 ... => 0363-Add-WardenAngerChangeEvent.patch} |   0
 ...I.patch => 0364-Nameable-Banner-API.patch} |   0
 ...atch => 0365-Add-Player-getFishHook.patch} |   0
 ...API.patch => 0366-More-Teleport-API.patch} |   2 +-
 ... => 0367-Add-EntityPortalReadyEvent.patch} |   0
 ...tom-Chat-Completion-Suggestions-API.patch} |   2 +-
 ...ion-API.patch => 0369-Collision-API.patch} |   0
 ...API.patch => 0370-Block-Ticking-API.patch} |   0
 ...371-Add-NamespacedKey-biome-methods.patch} |   0
 ...o-load-resources-from-LibraryLoader.patch} |   0
 ...serialization-deserialization-for-P.patch} |   2 +-
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...limit-in-YamlConfigOptions-and-incr.patch} |   0
 ... => 0376-Add-getDrops-to-BlockState.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0378-Elder-Guardian-appearance-API.patch} |   2 +-
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...d-EquipmentSlot-convenience-methods.patch} |   0
 ...swingHand-EquipmentSlot-convenience.patch} |   0
 ...ch => 0382-Add-entity-knockback-API.patch} |   0
 ... => 0383-Added-EntityToggleSitEvent.patch} |   0
 ...patch => 0384-Add-Moving-Piston-API.patch} |   0
 ...0385-Add-PrePlayerAttackEntityEvent.patch} |   0
 ... 0386-Add-Player-Warden-Warning-API.patch} |   2 +-
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...388-Add-paper-dumplisteners-command.patch} |   0
 ....patch => 0389-ItemStack-damage-API.patch} |   0
 ...patch => 0390-Add-Tick-TemporalUnit.patch} |   0
 ...tion-API.patch => 0391-Friction-API.patch} |   0
 ... 0392-Player-Entity-Tracking-Events.patch} |   0
 ...atch => 0393-Add-missing-Fluid-type.patch} |   0
 ...ments.patch => 0394-fix-Instruments.patch} |   0
 ...tch => 0395-Add-BlockLockCheckEvent.patch} |   0
 ... 0396-Add-Sneaking-API-for-Entities.patch} |   2 +-
 ....patch => 0397-Improve-PortalEvents.patch} |   0
 ...k-state-to-BlockExplodeEvent-and-En.patch} |   0
 ...atch => 0399-Flying-Fall-Damage-API.patch} |   2 +-
 ...ion-moving-velocity-to-VehicleBlock.patch} |   0
 ...eplace-ItemFlag.HIDE_POTION_EFFECTS.patch} |   0
 ...en-API.patch => 0402-Win-Screen-API.patch} |   2 +-
 ...tch => 0403-Add-Entity-Body-Yaw-API.patch} |   0
 ...or-InventoryBlockStartEvent-subclas.patch} |   0
 ...=> 0405-Add-EntityFertilizeEggEvent.patch} |   0
 ...temEvent-and-EntityCompostItemEvent.patch} |   0
 ...API.patch => 0407-Add-Shearable-API.patch} |   0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |   0
 ... 0409-Add-Mob-Experience-reward-API.patch} |   0
 ... => 0410-Expand-PlayerItemMendEvent.patch} |   0
 ... => 0411-Add-transient-modifier-API.patch} |   0
 ...he-experimental-smithing-inventory-.patch} |   0
 ...to-remove-all-active-potion-effects.patch} |   0
 ...olia-scheduler-and-owned-region-API.patch} |   0
 ...5-Add-event-for-player-editing-sign.patch} |   0
 ...416-Add-Sign-getInteractableSideFor.patch} |   0
 ...t-API.patch => 0417-Fix-BanList-API.patch} |   2 +-
 ....patch => 0418-Add-whitelist-events.patch} |   0
 ...API-for-updating-recipes-on-clients.patch} |   0
 ...tch => 0420-Add-PlayerFailMoveEvent.patch} |   0
 ...-custom-statistic-criteria-creation.patch} |   0
 ...tch => 0422-SculkCatalyst-bloom-API.patch} |   0
 ...API-for-an-entity-s-scoreboard-name.patch} |   0
 ...lace-methods-with-old-StructureType.patch} |   0
 ... => 0425-Add-Listing-API-for-Player.patch} |   2 +-
 ...d-BlockFace-during-BlockDamageEvent.patch} |   0
 ...h => 0427-Fix-NPE-on-Boat-getStatus.patch} |   0
 ...e-API.patch => 0428-Expand-Pose-API.patch} |   0
 ...MerchantRecipe-add-copy-constructor.patch} |   0
 ...patch => 0430-More-DragonBattle-API.patch} |   0
 ...tch => 0431-Add-PlayerPickItemEvent.patch} |   0
 ...=> 0432-Allow-trident-custom-damage.patch} |   0
 ...pose-hand-during-BlockCanBuildEvent.patch} |   0
 ...t-setBurnTime-to-valid-short-values.patch} |   0
 ... 0435-Add-OfflinePlayer-isConnected.patch} |   0
 ...titleOverride-to-InventoryOpenEvent.patch} |   0
 ...roper-checking-of-empty-item-stacks.patch} |   0
 ...dItemsEvent-throwing-exception-when.patch} |   0
 ...> 0439-Add-player-idle-duration-API.patch} |   2 +-
 ...e-collision-shape-of-a-block-before.patch} |   0
 ...redicate-for-blocks-when-raytracing.patch} |   2 +-
 ...h-event-for-all-player-interactions.patch} |   0
 ...443-Add-UUID-attribute-modifier-API.patch} |   0
 ... => 0444-Expand-LingeringPotion-API.patch} |   0
 ...y-durability-check-in-ItemStack-isS.patch} |   0
 ...tch => 0446-Add-Structure-check-API.patch} |   2 +-
 ...dd-missing-Experimental-annotations.patch} |   0
 ...tch => 0448-Add-more-scoreboard-API.patch} |   0
 ...stry.patch => 0449-Improve-Registry.patch} |   0
 ...h => 0450-Add-experience-points-API.patch} |   0
 ...h => 0451-Add-missing-InventoryType.patch} |   0
 ...h => 0452-Add-drops-to-shear-events.patch} |   0
 ... => 0453-Add-HiddenPotionEffect-API.patch} |   0
 ...> 0454-Add-PlayerShieldDisableEvent.patch} |   0
 ...mpty-String-in-NamespacedKey.fromSt.patch} |   0
 ...e-PlayerProfile-in-AsyncPreLoginEven.patch |  29 -----
 ...dd-more-fields-to-AsyncPreLoginEvent.patch |  72 ++++++++++++
 .../0180-Player.setPlayerProfile-API.patch    |  11 +-
 ...-address-to-AsyncPlayerPreLoginEvent.patch |  25 ----
 ...close.patch => 0585-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...atch => 0587-Add-basic-Datapack-API.patch} |   0
 ...ment-variable-to-disable-server-gui.patch} |   2 +-
 ...itions-to-PlayerGameModeChangeEvent.patch} |   4 +-
 ... => 0590-ItemStack-repair-check-API.patch} |   0
 ....patch => 0591-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   2 +-
 ...-and-optimise-world-force-upgrading.patch} |  10 +-
 ...PI.patch => 0594-Add-Mob-lookAt-API.patch} |   0
 ...0595-Add-Unix-domain-socket-support.patch} |   4 +-
 ... => 0596-Add-EntityInsideBlockEvent.patch} |   0
 ...97-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   4 +-
 ...patch => 0599-More-Lidded-Block-API.patch} |   0
 ...00-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0601-Add-PlayerKickEvent-causes.patch} |   0
 ...0602-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ThreadingDe.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0606-Add-BellRevealRaiderEvent.patch} |   0
 ... 0607-Fix-invulnerable-end-crystals.patch} |   0
 ...08-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0609-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...patch => 0612-Line-Of-Sight-Changes.patch} |   2 +-
 ... => 0613-add-per-world-spawn-limits.patch} |   2 +-
 ...h => 0614-Fix-potions-splash-events.patch} |   0
 ... => 0615-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   2 +-
 ...PI.patch => 0617-Missing-Entity-API.patch} |   4 +-
 ...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} |   0
 ...ch => 0622-Adds-PlayerArmSwingEvent.patch} |   2 +-
 ...-event-leave-message-not-being-sent.patch} |   4 +-
 ...-for-mobs-immune-to-default-effects.patch} |   4 +-
 ...-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 => 0628-Stinger-API.patch} |   0
 ...cy-issue-with-empty-map-items-in-CB.patch} |   0
 ... => 0630-Add-System.out-err-catcher.patch} |   2 +-
 ...-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} |   2 +-
 ...tch => 0635-Add-PlayerSetSpawnEvent.patch} |   2 +-
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...=> 0639-Added-EntityDamageItemEvent.patch} |   2 +-
 ...timize-indirect-passenger-iteration.patch} |   2 +-
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...643-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0645-Add-BlockBreakBlockEvent.patch} |   2 +-
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0647-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0649-Add-back-EntityPortalExitEvent.patch} |   2 +-
 ...-find-targets-for-lightning-strikes.patch} |   4 +-
 ... 0651-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0652-Left-handed-API.patch} |   0
 ...ch => 0653-Add-more-advancement-API.patch} |   0
 ...654-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0655-Add-critical-damage-API.patch} |   2 +-
 ...0656-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   2 +-
 ...-ram-API.patch => 0658-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...0-Add-Raw-Byte-Entity-Serialization.patch} |   0
 ...61-Vanilla-command-permission-fixes.patch} |   2 +-
 ...logic-for-inventories-on-chunk-unlo.patch} |   2 +-
 ...63-Fix-GameProfileCache-concurrency.patch} |   0
 ...664-Improve-and-expand-AsyncCatcher.patch} |   4 +-
 ...per-mobcaps-and-paper-playermobcaps.patch} |   0
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...=> 0667-Optimise-general-POI-access.patch} |   0
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   2 +-
 ...our-chunk-data-off-disk-when-conver.patch} |   0
 ...-lookup-fluid-state-when-raytracing.patch} |   0
 ...atch => 0674-Time-scoreboard-search.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...6-Do-not-run-raytrace-logic-for-AIR.patch} |   0
 ...> 0677-Execute-chunk-tasks-mid-tick.patch} |   0
 ...rimise-map-impl-for-tracked-players.patch} |   0
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ... 0680-Optimise-random-block-ticking.patch} |   4 +-
 ...ulate-regionfile-header-if-it-is-co.patch} |   4 +-
 ...city-compression-and-cipher-natives.patch} |   2 +-
 ...-more-information-in-watchdog-dumps.patch} |   0
 ...hread-worker-count-for-low-core-cou.patch} |   0
 ... 0685-Distance-manager-tick-timings.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   2 +-
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   2 +-
 ...h => 0689-Add-packet-limiter-config.patch} |   0
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0691-Ensure-valid-vehicle-status.patch} |   0
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   2 +-
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0696-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   0
 ...unintended-light-block-manipulation.patch} |   0
 ...0699-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ... => 0701-Configurable-feature-seeds.patch} |   0
 ... 0702-Add-root-admin-user-detection.patch} |   2 +-
 ...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 +-
 ...=> 0710-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0712-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...tch => 0713-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   0
 ...tch => 0715-Collision-optimisations.patch} |   0
 ...n-checking-in-player-move-packet-ha.patch} |   2 +-
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   0
 ...patch => 0718-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   0
 ...20-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   2 +-
 ... => 0722-Improve-scoreboard-entries.patch} |   0
 ...ch => 0723-Entity-powdered-snow-API.patch} |   0
 ...0724-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   4 +-
 ...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
 ...=> 0730-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0731-Bucketable-API.patch} |   0
 ...es.patch => 0732-Validate-usernames.patch} |   2 +-
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   6 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...heck-for-PersistentDataContainer-ha.patch} |   0
 ...7-Multiple-Entries-with-Scoreboards.patch} |   0
 ...738-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...0740-Fix-xp-reward-for-baby-zombies.patch} |   0
 ...Hostname-to-AsyncPlayerPreLoginEvent.patch |  19 ---
 ...lti-Block-Change-API-Implementation.patch} |   0
 ...ent.patch => 0742-Fix-NotePlayEvent.patch} |   0
 ....patch => 0743-Freeze-Tick-Lock-API.patch} |   0
 ...lphin-API.patch => 0744-Dolphin-API.patch} |   0
 ...h => 0745-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 => 0749-Implement-regenerateChunk.patch} |   2 +-
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   0
 ...gs.patch => 0752-Add-GameEvent-tags.patch} |   0
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0754-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} |   4 +-
 ... => 0759-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0760-Custom-Potion-Mixes.patch} |   0
 ...61-Force-close-world-loading-screen.patch} |   0
 ...762-Fix-falling-block-spawn-methods.patch} |   0
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0765-More-Projectile-API.patch} |   4 +-
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   2 +-
 ...0768-Implement-getComputedBiome-API.patch} |   2 +-
 ...> 0769-Make-some-itemstacks-nonnull.patch} |   0
 ...770-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0771-Fix-saving-in-unloadWorld.patch} |   2 +-
 ...h => 0772-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0773-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   2 +-
 ...bles-running-when-mob-loot-gamerule.patch} |   0
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...rd-against-invalid-entity-positions.patch} |   2 +-
 ...s.patch => 0778-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
 ...-ServerLevel-for-gamerule-callbacks.patch} |   6 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0786-WorldCreator-keepSpawnLoaded.patch} |   2 +-
 ...-in-CraftPersistentDataTypeRegistry.patch} |   0
 ...destroyed-trigger-in-the-correct-pl.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0792-Add-PlayerStopUsingItemEvent.patch} |   0
 ...rs.patch => 0793-Don-t-tick-markers.patch} |   2 +-
 ...tch => 0794-Expand-FallingBlock-API.patch} |   0
 ...-not-accept-invalid-client-settings.patch} |   2 +-
 ...0796-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0799-Sanitize-Sent-BlockEntity-NBT.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   0
 ...-on-world-create-while-being-ticked.patch} |   0
 ...ate-Current-redstone-implementation.patch} |   4 +-
 ...04-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0805-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   0
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0808-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   2 +-
 ...pty-items-from-being-added-to-world.patch} |   2 +-
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...atch => 0812-Add-Player-getFishHook.patch} |   2 +-
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   0
 ...PE.patch => 0815-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   2 +-
 ...API.patch => 0817-More-Teleport-API.patch} |   2 +-
 ... => 0818-Add-EntityPortalReadyEvent.patch} |   2 +-
 ...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
 ...Add-and-fix-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0824-Collision-API.patch} |   2 +-
 ...nd-message-for-brigadier-syntax-exc.patch} |   2 +-
 ...API.patch => 0826-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  16 +--
 ...828-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
 ...> 0832-Missing-eating-regain-reason.patch} |   0
 ....patch => 0833-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...6-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0837-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ... 0839-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ... => 0841-Add-getDrops-to-BlockState.patch} |   2 +-
 ...=> 0842-Fix-a-bunch-of-vanilla-bugs.patch} |   0
 ...y-onTrackingStart-during-navigation.patch} |   2 +-
 ... 0844-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0845-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   2 +-
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0848-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0850-Add-entity-knockback-API.patch} |   0
 ....patch => 0851-Detect-headless-JREs.patch} |   2 +-
 ...-vehicle-collision-event-not-called.patch} |   0
 ...3-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0854-Added-EntityToggleSitEvent.patch} |   0
 ... => 0855-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0856-Add-Moving-Piston-API.patch} |   0
 ...> 0857-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} |   2 +-
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0862-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0865-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...867-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   2 +-
 ...sync-entity-add-due-to-fungus-trees.patch} |   2 +-
 ....patch => 0870-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0871-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0873-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0874-Sync-offhand-slot-in-menus.patch} |   0
 ... 0875-Player-Entity-Tracking-Events.patch} |   2 +-
 ...tch => 0876-Limit-pet-look-distance.patch} |   0
 ...ch => 0877-Properly-resend-entities.patch} |   2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0879-fix-Instruments.patch} |   0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   2 +-
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ...tch => 0882-Add-BlockLockCheckEvent.patch} |   0
 ... 0883-Add-Sneaking-API-for-Entities.patch} |   0
 ... => 0884-Improve-logging-and-errors.patch} |   2 +-
 ....patch => 0885-Improve-PortalEvents.patch} |   2 +-
 ...ion-for-spider-worldborder-climbing.patch} |   0
 ...sing-SpigotConfig-logCommands-check.patch} |   2 +-
 ...Allay-stopDancing-while-not-dancing.patch} |   0
 ...ge.patch => 0889-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 => 0895-Win-Screen-API.patch} |   0
 ...ItemStack-setAmount-null-assignment.patch} |   2 +-
 ...ix-force-opening-enchantment-tables.patch} |   2 +-
 ...tch => 0898-Add-Entity-Body-Yaw-API.patch} |   0
 ...vent-sleeping-villagers-moving-towa.patch} |   0
 ...hen-a-captured-block-state-is-outda.patch} |   2 +-
 ...=> 0901-Add-EntityFertilizeEggEvent.patch} |   2 +-
 ...ty-drop-not-updating-the-client-inv.patch} |   2 +-
 ...temEvent-and-EntityCompostItemEvent.patch} |   0
 ...ctly-handle-ArmorStand-invisibility.patch} |   0
 ...ancement-triggers-for-entity-damage.patch} |   0
 ...906-Fix-text-display-error-on-spawn.patch} |   0
 ...nventories-returning-null-Locations.patch} |   0
 ...API.patch => 0908-Add-Shearable-API.patch} |   0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |   0
 ...pers.patch => 0910-Optimize-Hoppers.patch} |   0
 ...ives-generating-from-using-bonemeal.patch} |   0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |   0
 ...ence-violations-like-they-should-be.patch} |   2 +-
 ...uplicate-animate-packet-for-records.patch} |   0
 ...xpired-keys-from-impacting-new-join.patch} |   2 +-
 ...ts-being-fired-from-unloaded-chunks.patch} |   2 +-
 ...0917-Use-array-for-gamerule-storage.patch} |   0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |   0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |   2 +-
 ... 0920-Add-Mob-Experience-reward-API.patch} |   0
 ...redstone-on-top-of-trap-doors-early.patch} |   0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |   2 +-
 ...Lazy-Initialization-for-Enum-Fields.patch} |   0
 ...24-More-accurate-isInOpenWater-impl.patch} |   0
 ...ccess-to-lookups-field-in-RegistryO.patch} |   0
 ...ecalcBlockCounts-for-empty-sections.patch} |   0
 ... => 0927-Expand-PlayerItemMendEvent.patch} |   2 +-
 ...sh-ProjectileSource-for-projectiles.patch} |   0
 ... => 0929-Add-transient-modifier-API.patch} |   0
 ...patch => 0930-Fix-block-place-logic.patch} |   2 +-
 ...nd-playing-for-BlockItem-ItemStacks.patch} |   0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |   0
 ...nhasbukkit-default-if-alias-block-e.patch} |   2 +-
 ...pLike-spam-for-missing-key-selector.patch} |   0
 ...-Fix-sniffer-removeExploredLocation.patch} |   0
 ...to-remove-all-active-potion-effects.patch} |   0
 ...yerChunkLoaderData-in-order-to-prep.patch} |   0
 ...rafting-result-amount-for-fireworks.patch} |   0
 ...> 0939-Properly-Cancel-Usable-Items.patch} |   2 +-
 ...0-Add-event-for-player-editing-sign.patch} |   0
 ...k-item-frames-if-players-can-see-it.patch} |   0
 ...ermission-levels-for-command-blocks.patch} |   4 +-
 ...Add-option-to-disable-block-updates.patch} |   0
 ...944-Call-missing-BlockDispenseEvent.patch} |   2 +-
 ...-chunks-for-supporting-block-checks.patch} |   0
 ...Optimize-player-lookups-for-beacons.patch} |   0
 ...947-Add-Sign-getInteractableSideFor.patch} |   0
 ...48-Array-backed-synched-entity-data.patch} |   0
 ...9-fix-item-meta-for-tadpole-buckets.patch} |   0
 ...t-API.patch => 0950-Fix-BanList-API.patch} |   0
 ...d-water-fluid-explosion-resistance-.patch} |   0
 ...x-possible-NPE-on-painting-creation.patch} |   0
 ...imer-for-Wandering-Traders-spawned-.patch} |   0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |   2 +-
 ...t-throw-both-Spread-and-Grow-Events.patch} |   0
 ....patch => 0956-Add-whitelist-events.patch} |   0
 ... 0957-Implement-PlayerFailMoveEvent.patch} |   2 +-
 ...olia-scheduler-and-owned-region-API.patch} |   0
 ...se-allay-memory-on-non-item-targets.patch} |   0
 ...API-for-updating-recipes-on-clients.patch} |   2 +-
 ...tion-when-spawning-display-entities.patch} |   0
 ...962-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} |   2 +-
 ...ta-neighbour-ticks-outside-of-range.patch} |   0
 ...> 0967-Cache-map-ids-on-item-frames.patch} |   0
 ...-custom-statistic-criteria-creation.patch} |   0
 ...atch => 0969-Bandaid-fix-for-Effect.patch} |   0
 ...tch => 0970-SculkCatalyst-bloom-API.patch} |   0
 ...API-for-an-entity-s-scoreboard-name.patch} |   0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |   0
 ...lace-methods-with-old-StructureType.patch} |   2 +-
 ...e-namespaced-commands-if-send-names.patch} |   2 +-
 ...-handle-BlockBreakEvent-isDropItems.patch} |   0
 ...entity-death-event-for-ender-dragon.patch} |   0
 ...tity-tracking-range-by-Y-coordinate.patch} |   0
 ... => 0978-Add-Listing-API-for-Player.patch} |   0
 ...figurable-Region-Compression-Format.patch} |   0
 ...d-BlockFace-during-BlockDamageEvent.patch} |   2 +-
 ...h => 0981-Fix-NPE-on-Boat-getStatus.patch} |   0
 ...e-API.patch => 0982-Expand-Pose-API.patch} |   0
 ...patch => 0983-More-DragonBattle-API.patch} |   0
 ... 0984-Deep-clone-unhandled-nbt-tags.patch} |   0
 ...tch => 0985-Add-PlayerPickItemEvent.patch} |   2 +-
 ...-Improve-performance-of-mass-crafts.patch} |   0
 ...=> 0987-Allow-trident-custom-damage.patch} |   0
 ...pose-hand-during-BlockCanBuildEvent.patch} |   0
 ...-nearest-structure-border-iteration.patch} |   0
 ...Implement-OfflinePlayer-isConnected.patch} |   0
 ....patch => 0991-Fix-inventory-desync.patch} |   0
 ...titleOverride-to-InventoryOpenEvent.patch} |   4 +-
 ...93-Configure-sniffer-egg-hatch-time.patch} |   0
 ...-proximity-check-before-entity-look.patch} |   0
 ...kip-POI-finding-if-stuck-in-vehicle.patch} |   0
 ...t-sanity-checks-in-container-clicks.patch} |   2 +-
 ...ll-BlockRedstoneEvents-for-lecterns.patch} |   0
 ...roper-checking-of-empty-item-stacks.patch} |   2 +-
 ...ix-silent-equipment-change-for-mobs.patch} |   0
 ...h => 1000-Fix-spigot-s-Forced-Stats.patch} |   0
 ...ing-InventoryHolders-to-inventories.patch} |   0
 ...entities-in-chunks-that-are-positio.patch} |   0
 ...> 1003-Actually-optimise-explosions.patch} |   0
 ...sing-logs-for-log-ips-config-option.patch} |   0
 ...Remove-Spigot-Bug-Fix-for-MC-109346.patch} |   0
 ...atch => 1006-Fix-SuspiciousStewMeta.patch} |   0
 ... 1007-Optimise-chunk-tick-iteration.patch} |   0
 ...atch => 1008-Lag-compensation-ticks.patch} |   0
 ...n-on-UpgradeData.BlockFixers-class-.patch} |   0
 ...-AdvancementProgress-getDateAwarded.patch} |   0
 ...idebar-objectives-not-being-cleared.patch} |   0
 ...12-Optimise-nearby-player-retrieval.patch} |   2 +-
 ...1013-Remove-streams-for-villager-AI.patch} |   0
 ...x-missing-map-initialize-event-call.patch} |   2 +-
 ...a-when-attaching-firework-to-entity.patch} |   0
 ...ble-for-initializing-CraftLootTable.patch} |   0
 ...method-of-Fireballs-change-the-trav.patch} |   0
 ...18-Fix-UnsafeValues-loadAdvancement.patch} |   0
 ...> 1019-Add-player-idle-duration-API.patch} |   0
 ...-if-we-can-see-non-visible-entities.patch} |   2 +-
 ...NPE-in-SculkBloomEvent-world-access.patch} |   0
 ...tack-for-Player-sendEquipmentChange.patch} |   0
 ...Ints.patch => 1023-Optimize-VarInts.patch} |   0
 ...e-collision-shape-of-a-block-before.patch} |   0
 ...redicate-for-blocks-when-raytracing.patch} |   2 +-
 ...em-packets-with-collector-as-source.patch} |   2 +-
 ...cure-profile-with-proxy-online-mode.patch} |   2 +-
 ... => 1028-Expand-LingeringPotion-API.patch} |   0
 ....patch => 1029-Add-MaterialTagsTest.patch} |   0
 ...ngEffect-powers-lightning-rods-and-.patch} |   0
 ...h-event-for-all-player-interactions.patch} |   0
 ...everal-issues-with-EntityBreedEvent.patch} |   0
 ...033-Add-UUID-attribute-modifier-API.patch} |   0
 ...-event-call-for-entity-teleport-API.patch} |   0
 ...y-create-LootContext-for-criterions.patch} |   0
 ...-t-fire-sync-events-during-worldgen.patch} |   0
 ...-getAttributeModifier-duplication-c.patch} |   0
 ...store-vanilla-entity-drops-behavior.patch} |   0
 ...tch => 1039-Add-Structure-check-API.patch} |   2 +-
 ...-Dont-resend-blocks-on-interactions.patch} |   0
 ...evious-behavior-for-setResourcePack.patch} |   0
 ...-read-and-store-sus-effect-duration.patch} |   0
 ...e-correct-max-stack-size-in-crafter.patch} |   0
 ...tch => 1044-add-more-scoreboard-API.patch} |   0
 ...stry.patch => 1045-Improve-Registry.patch} |   0
 ...on-null-loc-for-EntityTeleportEvent.patch} |   0
 ...h => 1047-Add-experience-points-API.patch} |   0
 ...h => 1048-Add-missing-InventoryType.patch} |   0
 ...h => 1049-Add-drops-to-shear-events.patch} |   0
 ...> 1050-Add-PlayerShieldDisableEvent.patch} |   0
 ... => 1051-Add-HiddenPotionEffect-API.patch} |   0
 ...f-bucket-dispenses-will-succeed-for.patch} |   0
 ...x-ItemMeta-removing-CustomModelData.patch} |   0
 ...ate-ResourceLocation-in-NBT-reading.patch} |   0
 ...-experience-dropping-on-block-break.patch} |   0
 ...> 1056-Fixup-NamespacedKey-handling.patch} |   0
 657 files changed, 315 insertions(+), 397 deletions(-)
 rename patches/api/{0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0090-Add-more-fields-to-AsyncPreLoginEvent.patch} (58%)
 delete mode 100644 patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
 rename patches/api/{0281-Inventory-close.patch => 0280-Inventory-close.patch} (100%)
 rename patches/api/{0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/api/{0283-Add-basic-Datapack-API.patch => 0282-Add-basic-Datapack-API.patch} (100%)
 rename patches/api/{0284-additions-to-PlayerGameModeChangeEvent.patch => 0283-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/api/{0285-ItemStack-repair-check-API.patch => 0284-ItemStack-repair-check-API.patch} (100%)
 rename patches/api/{0286-More-Enchantment-API.patch => 0285-More-Enchantment-API.patch} (100%)
 rename patches/api/{0287-Add-Mob-lookAt-API.patch => 0286-Add-Mob-lookAt-API.patch} (100%)
 rename patches/api/{0288-ItemStack-editMeta.patch => 0287-ItemStack-editMeta.patch} (100%)
 rename patches/api/{0289-Add-EntityInsideBlockEvent.patch => 0288-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/api/{0290-Attributes-API-for-item-defaults.patch => 0289-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/api/{0291-Add-cause-to-Weather-ThunderChangeEvents.patch => 0290-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/api/{0292-More-Lidded-Block-API.patch => 0291-More-Lidded-Block-API.patch} (100%)
 rename patches/api/{0293-Add-PlayerKickEvent-causes.patch => 0292-Add-PlayerKickEvent-causes.patch} (97%)
 rename patches/api/{0294-Add-PufferFishStateChangeEvent.patch => 0293-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/api/{0295-Add-BellRevealRaiderEvent.patch => 0294-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/api/{0296-Add-ElderGuardianAppearanceEvent.patch => 0295-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/api/{0297-Add-more-line-of-sight-methods.patch => 0296-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/api/{0298-Add-WaterBottleSplashEvent.patch => 0297-Add-WaterBottleSplashEvent.patch} (100%)
 rename patches/api/{0299-Add-more-LimitedRegion-API.patch => 0298-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/api/{0300-Missing-Entity-API.patch => 0299-Missing-Entity-API.patch} (100%)
 rename patches/api/{0301-Adds-PlayerArmSwingEvent.patch => 0300-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/api/{0302-Add-PlayerSignCommandPreprocessEvent.patch => 0301-Add-PlayerSignCommandPreprocessEvent.patch} (100%)
 rename patches/api/{0303-fix-empty-array-elements-in-command-arguments.patch => 0302-fix-empty-array-elements-in-command-arguments.patch} (100%)
 rename patches/api/{0304-Stinger-API.patch => 0303-Stinger-API.patch} (100%)
 rename patches/api/{0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/api/{0306-Add-PlayerSetSpawnEvent.patch => 0305-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/api/{0307-Added-EntityDamageItemEvent.patch => 0306-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/api/{0308-Make-EntityUnleashEvent-cancellable.patch => 0307-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/api/{0309-Change-EnderEye-target-without-changing-other-things.patch => 0308-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/api/{0310-Add-BlockBreakBlockEvent.patch => 0309-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/api/{0311-Add-helpers-for-left-right-click-to-Action.patch => 0310-Add-helpers-for-left-right-click-to-Action.patch} (100%)
 rename patches/api/{0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/api/{0313-More-CommandBlock-API.patch => 0312-More-CommandBlock-API.patch} (100%)
 rename patches/api/{0314-Add-missing-team-sidebar-display-slots.patch => 0313-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/api/{0315-add-back-EntityPortalExitEvent.patch => 0314-add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/api/{0316-Add-methods-to-find-targets-for-lightning-strikes.patch => 0315-Add-methods-to-find-targets-for-lightning-strikes.patch} (95%)
 rename patches/api/{0317-Get-entity-default-attributes.patch => 0316-Get-entity-default-attributes.patch} (100%)
 rename patches/api/{0318-Left-handed-API.patch => 0317-Left-handed-API.patch} (100%)
 rename patches/api/{0319-Add-critical-damage-API.patch => 0318-Add-critical-damage-API.patch} (100%)
 rename patches/api/{0320-Add-more-advancement-API.patch => 0319-Add-more-advancement-API.patch} (100%)
 rename patches/api/{0321-Fix-issues-with-mob-conversion.patch => 0320-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/api/{0322-Add-isCollidable-methods-to-various-places.patch => 0321-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/api/{0323-Goat-ram-API.patch => 0322-Goat-ram-API.patch} (100%)
 rename patches/api/{0324-Add-API-for-resetting-a-single-score.patch => 0323-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/api/{0325-Add-Raw-Byte-Entity-Serialization.patch => 0324-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/api/{0326-Add-PlayerItemFrameChangeEvent.patch => 0325-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/api/{0327-Allow-delegation-to-vanilla-chunk-gen.patch => 0326-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/api/{0328-Add-more-Campfire-API.patch => 0327-Add-more-Campfire-API.patch} (100%)
 rename patches/api/{0329-Move-VehicleCollisionEvent-HandlerList-up.patch => 0328-Move-VehicleCollisionEvent-HandlerList-up.patch} (100%)
 rename patches/api/{0330-Improve-scoreboard-entries.patch => 0329-Improve-scoreboard-entries.patch} (100%)
 rename patches/api/{0331-Entity-powdered-snow-API.patch => 0330-Entity-powdered-snow-API.patch} (100%)
 rename patches/api/{0332-Add-API-for-item-entity-health.patch => 0331-Add-API-for-item-entity-health.patch} (100%)
 rename patches/api/{0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/api/{0334-Bucketable-API.patch => 0333-Bucketable-API.patch} (100%)
 rename patches/api/{0335-System-prop-for-default-config-comment-parsing.patch => 0334-System-prop-for-default-config-comment-parsing.patch} (100%)
 rename patches/api/{0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/api/{0337-Multiple-Entries-with-Scoreboards.patch => 0336-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/api/{0339-Warn-on-strange-EventHandler-return-types.patch => 0337-Warn-on-strange-EventHandler-return-types.patch} (100%)
 delete mode 100644 patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
 rename patches/api/{0340-Multi-Block-Change-API.patch => 0338-Multi-Block-Change-API.patch} (95%)
 rename patches/api/{0341-Fix-NotePlayEvent.patch => 0339-Fix-NotePlayEvent.patch} (100%)
 rename patches/api/{0342-Freeze-Tick-Lock-API.patch => 0340-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/api/{0343-Dolphin-API.patch => 0341-Dolphin-API.patch} (100%)
 rename patches/api/{0344-More-PotionEffectType-API.patch => 0342-More-PotionEffectType-API.patch} (100%)
 rename patches/api/{0345-API-for-creating-command-sender-which-forwards-feedb.patch => 0343-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/api/{0346-Implement-regenerateChunk.patch => 0344-Implement-regenerateChunk.patch} (91%)
 rename patches/api/{0347-Add-GameEvent-tags.patch => 0345-Add-GameEvent-tags.patch} (100%)
 rename patches/api/{0348-Furnace-RecipesUsed-API.patch => 0346-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/api/{0349-Configurable-sculk-sensor-listener-range.patch => 0347-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/api/{0350-Add-missing-block-data-mins-and-maxes.patch => 0348-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/api/{0351-Custom-Potion-Mixes.patch => 0349-Custom-Potion-Mixes.patch} (100%)
 rename patches/api/{0352-Expose-furnace-minecart-push-values.patch => 0350-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/api/{0353-More-Projectile-API.patch => 0351-More-Projectile-API.patch} (100%)
 rename patches/api/{0354-Add-getComputedBiome-API.patch => 0352-Add-getComputedBiome-API.patch} (100%)
 rename patches/api/{0355-Add-enchantWithLevels-API.patch => 0353-Add-enchantWithLevels-API.patch} (100%)
 rename patches/api/{0356-Add-TameableDeathMessageEvent.patch => 0354-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/api/{0357-Allow-to-change-the-podium-of-the-EnderDragon.patch => 0355-Allow-to-change-the-podium-of-the-EnderDragon.patch} (100%)
 rename patches/api/{0358-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch => 0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch} (100%)
 rename patches/api/{0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/api/{0360-WorldCreator-keepSpawnLoaded.patch => 0358-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/api/{0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/api/{0362-Add-PlayerStopUsingItemEvent.patch => 0360-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/api/{0363-Expand-FallingBlock-API.patch => 0361-Expand-FallingBlock-API.patch} (97%)
 rename patches/api/{0364-Add-method-isTickingWorlds-to-Bukkit.patch => 0362-Add-method-isTickingWorlds-to-Bukkit.patch} (100%)
 rename patches/api/{0365-Add-WardenAngerChangeEvent.patch => 0363-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/api/{0366-Nameable-Banner-API.patch => 0364-Nameable-Banner-API.patch} (100%)
 rename patches/api/{0367-Add-Player-getFishHook.patch => 0365-Add-Player-getFishHook.patch} (100%)
 rename patches/api/{0368-More-Teleport-API.patch => 0366-More-Teleport-API.patch} (99%)
 rename patches/api/{0369-Add-EntityPortalReadyEvent.patch => 0367-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/api/{0370-Custom-Chat-Completion-Suggestions-API.patch => 0368-Custom-Chat-Completion-Suggestions-API.patch} (94%)
 rename patches/api/{0371-Collision-API.patch => 0369-Collision-API.patch} (100%)
 rename patches/api/{0372-Block-Ticking-API.patch => 0370-Block-Ticking-API.patch} (100%)
 rename patches/api/{0373-Add-NamespacedKey-biome-methods.patch => 0371-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/api/{0374-Also-load-resources-from-LibraryLoader.patch => 0372-Also-load-resources-from-LibraryLoader.patch} (100%)
 rename patches/api/{0375-Added-byte-array-serialization-deserialization-for-P.patch => 0373-Added-byte-array-serialization-deserialization-for-P.patch} (95%)
 rename patches/api/{0376-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/api/{0377-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch => 0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch} (100%)
 rename patches/api/{0378-Add-getDrops-to-BlockState.patch => 0376-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/api/{0379-Add-PlayerInventorySlotChangeEvent.patch => 0377-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/api/{0380-Elder-Guardian-appearance-API.patch => 0378-Elder-Guardian-appearance-API.patch} (92%)
 rename patches/api/{0381-Allow-changing-bed-s-occupied-property.patch => 0379-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/api/{0382-Add-EquipmentSlot-convenience-methods.patch => 0380-Add-EquipmentSlot-convenience-methods.patch} (100%)
 rename patches/api/{0383-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch => 0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch} (100%)
 rename patches/api/{0384-Add-entity-knockback-API.patch => 0382-Add-entity-knockback-API.patch} (100%)
 rename patches/api/{0385-Added-EntityToggleSitEvent.patch => 0383-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/api/{0386-Add-Moving-Piston-API.patch => 0384-Add-Moving-Piston-API.patch} (100%)
 rename patches/api/{0387-Add-PrePlayerAttackEntityEvent.patch => 0385-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/api/{0388-Add-Player-Warden-Warning-API.patch => 0386-Add-Player-Warden-Warning-API.patch} (96%)
 rename patches/api/{0389-More-vanilla-friendly-methods-to-update-trades.patch => 0387-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/api/{0390-Add-paper-dumplisteners-command.patch => 0388-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/api/{0391-ItemStack-damage-API.patch => 0389-ItemStack-damage-API.patch} (100%)
 rename patches/api/{0392-Add-Tick-TemporalUnit.patch => 0390-Add-Tick-TemporalUnit.patch} (100%)
 rename patches/api/{0393-Friction-API.patch => 0391-Friction-API.patch} (100%)
 rename patches/api/{0394-Player-Entity-Tracking-Events.patch => 0392-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/api/{0395-Add-missing-Fluid-type.patch => 0393-Add-missing-Fluid-type.patch} (100%)
 rename patches/api/{0396-fix-Instruments.patch => 0394-fix-Instruments.patch} (100%)
 rename patches/api/{0397-Add-BlockLockCheckEvent.patch => 0395-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/api/{0398-Add-Sneaking-API-for-Entities.patch => 0396-Add-Sneaking-API-for-Entities.patch} (95%)
 rename patches/api/{0399-Improve-PortalEvents.patch => 0397-Improve-PortalEvents.patch} (100%)
 rename patches/api/{0400-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/api/{0401-Flying-Fall-Damage-API.patch => 0399-Flying-Fall-Damage-API.patch} (93%)
 rename patches/api/{0402-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/api/{0403-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch => 0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch} (100%)
 rename patches/api/{0404-Win-Screen-API.patch => 0402-Win-Screen-API.patch} (96%)
 rename patches/api/{0405-Add-Entity-Body-Yaw-API.patch => 0403-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/api/{0406-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch => 0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch} (100%)
 rename patches/api/{0407-Add-EntityFertilizeEggEvent.patch => 0405-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/api/{0408-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/api/{0409-Add-Shearable-API.patch => 0407-Add-Shearable-API.patch} (100%)
 rename patches/api/{0410-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0408-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/api/{0411-Add-Mob-Experience-reward-API.patch => 0409-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/api/{0412-Expand-PlayerItemMendEvent.patch => 0410-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/api/{0413-Add-transient-modifier-API.patch => 0411-Add-transient-modifier-API.patch} (100%)
 rename patches/api/{0414-Properly-remove-the-experimental-smithing-inventory-.patch => 0412-Properly-remove-the-experimental-smithing-inventory-.patch} (100%)
 rename patches/api/{0415-Add-method-to-remove-all-active-potion-effects.patch => 0413-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/api/{0416-Folia-scheduler-and-owned-region-API.patch => 0414-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/api/{0417-Add-event-for-player-editing-sign.patch => 0415-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/api/{0418-Add-Sign-getInteractableSideFor.patch => 0416-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/api/{0419-Fix-BanList-API.patch => 0417-Fix-BanList-API.patch} (98%)
 rename patches/api/{0420-Add-whitelist-events.patch => 0418-Add-whitelist-events.patch} (100%)
 rename patches/api/{0421-API-for-updating-recipes-on-clients.patch => 0419-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/api/{0422-Add-PlayerFailMoveEvent.patch => 0420-Add-PlayerFailMoveEvent.patch} (100%)
 rename patches/api/{0423-Fix-custom-statistic-criteria-creation.patch => 0421-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/api/{0424-SculkCatalyst-bloom-API.patch => 0422-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/api/{0425-API-for-an-entity-s-scoreboard-name.patch => 0423-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/api/{0426-Deprecate-and-replace-methods-with-old-StructureType.patch => 0424-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/api/{0427-Add-Listing-API-for-Player.patch => 0425-Add-Listing-API-for-Player.patch} (93%)
 rename patches/api/{0428-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/api/{0429-Fix-NPE-on-Boat-getStatus.patch => 0427-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/api/{0430-Expand-Pose-API.patch => 0428-Expand-Pose-API.patch} (100%)
 rename patches/api/{0431-MerchantRecipe-add-copy-constructor.patch => 0429-MerchantRecipe-add-copy-constructor.patch} (100%)
 rename patches/api/{0432-More-DragonBattle-API.patch => 0430-More-DragonBattle-API.patch} (100%)
 rename patches/api/{0433-Add-PlayerPickItemEvent.patch => 0431-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/api/{0434-Allow-trident-custom-damage.patch => 0432-Allow-trident-custom-damage.patch} (100%)
 rename patches/api/{0435-Expose-hand-during-BlockCanBuildEvent.patch => 0433-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/api/{0436-Limit-setBurnTime-to-valid-short-values.patch => 0434-Limit-setBurnTime-to-valid-short-values.patch} (100%)
 rename patches/api/{0437-Add-OfflinePlayer-isConnected.patch => 0435-Add-OfflinePlayer-isConnected.patch} (100%)
 rename patches/api/{0438-Add-titleOverride-to-InventoryOpenEvent.patch => 0436-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/api/{0439-Allow-proper-checking-of-empty-item-stacks.patch => 0437-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/api/{0440-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch => 0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch} (100%)
 rename patches/api/{0441-Add-player-idle-duration-API.patch => 0439-Add-player-idle-duration-API.patch} (93%)
 rename patches/api/{0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/api/{0443-Add-predicate-for-blocks-when-raytracing.patch => 0441-Add-predicate-for-blocks-when-raytracing.patch} (98%)
 rename patches/api/{0444-Add-hand-to-fish-event-for-all-player-interactions.patch => 0442-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/api/{0445-Add-UUID-attribute-modifier-API.patch => 0443-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/api/{0446-Expand-LingeringPotion-API.patch => 0444-Expand-LingeringPotion-API.patch} (100%)
 rename patches/api/{0447-Remove-unnecessary-durability-check-in-ItemStack-isS.patch => 0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch} (100%)
 rename patches/api/{0448-Add-Structure-check-API.patch => 0446-Add-Structure-check-API.patch} (94%)
 rename patches/api/{0449-add-missing-Experimental-annotations.patch => 0447-add-missing-Experimental-annotations.patch} (100%)
 rename patches/api/{0450-Add-more-scoreboard-API.patch => 0448-Add-more-scoreboard-API.patch} (100%)
 rename patches/api/{0451-Improve-Registry.patch => 0449-Improve-Registry.patch} (100%)
 rename patches/api/{0452-Add-experience-points-API.patch => 0450-Add-experience-points-API.patch} (100%)
 rename patches/api/{0453-Add-missing-InventoryType.patch => 0451-Add-missing-InventoryType.patch} (100%)
 rename patches/api/{0454-Add-drops-to-shear-events.patch => 0452-Add-drops-to-shear-events.patch} (100%)
 rename patches/api/{0455-Add-HiddenPotionEffect-API.patch => 0453-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/api/{0456-Add-PlayerShieldDisableEvent.patch => 0454-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/api/{0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch => 0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch} (100%)
 delete mode 100644 patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
 create mode 100644 patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
 delete mode 100644 patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
 rename patches/server/{0586-Inventory-close.patch => 0585-Inventory-close.patch} (100%)
 rename patches/server/{0587-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0588-Add-basic-Datapack-API.patch => 0587-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0589-Add-environment-variable-to-disable-server-gui.patch => 0588-Add-environment-variable-to-disable-server-gui.patch} (90%)
 rename patches/server/{0590-additions-to-PlayerGameModeChangeEvent.patch => 0589-additions-to-PlayerGameModeChangeEvent.patch} (98%)
 rename patches/server/{0591-ItemStack-repair-check-API.patch => 0590-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0592-More-Enchantment-API.patch => 0591-More-Enchantment-API.patch} (100%)
 rename patches/server/{0593-Move-range-check-for-block-placing-up.patch => 0592-Move-range-check-for-block-placing-up.patch} (92%)
 rename patches/server/{0594-Fix-and-optimise-world-force-upgrading.patch => 0593-Fix-and-optimise-world-force-upgrading.patch} (97%)
 rename patches/server/{0595-Add-Mob-lookAt-API.patch => 0594-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0596-Add-Unix-domain-socket-support.patch => 0595-Add-Unix-domain-socket-support.patch} (97%)
 rename patches/server/{0597-Add-EntityInsideBlockEvent.patch => 0596-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0598-Attributes-API-for-item-defaults.patch => 0597-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0599-Add-cause-to-Weather-ThunderChangeEvents.patch => 0598-Add-cause-to-Weather-ThunderChangeEvents.patch} (97%)
 rename patches/server/{0600-More-Lidded-Block-API.patch => 0599-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0601-Limit-item-frame-cursors-on-maps.patch => 0600-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0602-Add-PlayerKickEvent-causes.patch => 0601-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0603-Add-PufferFishStateChangeEvent.patch => 0602-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0604-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0605-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0606-Add-option-to-fix-items-merging-through-walls.patch => 0605-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0607-Add-BellRevealRaiderEvent.patch => 0606-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0608-Fix-invulnerable-end-crystals.patch => 0607-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0609-Add-ElderGuardianAppearanceEvent.patch => 0608-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0610-Fix-dangerous-end-portal-logic.patch => 0609-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0611-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0612-Make-item-validations-configurable.patch => 0611-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0613-Line-Of-Sight-Changes.patch => 0612-Line-Of-Sight-Changes.patch} (97%)
 rename patches/server/{0614-add-per-world-spawn-limits.patch => 0613-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0615-Fix-potions-splash-events.patch => 0614-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0616-Add-more-LimitedRegion-API.patch => 0615-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0617-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0616-Fix-PlayerDropItemEvent-using-wrong-item.patch} (94%)
 rename patches/server/{0618-Missing-Entity-API.patch => 0617-Missing-Entity-API.patch} (99%)
 rename patches/server/{0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (92%)
 rename patches/server/{0620-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0621-Use-getChunkIfLoadedImmediately-in-places.patch => 0620-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0622-Fix-commands-from-signs-not-firing-command-events.patch => 0621-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0623-Adds-PlayerArmSwingEvent.patch => 0622-Adds-PlayerArmSwingEvent.patch} (93%)
 rename patches/server/{0624-Fixes-kick-event-leave-message-not-being-sent.patch => 0623-Fixes-kick-event-leave-message-not-being-sent.patch} (97%)
 rename patches/server/{0625-Add-config-for-mobs-immune-to-default-effects.patch => 0624-Add-config-for-mobs-immune-to-default-effects.patch} (94%)
 rename patches/server/{0626-Don-t-apply-cramming-damage-to-players.patch => 0625-Don-t-apply-cramming-damage-to-players.patch} (94%)
 rename patches/server/{0627-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0626-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0628-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0627-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0629-Stinger-API.patch => 0628-Stinger-API.patch} (100%)
 rename patches/server/{0630-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0631-Add-System.out-err-catcher.patch => 0630-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0632-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0633-Improve-boat-collision-performance.patch => 0632-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0634-Prevent-AFK-kick-while-watching-end-credits.patch => 0633-Prevent-AFK-kick-while-watching-end-credits.patch} (93%)
 rename patches/server/{0635-Allow-skipping-writing-of-comments-to-server.propert.patch => 0634-Allow-skipping-writing-of-comments-to-server.propert.patch} (97%)
 rename patches/server/{0636-Add-PlayerSetSpawnEvent.patch => 0635-Add-PlayerSetSpawnEvent.patch} (99%)
 rename patches/server/{0637-Make-hoppers-respect-inventory-max-stack-size.patch => 0636-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0638-Optimize-entity-tracker-passenger-checks.patch => 0637-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0639-Config-option-for-Piglins-guarding-chests.patch => 0638-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0640-Added-EntityDamageItemEvent.patch => 0639-Added-EntityDamageItemEvent.patch} (97%)
 rename patches/server/{0641-Optimize-indirect-passenger-iteration.patch => 0640-Optimize-indirect-passenger-iteration.patch} (95%)
 rename patches/server/{0642-Configurable-item-frame-map-cursor-update-interval.patch => 0641-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0643-Make-EntityUnleashEvent-cancellable.patch => 0642-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0644-Clear-bucket-NBT-after-dispense.patch => 0643-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0645-Change-EnderEye-target-without-changing-other-things.patch => 0644-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0646-Add-BlockBreakBlockEvent.patch => 0645-Add-BlockBreakBlockEvent.patch} (98%)
 rename patches/server/{0647-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0648-More-CommandBlock-API.patch => 0647-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0649-Add-missing-team-sidebar-display-slots.patch => 0648-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0650-Add-back-EntityPortalExitEvent.patch => 0649-Add-back-EntityPortalExitEvent.patch} (97%)
 rename patches/server/{0651-Add-methods-to-find-targets-for-lightning-strikes.patch => 0650-Add-methods-to-find-targets-for-lightning-strikes.patch} (93%)
 rename patches/server/{0652-Get-entity-default-attributes.patch => 0651-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0653-Left-handed-API.patch => 0652-Left-handed-API.patch} (100%)
 rename patches/server/{0654-Add-more-advancement-API.patch => 0653-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0655-Add-ItemFactory-getSpawnEgg-API.patch => 0654-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0656-Add-critical-damage-API.patch => 0655-Add-critical-damage-API.patch} (98%)
 rename patches/server/{0657-Fix-issues-with-mob-conversion.patch => 0656-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0658-Add-isCollidable-methods-to-various-places.patch => 0657-Add-isCollidable-methods-to-various-places.patch} (96%)
 rename patches/server/{0659-Goat-ram-API.patch => 0658-Goat-ram-API.patch} (100%)
 rename patches/server/{0660-Add-API-for-resetting-a-single-score.patch => 0659-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0661-Add-Raw-Byte-Entity-Serialization.patch => 0660-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0662-Vanilla-command-permission-fixes.patch => 0661-Vanilla-command-permission-fixes.patch} (97%)
 rename patches/server/{0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0664-Fix-GameProfileCache-concurrency.patch => 0663-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0665-Improve-and-expand-AsyncCatcher.patch => 0664-Improve-and-expand-AsyncCatcher.patch} (98%)
 rename patches/server/{0666-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0665-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0667-Sanitize-ResourceLocation-error-logging.patch => 0666-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0668-Optimise-general-POI-access.patch => 0667-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0669-Custom-table-implementation-for-blockstate-state-loo.patch => 0668-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0670-Manually-inline-methods-in-BlockPosition.patch => 0669-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0671-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0670-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (94%)
 rename patches/server/{0673-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0674-Don-t-lookup-fluid-state-when-raytracing.patch => 0673-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0675-Time-scoreboard-search.patch => 0674-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0676-Send-full-pos-packets-for-hard-colliding-entities.patch => 0675-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0677-Do-not-run-raytrace-logic-for-AIR.patch => 0676-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0678-Execute-chunk-tasks-mid-tick.patch => 0677-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0679-Oprimise-map-impl-for-tracked-players.patch => 0678-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0680-Optimise-BlockSoil-nearby-water-lookup.patch => 0679-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0681-Optimise-random-block-ticking.patch => 0680-Optimise-random-block-ticking.patch} (99%)
 rename patches/server/{0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (99%)
 rename patches/server/{0683-Use-Velocity-compression-and-cipher-natives.patch => 0682-Use-Velocity-compression-and-cipher-natives.patch} (99%)
 rename patches/server/{0684-Detail-more-information-in-watchdog-dumps.patch => 0683-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0685-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0686-Distance-manager-tick-timings.patch => 0685-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (94%)
 rename patches/server/{0688-Check-requirement-before-suggesting-root-nodes.patch => 0687-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (92%)
 rename patches/server/{0690-Add-packet-limiter-config.patch => 0689-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0692-Ensure-valid-vehicle-status.patch => 0691-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0693-Prevent-softlocked-end-exit-portal-generation.patch => 0692-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0695-Don-t-log-debug-logging-being-disabled.patch => 0694-Don-t-log-debug-logging-being-disabled.patch} (88%)
 rename patches/server/{0696-fix-various-menus-with-empty-level-accesses.patch => 0695-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0697-Preserve-overstacked-loot.patch => 0696-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0698-Update-head-rotation-in-missing-places.patch => 0697-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0699-prevent-unintended-light-block-manipulation.patch => 0698-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0700-Fix-CraftCriteria-defaults-map.patch => 0699-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0701-Fix-upstreams-block-state-factories.patch => 0700-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0702-Configurable-feature-seeds.patch => 0701-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0703-Add-root-admin-user-detection.patch => 0702-Add-root-admin-user-detection.patch} (97%)
 rename patches/server/{0704-Always-allow-item-changing-in-Fireball.patch => 0703-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0705-don-t-attempt-to-teleport-dead-entities.patch => 0704-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0706-Prevent-excessive-velocity-through-repeated-crits.patch => 0705-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0707-Remove-client-side-code-using-deprecated-for-removal.patch => 0706-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0708-Fix-removing-recipes-from-RecipeIterator.patch => 0707-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0709-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0708-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0710-Hide-unnecessary-itemmeta-from-clients.patch => 0709-Hide-unnecessary-itemmeta-from-clients.patch} (98%)
 rename patches/server/{0711-Fix-Spigot-growth-modifiers.patch => 0710-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0713-Add-PlayerItemFrameChangeEvent.patch => 0712-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0714-Optimize-HashMapPalette.patch => 0713-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0715-Allow-delegation-to-vanilla-chunk-gen.patch => 0714-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0716-Collision-optimisations.patch => 0715-Collision-optimisations.patch} (100%)
 rename patches/server/{0717-Optimise-collision-checking-in-player-move-packet-ha.patch => 0716-Optimise-collision-checking-in-player-move-packet-ha.patch} (99%)
 rename patches/server/{0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0719-Add-more-Campfire-API.patch => 0718-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0721-Fix-tripwire-state-inconsistency.patch => 0720-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0722-Forward-CraftEntity-in-teleport-command.patch => 0721-Forward-CraftEntity-in-teleport-command.patch} (94%)
 rename patches/server/{0723-Improve-scoreboard-entries.patch => 0722-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0724-Entity-powdered-snow-API.patch => 0723-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0725-Add-API-for-item-entity-health.patch => 0724-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0726-Fix-entity-type-tags-suggestions-in-selectors.patch => 0725-Fix-entity-type-tags-suggestions-in-selectors.patch} (98%)
 rename patches/server/{0727-Configurable-max-block-light-for-monster-spawning.patch => 0726-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0728-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0727-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0729-Load-effect-amplifiers-greater-than-127-correctly.patch => 0728-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0730-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0729-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0731-Fix-bees-aging-inside-hives.patch => 0730-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0732-Bucketable-API.patch => 0731-Bucketable-API.patch} (100%)
 rename patches/server/{0733-Validate-usernames.patch => 0732-Validate-usernames.patch} (97%)
 rename patches/server/{0734-Make-water-animal-spawn-height-configurable.patch => 0733-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0734-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (96%)
 rename patches/server/{0736-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0735-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0737-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch => 0736-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch} (100%)
 rename patches/server/{0738-Multiple-Entries-with-Scoreboards.patch => 0737-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0739-Reset-placed-block-on-exception.patch => 0738-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0740-Add-configurable-height-for-slime-spawn.patch => 0739-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0742-Fix-xp-reward-for-baby-zombies.patch => 0740-Fix-xp-reward-for-baby-zombies.patch} (100%)
 delete mode 100644 patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
 rename patches/server/{0743-Multi-Block-Change-API-Implementation.patch => 0741-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0744-Fix-NotePlayEvent.patch => 0742-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0745-Freeze-Tick-Lock-API.patch => 0743-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0746-Dolphin-API.patch => 0744-Dolphin-API.patch} (100%)
 rename patches/server/{0747-More-PotionEffectType-API.patch => 0745-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0749-API-for-creating-command-sender-which-forwards-feedb.patch => 0747-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0750-Add-missing-structure-set-seed-configs.patch => 0748-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0751-Implement-regenerateChunk.patch => 0749-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0752-Fix-cancelled-powdered-snow-bucket-placement.patch => 0750-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0754-Add-GameEvent-tags.patch => 0752-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0756-Furnace-RecipesUsed-API.patch => 0754-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0757-Configurable-sculk-sensor-listener-range.patch => 0755-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0758-Add-missing-block-data-mins-and-maxes.patch => 0756-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (96%)
 rename patches/server/{0760-Put-world-into-worldlist-before-initing-the-world.patch => 0758-Put-world-into-worldlist-before-initing-the-world.patch} (91%)
 rename patches/server/{0761-Fix-Entity-Position-Desync.patch => 0759-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0762-Custom-Potion-Mixes.patch => 0760-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0763-Force-close-world-loading-screen.patch => 0761-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0764-Fix-falling-block-spawn-methods.patch => 0762-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0765-Expose-furnace-minecart-push-values.patch => 0763-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0766-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0764-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0767-More-Projectile-API.patch => 0765-More-Projectile-API.patch} (99%)
 rename patches/server/{0768-Fix-swamp-hut-cat-generation-deadlock.patch => 0766-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0767-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0770-Implement-getComputedBiome-API.patch => 0768-Implement-getComputedBiome-API.patch} (96%)
 rename patches/server/{0771-Make-some-itemstacks-nonnull.patch => 0769-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0772-Implement-enchantWithLevels-API.patch => 0770-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0773-Fix-saving-in-unloadWorld.patch => 0771-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0774-Buffer-OOB-setBlock-calls.patch => 0772-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0775-Add-TameableDeathMessageEvent.patch => 0773-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0774-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (99%)
 rename patches/server/{0777-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0775-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0778-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0776-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0779-Guard-against-invalid-entity-positions.patch => 0777-Guard-against-invalid-entity-positions.patch} (95%)
 rename patches/server/{0780-cache-resource-keys.patch => 0778-cache-resource-keys.patch} (100%)
 rename patches/server/{0781-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0779-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0782-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0780-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0783-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0781-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0784-Prevent-tile-entity-copies-loading-chunks.patch => 0782-Prevent-tile-entity-copies-loading-chunks.patch} (93%)
 rename patches/server/{0785-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0783-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0786-Pass-ServerLevel-for-gamerule-callbacks.patch => 0784-Pass-ServerLevel-for-gamerule-callbacks.patch} (97%)
 rename patches/server/{0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0785-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0788-WorldCreator-keepSpawnLoaded.patch => 0786-WorldCreator-keepSpawnLoaded.patch} (94%)
 rename patches/server/{0789-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0787-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0790-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0788-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0791-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0789-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0792-Fire-CauldronLevelChange-on-initial-fill.patch => 0790-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0793-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0791-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0794-Add-PlayerStopUsingItemEvent.patch => 0792-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0795-Don-t-tick-markers.patch => 0793-Don-t-tick-markers.patch} (97%)
 rename patches/server/{0796-Expand-FallingBlock-API.patch => 0794-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0797-Do-not-accept-invalid-client-settings.patch => 0795-Do-not-accept-invalid-client-settings.patch} (94%)
 rename patches/server/{0798-Add-support-for-Proxy-Protocol.patch => 0796-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0799-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0797-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0800-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0798-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0801-Sanitize-Sent-BlockEntity-NBT.patch => 0799-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0802-Disable-component-selector-resolving-in-books-by-def.patch => 0800-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0803-Prevent-entity-loading-causing-async-lookups.patch => 0801-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0804-Throw-exception-on-world-create-while-being-ticked.patch => 0802-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0805-Add-Alternate-Current-redstone-implementation.patch => 0803-Add-Alternate-Current-redstone-implementation.patch} (99%)
 rename patches/server/{0806-Dont-resent-entity-on-art-update.patch => 0804-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0807-Add-WardenAngerChangeEvent.patch => 0805-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0808-Add-option-for-strict-advancement-dimension-checks.patch => 0806-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0809-Add-missing-important-BlockStateListPopulator-method.patch => 0807-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0810-Nameable-Banner-API.patch => 0808-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0811-Don-t-broadcast-messages-to-command-blocks.patch => 0809-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0812-Prevent-empty-items-from-being-added-to-world.patch => 0810-Prevent-empty-items-from-being-added-to-world.patch} (93%)
 rename patches/server/{0813-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0811-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0814-Add-Player-getFishHook.patch => 0812-Add-Player-getFishHook.patch} (92%)
 rename patches/server/{0815-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0813-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0816-Add-various-missing-EntityDropItemEvent-calls.patch => 0814-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0817-Fix-Bee-flower-NPE.patch => 0815-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0816-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (92%)
 rename patches/server/{0819-More-Teleport-API.patch => 0817-More-Teleport-API.patch} (99%)
 rename patches/server/{0820-Add-EntityPortalReadyEvent.patch => 0818-Add-EntityPortalReadyEvent.patch} (95%)
 rename patches/server/{0821-Don-t-use-level-random-in-entity-constructors.patch => 0819-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0822-Send-block-entities-after-destroy-prediction.patch => 0820-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0823-Warn-on-plugins-accessing-faraway-chunks.patch => 0821-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0824-Custom-Chat-Completion-Suggestions-API.patch => 0822-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0825-Add-and-fix-missing-BlockFadeEvents.patch => 0823-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0826-Collision-API.patch => 0824-Collision-API.patch} (96%)
 rename patches/server/{0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0825-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (92%)
 rename patches/server/{0828-Block-Ticking-API.patch => 0826-Block-Ticking-API.patch} (100%)
 rename patches/server/{0829-Add-Velocity-IP-Forwarding-Support.patch => 0827-Add-Velocity-IP-Forwarding-Support.patch} (94%)
 rename patches/server/{0830-Add-NamespacedKey-biome-methods.patch => 0828-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0831-Fix-plugin-loggers-on-server-shutdown.patch => 0829-Fix-plugin-loggers-on-server-shutdown.patch} (96%)
 rename patches/server/{0832-Stop-large-look-changes-from-crashing-the-server.patch => 0830-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0833-Fire-EntityChangeBlockEvent-in-more-places.patch => 0831-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0834-Missing-eating-regain-reason.patch => 0832-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0835-Missing-effect-cause.patch => 0833-Missing-effect-cause.patch} (100%)
 rename patches/server/{0836-Added-byte-array-serialization-deserialization-for-P.patch => 0834-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0837-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0835-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0838-Call-BlockPhysicsEvent-more-often.patch => 0836-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0839-Configurable-chat-thread-limit.patch => 0837-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0840-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0838-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0841-fix-Jigsaw-block-kicking-user.patch => 0839-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0842-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0840-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0843-Add-getDrops-to-BlockState.patch => 0841-Add-getDrops-to-BlockState.patch} (95%)
 rename patches/server/{0844-Fix-a-bunch-of-vanilla-bugs.patch => 0842-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0845-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0843-Remove-unnecessary-onTrackingStart-during-navigation.patch} (94%)
 rename patches/server/{0846-Fix-custom-piglin-loved-items.patch => 0844-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0847-EntityPickupItemEvent-fixes.patch => 0845-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0848-Correctly-handle-interactions-with-items-on-cooldown.patch => 0846-Correctly-handle-interactions-with-items-on-cooldown.patch} (97%)
 rename patches/server/{0849-Add-PlayerInventorySlotChangeEvent.patch => 0847-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0850-Elder-Guardian-appearance-API.patch => 0848-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0851-Allow-changing-bed-s-occupied-property.patch => 0849-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0852-Add-entity-knockback-API.patch => 0850-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0853-Detect-headless-JREs.patch => 0851-Detect-headless-JREs.patch} (96%)
 rename patches/server/{0854-fixed-entity-vehicle-collision-event-not-called.patch => 0852-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0855-optimized-dirt-and-snow-spreading.patch => 0853-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0856-Added-EntityToggleSitEvent.patch => 0854-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0857-Add-fire-tick-delay-option.patch => 0855-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0858-Add-Moving-Piston-API.patch => 0856-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0859-Ignore-impossible-spawn-tick.patch => 0857-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0860-Track-projectile-source-for-fireworks-from-dispenser.patch => 0858-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0861-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0859-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0860-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (95%)
 rename patches/server/{0863-Prevent-compass-from-loading-chunks.patch => 0861-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0864-Add-PrePlayerAttackEntityEvent.patch => 0862-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0865-ensure-reset-EnderDragon-boss-event-name.patch => 0863-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0866-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0864-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0867-Add-Player-Warden-Warning-API.patch => 0865-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0868-More-vanilla-friendly-methods-to-update-trades.patch => 0866-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0869-Add-paper-dumplisteners-command.patch => 0867-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0870-check-global-player-list-where-appropriate.patch => 0868-check-global-player-list-where-appropriate.patch} (97%)
 rename patches/server/{0871-Fix-async-entity-add-due-to-fungus-trees.patch => 0869-Fix-async-entity-add-due-to-fungus-trees.patch} (95%)
 rename patches/server/{0872-ItemStack-damage-API.patch => 0870-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0873-Friction-API.patch => 0871-Friction-API.patch} (100%)
 rename patches/server/{0874-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0872-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0875-Fix-player-kick-on-shutdown.patch => 0873-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0876-Sync-offhand-slot-in-menus.patch => 0874-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0877-Player-Entity-Tracking-Events.patch => 0875-Player-Entity-Tracking-Events.patch} (96%)
 rename patches/server/{0878-Limit-pet-look-distance.patch => 0876-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0879-Properly-resend-entities.patch => 0877-Properly-resend-entities.patch} (99%)
 rename patches/server/{0880-Fixes-and-additions-to-the-SpawnReason-API.patch => 0878-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0881-fix-Instruments.patch => 0879-fix-Instruments.patch} (100%)
 rename patches/server/{0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (97%)
 rename patches/server/{0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0884-Add-BlockLockCheckEvent.patch => 0882-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0885-Add-Sneaking-API-for-Entities.patch => 0883-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0886-Improve-logging-and-errors.patch => 0884-Improve-logging-and-errors.patch} (98%)
 rename patches/server/{0887-Improve-PortalEvents.patch => 0885-Improve-PortalEvents.patch} (93%)
 rename patches/server/{0888-Add-config-option-for-spider-worldborder-climbing.patch => 0886-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0889-Add-missing-SpigotConfig-logCommands-check.patch => 0887-Add-missing-SpigotConfig-logCommands-check.patch} (92%)
 rename patches/server/{0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0891-Flying-Fall-Damage.patch => 0889-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0894-config-for-disabling-entity-tag-tags.patch => 0892-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0895-Use-single-player-info-update-packet-on-join.patch => 0893-Use-single-player-info-update-packet-on-join.patch} (97%)
 rename patches/server/{0896-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0894-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0897-Win-Screen-API.patch => 0895-Win-Screen-API.patch} (100%)
 rename patches/server/{0898-Remove-CraftItemStack-setAmount-null-assignment.patch => 0896-Remove-CraftItemStack-setAmount-null-assignment.patch} (93%)
 rename patches/server/{0899-Fix-force-opening-enchantment-tables.patch => 0897-Fix-force-opening-enchantment-tables.patch} (94%)
 rename patches/server/{0900-Add-Entity-Body-Yaw-API.patch => 0898-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0902-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0900-Update-the-flag-when-a-captured-block-state-is-outda.patch} (90%)
 rename patches/server/{0903-Add-EntityFertilizeEggEvent.patch => 0901-Add-EntityFertilizeEggEvent.patch} (98%)
 rename patches/server/{0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (94%)
 rename patches/server/{0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0906-Correctly-handle-ArmorStand-invisibility.patch => 0904-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0907-Fix-advancement-triggers-for-entity-damage.patch => 0905-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0908-Fix-text-display-error-on-spawn.patch => 0906-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0909-Fix-certain-inventories-returning-null-Locations.patch => 0907-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0910-Add-Shearable-API.patch => 0908-Add-Shearable-API.patch} (100%)
 rename patches/server/{0911-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0909-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0912-Optimize-Hoppers.patch => 0910-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0913-Fix-beehives-generating-from-using-bonemeal.patch => 0911-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0915-Treat-sequence-violations-like-they-should-be.patch => 0913-Treat-sequence-violations-like-they-should-be.patch} (91%)
 rename patches/server/{0916-remove-duplicate-animate-packet-for-records.patch => 0914-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0917-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0915-Prevent-causing-expired-keys-from-impacting-new-join.patch} (97%)
 rename patches/server/{0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (90%)
 rename patches/server/{0919-Use-array-for-gamerule-storage.patch => 0917-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0920-Fix-a-couple-of-upstream-bed-issues.patch => 0918-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0921-Fix-demo-flag-not-enabling-demo-mode.patch => 0919-Fix-demo-flag-not-enabling-demo-mode.patch} (91%)
 rename patches/server/{0922-Add-Mob-Experience-reward-API.patch => 0920-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0923-Break-redstone-on-top-of-trap-doors-early.patch => 0921-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0924-Fix-DamageCause-for-Falling-Blocks.patch => 0922-Fix-DamageCause-for-Falling-Blocks.patch} (92%)
 rename patches/server/{0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0926-More-accurate-isInOpenWater-impl.patch => 0924-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0928-Optimise-recalcBlockCounts-for-empty-sections.patch => 0926-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0929-Expand-PlayerItemMendEvent.patch => 0927-Expand-PlayerItemMendEvent.patch} (98%)
 rename patches/server/{0930-Refresh-ProjectileSource-for-projectiles.patch => 0928-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0931-Add-transient-modifier-API.patch => 0929-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0932-Fix-block-place-logic.patch => 0930-Fix-block-place-logic.patch} (97%)
 rename patches/server/{0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0934-Call-BlockGrowEvent-for-missing-blocks.patch => 0932-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (94%)
 rename patches/server/{0936-fix-MapLike-spam-for-missing-key-selector.patch => 0934-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0937-Fix-sniffer-removeExploredLocation.patch => 0935-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0938-Add-method-to-remove-all-active-potion-effects.patch => 0936-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0941-Properly-Cancel-Usable-Items.patch => 0939-Properly-Cancel-Usable-Items.patch} (97%)
 rename patches/server/{0942-Add-event-for-player-editing-sign.patch => 0940-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0943-Only-tick-item-frames-if-players-can-see-it.patch => 0941-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0944-Fix-cmd-permission-levels-for-command-blocks.patch => 0942-Fix-cmd-permission-levels-for-command-blocks.patch} (97%)
 rename patches/server/{0945-Add-option-to-disable-block-updates.patch => 0943-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0946-Call-missing-BlockDispenseEvent.patch => 0944-Call-missing-BlockDispenseEvent.patch} (98%)
 rename patches/server/{0947-Don-t-load-chunks-for-supporting-block-checks.patch => 0945-Don-t-load-chunks-for-supporting-block-checks.patch} (100%)
 rename patches/server/{0948-Optimize-player-lookups-for-beacons.patch => 0946-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0949-Add-Sign-getInteractableSideFor.patch => 0947-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0950-Array-backed-synched-entity-data.patch => 0948-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0951-fix-item-meta-for-tadpole-buckets.patch => 0949-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0952-Fix-BanList-API.patch => 0950-Fix-BanList-API.patch} (100%)
 rename patches/server/{0953-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0951-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0954-Fix-possible-NPE-on-painting-creation.patch => 0952-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0955-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0953-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0956-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0954-ExperienceOrb-should-call-EntitySpawnEvent.patch} (93%)
 rename patches/server/{0957-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0955-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0958-Add-whitelist-events.patch => 0956-Add-whitelist-events.patch} (100%)
 rename patches/server/{0959-Implement-PlayerFailMoveEvent.patch => 0957-Implement-PlayerFailMoveEvent.patch} (98%)
 rename patches/server/{0960-Folia-scheduler-and-owned-region-API.patch => 0958-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/server/{0961-Only-erase-allay-memory-on-non-item-targets.patch => 0959-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0962-API-for-updating-recipes-on-clients.patch => 0960-API-for-updating-recipes-on-clients.patch} (97%)
 rename patches/server/{0963-Fix-rotation-when-spawning-display-entities.patch => 0961-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0964-Only-capture-actual-tree-growth.patch => 0962-Only-capture-actual-tree-growth.patch} (100%)
 rename patches/server/{0965-Use-correct-source-for-mushroom-block-spread-event.patch => 0963-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0966-Respect-randomizeData-on-more-entities-when-spawning.patch => 0964-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0967-Use-correct-seed-on-api-world-load.patch => 0965-Use-correct-seed-on-api-world-load.patch} (90%)
 rename patches/server/{0968-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0966-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0969-Cache-map-ids-on-item-frames.patch => 0967-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0970-Fix-custom-statistic-criteria-creation.patch => 0968-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0971-Bandaid-fix-for-Effect.patch => 0969-Bandaid-fix-for-Effect.patch} (100%)
 rename patches/server/{0972-SculkCatalyst-bloom-API.patch => 0970-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0973-API-for-an-entity-s-scoreboard-name.patch => 0971-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0972-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%)
 rename patches/server/{0975-Deprecate-and-replace-methods-with-old-StructureType.patch => 0973-Deprecate-and-replace-methods-with-old-StructureType.patch} (96%)
 rename patches/server/{0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (95%)
 rename patches/server/{0977-Properly-handle-BlockBreakEvent-isDropItems.patch => 0975-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0978-Fire-entity-death-event-for-ender-dragon.patch => 0976-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0979-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0977-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%)
 rename patches/server/{0980-Add-Listing-API-for-Player.patch => 0978-Add-Listing-API-for-Player.patch} (100%)
 rename patches/server/{0981-Configurable-Region-Compression-Format.patch => 0979-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (96%)
 rename patches/server/{0983-Fix-NPE-on-Boat-getStatus.patch => 0981-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0984-Expand-Pose-API.patch => 0982-Expand-Pose-API.patch} (100%)
 rename patches/server/{0985-More-DragonBattle-API.patch => 0983-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0986-Deep-clone-unhandled-nbt-tags.patch => 0984-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{0987-Add-PlayerPickItemEvent.patch => 0985-Add-PlayerPickItemEvent.patch} (96%)
 rename patches/server/{0988-Improve-performance-of-mass-crafts.patch => 0986-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{0989-Allow-trident-custom-damage.patch => 0987-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0990-Expose-hand-during-BlockCanBuildEvent.patch => 0988-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0991-Optimize-nearest-structure-border-iteration.patch => 0989-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{0992-Implement-OfflinePlayer-isConnected.patch => 0990-Implement-OfflinePlayer-isConnected.patch} (100%)
 rename patches/server/{0993-Fix-inventory-desync.patch => 0991-Fix-inventory-desync.patch} (100%)
 rename patches/server/{0994-Add-titleOverride-to-InventoryOpenEvent.patch => 0992-Add-titleOverride-to-InventoryOpenEvent.patch} (97%)
 rename patches/server/{0995-Configure-sniffer-egg-hatch-time.patch => 0993-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{0996-Do-crystal-portal-proximity-check-before-entity-look.patch => 0994-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{0997-Skip-POI-finding-if-stuck-in-vehicle.patch => 0995-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{0998-Add-slot-sanity-checks-in-container-clicks.patch => 0996-Add-slot-sanity-checks-in-container-clicks.patch} (96%)
 rename patches/server/{0999-Call-BlockRedstoneEvents-for-lecterns.patch => 0997-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{1000-Allow-proper-checking-of-empty-item-stacks.patch => 0998-Allow-proper-checking-of-empty-item-stacks.patch} (93%)
 rename patches/server/{1001-Fix-silent-equipment-change-for-mobs.patch => 0999-Fix-silent-equipment-change-for-mobs.patch} (100%)
 rename patches/server/{1002-Fix-spigot-s-Forced-Stats.patch => 1000-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{1003-Add-missing-InventoryHolders-to-inventories.patch => 1001-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 1002-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%)
 rename patches/server/{1005-Actually-optimise-explosions.patch => 1003-Actually-optimise-explosions.patch} (100%)
 rename patches/server/{1006-Add-missing-logs-for-log-ips-config-option.patch => 1004-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{1007-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 1005-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (100%)
 rename patches/server/{1008-Fix-SuspiciousStewMeta.patch => 1006-Fix-SuspiciousStewMeta.patch} (100%)
 rename patches/server/{1009-Optimise-chunk-tick-iteration.patch => 1007-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{1010-Lag-compensation-ticks.patch => 1008-Lag-compensation-ticks.patch} (100%)
 rename patches/server/{1011-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 1009-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{1012-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 1010-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{1013-Fix-team-sidebar-objectives-not-being-cleared.patch => 1011-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{1014-Optimise-nearby-player-retrieval.patch => 1012-Optimise-nearby-player-retrieval.patch} (98%)
 rename patches/server/{1015-Remove-streams-for-villager-AI.patch => 1013-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{1016-Fix-missing-map-initialize-event-call.patch => 1014-Fix-missing-map-initialize-event-call.patch} (95%)
 rename patches/server/{1017-Update-entity-data-when-attaching-firework-to-entity.patch => 1015-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{1018-Use-correct-variable-for-initializing-CraftLootTable.patch => 1016-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%)
 rename patches/server/{1019-Make-setVelocity-method-of-Fireballs-change-the-trav.patch => 1017-Make-setVelocity-method-of-Fireballs-change-the-trav.patch} (100%)
 rename patches/server/{1020-Fix-UnsafeValues-loadAdvancement.patch => 1018-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{1021-Add-player-idle-duration-API.patch => 1019-Add-player-idle-duration-API.patch} (100%)
 rename patches/server/{1022-Don-t-check-if-we-can-see-non-visible-entities.patch => 1020-Don-t-check-if-we-can-see-non-visible-entities.patch} (90%)
 rename patches/server/{1023-Fix-NPE-in-SculkBloomEvent-world-access.patch => 1021-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 1022-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (100%)
 rename patches/server/{1025-Optimize-VarInts.patch => 1023-Optimize-VarInts.patch} (100%)
 rename patches/server/{1026-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 1024-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{1027-Add-predicate-for-blocks-when-raytracing.patch => 1025-Add-predicate-for-blocks-when-raytracing.patch} (98%)
 rename patches/server/{1028-Broadcast-take-item-packets-with-collector-as-source.patch => 1026-Broadcast-take-item-packets-with-collector-as-source.patch} (92%)
 rename patches/server/{1029-fix-secure-profile-with-proxy-online-mode.patch => 1027-fix-secure-profile-with-proxy-online-mode.patch} (92%)
 rename patches/server/{1030-Expand-LingeringPotion-API.patch => 1028-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{1031-Add-MaterialTagsTest.patch => 1029-Add-MaterialTagsTest.patch} (100%)
 rename patches/server/{1032-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 1030-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%)
 rename patches/server/{1033-Add-hand-to-fish-event-for-all-player-interactions.patch => 1031-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{1034-Fix-several-issues-with-EntityBreedEvent.patch => 1032-Fix-several-issues-with-EntityBreedEvent.patch} (100%)
 rename patches/server/{1035-Add-UUID-attribute-modifier-API.patch => 1033-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{1036-Fix-missing-event-call-for-entity-teleport-API.patch => 1034-Fix-missing-event-call-for-entity-teleport-API.patch} (100%)
 rename patches/server/{1037-Lazily-create-LootContext-for-criterions.patch => 1035-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{1038-Don-t-fire-sync-events-during-worldgen.patch => 1036-Don-t-fire-sync-events-during-worldgen.patch} (100%)
 rename patches/server/{1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 1037-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%)
 rename patches/server/{1040-Restore-vanilla-entity-drops-behavior.patch => 1038-Restore-vanilla-entity-drops-behavior.patch} (100%)
 rename patches/server/{1041-Add-Structure-check-API.patch => 1039-Add-Structure-check-API.patch} (91%)
 rename patches/server/{1042-Dont-resend-blocks-on-interactions.patch => 1040-Dont-resend-blocks-on-interactions.patch} (100%)
 rename patches/server/{1043-Keep-previous-behavior-for-setResourcePack.patch => 1041-Keep-previous-behavior-for-setResourcePack.patch} (100%)
 rename patches/server/{1044-properly-read-and-store-sus-effect-duration.patch => 1042-properly-read-and-store-sus-effect-duration.patch} (100%)
 rename patches/server/{1045-Use-correct-max-stack-size-in-crafter.patch => 1043-Use-correct-max-stack-size-in-crafter.patch} (100%)
 rename patches/server/{1046-add-more-scoreboard-API.patch => 1044-add-more-scoreboard-API.patch} (100%)
 rename patches/server/{1047-Improve-Registry.patch => 1045-Improve-Registry.patch} (100%)
 rename patches/server/{1048-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 1046-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%)
 rename patches/server/{1049-Add-experience-points-API.patch => 1047-Add-experience-points-API.patch} (100%)
 rename patches/server/{1050-Add-missing-InventoryType.patch => 1048-Add-missing-InventoryType.patch} (100%)
 rename patches/server/{1051-Add-drops-to-shear-events.patch => 1049-Add-drops-to-shear-events.patch} (100%)
 rename patches/server/{1052-Add-PlayerShieldDisableEvent.patch => 1050-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/server/{1053-Add-HiddenPotionEffect-API.patch => 1051-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/server/{1054-Correctly-check-if-bucket-dispenses-will-succeed-for.patch => 1052-Correctly-check-if-bucket-dispenses-will-succeed-for.patch} (100%)
 rename patches/server/{1055-fix-ItemMeta-removing-CustomModelData.patch => 1053-fix-ItemMeta-removing-CustomModelData.patch} (100%)
 rename patches/server/{1056-Validate-ResourceLocation-in-NBT-reading.patch => 1054-Validate-ResourceLocation-in-NBT-reading.patch} (100%)
 rename patches/server/{1057-Properly-handle-experience-dropping-on-block-break.patch => 1055-Properly-handle-experience-dropping-on-block-break.patch} (100%)
 rename patches/server/{1058-Fixup-NamespacedKey-handling.patch => 1056-Fixup-NamespacedKey-handling.patch} (100%)

diff --git a/build-data/spigot-server-patches/re-add-asm-dependency.patch b/build-data/spigot-server-patches/re-add-asm-dependency.patch
index fcf343fa1d..6e33148caa 100644
--- a/build-data/spigot-server-patches/re-add-asm-dependency.patch
+++ b/build-data/spigot-server-patches/re-add-asm-dependency.patch
@@ -24,6 +24,6 @@
 +         <dependency>
 +             <groupId>org.ow2.asm</groupId>
 +             <artifactId>asm-commons</artifactId>
-+-- 
++--
 +2.43.0
 +
diff --git a/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
similarity index 58%
rename from patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
index 93f6f96fdf..b73f9ab1ff 100644
--- a/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
@@ -1,12 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:43:30 -0400
-Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
+Subject: [PATCH] Add more fields to AsyncPreLoginEvent
 
-This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 6aaeba3feb66462ce352dacabd845f8d8283f54b..e4afc428e9a8625bf6f5967cb659987c14f65ba6 100644
+index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..f8b69b52ec8efa103e4e78e1b5c6a015e73d2a75 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -2,6 +2,9 @@ package org.bukkit.event.player;
@@ -19,27 +18,69 @@ index 6aaeba3feb66462ce352dacabd845f8d8283f54b..e4afc428e9a8625bf6f5967cb659987c
  import org.bukkit.event.Event;
  import org.bukkit.event.HandlerList;
  import org.jetbrains.annotations.NotNull;
-@@ -22,9 +25,9 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -22,9 +25,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
      private static final HandlerList handlers = new HandlerList();
      private Result result;
      private net.kyori.adventure.text.Component message; // Paper
 -    private final String name;
-+    //private String name; // Paper - Not used anymore
      private final InetAddress ipAddress;
 -    private final UUID uniqueId;
-+    //private UUID uniqueId; // Paper - Not used anymore
++    private PlayerProfile profile; // Paper
++    private final InetAddress rawAddress; // Paper
++    private final String hostname; // Paper
  
      @Deprecated
      public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
-@@ -32,12 +35,37 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -32,12 +36,29 @@ public class AsyncPlayerPreLoginEvent extends Event {
      }
  
      public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
 +        // Paper start
 +        this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name));
 +    }
-+    private PlayerProfile profile;
 +
++    @Deprecated(forRemoval = true)
++    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
++        this(name, ipAddress, ipAddress, uniqueId, profile);
++    }
++
++    @Deprecated(forRemoval = true)
++    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
++        this(name, ipAddress, rawAddress, uniqueId, profile, "");
++    }
++
++    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) {
+         super(true);
+         this.result = Result.ALLOWED;
+         this.message = net.kyori.adventure.text.Component.empty(); // Paper
+-        this.name = name;
++        this.profile = profile;
+         this.ipAddress = ipAddress;
+-        this.uniqueId = uniqueId;
++        this.rawAddress = rawAddress;
++        this.hostname = hostname;
++        // Paper end
+     }
+ 
+     /**
+@@ -200,7 +221,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+      */
+     @NotNull
+     public String getName() {
+-        return name;
++        return profile.getName(); // Paper
+     }
+ 
+     /**
+@@ -220,9 +241,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
+      */
+     @NotNull
+     public UUID getUniqueId() {
+-        return uniqueId;
++        return profile.getId(); // Paper
+     }
+ 
++    // Paper start
 +    /**
 +     * Gets the PlayerProfile of the player logging in
 +     * @return The Profile
@@ -57,35 +98,27 @@ index 6aaeba3feb66462ce352dacabd845f8d8283f54b..e4afc428e9a8625bf6f5967cb659987c
 +        this.profile = profile;
 +    }
 +
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-         super(true);
-+        this.profile = profile;
-+        // Paper end
-         this.result = Result.ALLOWED;
-         this.message = net.kyori.adventure.text.Component.empty(); // Paper
--        this.name = name;
-+        //this.name = name; // Paper - Not used anymore
-         this.ipAddress = ipAddress;
--        this.uniqueId = uniqueId;
-+        //this.uniqueId = uniqueId; // Paper - Not used anymore
-     }
- 
-     /**
-@@ -200,7 +228,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-      */
-     @NotNull
-     public String getName() {
--        return name;
-+        return profile.getName(); // Paper
-     }
- 
-     /**
-@@ -220,7 +248,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-      */
-     @NotNull
-     public UUID getUniqueId() {
--        return uniqueId;
-+        return profile.getId(); // Paper
-     }
- 
++    /**
++     * Gets the raw address of the player logging in
++     * @return The address
++     */
++    @NotNull
++    public InetAddress getRawAddress() {
++        return rawAddress;
++    }
++
++    /**
++     * Gets the hostname that the player used to connect to the server, or
++     * blank if unknown
++     *
++     * @return The hostname
++     */
++    @NotNull
++    public String getHostname() {
++        return hostname;
++    }
++    // Paper end
++
      @NotNull
+     @Override
+     public HandlerList getHandlers() {
diff --git a/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
deleted file mode 100644
index e2cdbb7e10..0000000000
--- a/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Connor Linfoot <connorlinfoot@me.com>
-Date: Wed, 12 May 2021 08:09:19 +0100
-Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index e4afc428e9a8625bf6f5967cb659987c14f65ba6..35176b16d208c9756bd00ac74b2a1dcc3fc9febb 100644
---- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -27,6 +27,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-     private net.kyori.adventure.text.Component message; // Paper
-     //private String name; // Paper - Not used anymore
-     private final InetAddress ipAddress;
-+    private final InetAddress rawAddress; // Paper
-     //private UUID uniqueId; // Paper - Not used anymore
- 
-     @Deprecated
-@@ -57,7 +58,23 @@ public class AsyncPlayerPreLoginEvent extends Event {
-         this.profile = profile;
-     }
- 
-+    // Paper Start
-+    /**
-+     * Gets the raw address of the player logging in
-+     * @return The address
-+     */
-+    @NotNull
-+    public InetAddress getRawAddress() {
-+        return rawAddress;
-+    }
-+    // Paper end
-+
-+    @Deprecated
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-+        this(name, ipAddress, ipAddress, uniqueId, profile);
-+    }
-+
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-         super(true);
-         this.profile = profile;
-         // Paper end
-@@ -65,6 +82,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-         this.message = net.kyori.adventure.text.Component.empty(); // Paper
-         //this.name = name; // Paper - Not used anymore
-         this.ipAddress = ipAddress;
-+        this.rawAddress = rawAddress; // Paper
-         //this.uniqueId = uniqueId; // Paper - Not used anymore
-     }
- 
diff --git a/patches/api/0281-Inventory-close.patch b/patches/api/0280-Inventory-close.patch
similarity index 100%
rename from patches/api/0281-Inventory-close.patch
rename to patches/api/0280-Inventory-close.patch
diff --git a/patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/api/0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0283-Add-basic-Datapack-API.patch b/patches/api/0282-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/api/0283-Add-basic-Datapack-API.patch
rename to patches/api/0282-Add-basic-Datapack-API.patch
diff --git a/patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0283-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/api/0283-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0285-ItemStack-repair-check-API.patch b/patches/api/0284-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/api/0285-ItemStack-repair-check-API.patch
rename to patches/api/0284-ItemStack-repair-check-API.patch
diff --git a/patches/api/0286-More-Enchantment-API.patch b/patches/api/0285-More-Enchantment-API.patch
similarity index 100%
rename from patches/api/0286-More-Enchantment-API.patch
rename to patches/api/0285-More-Enchantment-API.patch
diff --git a/patches/api/0287-Add-Mob-lookAt-API.patch b/patches/api/0286-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/api/0287-Add-Mob-lookAt-API.patch
rename to patches/api/0286-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0288-ItemStack-editMeta.patch b/patches/api/0287-ItemStack-editMeta.patch
similarity index 100%
rename from patches/api/0288-ItemStack-editMeta.patch
rename to patches/api/0287-ItemStack-editMeta.patch
diff --git a/patches/api/0289-Add-EntityInsideBlockEvent.patch b/patches/api/0288-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/api/0289-Add-EntityInsideBlockEvent.patch
rename to patches/api/0288-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0290-Attributes-API-for-item-defaults.patch b/patches/api/0289-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/api/0290-Attributes-API-for-item-defaults.patch
rename to patches/api/0289-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0290-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/api/0290-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0292-More-Lidded-Block-API.patch b/patches/api/0291-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/api/0292-More-Lidded-Block-API.patch
rename to patches/api/0291-More-Lidded-Block-API.patch
diff --git a/patches/api/0293-Add-PlayerKickEvent-causes.patch b/patches/api/0292-Add-PlayerKickEvent-causes.patch
similarity index 97%
rename from patches/api/0293-Add-PlayerKickEvent-causes.patch
rename to patches/api/0292-Add-PlayerKickEvent-causes.patch
index 5b213c4350..d03d83031a 100644
--- a/patches/api/0293-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0292-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b848ef1c207797b352c2ca97c574c4cd3fe6e43a..2a6879aa1b0497c485d127542ca4e526a23ecf85 100644
+index 6e44845340f23a5b6ad8be46a1fa3dbb9dec5d67..a5e4b4447b5c68339d6b09749520048642a4eb83 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -275,6 +275,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0294-Add-PufferFishStateChangeEvent.patch b/patches/api/0293-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/api/0294-Add-PufferFishStateChangeEvent.patch
rename to patches/api/0293-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0295-Add-BellRevealRaiderEvent.patch b/patches/api/0294-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/api/0295-Add-BellRevealRaiderEvent.patch
rename to patches/api/0294-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0296-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0295-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/api/0296-Add-ElderGuardianAppearanceEvent.patch
rename to patches/api/0295-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0297-Add-more-line-of-sight-methods.patch b/patches/api/0296-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/api/0297-Add-more-line-of-sight-methods.patch
rename to patches/api/0296-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0298-Add-WaterBottleSplashEvent.patch b/patches/api/0297-Add-WaterBottleSplashEvent.patch
similarity index 100%
rename from patches/api/0298-Add-WaterBottleSplashEvent.patch
rename to patches/api/0297-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0299-Add-more-LimitedRegion-API.patch b/patches/api/0298-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/api/0299-Add-more-LimitedRegion-API.patch
rename to patches/api/0298-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0300-Missing-Entity-API.patch b/patches/api/0299-Missing-Entity-API.patch
similarity index 100%
rename from patches/api/0300-Missing-Entity-API.patch
rename to patches/api/0299-Missing-Entity-API.patch
diff --git a/patches/api/0301-Adds-PlayerArmSwingEvent.patch b/patches/api/0300-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/api/0301-Adds-PlayerArmSwingEvent.patch
rename to patches/api/0300-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0301-Add-PlayerSignCommandPreprocessEvent.patch
similarity index 100%
rename from patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch
rename to patches/api/0301-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0303-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0302-fix-empty-array-elements-in-command-arguments.patch
similarity index 100%
rename from patches/api/0303-fix-empty-array-elements-in-command-arguments.patch
rename to patches/api/0302-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0304-Stinger-API.patch b/patches/api/0303-Stinger-API.patch
similarity index 100%
rename from patches/api/0304-Stinger-API.patch
rename to patches/api/0303-Stinger-API.patch
diff --git a/patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0306-Add-PlayerSetSpawnEvent.patch b/patches/api/0305-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/api/0306-Add-PlayerSetSpawnEvent.patch
rename to patches/api/0305-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0307-Added-EntityDamageItemEvent.patch b/patches/api/0306-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/api/0307-Added-EntityDamageItemEvent.patch
rename to patches/api/0306-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0308-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0307-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/api/0308-Make-EntityUnleashEvent-cancellable.patch
rename to patches/api/0307-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0308-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/api/0308-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0310-Add-BlockBreakBlockEvent.patch b/patches/api/0309-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/api/0310-Add-BlockBreakBlockEvent.patch
rename to patches/api/0309-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0310-Add-helpers-for-left-right-click-to-Action.patch
similarity index 100%
rename from patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch
rename to patches/api/0310-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/api/0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0313-More-CommandBlock-API.patch b/patches/api/0312-More-CommandBlock-API.patch
similarity index 100%
rename from patches/api/0313-More-CommandBlock-API.patch
rename to patches/api/0312-More-CommandBlock-API.patch
diff --git a/patches/api/0314-Add-missing-team-sidebar-display-slots.patch b/patches/api/0313-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/api/0314-Add-missing-team-sidebar-display-slots.patch
rename to patches/api/0313-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0315-add-back-EntityPortalExitEvent.patch b/patches/api/0314-add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/api/0315-add-back-EntityPortalExitEvent.patch
rename to patches/api/0314-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 95%
rename from patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch
index 1f32990f0d..209cde5c42 100644
--- a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8735a0a359450a6cbea44c1b01c85a4135ba1f86..48b3df2c12b3f6640e6c54c89763929487f0506d 100644
+index 39fd31cb24d16b8279f54e666bb5e7bccf32468c..21835fcc70c4dcffb2474caa7be3cd07bb54e2cd 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -735,6 +735,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0317-Get-entity-default-attributes.patch b/patches/api/0316-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/api/0317-Get-entity-default-attributes.patch
rename to patches/api/0316-Get-entity-default-attributes.patch
diff --git a/patches/api/0318-Left-handed-API.patch b/patches/api/0317-Left-handed-API.patch
similarity index 100%
rename from patches/api/0318-Left-handed-API.patch
rename to patches/api/0317-Left-handed-API.patch
diff --git a/patches/api/0319-Add-critical-damage-API.patch b/patches/api/0318-Add-critical-damage-API.patch
similarity index 100%
rename from patches/api/0319-Add-critical-damage-API.patch
rename to patches/api/0318-Add-critical-damage-API.patch
diff --git a/patches/api/0320-Add-more-advancement-API.patch b/patches/api/0319-Add-more-advancement-API.patch
similarity index 100%
rename from patches/api/0320-Add-more-advancement-API.patch
rename to patches/api/0319-Add-more-advancement-API.patch
diff --git a/patches/api/0321-Fix-issues-with-mob-conversion.patch b/patches/api/0320-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/api/0321-Fix-issues-with-mob-conversion.patch
rename to patches/api/0320-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0322-Add-isCollidable-methods-to-various-places.patch b/patches/api/0321-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/api/0322-Add-isCollidable-methods-to-various-places.patch
rename to patches/api/0321-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0323-Goat-ram-API.patch b/patches/api/0322-Goat-ram-API.patch
similarity index 100%
rename from patches/api/0323-Goat-ram-API.patch
rename to patches/api/0322-Goat-ram-API.patch
diff --git a/patches/api/0324-Add-API-for-resetting-a-single-score.patch b/patches/api/0323-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/api/0324-Add-API-for-resetting-a-single-score.patch
rename to patches/api/0323-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0326-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0325-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/api/0326-Add-PlayerItemFrameChangeEvent.patch
rename to patches/api/0325-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0328-Add-more-Campfire-API.patch b/patches/api/0327-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/api/0328-Add-more-Campfire-API.patch
rename to patches/api/0327-Add-more-Campfire-API.patch
diff --git a/patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch
similarity index 100%
rename from patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch
rename to patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0330-Improve-scoreboard-entries.patch b/patches/api/0329-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/api/0330-Improve-scoreboard-entries.patch
rename to patches/api/0329-Improve-scoreboard-entries.patch
diff --git a/patches/api/0331-Entity-powdered-snow-API.patch b/patches/api/0330-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/api/0331-Entity-powdered-snow-API.patch
rename to patches/api/0330-Entity-powdered-snow-API.patch
diff --git a/patches/api/0332-Add-API-for-item-entity-health.patch b/patches/api/0331-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/api/0332-Add-API-for-item-entity-health.patch
rename to patches/api/0331-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/api/0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0334-Bucketable-API.patch b/patches/api/0333-Bucketable-API.patch
similarity index 100%
rename from patches/api/0334-Bucketable-API.patch
rename to patches/api/0333-Bucketable-API.patch
diff --git a/patches/api/0335-System-prop-for-default-config-comment-parsing.patch b/patches/api/0334-System-prop-for-default-config-comment-parsing.patch
similarity index 100%
rename from patches/api/0335-System-prop-for-default-config-comment-parsing.patch
rename to patches/api/0334-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/api/0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0337-Multiple-Entries-with-Scoreboards.patch b/patches/api/0336-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/api/0337-Multiple-Entries-with-Scoreboards.patch
rename to patches/api/0336-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0339-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0337-Warn-on-strange-EventHandler-return-types.patch
similarity index 100%
rename from patches/api/0339-Warn-on-strange-EventHandler-return-types.patch
rename to patches/api/0337-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
deleted file mode 100644
index 44b186434d..0000000000
--- a/patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MCMDEV <john-m.1@gmx.de>
-Date: Fri, 24 Sep 2021 17:59:23 +0200
-Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 35176b16d208c9756bd00ac74b2a1dcc3fc9febb..da07fc4ab0c299c1bb06ede36e7230626bbc28c9 100644
---- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -29,6 +29,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-     private final InetAddress ipAddress;
-     private final InetAddress rawAddress; // Paper
-     //private UUID uniqueId; // Paper - Not used anymore
-+    private final String hostname; // Paper
- 
-     @Deprecated
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
-@@ -74,7 +75,14 @@ public class AsyncPlayerPreLoginEvent extends Event {
-         this(name, ipAddress, ipAddress, uniqueId, profile);
-     }
- 
-+    @Deprecated // Paper - Add hostname
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-+        // Paper start - Add hostname
-+        this(name, ipAddress, rawAddress, uniqueId, profile, "");
-+    }
-+
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) {
-+        // Paper end - Add hostname
-         super(true);
-         this.profile = profile;
-         // Paper end
-@@ -84,6 +92,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-         this.ipAddress = ipAddress;
-         this.rawAddress = rawAddress; // Paper
-         //this.uniqueId = uniqueId; // Paper - Not used anymore
-+        this.hostname = hostname; // Paper - Add hostname
-     }
- 
-     /**
-@@ -269,6 +278,19 @@ public class AsyncPlayerPreLoginEvent extends Event {
-         return profile.getId(); // Paper
-     }
- 
-+    // Paper start
-+    /**
-+     * Gets the hostname that the player used to connect to the server, or
-+     * blank if unknown
-+     *
-+     * @return The hostname
-+     */
-+    @NotNull
-+    public String getHostname() {
-+        return hostname;
-+    }
-+    // Paper end
-+
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {
diff --git a/patches/api/0340-Multi-Block-Change-API.patch b/patches/api/0338-Multi-Block-Change-API.patch
similarity index 95%
rename from patches/api/0340-Multi-Block-Change-API.patch
rename to patches/api/0338-Multi-Block-Change-API.patch
index 6f93a168a6..cdd9b018b0 100644
--- a/patches/api/0340-Multi-Block-Change-API.patch
+++ b/patches/api/0338-Multi-Block-Change-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7ce512072f242632f17db55224488f18c1cddcc4..a6053648464d903d1f9501bbeae688240fbfd754 100644
+index a5e4b4447b5c68339d6b09749520048642a4eb83..e2333a5f8e357ada69ff8857d3b1c666f51ac909 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -852,6 +852,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0341-Fix-NotePlayEvent.patch b/patches/api/0339-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/api/0341-Fix-NotePlayEvent.patch
rename to patches/api/0339-Fix-NotePlayEvent.patch
diff --git a/patches/api/0342-Freeze-Tick-Lock-API.patch b/patches/api/0340-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/api/0342-Freeze-Tick-Lock-API.patch
rename to patches/api/0340-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0343-Dolphin-API.patch b/patches/api/0341-Dolphin-API.patch
similarity index 100%
rename from patches/api/0343-Dolphin-API.patch
rename to patches/api/0341-Dolphin-API.patch
diff --git a/patches/api/0344-More-PotionEffectType-API.patch b/patches/api/0342-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/api/0344-More-PotionEffectType-API.patch
rename to patches/api/0342-More-PotionEffectType-API.patch
diff --git a/patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0343-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/api/0343-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0346-Implement-regenerateChunk.patch b/patches/api/0344-Implement-regenerateChunk.patch
similarity index 91%
rename from patches/api/0346-Implement-regenerateChunk.patch
rename to patches/api/0344-Implement-regenerateChunk.patch
index f431abe466..4625c51a5a 100644
--- a/patches/api/0346-Implement-regenerateChunk.patch
+++ b/patches/api/0344-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 48b3df2c12b3f6640e6c54c89763929487f0506d..b191d304832fe3475b76fdce131db51e5042ac01 100644
+index 21835fcc70c4dcffb2474caa7be3cd07bb54e2cd..86c7b4ba676f826344056b24b204b748cfce1580 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -484,8 +484,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0347-Add-GameEvent-tags.patch b/patches/api/0345-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/api/0347-Add-GameEvent-tags.patch
rename to patches/api/0345-Add-GameEvent-tags.patch
diff --git a/patches/api/0348-Furnace-RecipesUsed-API.patch b/patches/api/0346-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/api/0348-Furnace-RecipesUsed-API.patch
rename to patches/api/0346-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0349-Configurable-sculk-sensor-listener-range.patch b/patches/api/0347-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/api/0349-Configurable-sculk-sensor-listener-range.patch
rename to patches/api/0347-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0350-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0348-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/api/0350-Add-missing-block-data-mins-and-maxes.patch
rename to patches/api/0348-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0351-Custom-Potion-Mixes.patch b/patches/api/0349-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/api/0351-Custom-Potion-Mixes.patch
rename to patches/api/0349-Custom-Potion-Mixes.patch
diff --git a/patches/api/0352-Expose-furnace-minecart-push-values.patch b/patches/api/0350-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/api/0352-Expose-furnace-minecart-push-values.patch
rename to patches/api/0350-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0353-More-Projectile-API.patch b/patches/api/0351-More-Projectile-API.patch
similarity index 100%
rename from patches/api/0353-More-Projectile-API.patch
rename to patches/api/0351-More-Projectile-API.patch
diff --git a/patches/api/0354-Add-getComputedBiome-API.patch b/patches/api/0352-Add-getComputedBiome-API.patch
similarity index 100%
rename from patches/api/0354-Add-getComputedBiome-API.patch
rename to patches/api/0352-Add-getComputedBiome-API.patch
diff --git a/patches/api/0355-Add-enchantWithLevels-API.patch b/patches/api/0353-Add-enchantWithLevels-API.patch
similarity index 100%
rename from patches/api/0355-Add-enchantWithLevels-API.patch
rename to patches/api/0353-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0356-Add-TameableDeathMessageEvent.patch b/patches/api/0354-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/api/0356-Add-TameableDeathMessageEvent.patch
rename to patches/api/0354-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0357-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0355-Allow-to-change-the-podium-of-the-EnderDragon.patch
similarity index 100%
rename from patches/api/0357-Allow-to-change-the-podium-of-the-EnderDragon.patch
rename to patches/api/0355-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0358-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
similarity index 100%
rename from patches/api/0358-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
rename to patches/api/0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/api/0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/api/0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0360-WorldCreator-keepSpawnLoaded.patch b/patches/api/0358-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/api/0360-WorldCreator-keepSpawnLoaded.patch
rename to patches/api/0358-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/api/0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/api/0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0362-Add-PlayerStopUsingItemEvent.patch b/patches/api/0360-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/api/0362-Add-PlayerStopUsingItemEvent.patch
rename to patches/api/0360-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0363-Expand-FallingBlock-API.patch b/patches/api/0361-Expand-FallingBlock-API.patch
similarity index 97%
rename from patches/api/0363-Expand-FallingBlock-API.patch
rename to patches/api/0361-Expand-FallingBlock-API.patch
index d1138539df..b0a7ccd2c7 100644
--- a/patches/api/0363-Expand-FallingBlock-API.patch
+++ b/patches/api/0361-Expand-FallingBlock-API.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Expand FallingBlock API
 Co-authored-by: Lukas Planz <lukas.planz@web.de>
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b191d304832fe3475b76fdce131db51e5042ac01..298e63e0ca9d4cbac3172fd93a217af79fad91df 100644
+index 86c7b4ba676f826344056b24b204b748cfce1580..0f60823426898974b7d61123fb848006fdc7bfcf 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2220,8 +2220,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0362-Add-method-isTickingWorlds-to-Bukkit.patch
similarity index 100%
rename from patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch
rename to patches/api/0362-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0365-Add-WardenAngerChangeEvent.patch b/patches/api/0363-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/api/0365-Add-WardenAngerChangeEvent.patch
rename to patches/api/0363-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0366-Nameable-Banner-API.patch b/patches/api/0364-Nameable-Banner-API.patch
similarity index 100%
rename from patches/api/0366-Nameable-Banner-API.patch
rename to patches/api/0364-Nameable-Banner-API.patch
diff --git a/patches/api/0367-Add-Player-getFishHook.patch b/patches/api/0365-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/api/0367-Add-Player-getFishHook.patch
rename to patches/api/0365-Add-Player-getFishHook.patch
diff --git a/patches/api/0368-More-Teleport-API.patch b/patches/api/0366-More-Teleport-API.patch
similarity index 99%
rename from patches/api/0368-More-Teleport-API.patch
rename to patches/api/0366-More-Teleport-API.patch
index c73ad9b950..13d70bb0fd 100644
--- a/patches/api/0368-More-Teleport-API.patch
+++ b/patches/api/0366-More-Teleport-API.patch
@@ -158,7 +158,7 @@ index 953bb49b7079647450d3453356d1c8a91be94c01..2ea66188468cf32bcaedc5167d4b9b0c
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d0eeb2c6b0f3f56d8c3c9608991091750a3bd607..aeaed639ba3a0b91501d1da837adfc6bf5517ffa 100644
+index e2333a5f8e357ada69ff8857d3b1c666f51ac909..da4d8d36fdf8006e308220cb7665c9e0302e5879 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3287,6 +3287,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0369-Add-EntityPortalReadyEvent.patch b/patches/api/0367-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/api/0369-Add-EntityPortalReadyEvent.patch
rename to patches/api/0367-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch
index 94a7f8f851..2ee1dccaba 100644
--- a/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index aeaed639ba3a0b91501d1da837adfc6bf5517ffa..450ec166b8faf08de52b30844315a5ed29006784 100644
+index da4d8d36fdf8006e308220cb7665c9e0302e5879..541ac9cf8f4af2386a5c2930cbd8fa81a48d8445 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3171,6 +3171,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0371-Collision-API.patch b/patches/api/0369-Collision-API.patch
similarity index 100%
rename from patches/api/0371-Collision-API.patch
rename to patches/api/0369-Collision-API.patch
diff --git a/patches/api/0372-Block-Ticking-API.patch b/patches/api/0370-Block-Ticking-API.patch
similarity index 100%
rename from patches/api/0372-Block-Ticking-API.patch
rename to patches/api/0370-Block-Ticking-API.patch
diff --git a/patches/api/0373-Add-NamespacedKey-biome-methods.patch b/patches/api/0371-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/api/0373-Add-NamespacedKey-biome-methods.patch
rename to patches/api/0371-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0374-Also-load-resources-from-LibraryLoader.patch b/patches/api/0372-Also-load-resources-from-LibraryLoader.patch
similarity index 100%
rename from patches/api/0374-Also-load-resources-from-LibraryLoader.patch
rename to patches/api/0372-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0375-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 95%
rename from patches/api/0375-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch
index 24c9f5c0f7..9b71f12681 100644
--- a/patches/api/0375-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Added byte array serialization/deserialization for
 
 
 diff --git a/src/main/java/org/bukkit/persistence/PersistentDataContainer.java b/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
-index 6c156faf0148da13a44dabba7a807f68b3d50a36..da59e75267f43581bec6df73dda9f889347617d4 100644
+index 18fc4f1c7151bfdeed32a52cf5050a76ebc391d6..decf3b1949d4653a9fb01684b93ff91048137076 100644
 --- a/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
 +++ b/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
 @@ -184,4 +184,39 @@ public interface PersistentDataContainer {
diff --git a/patches/api/0376-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/api/0376-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/api/0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0377-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
similarity index 100%
rename from patches/api/0377-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
rename to patches/api/0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0378-Add-getDrops-to-BlockState.patch b/patches/api/0376-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/api/0378-Add-getDrops-to-BlockState.patch
rename to patches/api/0376-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0379-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0377-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/api/0379-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/api/0377-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0380-Elder-Guardian-appearance-API.patch b/patches/api/0378-Elder-Guardian-appearance-API.patch
similarity index 92%
rename from patches/api/0380-Elder-Guardian-appearance-API.patch
rename to patches/api/0378-Elder-Guardian-appearance-API.patch
index afa279fc4a..ca75252378 100644
--- a/patches/api/0380-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0378-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 450ec166b8faf08de52b30844315a5ed29006784..e00dabaf992580230e89292a2c2fea88c4de87fd 100644
+index 541ac9cf8f4af2386a5c2930cbd8fa81a48d8445..c79a3583ccbd808df6ca0ef2912bfed4f417c387 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3351,6 +3351,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0381-Allow-changing-bed-s-occupied-property.patch b/patches/api/0379-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/api/0381-Allow-changing-bed-s-occupied-property.patch
rename to patches/api/0379-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0382-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0380-Add-EquipmentSlot-convenience-methods.patch
similarity index 100%
rename from patches/api/0382-Add-EquipmentSlot-convenience-methods.patch
rename to patches/api/0380-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0383-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
similarity index 100%
rename from patches/api/0383-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
rename to patches/api/0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0384-Add-entity-knockback-API.patch b/patches/api/0382-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/api/0384-Add-entity-knockback-API.patch
rename to patches/api/0382-Add-entity-knockback-API.patch
diff --git a/patches/api/0385-Added-EntityToggleSitEvent.patch b/patches/api/0383-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/api/0385-Added-EntityToggleSitEvent.patch
rename to patches/api/0383-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0386-Add-Moving-Piston-API.patch b/patches/api/0384-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/api/0386-Add-Moving-Piston-API.patch
rename to patches/api/0384-Add-Moving-Piston-API.patch
diff --git a/patches/api/0387-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0385-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/api/0387-Add-PrePlayerAttackEntityEvent.patch
rename to patches/api/0385-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0388-Add-Player-Warden-Warning-API.patch b/patches/api/0386-Add-Player-Warden-Warning-API.patch
similarity index 96%
rename from patches/api/0388-Add-Player-Warden-Warning-API.patch
rename to patches/api/0386-Add-Player-Warden-Warning-API.patch
index 73ebc3306f..77e3620a98 100644
--- a/patches/api/0388-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0386-Add-Player-Warden-Warning-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player Warden Warning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e00dabaf992580230e89292a2c2fea88c4de87fd..0a3a29b5489684a4062663362694025cc3224adf 100644
+index c79a3583ccbd808df6ca0ef2912bfed4f417c387..5b1233ff2a5cdda75263eae86f96052bc28e9f5c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3367,6 +3367,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0389-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0387-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/api/0389-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/api/0387-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0390-Add-paper-dumplisteners-command.patch b/patches/api/0388-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/api/0390-Add-paper-dumplisteners-command.patch
rename to patches/api/0388-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0391-ItemStack-damage-API.patch b/patches/api/0389-ItemStack-damage-API.patch
similarity index 100%
rename from patches/api/0391-ItemStack-damage-API.patch
rename to patches/api/0389-ItemStack-damage-API.patch
diff --git a/patches/api/0392-Add-Tick-TemporalUnit.patch b/patches/api/0390-Add-Tick-TemporalUnit.patch
similarity index 100%
rename from patches/api/0392-Add-Tick-TemporalUnit.patch
rename to patches/api/0390-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0393-Friction-API.patch b/patches/api/0391-Friction-API.patch
similarity index 100%
rename from patches/api/0393-Friction-API.patch
rename to patches/api/0391-Friction-API.patch
diff --git a/patches/api/0394-Player-Entity-Tracking-Events.patch b/patches/api/0392-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/api/0394-Player-Entity-Tracking-Events.patch
rename to patches/api/0392-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0395-Add-missing-Fluid-type.patch b/patches/api/0393-Add-missing-Fluid-type.patch
similarity index 100%
rename from patches/api/0395-Add-missing-Fluid-type.patch
rename to patches/api/0393-Add-missing-Fluid-type.patch
diff --git a/patches/api/0396-fix-Instruments.patch b/patches/api/0394-fix-Instruments.patch
similarity index 100%
rename from patches/api/0396-fix-Instruments.patch
rename to patches/api/0394-fix-Instruments.patch
diff --git a/patches/api/0397-Add-BlockLockCheckEvent.patch b/patches/api/0395-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/api/0397-Add-BlockLockCheckEvent.patch
rename to patches/api/0395-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0398-Add-Sneaking-API-for-Entities.patch b/patches/api/0396-Add-Sneaking-API-for-Entities.patch
similarity index 95%
rename from patches/api/0398-Add-Sneaking-API-for-Entities.patch
rename to patches/api/0396-Add-Sneaking-API-for-Entities.patch
index 0aab3c95d4..274d5fb7d6 100644
--- a/patches/api/0398-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0396-Add-Sneaking-API-for-Entities.patch
@@ -35,7 +35,7 @@ index 351a7d0aeab5d83564dd543935ba503ea0b68d60..c9139bb7abc881fddd2d5610d9506cd4
       * Get the category of spawn to which this entity belongs.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 53026b36fce2a201e81a844b115a274e9495928d..673036dbc9f4bd7b81747d6094bbfcab666cad09 100644
+index 5b1233ff2a5cdda75263eae86f96052bc28e9f5c..e6191168df1032f5904ce5c580c7e41fb1249b22 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -415,6 +415,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0399-Improve-PortalEvents.patch b/patches/api/0397-Improve-PortalEvents.patch
similarity index 100%
rename from patches/api/0399-Improve-PortalEvents.patch
rename to patches/api/0397-Improve-PortalEvents.patch
diff --git a/patches/api/0400-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/api/0400-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/api/0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/api/0401-Flying-Fall-Damage-API.patch b/patches/api/0399-Flying-Fall-Damage-API.patch
similarity index 93%
rename from patches/api/0401-Flying-Fall-Damage-API.patch
rename to patches/api/0399-Flying-Fall-Damage-API.patch
index ea7650e655..8dd82b7749 100644
--- a/patches/api/0401-Flying-Fall-Damage-API.patch
+++ b/patches/api/0399-Flying-Fall-Damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 673036dbc9f4bd7b81747d6094bbfcab666cad09..fae33e170dd8155df94b9e7c3f277389ac366a5e 100644
+index e6191168df1032f5904ce5c580c7e41fb1249b22..a5ab59f2defa45af761a14fc955241af07b84a34 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1766,6 +1766,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0402-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/api/0402-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/api/0403-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/api/0403-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0404-Win-Screen-API.patch b/patches/api/0402-Win-Screen-API.patch
similarity index 96%
rename from patches/api/0404-Win-Screen-API.patch
rename to patches/api/0402-Win-Screen-API.patch
index 059965c688..0d24c598b0 100644
--- a/patches/api/0404-Win-Screen-API.patch
+++ b/patches/api/0402-Win-Screen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fae33e170dd8155df94b9e7c3f277389ac366a5e..12ac53a8ca8d91b8189dbb8775121b89f402de43 100644
+index a5ab59f2defa45af761a14fc955241af07b84a34..41e7e24c65c3ae8cb451608db7598297fd9ffff2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1136,6 +1136,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0405-Add-Entity-Body-Yaw-API.patch b/patches/api/0403-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/api/0405-Add-Entity-Body-Yaw-API.patch
rename to patches/api/0403-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0406-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/api/0406-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0407-Add-EntityFertilizeEggEvent.patch b/patches/api/0405-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/api/0407-Add-EntityFertilizeEggEvent.patch
rename to patches/api/0405-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0408-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/api/0408-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0409-Add-Shearable-API.patch b/patches/api/0407-Add-Shearable-API.patch
similarity index 100%
rename from patches/api/0409-Add-Shearable-API.patch
rename to patches/api/0407-Add-Shearable-API.patch
diff --git a/patches/api/0410-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0408-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/api/0410-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/api/0408-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0411-Add-Mob-Experience-reward-API.patch b/patches/api/0409-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/api/0411-Add-Mob-Experience-reward-API.patch
rename to patches/api/0409-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0412-Expand-PlayerItemMendEvent.patch b/patches/api/0410-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/api/0412-Expand-PlayerItemMendEvent.patch
rename to patches/api/0410-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0413-Add-transient-modifier-API.patch b/patches/api/0411-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/api/0413-Add-transient-modifier-API.patch
rename to patches/api/0411-Add-transient-modifier-API.patch
diff --git a/patches/api/0414-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0412-Properly-remove-the-experimental-smithing-inventory-.patch
similarity index 100%
rename from patches/api/0414-Properly-remove-the-experimental-smithing-inventory-.patch
rename to patches/api/0412-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0415-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0413-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/api/0415-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/api/0413-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/api/0416-Folia-scheduler-and-owned-region-API.patch b/patches/api/0414-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/api/0416-Folia-scheduler-and-owned-region-API.patch
rename to patches/api/0414-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/api/0417-Add-event-for-player-editing-sign.patch b/patches/api/0415-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/api/0417-Add-event-for-player-editing-sign.patch
rename to patches/api/0415-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0418-Add-Sign-getInteractableSideFor.patch b/patches/api/0416-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/api/0418-Add-Sign-getInteractableSideFor.patch
rename to patches/api/0416-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0419-Fix-BanList-API.patch b/patches/api/0417-Fix-BanList-API.patch
similarity index 98%
rename from patches/api/0419-Fix-BanList-API.patch
rename to patches/api/0417-Fix-BanList-API.patch
index 190177a822..e6e242f0d1 100644
--- a/patches/api/0419-Fix-BanList-API.patch
+++ b/patches/api/0417-Fix-BanList-API.patch
@@ -130,7 +130,7 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 12ac53a8ca8d91b8189dbb8775121b89f402de43..a948445b96a7c8c7803103171df644fc9a6f77f3 100644
+index 41e7e24c65c3ae8cb451608db7598297fd9ffff2..5b00c51157a724e1d3f89198e97ba7e33b3a163d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -299,7 +299,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0420-Add-whitelist-events.patch b/patches/api/0418-Add-whitelist-events.patch
similarity index 100%
rename from patches/api/0420-Add-whitelist-events.patch
rename to patches/api/0418-Add-whitelist-events.patch
diff --git a/patches/api/0421-API-for-updating-recipes-on-clients.patch b/patches/api/0419-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/api/0421-API-for-updating-recipes-on-clients.patch
rename to patches/api/0419-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0422-Add-PlayerFailMoveEvent.patch b/patches/api/0420-Add-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/api/0422-Add-PlayerFailMoveEvent.patch
rename to patches/api/0420-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0423-Fix-custom-statistic-criteria-creation.patch b/patches/api/0421-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/api/0423-Fix-custom-statistic-criteria-creation.patch
rename to patches/api/0421-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0424-SculkCatalyst-bloom-API.patch b/patches/api/0422-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/api/0424-SculkCatalyst-bloom-API.patch
rename to patches/api/0422-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0425-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0423-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/api/0425-API-for-an-entity-s-scoreboard-name.patch
rename to patches/api/0423-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0424-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/api/0424-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0427-Add-Listing-API-for-Player.patch b/patches/api/0425-Add-Listing-API-for-Player.patch
similarity index 93%
rename from patches/api/0427-Add-Listing-API-for-Player.patch
rename to patches/api/0425-Add-Listing-API-for-Player.patch
index 1273b6fb85..6029b9a632 100644
--- a/patches/api/0427-Add-Listing-API-for-Player.patch
+++ b/patches/api/0425-Add-Listing-API-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a948445b96a7c8c7803103171df644fc9a6f77f3..0909c7d1dae6192e3103f4eaeb08bf3efbbd4153 100644
+index 5b00c51157a724e1d3f89198e97ba7e33b3a163d..8ca61bca18c5520d20b0405d5add37759349560b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1902,6 +1902,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0428-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/api/0428-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/api/0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0429-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0427-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/api/0429-Fix-NPE-on-Boat-getStatus.patch
rename to patches/api/0427-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0430-Expand-Pose-API.patch b/patches/api/0428-Expand-Pose-API.patch
similarity index 100%
rename from patches/api/0430-Expand-Pose-API.patch
rename to patches/api/0428-Expand-Pose-API.patch
diff --git a/patches/api/0431-MerchantRecipe-add-copy-constructor.patch b/patches/api/0429-MerchantRecipe-add-copy-constructor.patch
similarity index 100%
rename from patches/api/0431-MerchantRecipe-add-copy-constructor.patch
rename to patches/api/0429-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0432-More-DragonBattle-API.patch b/patches/api/0430-More-DragonBattle-API.patch
similarity index 100%
rename from patches/api/0432-More-DragonBattle-API.patch
rename to patches/api/0430-More-DragonBattle-API.patch
diff --git a/patches/api/0433-Add-PlayerPickItemEvent.patch b/patches/api/0431-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/api/0433-Add-PlayerPickItemEvent.patch
rename to patches/api/0431-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0434-Allow-trident-custom-damage.patch b/patches/api/0432-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/api/0434-Allow-trident-custom-damage.patch
rename to patches/api/0432-Allow-trident-custom-damage.patch
diff --git a/patches/api/0435-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0433-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/api/0435-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/api/0433-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0436-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0434-Limit-setBurnTime-to-valid-short-values.patch
similarity index 100%
rename from patches/api/0436-Limit-setBurnTime-to-valid-short-values.patch
rename to patches/api/0434-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0437-Add-OfflinePlayer-isConnected.patch b/patches/api/0435-Add-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/api/0437-Add-OfflinePlayer-isConnected.patch
rename to patches/api/0435-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0438-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0436-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/api/0438-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/api/0436-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0439-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0437-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/api/0439-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/api/0437-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0440-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
similarity index 100%
rename from patches/api/0440-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
rename to patches/api/0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0441-Add-player-idle-duration-API.patch b/patches/api/0439-Add-player-idle-duration-API.patch
similarity index 93%
rename from patches/api/0441-Add-player-idle-duration-API.patch
rename to patches/api/0439-Add-player-idle-duration-API.patch
index 8ebed078d4..dbe78e032c 100644
--- a/patches/api/0441-Add-player-idle-duration-API.patch
+++ b/patches/api/0439-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 118ecb48f014539f18105a20bdebe2e03ee8e6f8..9f8d0242c00008432012319a95453a25c5ef761e 100644
+index 8ca61bca18c5520d20b0405d5add37759349560b..c09f423fe2a029c933bd2697c8ff104fc4230cf0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3508,6 +3508,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/api/0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0443-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch
similarity index 98%
rename from patches/api/0443-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch
index 04fc2e3ab9..2d0f899ec0 100644
--- a/patches/api/0443-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate for blocks when raytracing
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 298e63e0ca9d4cbac3172fd93a217af79fad91df..f72f0f0f8eee95f95adc969d55ba7de82ee30e2a 100644
+index 0f60823426898974b7d61123fb848006fdc7bfcf..e014a71f2fd20e41f985ce68301006c4a4e0c5e3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1692,6 +1692,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0444-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0442-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/api/0444-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/api/0442-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0445-Add-UUID-attribute-modifier-API.patch b/patches/api/0443-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/api/0445-Add-UUID-attribute-modifier-API.patch
rename to patches/api/0443-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0446-Expand-LingeringPotion-API.patch b/patches/api/0444-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/api/0446-Expand-LingeringPotion-API.patch
rename to patches/api/0444-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0447-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
similarity index 100%
rename from patches/api/0447-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
rename to patches/api/0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0448-Add-Structure-check-API.patch b/patches/api/0446-Add-Structure-check-API.patch
similarity index 94%
rename from patches/api/0448-Add-Structure-check-API.patch
rename to patches/api/0446-Add-Structure-check-API.patch
index d6d4ff6970..d993eeba7f 100644
--- a/patches/api/0448-Add-Structure-check-API.patch
+++ b/patches/api/0446-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index f72f0f0f8eee95f95adc969d55ba7de82ee30e2a..567a36a4887da8994c9170e2885aa8cc357efa0c 100644
+index e014a71f2fd20e41f985ce68301006c4a4e0c5e3..bf4b94ea2577e9d7e344385209fc0644a4e6bfbb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -76,6 +76,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0449-add-missing-Experimental-annotations.patch b/patches/api/0447-add-missing-Experimental-annotations.patch
similarity index 100%
rename from patches/api/0449-add-missing-Experimental-annotations.patch
rename to patches/api/0447-add-missing-Experimental-annotations.patch
diff --git a/patches/api/0450-Add-more-scoreboard-API.patch b/patches/api/0448-Add-more-scoreboard-API.patch
similarity index 100%
rename from patches/api/0450-Add-more-scoreboard-API.patch
rename to patches/api/0448-Add-more-scoreboard-API.patch
diff --git a/patches/api/0451-Improve-Registry.patch b/patches/api/0449-Improve-Registry.patch
similarity index 100%
rename from patches/api/0451-Improve-Registry.patch
rename to patches/api/0449-Improve-Registry.patch
diff --git a/patches/api/0452-Add-experience-points-API.patch b/patches/api/0450-Add-experience-points-API.patch
similarity index 100%
rename from patches/api/0452-Add-experience-points-API.patch
rename to patches/api/0450-Add-experience-points-API.patch
diff --git a/patches/api/0453-Add-missing-InventoryType.patch b/patches/api/0451-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/api/0453-Add-missing-InventoryType.patch
rename to patches/api/0451-Add-missing-InventoryType.patch
diff --git a/patches/api/0454-Add-drops-to-shear-events.patch b/patches/api/0452-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/api/0454-Add-drops-to-shear-events.patch
rename to patches/api/0452-Add-drops-to-shear-events.patch
diff --git a/patches/api/0455-Add-HiddenPotionEffect-API.patch b/patches/api/0453-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/api/0455-Add-HiddenPotionEffect-API.patch
rename to patches/api/0453-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0456-Add-PlayerShieldDisableEvent.patch b/patches/api/0454-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/api/0456-Add-PlayerShieldDisableEvent.patch
rename to patches/api/0454-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
similarity index 100%
rename from patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
rename to patches/api/0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
deleted file mode 100644
index d77acd59c5..0000000000
--- a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 18 Mar 2018 11:45:57 -0400
-Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
-
-This will allow you to change the players name or skin on login.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 000e5e6085b95e4fc4995e53dc83d9075e27aa05..08a40d2418dc7e3f481a0a45e0c1845d68a74f07 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -293,8 +293,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-         java.util.UUID uniqueId = gameprofile.getId();
-         final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server;
- 
--        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId);
-+        // Paper start
-+        com.destroystokyo.paper.profile.PlayerProfile profile = org.bukkit.Bukkit.createProfile(uniqueId, playerName);
-+        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile);
-         server.getPluginManager().callEvent(asyncEvent);
-+        profile = asyncEvent.getPlayerProfile();
-+        profile.complete();
-+        gameprofile = com.destroystokyo.paper.profile.CraftPlayerProfile.asAuthlibCopy(profile);
-+        playerName = gameprofile.getName();
-+        uniqueId = gameprofile.getId();
-+        // Paper end
- 
-         if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
-             final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
diff --git a/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
new file mode 100644
index 0000000000..d56e4c78c9
--- /dev/null
+++ b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sun, 18 Mar 2018 11:45:57 -0400
+Subject: [PATCH] Add more fields to AsyncPreLoginEvent
+
+Co-authored-by: Connor Linfoot <connorlinfoot@me.com>
+Co-authored-by: MCMDEV <john-m.1@gmx.de>
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+index 000e5e6085b95e4fc4995e53dc83d9075e27aa05..58d97fce07ad8f786940c3f5e74e9aaeabe8d261 100644
+--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+@@ -157,7 +157,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+                         try {
+                             GameProfile gameprofile = ServerLoginPacketListenerImpl.this.createOfflineProfile(ServerLoginPacketListenerImpl.this.requestedUsername); // Spigot
+ 
+-                            ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile);
++                            gameprofile = ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); // Paper - Add more fields to AsyncPlayerPreLoginEvent
+                             ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId());
+                             ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile);
+                         } catch (Exception ex) {
+@@ -248,7 +248,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+                         if (!ServerLoginPacketListenerImpl.this.connection.isConnected()) {
+                             return;
+                         }
+-                        ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile);
++                        gameprofile = ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); // Paper - Add more fields to AsyncPlayerPreLoginEvent
+                         // CraftBukkit end
+                         ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId());
+                         ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile);
+@@ -287,14 +287,23 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+     }
+ 
+     // CraftBukkit start
+-    private void callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception {
++    private GameProfile callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { // Paper - Add more fields to AsyncPlayerPreLoginEvent
+         String playerName = gameprofile.getName();
+         java.net.InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
+         java.util.UUID uniqueId = gameprofile.getId();
+         final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server;
+ 
+-        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId);
++        // Paper start - Add more fields to AsyncPlayerPreLoginEvent
++        final java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) this.connection.channel.remoteAddress()).getAddress();
++        com.destroystokyo.paper.profile.PlayerProfile profile = org.bukkit.Bukkit.createProfile(uniqueId, playerName);
++        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile, this.connection.hostname);
+         server.getPluginManager().callEvent(asyncEvent);
++        profile = asyncEvent.getPlayerProfile();
++        profile.complete();
++        gameprofile = com.destroystokyo.paper.profile.CraftPlayerProfile.asAuthlibCopy(profile);
++        playerName = gameprofile.getName();
++        uniqueId = gameprofile.getId();
++        // Paper end - Add more fields to AsyncPlayerPreLoginEvent
+ 
+         if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
+             final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
+@@ -312,14 +321,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+             ServerLoginPacketListenerImpl.this.server.processQueue.add(waitable);
+             if (waitable.get() != PlayerPreLoginEvent.Result.ALLOWED) {
+                 this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.kickMessage())); // Paper - Adventure
+-                return;
+             }
+         } else {
+             if (asyncEvent.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
+                 this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(asyncEvent.kickMessage())); // Paper - Adventure
+-                return;
+             }
+         }
++        return gameprofile; // Paper - Add more fields to AsyncPlayerPreLoginEvent
+     }
+     // CraftBukkit end
+ 
diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
index 7608558483..cce5e09728 100644
--- a/patches/server/0180-Player.setPlayerProfile-API.patch
+++ b/patches/server/0180-Player.setPlayerProfile-API.patch
@@ -22,16 +22,11 @@ index 9c0440a6e3768ca6300e128da7f1b11a96f10f91..c1c9076be05cd4b0b19d16aabbf0320c
          if (Float.isNaN(f)) {
              f = 0;
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 08a40d2418dc7e3f481a0a45e0c1845d68a74f07..3a250865ed364cdcd6f75e874c218b259b1aaad5 100644
+index 58d97fce07ad8f786940c3f5e74e9aaeabe8d261..fd2a8959e9a929ae7ea17dcb554591a6e2b1ac92 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -294,11 +294,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-         final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server;
- 
-         // Paper start
--        com.destroystokyo.paper.profile.PlayerProfile profile = org.bukkit.Bukkit.createProfile(uniqueId, playerName);
-+        com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile);
-         AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile);
+@@ -299,7 +299,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+         AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile, this.connection.hostname);
          server.getPluginManager().callEvent(asyncEvent);
          profile = asyncEvent.getPlayerProfile();
 -        profile.complete();
diff --git a/patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
deleted file mode 100644
index 2a75ad4204..0000000000
--- a/patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Connor Linfoot <connorlinfoot@me.com>
-Date: Wed, 12 May 2021 08:09:19 +0100
-Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 70e89b77e99846258aae59de6246f82cff312452..b1b778c534fae23294b95b084fac0f52f94c37c2 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -290,12 +290,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-     private void callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception {
-         String playerName = gameprofile.getName();
-         java.net.InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
-+        java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) this.connection.channel.remoteAddress()).getAddress(); // Paper
-         java.util.UUID uniqueId = gameprofile.getId();
-         final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server;
- 
-         // Paper start
-         com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile);
--        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile);
-+        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile); // Paper - add rawAddress
-         server.getPluginManager().callEvent(asyncEvent);
-         profile = asyncEvent.getPlayerProfile();
-         profile.complete(true); // Paper - setPlayerProfileAPI
diff --git a/patches/server/0586-Inventory-close.patch b/patches/server/0585-Inventory-close.patch
similarity index 100%
rename from patches/server/0586-Inventory-close.patch
rename to patches/server/0585-Inventory-close.patch
diff --git a/patches/server/0587-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0587-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0588-Add-basic-Datapack-API.patch b/patches/server/0587-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0588-Add-basic-Datapack-API.patch
rename to patches/server/0587-Add-basic-Datapack-API.patch
diff --git a/patches/server/0589-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0588-Add-environment-variable-to-disable-server-gui.patch
similarity index 90%
rename from patches/server/0589-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0588-Add-environment-variable-to-disable-server-gui.patch
index 0e06008d89..f143fe1787 100644
--- a/patches/server/0589-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0588-Add-environment-variable-to-disable-server-gui.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add environment variable to disable server gui
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 0cb453b03977e90addc26f71d0518f134af3c36a..444b21bbc596ce79007560bfb0a4008ccab1dab8 100644
+index 1c64c81980739bbf09b71e1d1dd6d86dbf924e0d..415d55285bb02442d8d1ec907d37b07fad4f3fcc 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -326,6 +326,7 @@ public class Main {
diff --git a/patches/server/0590-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0590-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch
index 29e14396aa..1323b067ea 100644
--- a/patches/server/0590-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,7 +45,7 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9db7bfe3782e96921e3a65ed60f4494770210d5a..48a5fda8d59e8a13bcca61e21c7cb1358c2d17a2 100644
+index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd5ba826de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1989,8 +1989,16 @@ public class ServerPlayer extends Player {
@@ -131,7 +131,7 @@ index c61754976fab6654f55b1403d769eb1721871dca..236dabc1d4ae9dc9a2a2c07a4a27fc0b
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60945de12bf3b7068da9897d3af778f4f8577134..7223e30011defb34db176408e528025eef96be07 100644
+index 206c0a1e783699ed272e3640a29fe349eb0b465e..4ea889c12a6750914b82d796ed641cdd810ea957 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2653,7 +2653,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0591-ItemStack-repair-check-API.patch b/patches/server/0590-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0591-ItemStack-repair-check-API.patch
rename to patches/server/0590-ItemStack-repair-check-API.patch
diff --git a/patches/server/0592-More-Enchantment-API.patch b/patches/server/0591-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0592-More-Enchantment-API.patch
rename to patches/server/0591-More-Enchantment-API.patch
diff --git a/patches/server/0593-Move-range-check-for-block-placing-up.patch b/patches/server/0592-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0593-Move-range-check-for-block-placing-up.patch
rename to patches/server/0592-Move-range-check-for-block-placing-up.patch
index 397ec7b4ec..e2caddd0a7 100644
--- a/patches/server/0593-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0592-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 3a7592f022a5fdd90a525d84502b450c08409cf1..808b000b43c6099bb4d1a0ea3041ec221ce3e6bb 100644
+index 4ea889c12a6750914b82d796ed641cdd810ea957..4d3452fb5cf9330e87d914f775c1a8e0c955a571 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1743,6 +1743,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0594-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0593-Fix-and-optimise-world-force-upgrading.patch
similarity index 97%
rename from patches/server/0594-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0593-Fix-and-optimise-world-force-upgrading.patch
index e7c3e4464c..948e820991 100644
--- a/patches/server/0594-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0593-Fix-and-optimise-world-force-upgrading.patch
@@ -247,7 +247,7 @@ index 0000000000000000000000000000000000000000..513833c2ea23df5b079d157bc5cb89d5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 444b21bbc596ce79007560bfb0a4008ccab1dab8..62f4c2c9485f7700a46f33cf9d158ce3d0552185 100644
+index 415d55285bb02442d8d1ec907d37b07fad4f3fcc..9b0bbaf23b90a04b6e6f6c97d9174fe31af557ce 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -385,6 +385,15 @@ public class Main {
@@ -267,7 +267,7 @@ index 444b21bbc596ce79007560bfb0a4008ccab1dab8..62f4c2c9485f7700a46f33cf9d158ce3
          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 36ca381445102fee1960410aa56e8b2a28dca615..8937b71511bc1dce082683b4107d52e0e632e7a2 100644
+index fbfe5d18a004225396f2d33084fb5073af2d9731..2acd875f34c367f9b9db85dee5052140c05d0add 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -586,11 +586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -298,7 +298,7 @@ index 36ca381445102fee1960410aa56e8b2a28dca615..8937b71511bc1dce082683b4107d52e0
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f9b37892ca92f0fb4943088ad6c4f1f48db287c6..befd147f604bf9cf881893580436bbf8fbead86d 100644
+index 3588ad0b5e8510a00b1a65c73defec39ee7fb108..761d01c993b60a11c749e172c3ee3067c055b582 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -187,6 +187,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -318,7 +318,7 @@ index f9b37892ca92f0fb4943088ad6c4f1f48db287c6..befd147f604bf9cf881893580436bbf8
          return this.world;
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e696239f840ed 100644
+index deed4d50e0e4d810647a0745ef328c20dfe51093..9fa07295bf73317a4c2bbbbaf1918393c891f09a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -60,6 +60,29 @@ public class RegionFileStorage implements AutoCloseable {
@@ -352,7 +352,7 @@ index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e6962
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cda604e72a6335e18bdff0ab0f1d61d1584fa925..0ed5db37759e66647bc54cdaa0e612cf2e851771 100644
+index 1a4168073251e105c53dae2da040367294eb3787..b3225546c6c65dc18aa71930a38a72c7b6997ad5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1251,9 +1251,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0595-Add-Mob-lookAt-API.patch b/patches/server/0594-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0595-Add-Mob-lookAt-API.patch
rename to patches/server/0594-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0596-Add-Unix-domain-socket-support.patch b/patches/server/0595-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0596-Add-Unix-domain-socket-support.patch
rename to patches/server/0595-Add-Unix-domain-socket-support.patch
index 298c59f3f7..82f599b1b2 100644
--- a/patches/server/0596-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0595-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8f9ea1907ed4574cca8d362a0f207fb546cb6484..0008e63e96841c48fa039001f282ffa70c88494f 100644
+index f9e39f557f04269769b869ff24127a6f312ddec3..a8621519c2fec415c8d56c3510b0780b6ccd9eeb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -93,7 +93,7 @@ index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..5f625acf04ddb56e3596d086252f9bfc
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 089f4670aec8612b1e0e9cc69d785dcd135dc44a..294074cb4cac5089b57f3629f46d71175911a906 100644
+index 4d3452fb5cf9330e87d914f775c1a8e0c955a571..4d23d019173d0921145338544e190bc34f9f45c2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2476,6 +2476,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0597-Add-EntityInsideBlockEvent.patch b/patches/server/0596-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0597-Add-EntityInsideBlockEvent.patch
rename to patches/server/0596-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0598-Attributes-API-for-item-defaults.patch b/patches/server/0597-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0598-Attributes-API-for-item-defaults.patch
rename to patches/server/0597-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0599-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 97%
rename from patches/server/0599-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch
index 7dd8dcb77a..3c2e6af4c6 100644
--- a/patches/server/0599-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7b1374c8ee66c58fe6bd25173966d62e8971e3e4..e00fe39fbcd4aa54eb498b91783b7e4dd021acc0 100644
+index a3288d3cd160978e8bab4ca34d1fe6dbee042e28..8b2f72be4304ebab84fc46e6c4c0984abd8e8905 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -672,8 +672,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,7 +95,7 @@ index f5ac36fa54f3d3b39de103c95abb9ca3adfe8dda..47266d2b86e7f2022de7ea0c9347b4f5
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6ab03cc55658789baedf5374ebb9c0a6c0187826..7612ceb9ac9dedeaaade51ba4cac3f35c010da4b 100644
+index 43d3c45cd7a178a4ca30e4c0c7fb1e7e21cd89f1..e88b42727ba0b87ba01933116b6ef456203d9dbb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1243,7 +1243,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0600-More-Lidded-Block-API.patch b/patches/server/0599-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0600-More-Lidded-Block-API.patch
rename to patches/server/0599-More-Lidded-Block-API.patch
diff --git a/patches/server/0601-Limit-item-frame-cursors-on-maps.patch b/patches/server/0600-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0601-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0600-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0602-Add-PlayerKickEvent-causes.patch b/patches/server/0601-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0602-Add-PlayerKickEvent-causes.patch
rename to patches/server/0601-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0603-Add-PufferFishStateChangeEvent.patch b/patches/server/0602-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0603-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0602-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0604-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0604-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0605-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0605-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0606-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0605-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0606-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0605-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0607-Add-BellRevealRaiderEvent.patch b/patches/server/0606-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0607-Add-BellRevealRaiderEvent.patch
rename to patches/server/0606-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0608-Fix-invulnerable-end-crystals.patch b/patches/server/0607-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0608-Fix-invulnerable-end-crystals.patch
rename to patches/server/0607-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0609-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0608-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0609-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0608-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0610-Fix-dangerous-end-portal-logic.patch b/patches/server/0609-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0610-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0609-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0611-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0611-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0612-Make-item-validations-configurable.patch b/patches/server/0611-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0612-Make-item-validations-configurable.patch
rename to patches/server/0611-Make-item-validations-configurable.patch
diff --git a/patches/server/0613-Line-Of-Sight-Changes.patch b/patches/server/0612-Line-Of-Sight-Changes.patch
similarity index 97%
rename from patches/server/0613-Line-Of-Sight-Changes.patch
rename to patches/server/0612-Line-Of-Sight-Changes.patch
index 810215b75d..7dc4e57a02 100644
--- a/patches/server/0613-Line-Of-Sight-Changes.patch
+++ b/patches/server/0612-Line-Of-Sight-Changes.patch
@@ -19,7 +19,7 @@ index 383c39ac381f9a86693abb7935b5b142b889d7be..ca6e0f27b9d0c5d867909abd89262132
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 2667822413c329fc004aad826e5890ab4dc5bfeb..eeb1bd05d4407224aefa26b5ae2f2a8da1101b31 100644
+index 9cd267f53505658d1c75187b662c4d9f68cd6bae..5f4958d28b6d79fe9e589e4794d9a7e8ab67c8b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -510,5 +510,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0614-add-per-world-spawn-limits.patch b/patches/server/0613-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0614-add-per-world-spawn-limits.patch
rename to patches/server/0613-add-per-world-spawn-limits.patch
index b03a6ab08e..c70252598b 100644
--- a/patches/server/0614-add-per-world-spawn-limits.patch
+++ b/patches/server/0613-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bc2c56b0a3ea8e9107c3ef798bb058ae1ff41652..6c91471b5459ca45b532934d25c682ddc5b00042 100644
+index e88b42727ba0b87ba01933116b6ef456203d9dbb..a920936018a2e05ea72d68a83e6debb3807df353 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -215,6 +215,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0615-Fix-potions-splash-events.patch b/patches/server/0614-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0615-Fix-potions-splash-events.patch
rename to patches/server/0614-Fix-potions-splash-events.patch
diff --git a/patches/server/0616-Add-more-LimitedRegion-API.patch b/patches/server/0615-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0616-Add-more-LimitedRegion-API.patch
rename to patches/server/0615-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0617-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 94%
rename from patches/server/0617-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 8cf564db7f..b41a629e54 100644
--- a/patches/server/0617-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0616-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 48a5fda8d59e8a13bcca61e21c7cb1358c2d17a2..bb44d07bdffcf077dae3c5c2aef2aa87a77bb264 100644
+index 8766c1a6485b371c1d95804d7ad364fd5ba826de..76eb668311d2aa2659adf4f7857a670d81387830 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2391,7 +2391,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0618-Missing-Entity-API.patch b/patches/server/0617-Missing-Entity-API.patch
similarity index 99%
rename from patches/server/0618-Missing-Entity-API.patch
rename to patches/server/0617-Missing-Entity-API.patch
index b014179c90..4cbbbf5a03 100644
--- a/patches/server/0618-Missing-Entity-API.patch
+++ b/patches/server/0617-Missing-Entity-API.patch
@@ -257,7 +257,7 @@ index edbb933d1f6f7fc6432f7a8b074c5dc20f47adfb..91fb62807b3c5600c83d4dc8d3fadf36
      public Llama(EntityType<? extends Llama> type, Level world) {
          super(type, world);
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 29b603f5d361fdfb4dd0d20b7e77a29a920f6961..32b69b09ba2ee63e393aa6b4b6a142aaca6819a1 100644
+index 14b09adeb9222600c24f3fb846ea8aee467952e6..8241dbf7591b2f56b25cdc3ce9009c7133d2e4ef 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -942,7 +942,7 @@ index 9304e201db1ec96d0916aa8ea781f3e4bc7991e6..8338effd39b1709dbe578e247710a8e5
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-index 8b9695de6e3411cbcc2f97e4a4e243ec1d1dd076..03e74b29ebf0f9b9a0dbc6ffc872e22a22be20f0 100644
+index f5ecb8c1dc92e5a4b123effd2859123b17a586d3..5124a383b60b2c8de89fa992547d0c61db760c21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
 @@ -84,4 +84,37 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest
diff --git a/patches/server/0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index efc0788640..0e9946cfe0 100644
--- a/patches/server/0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0618-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 5382fc27e4f0147cae32c2ee2959428d28ab9265..4440c872aaf0a708de5c561f46ababadef95d900 100644
+index 1a85755ad62498c263783d1d54130d023105ec8d..fe969ecdca0e93319449f2fe3c3f41b4e17b385e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1099,7 +1099,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0620-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0620-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0621-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0620-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0621-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0620-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0622-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0621-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0622-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0621-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0623-Adds-PlayerArmSwingEvent.patch b/patches/server/0622-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0623-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0622-Adds-PlayerArmSwingEvent.patch
index 1f1f4f77f0..f2f4cf9cd1 100644
--- a/patches/server/0623-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0622-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 3ed491afc47273cb8d648ff527c81d968a1a3833..8e229a43a5b6042597532419cf6e63439a94d4f9 100644
+index fe969ecdca0e93319449f2fe3c3f41b4e17b385e..da21fdec10a10e4dcec3b0cadb72fa82ef56e4b4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2333,7 +2333,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0624-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 97%
rename from patches/server/0624-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch
index 4cb254bdb9..fdd06094ab 100644
--- a/patches/server/0624-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 19ce7611ea1ebef24f246118839b57d9b6949c34..83ba8472a5f3dc2c5d804e49310d8d0a2332a709 100644
+index 76eb668311d2aa2659adf4f7857a670d81387830..ae9acf496b866309d336ebd480a0b99aa03694df 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -273,7 +273,6 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 70458ff8c9bf6f3263868b0f5570840fe3d89ed2..d28d0ef6105ddeb562ddf31ae9088739
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2d7b88d0ea0acdd6e40d7c3e622af26de26bc0b7..685f4bb5c0c6c7e546e44bf6d2e4bf1f4c6dce68 100644
+index da21fdec10a10e4dcec3b0cadb72fa82ef56e4b4..8ed347ad9e758a3d5df7110ea0b098a207f61094 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1887,6 +1887,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0625-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 94%
rename from patches/server/0625-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch
index 0693018bf1..cf7f8ac4c4 100644
--- a/patches/server/0625-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4a11bf06a725a5c1927e24ac4ad066f7631a430a..ddfac0ec3baeff8596bea7e742707aa1fddfc1c2 100644
+index ca6e0f27b9d0c5d867909abd89262132bf1aa6bd..0e004d32250fea991c66caead50f2f64dbe0bbf7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -18,7 +18,7 @@ index 4a11bf06a725a5c1927e24ac4ad066f7631a430a..ddfac0ec3baeff8596bea7e742707aa1
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 32b69b09ba2ee63e393aa6b4b6a142aaca6819a1..0d1afaecc35b4c7f7656a2d903f08f92a706cb3f 100644
+index 8241dbf7591b2f56b25cdc3ce9009c7133d2e4ef..2beece01e1b2acc69eeb92810ce14db01a311f23 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -606,7 +606,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/0626-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0625-Don-t-apply-cramming-damage-to-players.patch
similarity index 94%
rename from patches/server/0626-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0625-Don-t-apply-cramming-damage-to-players.patch
index 065aae286b..c14d98b487 100644
--- a/patches/server/0626-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0625-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 6a21b06d07fd3ee8ea0fa567240ad6aec9e57096..064b7ccea1342a871caad96fc42db38720043c3b 100644
+index ae9acf496b866309d336ebd480a0b99aa03694df..b49b56848bdbbd07c49e44d85997fa36192332c5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0627-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0626-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0627-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0626-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0628-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0627-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0628-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0627-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0629-Stinger-API.patch b/patches/server/0628-Stinger-API.patch
similarity index 100%
rename from patches/server/0629-Stinger-API.patch
rename to patches/server/0628-Stinger-API.patch
diff --git a/patches/server/0630-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0630-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0631-Add-System.out-err-catcher.patch b/patches/server/0630-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0631-Add-System.out-err-catcher.patch
rename to patches/server/0630-Add-System.out-err-catcher.patch
index 0b6cdc01dc..1398271867 100644
--- a/patches/server/0631-Add-System.out-err-catcher.patch
+++ b/patches/server/0630-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ed5db37759e66647bc54cdaa0e612cf2e851771..21dfa2d10e1c67c968b59eb11132ab1ff46ba2d7 100644
+index b3225546c6c65dc18aa71930a38a72c7b6997ad5..7621b77d49330e462c4857f2033d74723eee4281 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0632-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0632-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0633-Improve-boat-collision-performance.patch b/patches/server/0632-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0633-Improve-boat-collision-performance.patch
rename to patches/server/0632-Improve-boat-collision-performance.patch
diff --git a/patches/server/0634-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0634-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch
index c0d096df58..08e7d79e1e 100644
--- a/patches/server/0634-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0633-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 685f4bb5c0c6c7e546e44bf6d2e4bf1f4c6dce68..80a31b422ecae9eb30a418034b6eb357076eded1 100644
+index 8ed347ad9e758a3d5df7110ea0b098a207f61094..28fdf5f4df4b61383e6d132f603c50ec35f62024 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,7 +390,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0635-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 97%
rename from patches/server/0635-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch
index 591481a8b5..5f22e4194a 100644
--- a/patches/server/0635-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch
@@ -8,7 +8,7 @@ Makes less git noise, as it won't update the date every single time
 Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index d9ad5087d152a2233d16743768d9ce885f32071d..15bd96f42fa6add2455e6e6a29deb8e6ff643ca0 100644
+index fc45c2c4ecdf3906df6bceaf3e019c462fe62186..f04bfbef6876ceb1fc7d28d9f964b730d1e5c238 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
 @@ -29,6 +29,7 @@ public abstract class Settings<T extends Settings<T>> {
diff --git a/patches/server/0636-Add-PlayerSetSpawnEvent.patch b/patches/server/0635-Add-PlayerSetSpawnEvent.patch
similarity index 99%
rename from patches/server/0636-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0635-Add-PlayerSetSpawnEvent.patch
index e2e6dcdd12..4233f9c921 100644
--- a/patches/server/0636-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0635-Add-PlayerSetSpawnEvent.patch
@@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..d797637f61bdf8a424f56fbb48e28b7c
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 064b7ccea1342a871caad96fc42db38720043c3b..b7cdc097e77cb133442191af6e46324a4d0310da 100644
+index b49b56848bdbbd07c49e44d85997fa36192332c5..9f7c149d3ad1175d55ec02e295ee43bc571c3280 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0637-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0636-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0637-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0636-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0638-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0637-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0638-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0637-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0639-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0638-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0639-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0638-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0640-Added-EntityDamageItemEvent.patch b/patches/server/0639-Added-EntityDamageItemEvent.patch
similarity index 97%
rename from patches/server/0640-Added-EntityDamageItemEvent.patch
rename to patches/server/0639-Added-EntityDamageItemEvent.patch
index ef1aeee736..c4a3268367 100644
--- a/patches/server/0640-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0639-Added-EntityDamageItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0dfa1ca78f747b2ea7e6b9f59d4561daad8bfcc8..368837172f87ac45e1d58e9905b4693cc0804328 100644
+index 761a46c21aaddcd43b4c33f477658605648127e9..fdcec8496abda362e611b42ef054ea730f47f408 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -622,7 +622,7 @@ public final class ItemStack {
diff --git a/patches/server/0641-Optimize-indirect-passenger-iteration.patch b/patches/server/0640-Optimize-indirect-passenger-iteration.patch
similarity index 95%
rename from patches/server/0641-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0640-Optimize-indirect-passenger-iteration.patch
index 04f5ad2db9..302d90eab0 100644
--- a/patches/server/0641-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0640-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 229ed03a59c77d37242b44edabc2ddb843037fa6..6889b02637178db2caad58e5513847fb96e04ecb 100644
+index 486a4d9e5cd421e2444327e2c28e4f674c98894a..c598247bd8cf65f33845502107277518f7260d4d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3926,20 +3926,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0642-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0641-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0642-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0641-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0643-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0642-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0643-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0642-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0644-Clear-bucket-NBT-after-dispense.patch b/patches/server/0643-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0644-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0643-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0645-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0644-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0645-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0644-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0646-Add-BlockBreakBlockEvent.patch b/patches/server/0645-Add-BlockBreakBlockEvent.patch
similarity index 98%
rename from patches/server/0646-Add-BlockBreakBlockEvent.patch
rename to patches/server/0645-Add-BlockBreakBlockEvent.patch
index bd3d51aa81..79b68d6784 100644
--- a/patches/server/0646-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0645-Add-BlockBreakBlockEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockBreakBlockEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 2c190473b98899e86d8bcd5a81c72bbc0a85b2a9..f0a85f1b48a911ffd8740df5ebe869e8f0371a58 100644
+index 5e5199b50847958f7abc6d8e42cfb6806df8421f..142f9438f75cb7e2d97011fdeb3f9e367ff81599 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -326,6 +326,23 @@ public class Block extends BlockBehaviour implements ItemLike {
diff --git a/patches/server/0647-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0647-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0648-More-CommandBlock-API.patch b/patches/server/0647-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0648-More-CommandBlock-API.patch
rename to patches/server/0647-More-CommandBlock-API.patch
diff --git a/patches/server/0649-Add-missing-team-sidebar-display-slots.patch b/patches/server/0648-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0649-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0648-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0650-Add-back-EntityPortalExitEvent.patch b/patches/server/0649-Add-back-EntityPortalExitEvent.patch
similarity index 97%
rename from patches/server/0650-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0649-Add-back-EntityPortalExitEvent.patch
index 97155b3279..ab399684bb 100644
--- a/patches/server/0650-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0649-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 6889b02637178db2caad58e5513847fb96e04ecb..6f023b22a1051baaa5310d8c5a1aa6d8b76d8992 100644
+index c598247bd8cf65f33845502107277518f7260d4d..8db434d01f2771a94cd4c4a662ea0482b2a02307 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3373,6 +3373,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0651-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 93%
rename from patches/server/0651-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch
index 5ee092eda0..8b56c0c4a7 100644
--- a/patches/server/0651-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 89396f956fc413f6ce53c2f66a85c395557aa883..0830f7671ade925e0b89b2723cef9f43d4f20922 100644
+index dbfd4a642e862f46a8b4fd1f3fc52c13ecf74284..1629a94a272f34d395b6be8f16944b9a8837d195 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -998,6 +998,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,7 +31,7 @@ index 89396f956fc413f6ce53c2f66a85c395557aa883..0830f7671ade925e0b89b2723cef9f43
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 144d49ddf5b4daf9d36ba84a25b130c1491fcc02..392714a19fc977678a7a7041d48ff553934ecf51 100644
+index a920936018a2e05ea72d68a83e6debb3807df353..095fa9e4c4d367a3cdd343ca71bef7a6564759be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0652-Get-entity-default-attributes.patch b/patches/server/0651-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0652-Get-entity-default-attributes.patch
rename to patches/server/0651-Get-entity-default-attributes.patch
diff --git a/patches/server/0653-Left-handed-API.patch b/patches/server/0652-Left-handed-API.patch
similarity index 100%
rename from patches/server/0653-Left-handed-API.patch
rename to patches/server/0652-Left-handed-API.patch
diff --git a/patches/server/0654-Add-more-advancement-API.patch b/patches/server/0653-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0654-Add-more-advancement-API.patch
rename to patches/server/0653-Add-more-advancement-API.patch
diff --git a/patches/server/0655-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0654-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0655-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0654-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0656-Add-critical-damage-API.patch b/patches/server/0655-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0656-Add-critical-damage-API.patch
rename to patches/server/0655-Add-critical-damage-API.patch
index 05210d88e4..d2acf3ffd5 100644
--- a/patches/server/0656-Add-critical-damage-API.patch
+++ b/patches/server/0655-Add-critical-damage-API.patch
@@ -71,7 +71,7 @@ index 004c130fc03dc01ef75fabdb4ef1ef711e33cb95..ae4319c2532855315bc45995a39d7eb9
          int k = entity.getRemainingFireTicks();
          boolean flag1 = entity.getType().is(EntityTypeTags.DEFLECTS_ARROWS);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ca586aef7a22b4824f3c954d9574682f6a25ab28..e4d08d4b85f9ce57af50e6aaf4a308a8a6c85ce3 100644
+index 8a7c90014beb5e044abc1fd6f8832bb3c78ffb12..1894fddf867df210d041307d72118eacde9fe5cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1043,7 +1043,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0657-Fix-issues-with-mob-conversion.patch b/patches/server/0656-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0657-Fix-issues-with-mob-conversion.patch
rename to patches/server/0656-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0658-Add-isCollidable-methods-to-various-places.patch b/patches/server/0657-Add-isCollidable-methods-to-various-places.patch
similarity index 96%
rename from patches/server/0658-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0657-Add-isCollidable-methods-to-various-places.patch
index f02bfe0a1d..9623c46599 100644
--- a/patches/server/0658-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0657-Add-isCollidable-methods-to-various-places.patch
@@ -23,7 +23,7 @@ index ce297420f695404356655b1df2847a32fb98ec59..068b3735b6c50a7a2053c7dc39856f72
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index aca63719790429d3d7c7c59a1931a98221c70fc0..31bb92c026a4a2de0e8d3500f6ecf35b60d61fb9 100644
+index 928a301627134b49915b0ceaeabb7dc350605dc2..08716e757b2e100f7bc47a046f02db664d882aba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 @@ -331,4 +331,11 @@ public class CraftBlockState implements BlockState {
diff --git a/patches/server/0659-Goat-ram-API.patch b/patches/server/0658-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0659-Goat-ram-API.patch
rename to patches/server/0658-Goat-ram-API.patch
diff --git a/patches/server/0660-Add-API-for-resetting-a-single-score.patch b/patches/server/0659-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0660-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0659-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0661-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0660-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0661-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0660-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0662-Vanilla-command-permission-fixes.patch b/patches/server/0661-Vanilla-command-permission-fixes.patch
similarity index 97%
rename from patches/server/0662-Vanilla-command-permission-fixes.patch
rename to patches/server/0661-Vanilla-command-permission-fixes.patch
index b0ff5eb32d..6813c9adc7 100644
--- a/patches/server/0662-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0661-Vanilla-command-permission-fixes.patch
@@ -33,7 +33,7 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..f875507241ac6769545e91cd3285232b
      private RedirectModifier<S> modifier = null;
      private boolean forks;
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 1409801946be84e3256748c68ba0c62d42b869de..713e665ee962d9e8bebeb13d2621d43849084090 100644
+index 3b3fa067ee5a95d52645147c2d9d1e43d7a789b6..bc0f9bf88de8f79f8e2aa2261d5a8bdc9dd1f53a 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -257,6 +257,13 @@ public class Commands {
diff --git a/patches/server/0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 15f28499ca..55882d0841 100644
--- a/patches/server/0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0830f7671ade925e0b89b2723cef9f43d4f20922..5329fe64b64fab73d3bda02c700a6f01aa2d9637 100644
+index 1629a94a272f34d395b6be8f16944b9a8837d195..ce74bfb123427c5459c03c3c8f85445077c329c7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1578,9 +1578,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0664-Fix-GameProfileCache-concurrency.patch b/patches/server/0663-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0664-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0663-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0665-Improve-and-expand-AsyncCatcher.patch b/patches/server/0664-Improve-and-expand-AsyncCatcher.patch
similarity index 98%
rename from patches/server/0665-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0664-Improve-and-expand-AsyncCatcher.patch
index 4ec9137a17..810bd9cbce 100644
--- a/patches/server/0665-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0664-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 80a31b422ecae9eb30a418034b6eb357076eded1..93cb76c8e96488051b10ed4a634c681305628fcc 100644
+index 28fdf5f4df4b61383e6d132f603c50ec35f62024..b203c945e7c013e202013f7bce6b3c7077bf2d42 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1575,6 +1575,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -166,7 +166,7 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 392714a19fc977678a7a7041d48ff553934ecf51..5910373dfbe561e52c507129d506f68aa9252249 100644
+index 095fa9e4c4d367a3cdd343ca71bef7a6564759be..b52d3413cfe725ff5778c897a0ba06ca834e533f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1803,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0666-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0666-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0667-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0666-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0667-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0666-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0668-Optimise-general-POI-access.patch b/patches/server/0667-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0668-Optimise-general-POI-access.patch
rename to patches/server/0667-Optimise-general-POI-access.patch
diff --git a/patches/server/0669-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0668-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0669-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0668-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0670-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0669-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0670-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0669-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0671-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0670-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0671-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0670-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 5931189e15..779fad9d1a 100644
--- a/patches/server/0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2b29b1cf3cd8abccd4b7629e56f18eee741522a5..18e26a5fd8843618710403b3fa4818287e90376c 100644
+index 35ca44c88497e0b07f43ba7bf092360365b1c53a..e297be9cf8c59b6b8d051d5db70c3bebcd235a2d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -458,6 +458,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0673-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0673-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0674-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0673-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0674-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0673-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0675-Time-scoreboard-search.patch b/patches/server/0674-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0675-Time-scoreboard-search.patch
rename to patches/server/0674-Time-scoreboard-search.patch
diff --git a/patches/server/0676-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0675-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0676-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0675-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0677-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0676-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0677-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0676-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0678-Execute-chunk-tasks-mid-tick.patch b/patches/server/0677-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0678-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0677-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0679-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0678-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0679-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0678-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0680-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0679-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0680-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0679-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0681-Optimise-random-block-ticking.patch b/patches/server/0680-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0681-Optimise-random-block-ticking.patch
rename to patches/server/0680-Optimise-random-block-ticking.patch
index d875078af0..347a22d5c4 100644
--- a/patches/server/0681-Optimise-random-block-ticking.patch
+++ b/patches/server/0680-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4df6c879aae57cb85c67a0c7342fc33db6f180dc..bc826660514a76738f5256bf571eb2abf8bf85ef 100644
+index 6b999e05f93b0da1a3cc9a679a3a88b89df4aab5..a9f336ed75ef406c1179bdc6e63e6fd944470534 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -860,6 +860,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -324,7 +324,7 @@ index 722e323d2ae3f4ac8aa3197fed79f7d926d5ccfa..f8c1dfc8e121a406955348a1ec00c264
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 43f43c59138b661299f20cba89d91aa5585cdf32..3b13a13c4e7de12ed0cac354701bf3502d788b59 100644
+index 02dfea10b27c6f932bc5742f6c577e30c155b3fe..94a4ceeea167164fb589518881952dd5e082f8c2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1398,10 +1398,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 99%
rename from patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..d2cc318b7d 100644
--- a/patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
@@ -10,7 +10,7 @@ hoping that at least then we don't swap chunks, and maybe recover
 them all.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 19b35d1c07c75b27cef9a53258a68ec5d9f721d5..e1ad2152bbd55435495bdad57a0984842e55fcb8 100644
+index a95909bc818f395ce5772c5129f9cc9b789ce133..df9ae808c5a59ea25145c9df62f42fb33d159021 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -70,6 +70,18 @@ import net.minecraft.world.ticks.ProtoChunkTicks;
@@ -685,7 +685,7 @@ index 647ce340c81606ab86d33e1f9dec1fb0afc262d8..98c8b676fc5b2add44d6ddf5d32f85bc
          return bytebuffer;
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 7dee0f7d49f3492c92fceff7750e696239f840ed..134a5cf10073c27dfbc19709e81ffa75bcc73743 100644
+index 9fa07295bf73317a4c2bbbbaf1918393c891f09a..a2794ec3d846136da64b6888d846587499a5f635 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -24,6 +24,7 @@ public class RegionFileStorage implements AutoCloseable {
diff --git a/patches/server/0683-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0683-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch
index d1fecc8c75..159866c83f 100644
--- a/patches/server/0683-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch
@@ -337,7 +337,7 @@ index 5f625acf04ddb56e3596d086252f9bfccfdb95f2..54c7f34ba3dc8466223e589702d0c93a
                  protected void initChannel(Channel channel) {
                      Connection.setInitialProtocolAttributes(channel);
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 8f60341a3f17fa4553a22e4a98699e0855c54e06..7da7571eef2a90d039da3a3ec122398b523b6730 100644
+index 0bed0d7aff06a400fa28348f8658d7ad385e8749..453ed111a6640bfafe66d914db976243e94f94c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -223,12 +223,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0683-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0684-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0683-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0685-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0685-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0686-Distance-manager-tick-timings.patch b/patches/server/0685-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0686-Distance-manager-tick-timings.patch
rename to patches/server/0685-Distance-manager-tick-timings.patch
diff --git a/patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 94%
rename from patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index f42b637cae..5a15e29fbe 100644
--- a/patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 53ab0a55cef95bf7660ccf68558967ce9b63c741..15533cf984bc29edc8015f0cc6b1d510c672c896 100644
+index 56c999c7f80b280966e81a0b1ca4929f034edb20..cae00701c5dbf40be07ea5c2d01ea8929f4fa216 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2696,6 +2696,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0688-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0687-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0688-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0687-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index a0919cf953..23944724e9 100644
--- a/patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0688-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 8ad189164db55c8416b07511dc349ee7a94752a0..3fb7e355a86851731f5f11b6b8bb8e4515806a33 100644
+index b203c945e7c013e202013f7bce6b3c7077bf2d42..648530ce3183362ed71cbd2de534471da65ab787 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -736,6 +736,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0690-Add-packet-limiter-config.patch b/patches/server/0689-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0690-Add-packet-limiter-config.patch
rename to patches/server/0689-Add-packet-limiter-config.patch
diff --git a/patches/server/0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0692-Ensure-valid-vehicle-status.patch b/patches/server/0691-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0692-Ensure-valid-vehicle-status.patch
rename to patches/server/0691-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0693-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0692-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0693-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0692-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0695-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0694-Don-t-log-debug-logging-being-disabled.patch
similarity index 88%
rename from patches/server/0695-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0694-Don-t-log-debug-logging-being-disabled.patch
index 2130840734..8daedd938d 100644
--- a/patches/server/0695-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0694-Don-t-log-debug-logging-being-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't log debug logging being disabled
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 1eafb92fdf3c6ddce5f5f847bd9034287e2d4b84..68602dfb171d47e47fd0710b4324013ef05214d0 100644
+index 56dbc23f10d946a7ec992b08fd868f3ee5089068..6c260403d91d640da0473a3df56e1c5582459fde 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -382,7 +382,7 @@ public class SpigotConfig
diff --git a/patches/server/0696-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0695-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0696-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0695-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0697-Preserve-overstacked-loot.patch b/patches/server/0696-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0697-Preserve-overstacked-loot.patch
rename to patches/server/0696-Preserve-overstacked-loot.patch
diff --git a/patches/server/0698-Update-head-rotation-in-missing-places.patch b/patches/server/0697-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0698-Update-head-rotation-in-missing-places.patch
rename to patches/server/0697-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0699-prevent-unintended-light-block-manipulation.patch b/patches/server/0698-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0699-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0698-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0700-Fix-CraftCriteria-defaults-map.patch b/patches/server/0699-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0700-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0699-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0701-Fix-upstreams-block-state-factories.patch b/patches/server/0700-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0701-Fix-upstreams-block-state-factories.patch
rename to patches/server/0700-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0702-Configurable-feature-seeds.patch b/patches/server/0701-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0702-Configurable-feature-seeds.patch
rename to patches/server/0701-Configurable-feature-seeds.patch
diff --git a/patches/server/0703-Add-root-admin-user-detection.patch b/patches/server/0702-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0703-Add-root-admin-user-detection.patch
rename to patches/server/0702-Add-root-admin-user-detection.patch
index 1b3440b012..a8a91bed0f 100644
--- a/patches/server/0703-Add-root-admin-user-detection.patch
+++ b/patches/server/0702-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0008e63e96841c48fa039001f282ffa70c88494f..a305557e97d8719f5f82e70794d15242364ce136 100644
+index a8621519c2fec415c8d56c3510b0780b6ccd9eeb..c9af6ba082d1d387aa2e6ecf5fb4647d994447f4 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0704-Always-allow-item-changing-in-Fireball.patch b/patches/server/0703-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0704-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0703-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0704-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0704-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0706-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0705-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0706-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0705-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0707-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0706-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0707-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0706-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0708-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0707-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0708-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0707-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0709-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0708-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0709-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0708-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch
index a500bba162..2279e31033 100644
--- a/patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 8d2870c780c4c253f6570c7ef73f6e7c2ccc46ad..0cbb5dd17c5b37ad90ce11a31b644707
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3fb7e355a86851731f5f11b6b8bb8e4515806a33..3d2ef1728a54d7612a773dfb7066b7370c9df178 100644
+index 648530ce3183362ed71cbd2de534471da65ab787..1e519cdd673a4d4beb53ae84822e7b85c25a5e97 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2566,8 +2566,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0711-Fix-Spigot-growth-modifiers.patch b/patches/server/0710-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0711-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0710-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0713-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0712-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0713-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0712-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0714-Optimize-HashMapPalette.patch b/patches/server/0713-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0714-Optimize-HashMapPalette.patch
rename to patches/server/0713-Optimize-HashMapPalette.patch
diff --git a/patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0716-Collision-optimisations.patch b/patches/server/0715-Collision-optimisations.patch
similarity index 100%
rename from patches/server/0716-Collision-optimisations.patch
rename to patches/server/0715-Collision-optimisations.patch
diff --git a/patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch
index aac62fe828..67f3734290 100644
--- a/patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0716-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 3d2ef1728a54d7612a773dfb7066b7370c9df178..846db5783d85b68ca1f3788fe5434bc88b90c2d9 100644
+index 1e519cdd673a4d4beb53ae84822e7b85c25a5e97..554b0cd2f61005b57e1b0f68730354a8753fb0b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -543,7 +543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0719-Add-more-Campfire-API.patch b/patches/server/0718-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0719-Add-more-Campfire-API.patch
rename to patches/server/0718-Add-more-Campfire-API.patch
diff --git a/patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0721-Fix-tripwire-state-inconsistency.patch b/patches/server/0720-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0721-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0720-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0722-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0721-Forward-CraftEntity-in-teleport-command.patch
similarity index 94%
rename from patches/server/0722-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0721-Forward-CraftEntity-in-teleport-command.patch
index 7cecf97561..0133abe04e 100644
--- a/patches/server/0722-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0721-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4903c0ddff7a7fcfdadb62e92ff285b77bd8eacf..0d561537ab767e357c2e4385d0d87f8e3db022d8 100644
+index 519e3f0e376198fb399819f4587ccf935b93ea1a..4ffd551e6ea540cff14eaba0e95ed2c7c0bca513 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3531,6 +3531,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0723-Improve-scoreboard-entries.patch b/patches/server/0722-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0723-Improve-scoreboard-entries.patch
rename to patches/server/0722-Improve-scoreboard-entries.patch
diff --git a/patches/server/0724-Entity-powdered-snow-API.patch b/patches/server/0723-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0724-Entity-powdered-snow-API.patch
rename to patches/server/0723-Entity-powdered-snow-API.patch
diff --git a/patches/server/0725-Add-API-for-item-entity-health.patch b/patches/server/0724-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0725-Add-API-for-item-entity-health.patch
rename to patches/server/0724-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 98%
rename from patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch
index 2064d7103a..225dce154f 100644
--- a/patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed.
 Mojira Issue: https://bugs.mojang.com/browse/MC-235045
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index e58c2844356c71973d81b460a21aab795b506d77..20b2cbbc73f6420b6ace9746016527b90d9f01b9 100644
+index 79732086bc4cdbca8364d78eb60d68c758055966..82ca6267bca684a8f04ca37d40816686677a852a 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -447,4 +447,20 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
@@ -35,7 +35,7 @@ index e58c2844356c71973d81b460a21aab795b506d77..20b2cbbc73f6420b6ace9746016527b9
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 713e665ee962d9e8bebeb13d2621d43849084090..c60f7546f260d18f308bf160fb122a1bc036ff8a 100644
+index bc0f9bf88de8f79f8e2aa2261d5a8bdc9dd1f53a..c2bd7eea15437f3526da37ce1c8642084a26406b 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -532,6 +532,7 @@ public class Commands {
diff --git a/patches/server/0727-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0726-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0727-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0726-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0728-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0727-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0728-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0727-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0729-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0728-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0729-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0728-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0730-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0729-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0730-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0729-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0731-Fix-bees-aging-inside-hives.patch b/patches/server/0730-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0731-Fix-bees-aging-inside-hives.patch
rename to patches/server/0730-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0732-Bucketable-API.patch b/patches/server/0731-Bucketable-API.patch
similarity index 100%
rename from patches/server/0732-Bucketable-API.patch
rename to patches/server/0731-Bucketable-API.patch
diff --git a/patches/server/0733-Validate-usernames.patch b/patches/server/0732-Validate-usernames.patch
similarity index 97%
rename from patches/server/0733-Validate-usernames.patch
rename to patches/server/0732-Validate-usernames.patch
index 34670a1c61..e86a22d0f0 100644
--- a/patches/server/0733-Validate-usernames.patch
+++ b/patches/server/0732-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 552568aabcd4910697027c4b578edcd75f56b723..a7a6d3d243bb11101cfe6fce97dad74242597121 100644
+index 453ed111a6640bfafe66d914db976243e94f94c8..08a65700909dd64e6e15fac5c6542b02a864782b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -63,6 +63,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0734-Make-water-animal-spawn-height-configurable.patch b/patches/server/0733-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0734-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0733-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0734-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0734-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 3739b7c4c7..c80646e846 100644
--- a/patches/server/0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0734-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 0a23cfeaba071c2179de1931caa86bc46462c338..bc181f3f59eef3f2f3645e3facb37d5e4a605d34 100644
+index 6873036e7d24a2b8e85ab7ae270eec63bd7e7b5b..ac4d96345c985284a1306055b164a74a483cb444 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -596,7 +596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 0a23cfeaba071c2179de1931caa86bc46462c338..bc181f3f59eef3f2f3645e3facb37d5e
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 23124f8b302e3ac5751c03e3839d2c35e24e5b30..be83340a6b2e64883c04a3593199179b856c5722 100644
+index ea5147262daade44265af7aa029d02f8314673ee..c5aa5bd2a9372d9d21ac600fdf4041d78186c002 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1258,7 +1258,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 23124f8b302e3ac5751c03e3839d2c35e24e5b30..be83340a6b2e64883c04a3593199179b
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e8d81c1f265001bcf4574c98950296ac99f24a29..83f51cbe9de3fdde19d02a564f873f51f697a828 100644
+index 24156bd9d964e2c32bc758dd9e099744cf8ac647..999602a6c11257b05083bcc2d36b6e30b2b129f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -205,6 +205,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0736-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0735-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0736-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0735-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0737-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0736-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0737-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0736-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0738-Multiple-Entries-with-Scoreboards.patch b/patches/server/0737-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0738-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0737-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0739-Reset-placed-block-on-exception.patch b/patches/server/0738-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0739-Reset-placed-block-on-exception.patch
rename to patches/server/0738-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0740-Add-configurable-height-for-slime-spawn.patch b/patches/server/0739-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0740-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0739-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0742-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0740-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0742-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0740-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
deleted file mode 100644
index ad459f5555..0000000000
--- a/patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MCMDEV <john-m.1@gmx.de>
-Date: Fri, 24 Sep 2021 17:59:21 +0200
-Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 856699cd8976bca49bb4f7cae424bad606166b9d..12dc053af430218fae9ec30d3e793e0323ca1137 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -299,7 +299,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
- 
-         // Paper start
-         com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile);
--        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile); // Paper - add rawAddress
-+        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile, ServerLoginPacketListenerImpl.this.connection.hostname); // Paper - add rawAddress & hostname
-         server.getPluginManager().callEvent(asyncEvent);
-         profile = asyncEvent.getPlayerProfile();
-         profile.complete(true); // Paper - setPlayerProfileAPI
diff --git a/patches/server/0743-Multi-Block-Change-API-Implementation.patch b/patches/server/0741-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0743-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0741-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0744-Fix-NotePlayEvent.patch b/patches/server/0742-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0744-Fix-NotePlayEvent.patch
rename to patches/server/0742-Fix-NotePlayEvent.patch
diff --git a/patches/server/0745-Freeze-Tick-Lock-API.patch b/patches/server/0743-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0745-Freeze-Tick-Lock-API.patch
rename to patches/server/0743-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0746-Dolphin-API.patch b/patches/server/0744-Dolphin-API.patch
similarity index 100%
rename from patches/server/0746-Dolphin-API.patch
rename to patches/server/0744-Dolphin-API.patch
diff --git a/patches/server/0747-More-PotionEffectType-API.patch b/patches/server/0745-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0747-More-PotionEffectType-API.patch
rename to patches/server/0745-More-PotionEffectType-API.patch
diff --git a/patches/server/0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0750-Add-missing-structure-set-seed-configs.patch b/patches/server/0748-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0750-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0748-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0751-Implement-regenerateChunk.patch b/patches/server/0749-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0751-Implement-regenerateChunk.patch
rename to patches/server/0749-Implement-regenerateChunk.patch
index b4ba01ed7b..18db0bc2db 100644
--- a/patches/server/0751-Implement-regenerateChunk.patch
+++ b/patches/server/0749-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 83f51cbe9de3fdde19d02a564f873f51f697a828..e709b6fda1703c0787ddeedec9b7cc09f440d652 100644
+index 999602a6c11257b05083bcc2d36b6e30b2b129f4..d41cd3075a5f59f271ddee7009a3ed26a34d3041 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -144,6 +144,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0750-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0750-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0754-Add-GameEvent-tags.patch b/patches/server/0752-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0754-Add-GameEvent-tags.patch
rename to patches/server/0752-Add-GameEvent-tags.patch
diff --git a/patches/server/0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0756-Furnace-RecipesUsed-API.patch b/patches/server/0754-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0756-Furnace-RecipesUsed-API.patch
rename to patches/server/0754-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0757-Configurable-sculk-sensor-listener-range.patch b/patches/server/0755-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0757-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0755-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0758-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0756-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0758-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0756-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index b584e52ee2..e48a115689 100644
--- a/patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0757-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 8f375cc054f6c15537eca4927ea5cb0eb6a93b67..abd20b1bbda4177a3f3be8abf3977866780a9b67 100644
+index 396cbd1a0a94e913475bad65faf8e871b7105895..67bda174adb74e6176e81f986382b3bbbfe6b95f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -623,7 +623,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0760-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0758-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 91%
rename from patches/server/0760-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0758-Put-world-into-worldlist-before-initing-the-world.patch
index fc02afdc26..ea31a814cb 100644
--- a/patches/server/0760-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0758-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 abd20b1bbda4177a3f3be8abf3977866780a9b67..330a7921849a4b3ab0d7ef156af4880ef602d5eb 100644
+index 67bda174adb74e6176e81f986382b3bbbfe6b95f..4f43e306d70bc733ceba2b375c8732f330abc0e4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -635,9 +635,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index abd20b1bbda4177a3f3be8abf3977866780a9b67..330a7921849a4b3ab0d7ef156af4880e
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e28cb2db9b93bf3c045563a8df9d1c819f054851..7efd9766fa1e78127e9f02d8f29da435c7f27e0a 100644
+index 48961913ed0a437129432cfa5fa707904d5bcdb2..4ffb0a342a553b714a0807591a3d21d7a6b08959 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1288,10 +1288,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0761-Fix-Entity-Position-Desync.patch b/patches/server/0759-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0761-Fix-Entity-Position-Desync.patch
rename to patches/server/0759-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0762-Custom-Potion-Mixes.patch b/patches/server/0760-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0762-Custom-Potion-Mixes.patch
rename to patches/server/0760-Custom-Potion-Mixes.patch
diff --git a/patches/server/0763-Force-close-world-loading-screen.patch b/patches/server/0761-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0763-Force-close-world-loading-screen.patch
rename to patches/server/0761-Force-close-world-loading-screen.patch
diff --git a/patches/server/0764-Fix-falling-block-spawn-methods.patch b/patches/server/0762-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0764-Fix-falling-block-spawn-methods.patch
rename to patches/server/0762-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0765-Expose-furnace-minecart-push-values.patch b/patches/server/0763-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0765-Expose-furnace-minecart-push-values.patch
rename to patches/server/0763-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0766-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0764-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0766-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0764-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0767-More-Projectile-API.patch b/patches/server/0765-More-Projectile-API.patch
similarity index 99%
rename from patches/server/0767-More-Projectile-API.patch
rename to patches/server/0765-More-Projectile-API.patch
index 4657f4b43b..923c8570a8 100644
--- a/patches/server/0767-More-Projectile-API.patch
+++ b/patches/server/0765-More-Projectile-API.patch
@@ -509,7 +509,7 @@ index 20f9735c7cb76024e15dbdca7684f5c560876175..8a6af0db8e0aa0cffbf19584be747076
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d26dd7b3931ac99589880e3a02d3e7f19c53112a..595293dba9643ee3823f07ec2b077b805419d63c 100644
+index 1894fddf867df210d041307d72118eacde9fe5cb..de35569880efc2267e17c44b5011533fd348c2f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -831,19 +831,19 @@ public class CraftEventFactory {
@@ -560,7 +560,7 @@ index d26dd7b3931ac99589880e3a02d3e7f19c53112a..595293dba9643ee3823f07ec2b077b80
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index aab8eb7c96be6a2f157e971d9d494d2e01d3218c..8c06ff72bcc7cce2c853bf999bda8afc10e53ca6 100644
+index 1478fb3e1f0f97423855db7e5c4618cc066efb6b..a4d522a19f1a1288baa2688d5beb62c91a5fb3a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -289,12 +289,20 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0768-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0766-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0768-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0766-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0767-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0767-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 016a48a132..3d739ee7ff 100644
--- a/patches/server/0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0767-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 846db5783d85b68ca1f3788fe5434bc88b90c2d9..f48d6c0b1a9fd86061314d696ff84019667a38a2 100644
+index 554b0cd2f61005b57e1b0f68730354a8753fb0b7..ab64ffed96e0f8a3293254105d63b934133407e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -465,6 +465,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0770-Implement-getComputedBiome-API.patch b/patches/server/0768-Implement-getComputedBiome-API.patch
similarity index 96%
rename from patches/server/0770-Implement-getComputedBiome-API.patch
rename to patches/server/0768-Implement-getComputedBiome-API.patch
index 805784f862..610d889706 100644
--- a/patches/server/0770-Implement-getComputedBiome-API.patch
+++ b/patches/server/0768-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index eeb1bd05d4407224aefa26b5ae2f2a8da1101b31..d46ab8b75fe99e03874539956ca6389d3cdd0641 100644
+index 5f4958d28b6d79fe9e589e4794d9a7e8ab67c8b3..42def68f0c682afe7628ff0b9a537e74d77e558c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -76,6 +76,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0771-Make-some-itemstacks-nonnull.patch b/patches/server/0769-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0771-Make-some-itemstacks-nonnull.patch
rename to patches/server/0769-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0772-Implement-enchantWithLevels-API.patch b/patches/server/0770-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0772-Implement-enchantWithLevels-API.patch
rename to patches/server/0770-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0773-Fix-saving-in-unloadWorld.patch b/patches/server/0771-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0773-Fix-saving-in-unloadWorld.patch
rename to patches/server/0771-Fix-saving-in-unloadWorld.patch
index ff2f38db61..24b31ecfa3 100644
--- a/patches/server/0773-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0771-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8750983a05da55b0f491a5267965fe939e771c0e..3366bcb7fe198f4b9681efb1ee201e32d10becb5 100644
+index 4af7f37e12104f6a493c08aff2968762bbdc4811..50a941add66d160ce3328d869238bab73215be5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1336,7 +1336,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0774-Buffer-OOB-setBlock-calls.patch b/patches/server/0772-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0774-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0772-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0775-Add-TameableDeathMessageEvent.patch b/patches/server/0773-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0775-Add-TameableDeathMessageEvent.patch
rename to patches/server/0773-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0774-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 99%
rename from patches/server/0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0774-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 93f129ec9b..c247f8a3e5 100644
--- a/patches/server/0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0774-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -196,7 +196,7 @@ index c01cc63497917b0c5d95424c060c69f3693fc871..b6105d178778b326c11b7d29c5e4d8aa
              }
              // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 595293dba9643ee3823f07ec2b077b805419d63c..3a6743c81c6740cda1622c60c09088c4cd61f4a3 100644
+index de35569880efc2267e17c44b5011533fd348c2f3..b2f96da3405875eae5d4398d0dc3580108f561bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1410,11 +1410,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0777-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0775-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0777-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0775-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0778-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0776-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0778-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0776-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0779-Guard-against-invalid-entity-positions.patch b/patches/server/0777-Guard-against-invalid-entity-positions.patch
similarity index 95%
rename from patches/server/0779-Guard-against-invalid-entity-positions.patch
rename to patches/server/0777-Guard-against-invalid-entity-positions.patch
index 22147b5377..15d3e47294 100644
--- a/patches/server/0779-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0777-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 624e0b1af20a3595734bc3d59a674e902698b6d6..bc1b08f778537f7973ed1249dee63d9d12735dd1 100644
+index 8284b150bbca66fc536418ec66bf93fb205cdcc5..2c3193fdfb0e4b4a47cceb2da8b3fe85bd1e6848 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4539,11 +4539,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0780-cache-resource-keys.patch b/patches/server/0778-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0780-cache-resource-keys.patch
rename to patches/server/0778-cache-resource-keys.patch
diff --git a/patches/server/0781-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0779-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0781-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0779-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0782-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0780-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0782-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0780-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0783-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0781-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0783-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0781-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0784-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0782-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 93%
rename from patches/server/0784-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0782-Prevent-tile-entity-copies-loading-chunks.patch
index 1745f2cb60..ad6effe202 100644
--- a/patches/server/0784-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0782-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 f48d6c0b1a9fd86061314d696ff84019667a38a2..238df5ab2bf2a656396bc870678fdfcd77b59375 100644
+index ab64ffed96e0f8a3293254105d63b934133407e8..15198891975856e54bb9fcf1eb8a2838bc107da5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3197,7 +3197,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0785-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0783-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0785-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0783-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0786-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0784-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 97%
rename from patches/server/0786-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0784-Pass-ServerLevel-for-gamerule-callbacks.patch
index f93be5e239..203c8ac7fd 100644
--- a/patches/server/0786-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0784-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a305557e97d8719f5f82e70794d15242364ce136..5264235c1547c78b8123e2efb07dcb77486cc5bf 100644
+index c9af6ba082d1d387aa2e6ecf5fb4647d994447f4..62c66bb3bcb1cb0a09011aa81bbb39f23623506f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,7 +18,7 @@ index a305557e97d8719f5f82e70794d15242364ce136..5264235c1547c78b8123e2efb07dcb77
  
              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 238df5ab2bf2a656396bc870678fdfcd77b59375..175c62758f11cba53df53286c0c84472234b6bfa 100644
+index 15198891975856e54bb9fcf1eb8a2838bc107da5..52efebcc440253e84640be3c24c2dcd76c2a5b9a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2761,7 +2761,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -167,7 +167,7 @@ index 2a480026c3bfb06e6556fe5b11d9712c8e02debe..6c1af24f2f02ef5fe1be135b4071362f
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6dbd45103571f033daafe085c5ccb962e5d9a17a..9ced82941e051a77a4832929f10d28f7bce82b0d 100644
+index 719d2ac5907b4c96828460daae9f254c2cd3e840..388ce676487dc094cf78ce7bd3c50942b3ec5e29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2038,7 +2038,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0785-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0785-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0788-WorldCreator-keepSpawnLoaded.patch b/patches/server/0786-WorldCreator-keepSpawnLoaded.patch
similarity index 94%
rename from patches/server/0788-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0786-WorldCreator-keepSpawnLoaded.patch
index 7bddd86527..7a1ddbe39c 100644
--- a/patches/server/0788-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0786-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3366bcb7fe198f4b9681efb1ee201e32d10becb5..90602c2201b50e8b5d300193aef962a70c52625f 100644
+index 50a941add66d160ce3328d869238bab73215be5e..4642cfb862549c4b3d7e64ac6f040b7cf54d3793 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1283,7 +1283,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0789-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0787-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0789-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0787-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0790-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0788-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0790-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0788-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0791-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0789-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0791-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0789-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0792-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0790-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0792-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0790-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0793-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0791-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0793-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0791-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0794-Add-PlayerStopUsingItemEvent.patch b/patches/server/0792-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0794-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0792-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0795-Don-t-tick-markers.patch b/patches/server/0793-Don-t-tick-markers.patch
similarity index 97%
rename from patches/server/0795-Don-t-tick-markers.patch
rename to patches/server/0793-Don-t-tick-markers.patch
index bfa8fe438c..b24d4569b2 100644
--- a/patches/server/0795-Don-t-tick-markers.patch
+++ b/patches/server/0793-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5f43aedc6596e2b1ac7af97115157147
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 15533cf984bc29edc8015f0cc6b1d510c672c896..f5a32aaae5b4eb6dda3da3d5d39f38e000e806c2 100644
+index cae00701c5dbf40be07ea5c2d01ea8929f4fa216..646fb7e4a83e9f9a1b78d8c70f3518b977572fde 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2605,6 +2605,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0796-Expand-FallingBlock-API.patch b/patches/server/0794-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0796-Expand-FallingBlock-API.patch
rename to patches/server/0794-Expand-FallingBlock-API.patch
diff --git a/patches/server/0797-Do-not-accept-invalid-client-settings.patch b/patches/server/0795-Do-not-accept-invalid-client-settings.patch
similarity index 94%
rename from patches/server/0797-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0795-Do-not-accept-invalid-client-settings.patch
index 7135f04f52..2d9a6d6bf2 100644
--- a/patches/server/0797-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0795-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 175c62758f11cba53df53286c0c84472234b6bfa..bfc1404bd1478f2a7c475d55b53a70181506c4f8 100644
+index 52efebcc440253e84640be3c24c2dcd76c2a5b9a..c63dd80b23df877cb900e608406f747b87e3cae7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3321,6 +3321,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0798-Add-support-for-Proxy-Protocol.patch b/patches/server/0796-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0798-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0796-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0799-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0797-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0799-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0797-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0800-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0798-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0800-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0798-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0801-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0799-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0801-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0799-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0802-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0800-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0802-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0800-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0803-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0801-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0803-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0801-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0804-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0802-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0804-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0802-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0805-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0803-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0805-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0803-Add-Alternate-Current-redstone-implementation.patch
index 531c39ae51..d3a755d55e 100644
--- a/patches/server/0805-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0803-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f5a32aaae5b4eb6dda3da3d5d39f38e000e806c2..6015033919cab9127785b9e30c30b9e8d086c867 100644
+index 646fb7e4a83e9f9a1b78d8c70f3518b977572fde..43893ea7ff9bda6130b5b74340cdd27bf5f809c5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2034,7 +2034,7 @@ index f5a32aaae5b4eb6dda3da3d5d39f38e000e806c2..6015033919cab9127785b9e30c30b9e8
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 3f196645f2259ed468e0dc3a05ecbd84d3792af0..dfb2decd624c29c7ef88bccf2b5431eb471a25e5 100644
+index 2287987d5bb0e6c4cb6153f04c420fe5ec7c8089..8200844b73dc7181d5867aafa83087e09ff2df76 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1885,4 +1885,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0806-Dont-resent-entity-on-art-update.patch b/patches/server/0804-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0806-Dont-resent-entity-on-art-update.patch
rename to patches/server/0804-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0807-Add-WardenAngerChangeEvent.patch b/patches/server/0805-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0807-Add-WardenAngerChangeEvent.patch
rename to patches/server/0805-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0808-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0806-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0808-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0806-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0809-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0807-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0809-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0807-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0810-Nameable-Banner-API.patch b/patches/server/0808-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0810-Nameable-Banner-API.patch
rename to patches/server/0808-Nameable-Banner-API.patch
diff --git a/patches/server/0811-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0809-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0811-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0809-Don-t-broadcast-messages-to-command-blocks.patch
index 20e1c8170c..5f36d0ac98 100644
--- a/patches/server/0811-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0809-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index c56f5173fda6b38c2dcaea196217f2f5a7d7c641..d4ff8c6b7801e33be4ff69b8bae13c09
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b0ef3a7fbf68fc7687f76350088c129628bb505..90eca456db0545de8a8247f7638d2e990fdfd246 100644
+index de2cd044c5aaf8aca922443374b7a10aafd6f03e..2d12d59974224d1adaf862e5a9bbffe804bd07ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1873,7 +1873,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0812-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0810-Prevent-empty-items-from-being-added-to-world.patch
similarity index 93%
rename from patches/server/0812-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0810-Prevent-empty-items-from-being-added-to-world.patch
index 09d25172d3..e2c89a285c 100644
--- a/patches/server/0812-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0810-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6015033919cab9127785b9e30c30b9e8d086c867..d23c376b2421c8f94e5729d62beff93ce9c3b53c 100644
+index 43893ea7ff9bda6130b5b74340cdd27bf5f809c5..2bfa9d1abf7a777b588314d314d06be3b4d2c6a5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1587,6 +1587,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0813-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0811-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0813-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0811-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0814-Add-Player-getFishHook.patch b/patches/server/0812-Add-Player-getFishHook.patch
similarity index 92%
rename from patches/server/0814-Add-Player-getFishHook.patch
rename to patches/server/0812-Add-Player-getFishHook.patch
index 76aa8357c9..da9e9ebc91 100644
--- a/patches/server/0814-Add-Player-getFishHook.patch
+++ b/patches/server/0812-Add-Player-getFishHook.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a5ca7c33565a3ffbb6ff991f5be2e1d807b4b4bf..7ce6d05b99cce1672ce397b5ce64d266f68a8cae 100644
+index fd8d8b1e3583fe61b966f3550bd8e846b536b4e5..267863ff81a95d686b8db6cfee9256a2c5ad3f68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -161,6 +161,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0815-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0813-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0815-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0813-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0816-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0814-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0816-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0814-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0817-Fix-Bee-flower-NPE.patch b/patches/server/0815-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0817-Fix-Bee-flower-NPE.patch
rename to patches/server/0815-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0816-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0816-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 184ff77599..f61b1c4124 100644
--- a/patches/server/0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0816-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 bfc1404bd1478f2a7c475d55b53a70181506c4f8..b384af27839b7bb6e028baf817fe844c225963f5 100644
+index c63dd80b23df877cb900e608406f747b87e3cae7..be9584daa1da322855524386acf7718d825a7034 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2378,7 +2378,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0819-More-Teleport-API.patch b/patches/server/0817-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0819-More-Teleport-API.patch
rename to patches/server/0817-More-Teleport-API.patch
index 4da0e431a6..bf438f2890 100644
--- a/patches/server/0819-More-Teleport-API.patch
+++ b/patches/server/0817-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b384af27839b7bb6e028baf817fe844c225963f5..95966fdddc81dcc4e65b075a4df6d5dd9af4e65a 100644
+index be9584daa1da322855524386acf7718d825a7034..94ea292ea1754c5b0b0776a2dcce034194fb0290 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1637,11 +1637,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0820-Add-EntityPortalReadyEvent.patch b/patches/server/0818-Add-EntityPortalReadyEvent.patch
similarity index 95%
rename from patches/server/0820-Add-EntityPortalReadyEvent.patch
rename to patches/server/0818-Add-EntityPortalReadyEvent.patch
index 01ff7dc923..3354641f4f 100644
--- a/patches/server/0820-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0818-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9de9a7c204b241e92ab940723a160ede1e2dc97b..f431dc7c31d91ee6bd614a303d11b3abbe8c33ed 100644
+index b0a7c41372609de260298d40490781bb63b0fa1d..fcef36f5314107f416953fbd0f891da7348c2243 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3099,6 +3099,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0821-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0819-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0821-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0819-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0822-Send-block-entities-after-destroy-prediction.patch b/patches/server/0820-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0822-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0820-Send-block-entities-after-destroy-prediction.patch
index a224614880..bdd6c95246 100644
--- a/patches/server/0822-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0820-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index bf9b185e3defb496022c20ec60a84a4f6f99d5be..4e1ed252bf400ec991f95b02984f01a9
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 95966fdddc81dcc4e65b075a4df6d5dd9af4e65a..7b6c3d1feeb390485e5ef5507e6dae3992155212 100644
+index 94ea292ea1754c5b0b0776a2dcce034194fb0290..3f60f33c43dfcc4ea99a80c66a70222b2ea2f4a6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1783,8 +1783,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0823-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0821-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0823-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0821-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0824-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0822-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0824-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0822-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0825-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0823-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0825-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0823-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0826-Collision-API.patch b/patches/server/0824-Collision-API.patch
similarity index 96%
rename from patches/server/0826-Collision-API.patch
rename to patches/server/0824-Collision-API.patch
index 757804a69c..1a0f00b2ea 100644
--- a/patches/server/0826-Collision-API.patch
+++ b/patches/server/0824-Collision-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index d46ab8b75fe99e03874539956ca6389d3cdd0641..ec11732b5c3285429aa370c7bed80c3ec5d64d22 100644
+index 42def68f0c682afe7628ff0b9a537e74d77e558c..884343c4ecdecdecb4117ce61d14e05787195656 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -533,5 +533,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0825-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 92%
rename from patches/server/0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0825-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 391e55a13a..6dd245b2cb 100644
--- a/patches/server/0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0825-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions
 This is a bug accidentally introduced in upstream CB
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index c60f7546f260d18f308bf160fb122a1bc036ff8a..55f3f5396dac2b0bb0cc37b537547e9245042100 100644
+index c2bd7eea15437f3526da37ce1c8642084a26406b..6abef7947cadca6bccac809a8d58d38961132e0f 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -392,7 +392,7 @@ public class Commands {
diff --git a/patches/server/0828-Block-Ticking-API.patch b/patches/server/0826-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0828-Block-Ticking-API.patch
rename to patches/server/0826-Block-Ticking-API.patch
diff --git a/patches/server/0829-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0827-Add-Velocity-IP-Forwarding-Support.patch
similarity index 94%
rename from patches/server/0829-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0827-Add-Velocity-IP-Forwarding-Support.patch
index 3b7f3b1ad8..b2324c5ee6 100644
--- a/patches/server/0829-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0827-Add-Velocity-IP-Forwarding-Support.patch
@@ -123,7 +123,7 @@ index 62c66bb3bcb1cb0a09011aa81bbb39f23623506f..5969f45d479188aceedfbe7931c69c36
                  DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 82554ec47cd10f4bd27149acb9916249ff55ed3a..b8d9ee1920ce1aa2f881c12e5c8c669287ad677f 100644
+index 08a65700909dd64e6e15fac5c6542b02a864782b..9a5ce6fff9fc2bf18e9fb4bf304584fbbf78b621 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -64,6 +64,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -154,17 +154,17 @@ index 82554ec47cd10f4bd27149acb9916249ff55ed3a..b8d9ee1920ce1aa2f881c12e5c8c6692
 @@ -291,6 +302,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
  
      // CraftBukkit start
-     private void callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception {
+     private GameProfile callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { // Paper - Add more fields to AsyncPlayerPreLoginEvent
 +        // Paper start - Velocity support
 +        if (ServerLoginPacketListenerImpl.this.velocityLoginMessageId == -1 && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) {
 +            disconnect("This server requires you to connect with Velocity.");
-+            return;
++            return gameprofile;
 +        }
-+        // Paper end
++        // Paper end - Velocity support
          String playerName = gameprofile.getName();
          java.net.InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
-         java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) this.connection.channel.remoteAddress()).getAddress(); // Paper
-@@ -337,6 +354,49 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+         java.util.UUID uniqueId = gameprofile.getId();
+@@ -336,6 +353,51 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
  
      @Override
      public void handleCustomQueryPacket(ServerboundCustomQueryAnswerPacket packet) {
@@ -202,7 +202,9 @@ index 82554ec47cd10f4bd27149acb9916249ff55ed3a..b8d9ee1920ce1aa2f881c12e5c8c6692
 +            // Proceed with login
 +            authenticatorPool.execute(() -> {
 +                try {
-+                    this.callPlayerPreLoginEvents(this.authenticatedProfile);
++                    final GameProfile gameprofile = this.callPlayerPreLoginEvents(this.authenticatedProfile);
++                    ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId());
++                    ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile);
 +                } catch (Exception ex) {
 +                    disconnect("Failed to verify username!");
 +                    server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + this.authenticatedProfile.getName(), ex);
diff --git a/patches/server/0830-Add-NamespacedKey-biome-methods.patch b/patches/server/0828-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0830-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0828-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch
index ed3aa5f07b..ba6d4a0a8d 100644
--- a/patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0829-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 5b39e4a6b39e73cfe5645d80cd823e582ade6bc2..a2961f1453e3805879941c709ab74a608285db42 100644
+index 002511a54565aab9eb4552fecdf974fe0eab9122..7c9f7aefc59ae1a785b261f80f25d3304f3bdd22 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0832-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0830-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0832-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0830-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0833-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0831-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0833-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0831-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0834-Missing-eating-regain-reason.patch b/patches/server/0832-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0834-Missing-eating-regain-reason.patch
rename to patches/server/0832-Missing-eating-regain-reason.patch
diff --git a/patches/server/0835-Missing-effect-cause.patch b/patches/server/0833-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0835-Missing-effect-cause.patch
rename to patches/server/0833-Missing-effect-cause.patch
diff --git a/patches/server/0836-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0834-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0836-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0834-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0837-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0835-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0837-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0835-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0838-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0836-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0838-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0836-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0839-Configurable-chat-thread-limit.patch b/patches/server/0837-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0839-Configurable-chat-thread-limit.patch
rename to patches/server/0837-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0840-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0838-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0840-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0838-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0841-fix-Jigsaw-block-kicking-user.patch b/patches/server/0839-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0841-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0839-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0842-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0840-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0842-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0840-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0843-Add-getDrops-to-BlockState.patch b/patches/server/0841-Add-getDrops-to-BlockState.patch
similarity index 95%
rename from patches/server/0843-Add-getDrops-to-BlockState.patch
rename to patches/server/0841-Add-getDrops-to-BlockState.patch
index f1c9e20197..93f48ad578 100644
--- a/patches/server/0843-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0841-Add-getDrops-to-BlockState.patch
@@ -7,7 +7,7 @@ Originally added isPreferredTool to BlockData but
 upstream added that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index 31bb92c026a4a2de0e8d3500f6ecf35b60d61fb9..390e1b7fd2721b99cb3ce268c6bc1bf0a38e08a3 100644
+index 08716e757b2e100f7bc47a046f02db664d882aba..d11d854ae90b99aa2ce227994d07fe1fe9b4a60a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 @@ -337,5 +337,33 @@ public class CraftBlockState implements BlockState {
diff --git a/patches/server/0844-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0842-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0844-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0842-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0845-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0843-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 94%
rename from patches/server/0845-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0843-Remove-unnecessary-onTrackingStart-during-navigation.patch
index afe66f403e..d47a821725 100644
--- a/patches/server/0845-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0843-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 742d7146c2a6d364de15b18caacc2ca6a4355f9b..269444c5a4c73ebd21982bbe8f6dd8390cd8c98b 100644
+index 0a4586d1b847de49d9e6faa16dba6de4a6a7cca6..c3ee52f2ad47c6f92b0e8cb284a14a3376fabba7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2641,7 +2641,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0846-Fix-custom-piglin-loved-items.patch b/patches/server/0844-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0846-Fix-custom-piglin-loved-items.patch
rename to patches/server/0844-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0847-EntityPickupItemEvent-fixes.patch b/patches/server/0845-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0847-EntityPickupItemEvent-fixes.patch
rename to patches/server/0845-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0848-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0846-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 97%
rename from patches/server/0848-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0846-Correctly-handle-interactions-with-items-on-cooldown.patch
index 77d1d6adb1..07f3a66780 100644
--- a/patches/server/0848-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0846-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -30,7 +30,7 @@ index 805c9b9b0e89002b97e1e11e1e6e2435315b8f2c..f58386e952d29a16d160b628a23efbe1
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3a6743c81c6740cda1622c60c09088c4cd61f4a3..d51bcd5ccda9e923f0e259c187b9f349df974dfb 100644
+index b2f96da3405875eae5d4398d0dc3580108f561bd..38fc706dabbeb93959638deb22311e226a48a6ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -543,7 +543,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0849-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0847-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0849-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0847-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0850-Elder-Guardian-appearance-API.patch b/patches/server/0848-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0850-Elder-Guardian-appearance-API.patch
rename to patches/server/0848-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0851-Allow-changing-bed-s-occupied-property.patch b/patches/server/0849-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0851-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0849-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0852-Add-entity-knockback-API.patch b/patches/server/0850-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0852-Add-entity-knockback-API.patch
rename to patches/server/0850-Add-entity-knockback-API.patch
diff --git a/patches/server/0853-Detect-headless-JREs.patch b/patches/server/0851-Detect-headless-JREs.patch
similarity index 96%
rename from patches/server/0853-Detect-headless-JREs.patch
rename to patches/server/0851-Detect-headless-JREs.patch
index a686a1859b..6a917dbfee 100644
--- a/patches/server/0853-Detect-headless-JREs.patch
+++ b/patches/server/0851-Detect-headless-JREs.patch
@@ -27,7 +27,7 @@ index 6bd0afddbcc461149dfe9a5c7a86fff6ea13a5f1..148d233f4f5278ff39eacdaa0f4f0e7d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 62f4c2c9485f7700a46f33cf9d158ce3d0552185..4a451d6d5b11f10db9c583823c4d742f4a69970c 100644
+index 9b0bbaf23b90a04b6e6f6c97d9174fe31af557ce..786104fb12f02f493619dfc0d81ab98140d70912 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -175,6 +175,18 @@ public class Main {
diff --git a/patches/server/0854-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0852-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0854-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0852-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0855-optimized-dirt-and-snow-spreading.patch b/patches/server/0853-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0855-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0853-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0856-Added-EntityToggleSitEvent.patch b/patches/server/0854-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0856-Added-EntityToggleSitEvent.patch
rename to patches/server/0854-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0857-Add-fire-tick-delay-option.patch b/patches/server/0855-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0857-Add-fire-tick-delay-option.patch
rename to patches/server/0855-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0858-Add-Moving-Piston-API.patch b/patches/server/0856-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0858-Add-Moving-Piston-API.patch
rename to patches/server/0856-Add-Moving-Piston-API.patch
diff --git a/patches/server/0859-Ignore-impossible-spawn-tick.patch b/patches/server/0857-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0859-Ignore-impossible-spawn-tick.patch
rename to patches/server/0857-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0860-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0858-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0860-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0858-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0861-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0859-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0861-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0859-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0860-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 95%
rename from patches/server/0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0860-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index e99540eca8..26f0e4266a 100644
--- a/patches/server/0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0860-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f431dc7c31d91ee6bd614a303d11b3abbe8c33ed..78201a4bd4f00653d920ab311ed4622d1246ccb2 100644
+index fcef36f5314107f416953fbd0f891da7348c2243..d5322f344b65c4442958eb4e36ddae1f9cfca974 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3378,6 +3378,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0863-Prevent-compass-from-loading-chunks.patch b/patches/server/0861-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0863-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0861-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0864-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0862-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0864-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0862-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0865-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0863-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0865-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0863-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0866-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0864-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0866-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0864-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0867-Add-Player-Warden-Warning-API.patch b/patches/server/0865-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0867-Add-Player-Warden-Warning-API.patch
rename to patches/server/0865-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0868-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0866-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0868-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0866-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0869-Add-paper-dumplisteners-command.patch b/patches/server/0867-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0869-Add-paper-dumplisteners-command.patch
rename to patches/server/0867-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0870-check-global-player-list-where-appropriate.patch b/patches/server/0868-check-global-player-list-where-appropriate.patch
similarity index 97%
rename from patches/server/0870-check-global-player-list-where-appropriate.patch
rename to patches/server/0868-check-global-player-list-where-appropriate.patch
index df08f0564c..e90e425c82 100644
--- a/patches/server/0870-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0868-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 269444c5a4c73ebd21982bbe8f6dd8390cd8c98b..93bd05adb8dcc1dae81b820e262bc1fb43430981 100644
+index c3ee52f2ad47c6f92b0e8cb284a14a3376fabba7..4e8e1f4562b3edb7041e299b6719e965df975636 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2764,4 +2764,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0871-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0869-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 95%
rename from patches/server/0871-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0869-Fix-async-entity-add-due-to-fungus-trees.patch
index 4fc48254a8..8fa372969b 100644
--- a/patches/server/0871-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0869-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index 49c7825156afd053df1b7721a63070b51427aff2..14a5492428eac823a295ef3746d0aca6
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index ec11732b5c3285429aa370c7bed80c3ec5d64d22..45fd28f26aa2e53785919abbfe42bb237131e453 100644
+index 884343c4ecdecdecb4117ce61d14e05787195656..ef56e0346228b2c26e356d4b631fbc49274a8aec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -257,10 +257,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0872-ItemStack-damage-API.patch b/patches/server/0870-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0872-ItemStack-damage-API.patch
rename to patches/server/0870-ItemStack-damage-API.patch
diff --git a/patches/server/0873-Friction-API.patch b/patches/server/0871-Friction-API.patch
similarity index 100%
rename from patches/server/0873-Friction-API.patch
rename to patches/server/0871-Friction-API.patch
diff --git a/patches/server/0874-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0872-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0874-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0872-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0875-Fix-player-kick-on-shutdown.patch b/patches/server/0873-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0875-Fix-player-kick-on-shutdown.patch
rename to patches/server/0873-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0876-Sync-offhand-slot-in-menus.patch b/patches/server/0874-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0876-Sync-offhand-slot-in-menus.patch
rename to patches/server/0874-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0877-Player-Entity-Tracking-Events.patch b/patches/server/0875-Player-Entity-Tracking-Events.patch
similarity index 96%
rename from patches/server/0877-Player-Entity-Tracking-Events.patch
rename to patches/server/0875-Player-Entity-Tracking-Events.patch
index 02c392bcf0..e60534fb29 100644
--- a/patches/server/0877-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0875-Player-Entity-Tracking-Events.patch
@@ -21,7 +21,7 @@ index 982750fd4f3f474514194df9b76388311c052b29..526b52bbf7c5d82645d26710f05e62b7
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 78201a4bd4f00653d920ab311ed4622d1246ccb2..bee8fe397c960c4f2ceba8777d0cc4e6e2bd060d 100644
+index d5322f344b65c4442958eb4e36ddae1f9cfca974..5968a555ce7cc4681f5c096bda7d007005e2a8bf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4107,7 +4107,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0878-Limit-pet-look-distance.patch b/patches/server/0876-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0878-Limit-pet-look-distance.patch
rename to patches/server/0876-Limit-pet-look-distance.patch
diff --git a/patches/server/0879-Properly-resend-entities.patch b/patches/server/0877-Properly-resend-entities.patch
similarity index 99%
rename from patches/server/0879-Properly-resend-entities.patch
rename to patches/server/0877-Properly-resend-entities.patch
index 4d74f87857..d9b427e428 100644
--- a/patches/server/0879-Properly-resend-entities.patch
+++ b/patches/server/0877-Properly-resend-entities.patch
@@ -85,7 +85,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..ccb7d92b6c36b6225a2e640f8cea6c0d
      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 7b6c3d1feeb390485e5ef5507e6dae3992155212..bdd2909b1ce8932509ab37ff1124a97171658d18 100644
+index 3f60f33c43dfcc4ea99a80c66a70222b2ea2f4a6..2fdc9fcc8f88d78fd4b06bfae947c5cb28f8eea7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2658,7 +2658,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0880-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0878-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0880-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0878-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0881-fix-Instruments.patch b/patches/server/0879-fix-Instruments.patch
similarity index 100%
rename from patches/server/0881-fix-Instruments.patch
rename to patches/server/0879-fix-Instruments.patch
diff --git a/patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 97%
rename from patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index e454a32d6d..b956dd543c 100644
--- a/patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve inlining for some hot BlockBehavior and FluidState
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 84d7aeafafe1497d96dca2238b579007cbe27146..3ab8b99837b1d1faea722c598b0228b2780be8b1 100644
+index d91a82428a435a65bc55ad466ccebe91e0d905e0..17d2b90441d7513d7907b988610be8604ac05282 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -1078,15 +1078,15 @@ public abstract class BlockBehaviour implements FeatureElement {
diff --git a/patches/server/0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0884-Add-BlockLockCheckEvent.patch b/patches/server/0882-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0884-Add-BlockLockCheckEvent.patch
rename to patches/server/0882-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0885-Add-Sneaking-API-for-Entities.patch b/patches/server/0883-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0885-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0883-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0886-Improve-logging-and-errors.patch b/patches/server/0884-Improve-logging-and-errors.patch
similarity index 98%
rename from patches/server/0886-Improve-logging-and-errors.patch
rename to patches/server/0884-Improve-logging-and-errors.patch
index 7a98293c52..aaf43d1ac7 100644
--- a/patches/server/0886-Improve-logging-and-errors.patch
+++ b/patches/server/0884-Improve-logging-and-errors.patch
@@ -40,7 +40,7 @@ index 536f0c496ce36ca3248fc6eeac9bbd77214a36f9..5e24c1e712eb16d0d5343760a65310bd
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bdd2909b1ce8932509ab37ff1124a97171658d18..623de7ab6d45f48db7637ecb46e07488c01d4dc6 100644
+index 2fdc9fcc8f88d78fd4b06bfae947c5cb28f8eea7..e602a3b5182e68e7cb20395169bb392d49a23e89 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3395,7 +3395,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0887-Improve-PortalEvents.patch b/patches/server/0885-Improve-PortalEvents.patch
similarity index 93%
rename from patches/server/0887-Improve-PortalEvents.patch
rename to patches/server/0885-Improve-PortalEvents.patch
index 26f33f7a45..333ac5fa11 100644
--- a/patches/server/0887-Improve-PortalEvents.patch
+++ b/patches/server/0885-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bee8fe397c960c4f2ceba8777d0cc4e6e2bd060d..250a0ade29d4cf619d99a1c052e521e94482a213 100644
+index 5968a555ce7cc4681f5c096bda7d007005e2a8bf..04ca1f84c68a73addd2177256268bb9b444f72da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3765,7 +3765,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0888-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0886-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0888-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0886-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 92%
rename from patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch
index 53541ae431..855d972537 100644
--- a/patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0887-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 623de7ab6d45f48db7637ecb46e07488c01d4dc6..23fe6877cadd780f4db99955fd993e1461a21040 100644
+index e602a3b5182e68e7cb20395169bb392d49a23e89..b9d6f38df243bbdd55639716cfaff24eb95aaa74 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2139,7 +2139,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0891-Flying-Fall-Damage.patch b/patches/server/0889-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0891-Flying-Fall-Damage.patch
rename to patches/server/0889-Flying-Fall-Damage.patch
diff --git a/patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0894-config-for-disabling-entity-tag-tags.patch b/patches/server/0892-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0894-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0892-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0895-Use-single-player-info-update-packet-on-join.patch b/patches/server/0893-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0895-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0893-Use-single-player-info-update-packet-on-join.patch
index 890fc64712..4b599b6723 100644
--- a/patches/server/0895-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0893-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 23fe6877cadd780f4db99955fd993e1461a21040..00855a1e3519a43ab5b203cf0313b297baa254a0 100644
+index b9d6f38df243bbdd55639716cfaff24eb95aaa74..ab5b354b0fb42535e8d176a219876e23f08c1f3d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3425,7 +3425,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0896-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0894-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0896-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0894-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0897-Win-Screen-API.patch b/patches/server/0895-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0897-Win-Screen-API.patch
rename to patches/server/0895-Win-Screen-API.patch
diff --git a/patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 93%
rename from patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch
index 2cc8370e15..4dff637cb9 100644
--- a/patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8c06ff72bcc7cce2c853bf999bda8afc10e53ca6..7081aebf67cc3d8deb27dfc508970f0fa5e9d1b6 100644
+index a4d522a19f1a1288baa2688d5beb62c91a5fb3a3..749bf6a897b053197988112551192abe6af2f186 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0899-Fix-force-opening-enchantment-tables.patch b/patches/server/0897-Fix-force-opening-enchantment-tables.patch
similarity index 94%
rename from patches/server/0899-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0897-Fix-force-opening-enchantment-tables.patch
index b258d63751..7137782d6f 100644
--- a/patches/server/0899-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0897-Fix-force-opening-enchantment-tables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 7ce6d05b99cce1672ce397b5ce64d266f68a8cae..4e2e16a7c40f69ff79979a7b580364224c64585f 100644
+index 267863ff81a95d686b8db6cfee9256a2c5ad3f68..5e5fda690605f767b33f8225bffea98d23299fea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0900-Add-Entity-Body-Yaw-API.patch b/patches/server/0898-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0900-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0898-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 90%
rename from patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 17e4b0c331..82ed0eb325 100644
--- a/patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e6c49b780b802fce13451e71be0b36160fabbef7..9f08ab23b9c0c24c4b6131b110dfc7d4a9cdd1b2 100644
+index 28ed2605bc3f4d657f6f58729134aeb81a98dac4..c7eb97008b8096f69602678722506fddbeac3148 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -923,6 +923,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0903-Add-EntityFertilizeEggEvent.patch b/patches/server/0901-Add-EntityFertilizeEggEvent.patch
similarity index 98%
rename from patches/server/0903-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0901-Add-EntityFertilizeEggEvent.patch
index 28c9a823c0..e24d728361 100644
--- a/patches/server/0903-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0901-Add-EntityFertilizeEggEvent.patch
@@ -69,7 +69,7 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a6ccc177a3435d807dd6be3bdfca7f016c094158..9ad9f18b62c8c7d2b4f53bf795817e4fcce3c4cc 100644
+index ef7d6f898c2c94d0697e38230564e110948b0460..dfab64b21eedfbdd129c881b7c862ad962c78f3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2092,4 +2092,29 @@ public class CraftEventFactory {
diff --git a/patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 94%
rename from patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 9e8f8139fb..e8652816d7 100644
--- a/patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 4e2e16a7c40f69ff79979a7b580364224c64585f..e0ab2124b339d0053a1d075204ca1070be572e75 100644
+index 5e5fda690605f767b33f8225bffea98d23299fea..52c9244194f3c0182f3a6010ed97d4238efd4eb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0906-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0904-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0906-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0904-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0907-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0905-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0907-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0905-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0908-Fix-text-display-error-on-spawn.patch b/patches/server/0906-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0908-Fix-text-display-error-on-spawn.patch
rename to patches/server/0906-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0909-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0907-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0909-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0907-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0910-Add-Shearable-API.patch b/patches/server/0908-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0910-Add-Shearable-API.patch
rename to patches/server/0908-Add-Shearable-API.patch
diff --git a/patches/server/0911-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0909-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0911-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0909-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0912-Optimize-Hoppers.patch b/patches/server/0910-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0912-Optimize-Hoppers.patch
rename to patches/server/0910-Optimize-Hoppers.patch
diff --git a/patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0911-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0911-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0915-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0913-Treat-sequence-violations-like-they-should-be.patch
similarity index 91%
rename from patches/server/0915-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0913-Treat-sequence-violations-like-they-should-be.patch
index 9eb3ebf470..f08f796d75 100644
--- a/patches/server/0915-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0913-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 00855a1e3519a43ab5b203cf0313b297baa254a0..6f1602e5e077b9dd401a1ca80aef445b257801fd 100644
+index ab5b354b0fb42535e8d176a219876e23f08c1f3d..e0bdb0ef35494b376960613bd6e319d179676bf3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2043,6 +2043,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0916-remove-duplicate-animate-packet-for-records.patch b/patches/server/0914-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0916-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0914-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 2df3ae6626..66b0be1bb3 100644
--- a/patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..aa1c6de4d6cb7bbca33d25895c54707d
          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 6f1602e5e077b9dd401a1ca80aef445b257801fd..70adc48f7126425b43a667c4d82d511f92909807 100644
+index e0bdb0ef35494b376960613bd6e319d179676bf3..361d31a4a527c32ff3b8cd2e763e23963ec0a2b4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 90%
rename from patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 7907f1339e..c98ffaa074 100644
--- a/patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 93bd05adb8dcc1dae81b820e262bc1fb43430981..abef96d4c0ee22d05fc8b462811189128900fb8d 100644
+index 4e8e1f4562b3edb7041e299b6719e965df975636..a7f2e8755af41abc66070f1971e526b4f05bc710 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1724,6 +1724,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0919-Use-array-for-gamerule-storage.patch b/patches/server/0917-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0919-Use-array-for-gamerule-storage.patch
rename to patches/server/0917-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0920-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0918-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0920-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0918-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 91%
rename from patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch
index 7810e020e8..01bdc03d01 100644
--- a/patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix demo flag not enabling demo mode
 https://github.com/PaperMC/Paper/issues/9046
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 4a451d6d5b11f10db9c583823c4d742f4a69970c..7573c12a77797146c51ef2dfe4b2a636df45e21a 100644
+index 786104fb12f02f493619dfc0d81ab98140d70912..2568272a10c0d92bc49c0c244b10791db7bfae2b 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -333,7 +333,9 @@ public class Main {
diff --git a/patches/server/0922-Add-Mob-Experience-reward-API.patch b/patches/server/0920-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0922-Add-Mob-Experience-reward-API.patch
rename to patches/server/0920-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0923-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0921-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0923-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0921-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 92%
rename from patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch
index cbe24321bd..e1935baf2e 100644
--- a/patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9ad9f18b62c8c7d2b4f53bf795817e4fcce3c4cc..7bd1147362d057a16cdac0893615483479233c66 100644
+index dfab64b21eedfbdd129c881b7c862ad962c78f3d..454365ea4795ac6c0e30530f795cbdb511908440 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1085,6 +1085,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0926-More-accurate-isInOpenWater-impl.patch b/patches/server/0924-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0926-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0924-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0928-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0926-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0928-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0926-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0929-Expand-PlayerItemMendEvent.patch b/patches/server/0927-Expand-PlayerItemMendEvent.patch
similarity index 98%
rename from patches/server/0929-Expand-PlayerItemMendEvent.patch
rename to patches/server/0927-Expand-PlayerItemMendEvent.patch
index b0c81d037f..0ad40b41eb 100644
--- a/patches/server/0929-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0927-Expand-PlayerItemMendEvent.patch
@@ -51,7 +51,7 @@ index b1d12c30dd23e092531c0d4d3af367262ccb5402..809932208bdf8e01d7bc73f885c44497
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7bd1147362d057a16cdac0893615483479233c66..d55e1611028a836a34dd85f08c4463f1ec15662e 100644
+index 454365ea4795ac6c0e30530f795cbdb511908440..a6897c9a46d9cef083d5424c5b4a2ed0a32dfe3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1321,10 +1321,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0928-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0928-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0931-Add-transient-modifier-API.patch b/patches/server/0929-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0931-Add-transient-modifier-API.patch
rename to patches/server/0929-Add-transient-modifier-API.patch
diff --git a/patches/server/0932-Fix-block-place-logic.patch b/patches/server/0930-Fix-block-place-logic.patch
similarity index 97%
rename from patches/server/0932-Fix-block-place-logic.patch
rename to patches/server/0930-Fix-block-place-logic.patch
index 5437387225..0f786528da 100644
--- a/patches/server/0932-Fix-block-place-logic.patch
+++ b/patches/server/0930-Fix-block-place-logic.patch
@@ -41,7 +41,7 @@ index 3f420bbe8c2b9128a051030c4acd3603ea487132..453f48b540560a340721d762ca80eadf
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9f08ab23b9c0c24c4b6131b110dfc7d4a9cdd1b2..3a6615df0e9e0043cebe35268509b882893725fb 100644
+index c7eb97008b8096f69602678722506fddbeac3148..7a4c21beaa4004f72cbfe75e567cafb3279a1c94 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1038,17 +1038,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0934-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0932-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0934-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0932-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 94%
rename from patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 26067bee3d..0fec15f9b7 100644
--- a/patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2836eb1edefc46556d71a23ddbb50cb495b44021..036d1d133dbe39194ba8bc5201bdae1a3bdae56c 100644
+index 0b4639e56b87319e78c1b46fb581d8bb74ead2e4..4310134fe9cb74cb11591d52562bc35039130d19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -352,7 +352,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0936-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0934-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0936-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0934-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0937-Fix-sniffer-removeExploredLocation.patch b/patches/server/0935-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0937-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0935-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0938-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0936-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0938-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0936-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0941-Properly-Cancel-Usable-Items.patch b/patches/server/0939-Properly-Cancel-Usable-Items.patch
similarity index 97%
rename from patches/server/0941-Properly-Cancel-Usable-Items.patch
rename to patches/server/0939-Properly-Cancel-Usable-Items.patch
index 2055eb8ac7..4122f9b89f 100644
--- a/patches/server/0941-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0939-Properly-Cancel-Usable-Items.patch
@@ -34,7 +34,7 @@ index f58386e952d29a16d160b628a23efbe102791277..82f26186156a487f29ad3abff3f68852
          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 70adc48f7126425b43a667c4d82d511f92909807..9fc1ed35896563ba5fd3e19512db6a2bc79fd0ad 100644
+index 361d31a4a527c32ff3b8cd2e763e23963ec0a2b4..ab2fcbdd9567e18a59eb70b3557da7a3f4a91f38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1955,6 +1955,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0942-Add-event-for-player-editing-sign.patch b/patches/server/0940-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0942-Add-event-for-player-editing-sign.patch
rename to patches/server/0940-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0943-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0941-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0943-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0941-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 97%
rename from patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch
index ac6fec8981..7f1a397233 100644
--- a/patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cmd permission levels for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 20b2cbbc73f6420b6ace9746016527b90d9f01b9..37ba8fd69a0099f80bdf7c28b593241f1f5d681f 100644
+index 82ca6267bca684a8f04ca37d40816686677a852a..4e81a823c49807d9978aeaef8293baaa67194c4d 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -204,10 +204,29 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
@@ -41,7 +41,7 @@ index 20b2cbbc73f6420b6ace9746016527b90d9f01b9..37ba8fd69a0099f80bdf7c28b593241f
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 55f3f5396dac2b0bb0cc37b537547e9245042100..8fe48c6bf65db6b11fcd0674aad01d5bb8d17a5f 100644
+index 6abef7947cadca6bccac809a8d58d38961132e0f..55a835bbe69453fe010d03f3b2e80b954dfc208e 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -296,16 +296,7 @@ public class Commands {
diff --git a/patches/server/0945-Add-option-to-disable-block-updates.patch b/patches/server/0943-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0945-Add-option-to-disable-block-updates.patch
rename to patches/server/0943-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0946-Call-missing-BlockDispenseEvent.patch b/patches/server/0944-Call-missing-BlockDispenseEvent.patch
similarity index 98%
rename from patches/server/0946-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0944-Call-missing-BlockDispenseEvent.patch
index fbe0e558b5..8b8394dbe5 100644
--- a/patches/server/0946-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0944-Call-missing-BlockDispenseEvent.patch
@@ -50,7 +50,7 @@ index 415d387f8cfa3ae99b1c809233c86c18b76ad1e2..0286740aabe04e6e78ad6efd003a1e1a
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d55e1611028a836a34dd85f08c4463f1ec15662e..eeed64faf94e55b247ae13eba67336a48834bba6 100644
+index a6897c9a46d9cef083d5424c5b4a2ed0a32dfe3b..5ead89e46d9cf17980baf35cda000bc4c0e7425b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2098,6 +2098,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0947-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0945-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0947-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0945-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0948-Optimize-player-lookups-for-beacons.patch b/patches/server/0946-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0948-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0946-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0949-Add-Sign-getInteractableSideFor.patch b/patches/server/0947-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0949-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0947-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0950-Array-backed-synched-entity-data.patch b/patches/server/0948-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0950-Array-backed-synched-entity-data.patch
rename to patches/server/0948-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0951-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0949-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0951-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0949-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0952-Fix-BanList-API.patch b/patches/server/0950-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0952-Fix-BanList-API.patch
rename to patches/server/0950-Fix-BanList-API.patch
diff --git a/patches/server/0953-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0951-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0953-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0951-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0954-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0952-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0954-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0952-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0955-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0953-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0955-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0953-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0956-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0954-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 93%
rename from patches/server/0956-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0954-ExperienceOrb-should-call-EntitySpawnEvent.patch
index cf76e413fb..dfc52d60b6 100644
--- a/patches/server/0956-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0954-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index eeed64faf94e55b247ae13eba67336a48834bba6..e568862e235e35ba1b34061b0cf0584f33d08451 100644
+index 5ead89e46d9cf17980baf35cda000bc4c0e7425b..2299cff413241aa97e9f498eb0dea51575e364ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -734,7 +734,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0957-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0955-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0957-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0955-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0958-Add-whitelist-events.patch b/patches/server/0956-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0958-Add-whitelist-events.patch
rename to patches/server/0956-Add-whitelist-events.patch
diff --git a/patches/server/0959-Implement-PlayerFailMoveEvent.patch b/patches/server/0957-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0959-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0957-Implement-PlayerFailMoveEvent.patch
index 8c33214290..0d68f9b3b7 100644
--- a/patches/server/0959-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0957-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 9fc1ed35896563ba5fd3e19512db6a2bc79fd0ad..775d88a8f6b42cec2bcbf98378e40487a81eb157 100644
+index ab2fcbdd9567e18a59eb70b3557da7a3f4a91f38..a20e8910f1a4800708e587853ba9aea5cc0ebce2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1316,8 +1316,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0960-Folia-scheduler-and-owned-region-API.patch b/patches/server/0958-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0960-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0958-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0961-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0959-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0961-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0959-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0962-API-for-updating-recipes-on-clients.patch b/patches/server/0960-API-for-updating-recipes-on-clients.patch
similarity index 97%
rename from patches/server/0962-API-for-updating-recipes-on-clients.patch
rename to patches/server/0960-API-for-updating-recipes-on-clients.patch
index 2541a96b77..d677fe2f52 100644
--- a/patches/server/0962-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0960-API-for-updating-recipes-on-clients.patch
@@ -39,7 +39,7 @@ index 69e75aec30e8c25f621c8e7d024abe672395a0ef..683317e8c008fdb501e981490fd62f94
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 81afb0d5349102025a96610098676e21647f85da..7155948d803bdea48602d10ca9f18b64c9fd1991 100644
+index 8d92fe2b91bc1a68df05c0833acd964dbfbcc312..2c044fc1d5c26c68a103932f516e0625b83f4da7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1129,6 +1129,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0963-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0961-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0963-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0961-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0964-Only-capture-actual-tree-growth.patch b/patches/server/0962-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0964-Only-capture-actual-tree-growth.patch
rename to patches/server/0962-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0965-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0963-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0965-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0963-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0966-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0964-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0966-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0964-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0967-Use-correct-seed-on-api-world-load.patch b/patches/server/0965-Use-correct-seed-on-api-world-load.patch
similarity index 90%
rename from patches/server/0967-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0965-Use-correct-seed-on-api-world-load.patch
index 2d4a244153..915841f29f 100644
--- a/patches/server/0967-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0965-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7155948d803bdea48602d10ca9f18b64c9fd1991..4a1e8936b6e20551946fc4e0dda7527a4a8672f9 100644
+index 2c044fc1d5c26c68a103932f516e0625b83f4da7..c986e6c25cb3865fe94e0c37a21701c7c5fa3e8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1347,7 +1347,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0968-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0966-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0968-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0966-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0969-Cache-map-ids-on-item-frames.patch b/patches/server/0967-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0969-Cache-map-ids-on-item-frames.patch
rename to patches/server/0967-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0970-Fix-custom-statistic-criteria-creation.patch b/patches/server/0968-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0970-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0968-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0971-Bandaid-fix-for-Effect.patch b/patches/server/0969-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0971-Bandaid-fix-for-Effect.patch
rename to patches/server/0969-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0972-SculkCatalyst-bloom-API.patch b/patches/server/0970-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0972-SculkCatalyst-bloom-API.patch
rename to patches/server/0970-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0973-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0971-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0973-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0971-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0972-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0972-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0975-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0973-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 96%
rename from patches/server/0975-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0973-Deprecate-and-replace-methods-with-old-StructureType.patch
index fdfc43e958..02d04be28c 100644
--- a/patches/server/0975-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0973-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4a1e8936b6e20551946fc4e0dda7527a4a8672f9..142d2c48239d4ebe3896218536656d116cd24d7c 100644
+index c986e6c25cb3865fe94e0c37a21701c7c5fa3e8d..0b68bd21b0e45d556ec9ae0a51507987dfed559c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1951,6 +1951,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 368d0c5a79..e66d5e6564 100644
--- a/patches/server/0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 775d88a8f6b42cec2bcbf98378e40487a81eb157..4d92df7fce000e1286cc4e17df0db8e686af8b16 100644
+index a20e8910f1a4800708e587853ba9aea5cc0ebce2..fa3c26732778339cd84d53a28c6c938b50594f0f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -807,6 +807,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0977-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0975-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0977-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0975-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0978-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0976-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0978-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0976-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0979-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0977-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0979-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0977-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0980-Add-Listing-API-for-Player.patch b/patches/server/0978-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0980-Add-Listing-API-for-Player.patch
rename to patches/server/0978-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0981-Configurable-Region-Compression-Format.patch b/patches/server/0979-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0981-Configurable-Region-Compression-Format.patch
rename to patches/server/0979-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 96%
rename from patches/server/0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index a7b5bdc7b4..f2d86a7eed 100644
--- a/patches/server/0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
@@ -18,7 +18,7 @@ index 3088cf508427ca03804bfa4c081bb6dfcce07d45..cc1c077c3e91d1f8852fcd6ea939864c
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e568862e235e35ba1b34061b0cf0584f33d08451..e4ceb292248ee737eab3e9a8ea9ac9b72312ce56 100644
+index 2299cff413241aa97e9f498eb0dea51575e364ae..9e204e066550a47b3b670b6b60b7cb4421812d3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -649,13 +649,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0983-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0981-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0983-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0981-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0984-Expand-Pose-API.patch b/patches/server/0982-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0984-Expand-Pose-API.patch
rename to patches/server/0982-Expand-Pose-API.patch
diff --git a/patches/server/0985-More-DragonBattle-API.patch b/patches/server/0983-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0985-More-DragonBattle-API.patch
rename to patches/server/0983-More-DragonBattle-API.patch
diff --git a/patches/server/0986-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0984-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0986-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0984-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0987-Add-PlayerPickItemEvent.patch b/patches/server/0985-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0987-Add-PlayerPickItemEvent.patch
rename to patches/server/0985-Add-PlayerPickItemEvent.patch
index 1eb83a8c9c..15241752ef 100644
--- a/patches/server/0987-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0985-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4d92df7fce000e1286cc4e17df0db8e686af8b16..684895e16db25308cb9a7efe5fdcb8691b8f8fe9 100644
+index fa3c26732778339cd84d53a28c6c938b50594f0f..e04ba1e0949e3fa237ea002c37229f5cb03275cb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -944,7 +944,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0988-Improve-performance-of-mass-crafts.patch b/patches/server/0986-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0988-Improve-performance-of-mass-crafts.patch
rename to patches/server/0986-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0989-Allow-trident-custom-damage.patch b/patches/server/0987-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0989-Allow-trident-custom-damage.patch
rename to patches/server/0987-Allow-trident-custom-damage.patch
diff --git a/patches/server/0990-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0988-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0990-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/0988-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/0991-Optimize-nearest-structure-border-iteration.patch b/patches/server/0989-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0991-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0989-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0992-Implement-OfflinePlayer-isConnected.patch b/patches/server/0990-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/0992-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0990-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0993-Fix-inventory-desync.patch b/patches/server/0991-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0993-Fix-inventory-desync.patch
rename to patches/server/0991-Fix-inventory-desync.patch
diff --git a/patches/server/0994-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0992-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 97%
rename from patches/server/0994-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0992-Add-titleOverride-to-InventoryOpenEvent.patch
index 1afdbdb5fa..0ec6f17594 100644
--- a/patches/server/0994-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0992-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -37,7 +37,7 @@ index 42c42d599d5b4827693cfe3f6cf9a32e67f2e16c..7f370d7f6e576ef719e69734dd81ec95
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index e0ab2124b339d0053a1d075204ca1070be572e75..c3dbcb317b7d366feb31f707ad1199c60169f07f 100644
+index 52c9244194f3c0182f3a6010ed97d4238efd4eb4..b9fa739f03b33da7d20cf6430321da64690ec4f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -357,12 +357,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -79,7 +79,7 @@ index e0ab2124b339d0053a1d075204ca1070be572e75..c3dbcb317b7d366feb31f707ad1199c6
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e4ceb292248ee737eab3e9a8ea9ac9b72312ce56..e15e60b67c17a0ea4fedb4882ea839e1b9b1ae60 100644
+index 9e204e066550a47b3b670b6b60b7cb4421812d3f..93bf055d1b050c58677e8cec39e95b53b879ec1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1440,10 +1440,21 @@ public class CraftEventFactory {
diff --git a/patches/server/0995-Configure-sniffer-egg-hatch-time.patch b/patches/server/0993-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0995-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0993-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0996-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0994-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0996-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0994-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0997-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0995-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0997-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0995-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0998-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0996-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 96%
rename from patches/server/0998-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0996-Add-slot-sanity-checks-in-container-clicks.patch
index d80e316e7d..eb4e322b31 100644
--- a/patches/server/0998-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0996-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 684895e16db25308cb9a7efe5fdcb8691b8f8fe9..8b630fc4da8a7fda08c416e70c22463f04c3b6b5 100644
+index e04ba1e0949e3fa237ea002c37229f5cb03275cb..81e143aa2af57ee40513452ef7f3dd9dad5c91e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2990,6 +2990,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0999-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0997-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0999-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0997-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1000-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0998-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 93%
rename from patches/server/1000-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0998-Allow-proper-checking-of-empty-item-stacks.patch
index 69c0cf452f..11c616703a 100644
--- a/patches/server/1000-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0998-Allow-proper-checking-of-empty-item-stacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 9ce03abd24ae8c2f156ade360094157e20f63666..bec8114b52d4d888a78c238f48902aa460e193f5 100644
+index d1604c52784c1bf94e797ca1f5d8146c19314c11..414a67096478ca57be54bd2ce565e7d50c8dd100 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -33,12 +33,19 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/1001-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0999-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/1001-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0999-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1002-Fix-spigot-s-Forced-Stats.patch b/patches/server/1000-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1002-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1000-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1003-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1001-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1003-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1001-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1002-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1002-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1005-Actually-optimise-explosions.patch b/patches/server/1003-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1005-Actually-optimise-explosions.patch
rename to patches/server/1003-Actually-optimise-explosions.patch
diff --git a/patches/server/1006-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1004-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/1006-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/1004-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1007-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1005-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/1007-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/1005-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1008-Fix-SuspiciousStewMeta.patch b/patches/server/1006-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/1008-Fix-SuspiciousStewMeta.patch
rename to patches/server/1006-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1009-Optimise-chunk-tick-iteration.patch b/patches/server/1007-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1009-Optimise-chunk-tick-iteration.patch
rename to patches/server/1007-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1010-Lag-compensation-ticks.patch b/patches/server/1008-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/1010-Lag-compensation-ticks.patch
rename to patches/server/1008-Lag-compensation-ticks.patch
diff --git a/patches/server/1011-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1009-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/1011-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/1009-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1012-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1010-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/1012-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/1010-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1013-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1011-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1013-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/1011-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1014-Optimise-nearby-player-retrieval.patch b/patches/server/1012-Optimise-nearby-player-retrieval.patch
similarity index 98%
rename from patches/server/1014-Optimise-nearby-player-retrieval.patch
rename to patches/server/1012-Optimise-nearby-player-retrieval.patch
index c96c493cdb..9165214b11 100644
--- a/patches/server/1014-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1012-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b4a77d66e84e335cecf7e3290aa36d17ac600033..ba5b86211b02fc5a90d1e3443afbd1e41fc1dbf1 100644
+index 9a7d5aa722eb1e56da8e9e11b46179c9f9ab716f..672dcf1d82b4a858167be678888d3fb672c1384a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -581,6 +581,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1015-Remove-streams-for-villager-AI.patch b/patches/server/1013-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/1015-Remove-streams-for-villager-AI.patch
rename to patches/server/1013-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1016-Fix-missing-map-initialize-event-call.patch b/patches/server/1014-Fix-missing-map-initialize-event-call.patch
similarity index 95%
rename from patches/server/1016-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1014-Fix-missing-map-initialize-event-call.patch
index d8cfbeba41..6bcc31b494 100644
--- a/patches/server/1016-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1014-Fix-missing-map-initialize-event-call.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ba5b86211b02fc5a90d1e3443afbd1e41fc1dbf1..6ff5898846ef2d985f5ce630db9a31c4ad75ca66 100644
+index 672dcf1d82b4a858167be678888d3fb672c1384a..79b6602570de0e213faef04f9605f206aa5b7840 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2133,13 +2133,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1017-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1015-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1017-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1015-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1018-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1016-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1018-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1016-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1019-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1017-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1019-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1017-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1020-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1018-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1020-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1018-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1021-Add-player-idle-duration-API.patch b/patches/server/1019-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/1021-Add-player-idle-duration-API.patch
rename to patches/server/1019-Add-player-idle-duration-API.patch
diff --git a/patches/server/1022-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1020-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 90%
rename from patches/server/1022-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1020-Don-t-check-if-we-can-see-non-visible-entities.patch
index 8f415a41b2..18496660d9 100644
--- a/patches/server/1022-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1020-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check if we can see non-visible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d08b4ff04362a5a9add88d060beb48e4119b594d..ecb09c74153349e78bb81d1188c282e4be4000bf 100644
+index 71606bca60410c8ab6fd6427dc11e35614928702..bde56e7bf595a8ecfe77c04eb3fcaf1ce4d92670 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1435,7 +1435,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/1023-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1021-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1023-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1021-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1022-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1022-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/1025-Optimize-VarInts.patch b/patches/server/1023-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1025-Optimize-VarInts.patch
rename to patches/server/1023-Optimize-VarInts.patch
diff --git a/patches/server/1026-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1024-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/1026-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1024-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1027-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1025-Add-predicate-for-blocks-when-raytracing.patch
similarity index 98%
rename from patches/server/1027-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1025-Add-predicate-for-blocks-when-raytracing.patch
index 5f2f9da6bd..a2bf2131a9 100644
--- a/patches/server/1027-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/1025-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,7 +47,7 @@ index 799837c172a5f7856c78e6fe2595c575f3058a5e..0abbe9be08cf7450f5d2d17deed59005
              Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4f89f38e1d2d9cdb34af8d1d217577e9a437eea5..56ff02ebe9da504f2aa955430ac13b3dba4211f7 100644
+index 6bd86a7183042f9023b9e8cf6423e0a1cbfde97a..ed2a02514b7a6b67d45890fedb9bb9f4b10846d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1125,9 +1125,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1028-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1026-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 92%
rename from patches/server/1028-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1026-Broadcast-take-item-packets-with-collector-as-source.patch
index 82e9854d8b..1d1ab9746c 100644
--- a/patches/server/1028-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/1026-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 12d4ab6aa349e3f465cc88a2717243ff5064df02..7471e5ba8fc0e2d17cdd3d8b580fe7375d58cc73 100644
+index c5a07b414da0209035f3f186f72a8913243187be..d90d86f6b6e656bc6680afa07c7a9e99e6325851 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3703,7 +3703,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1029-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1027-fix-secure-profile-with-proxy-online-mode.patch
similarity index 92%
rename from patches/server/1029-fix-secure-profile-with-proxy-online-mode.patch
rename to patches/server/1027-fix-secure-profile-with-proxy-online-mode.patch
index c4faa8a8ee..f0b910f6e1 100644
--- a/patches/server/1029-fix-secure-profile-with-proxy-online-mode.patch
+++ b/patches/server/1027-fix-secure-profile-with-proxy-online-mode.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix secure profile with proxy online mode
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index db363bca264e37c29fda58291246aba0d3759de0..ae5686515707a510e4bae6e78b196adba2a182ef 100644
+index 5969f45d479188aceedfbe7931c69c36de78a705..c1402d4dfbddc14ca748efa24e7d62d81abf4e58 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -638,7 +638,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/1030-Expand-LingeringPotion-API.patch b/patches/server/1028-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/1030-Expand-LingeringPotion-API.patch
rename to patches/server/1028-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1031-Add-MaterialTagsTest.patch b/patches/server/1029-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1031-Add-MaterialTagsTest.patch
rename to patches/server/1029-Add-MaterialTagsTest.patch
diff --git a/patches/server/1032-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1030-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/1032-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1030-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1033-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1031-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1033-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1031-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1034-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1032-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/1034-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1032-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/1035-Add-UUID-attribute-modifier-API.patch b/patches/server/1033-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1035-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1033-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1036-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1034-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/1036-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1034-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1037-Lazily-create-LootContext-for-criterions.patch b/patches/server/1035-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1037-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1035-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1038-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/1036-Don-t-fire-sync-events-during-worldgen.patch
similarity index 100%
rename from patches/server/1038-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/1036-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1037-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1037-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1040-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1038-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/1040-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1038-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/1041-Add-Structure-check-API.patch b/patches/server/1039-Add-Structure-check-API.patch
similarity index 91%
rename from patches/server/1041-Add-Structure-check-API.patch
rename to patches/server/1039-Add-Structure-check-API.patch
index 1fa24104a9..8785db4ed1 100644
--- a/patches/server/1041-Add-Structure-check-API.patch
+++ b/patches/server/1039-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fd37494da843e70cbb5e707714ff77724d7ff0bb..38d842bc0fb7d9c39a3673983a643248e9563fe2 100644
+index e7d503366c58e567c392b040e46a14457d86ad8d..f785e7b366175a32c834e1ebb56166a6fdcca3da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -230,6 +230,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1042-Dont-resend-blocks-on-interactions.patch b/patches/server/1040-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/1042-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1040-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/1043-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1041-Keep-previous-behavior-for-setResourcePack.patch
similarity index 100%
rename from patches/server/1043-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1041-Keep-previous-behavior-for-setResourcePack.patch
diff --git a/patches/server/1044-properly-read-and-store-sus-effect-duration.patch b/patches/server/1042-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/1044-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/1042-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/1045-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1043-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/1045-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/1043-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/1046-add-more-scoreboard-API.patch b/patches/server/1044-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/1046-add-more-scoreboard-API.patch
rename to patches/server/1044-add-more-scoreboard-API.patch
diff --git a/patches/server/1047-Improve-Registry.patch b/patches/server/1045-Improve-Registry.patch
similarity index 100%
rename from patches/server/1047-Improve-Registry.patch
rename to patches/server/1045-Improve-Registry.patch
diff --git a/patches/server/1048-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/1046-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/1048-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/1046-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/1049-Add-experience-points-API.patch b/patches/server/1047-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/1049-Add-experience-points-API.patch
rename to patches/server/1047-Add-experience-points-API.patch
diff --git a/patches/server/1050-Add-missing-InventoryType.patch b/patches/server/1048-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/1050-Add-missing-InventoryType.patch
rename to patches/server/1048-Add-missing-InventoryType.patch
diff --git a/patches/server/1051-Add-drops-to-shear-events.patch b/patches/server/1049-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/1051-Add-drops-to-shear-events.patch
rename to patches/server/1049-Add-drops-to-shear-events.patch
diff --git a/patches/server/1052-Add-PlayerShieldDisableEvent.patch b/patches/server/1050-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/1052-Add-PlayerShieldDisableEvent.patch
rename to patches/server/1050-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/1053-Add-HiddenPotionEffect-API.patch b/patches/server/1051-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1053-Add-HiddenPotionEffect-API.patch
rename to patches/server/1051-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1054-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1052-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/1054-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/1052-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/1055-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1053-fix-ItemMeta-removing-CustomModelData.patch
similarity index 100%
rename from patches/server/1055-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/1053-fix-ItemMeta-removing-CustomModelData.patch
diff --git a/patches/server/1056-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1054-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/1056-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/1054-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/1057-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1055-Properly-handle-experience-dropping-on-block-break.patch
similarity index 100%
rename from patches/server/1057-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/1055-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/1058-Fixup-NamespacedKey-handling.patch b/patches/server/1056-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/1058-Fixup-NamespacedKey-handling.patch
rename to patches/server/1056-Fixup-NamespacedKey-handling.patch