From e46276eb71a518e3137ca9b4b5d664ddcf8785a2 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 6 Jan 2024 15:07:59 +0100
Subject: [PATCH] Fixup NamespacedKey parsing

---
 ...empty-String-in-NamespacedKey.fromSt.patch |  40 ++++++
 ... 0686-Distance-manager-tick-timings.patch} |   0
 ...Fix-Bukkit-NamespacedKey-shenanigans.patch |  45 -------
 ...ntory-not-closing-on-entity-removal.patch} |   0
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   2 +-
 ...h => 0690-Add-packet-limiter-config.patch} |   0
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0692-Ensure-valid-vehicle-status.patch} |   2 +-
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0697-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   2 +-
 ...unintended-light-block-manipulation.patch} |   0
 ...0700-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ... => 0702-Configurable-feature-seeds.patch} |   2 +-
 ... 0703-Add-root-admin-user-detection.patch} |   0
 ...ays-allow-item-changing-in-Fireball.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   2 +-
 ...ive-velocity-through-repeated-crits.patch} |   0
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...emoving-recipes-from-RecipeIterator.patch} |   0
 ...versized-item-data-in-equipment-and.patch} |   0
 ...e-unnecessary-itemmeta-from-clients.patch} |   0
 ...=> 0711-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0713-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...tch => 0714-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   2 +-
 ...tch => 0716-Collision-optimisations.patch} |   6 +-
 ...n-checking-in-player-move-packet-ha.patch} |   2 +-
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   0
 ...patch => 0719-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   2 +-
 ...21-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   2 +-
 ... => 0723-Improve-scoreboard-entries.patch} |   0
 ...ch => 0724-Entity-powdered-snow-API.patch} |   0
 ...0725-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...plifiers-greater-than-127-correctly.patch} |   2 +-
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...=> 0731-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0732-Bucketable-API.patch} |   0
 ...es.patch => 0733-Validate-usernames.patch} |   4 +-
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   4 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...heck-for-PersistentDataContainer-ha.patch} |   0
 ...8-Multiple-Entries-with-Scoreboards.patch} |   0
 ...739-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |   2 +-
 ...0742-Fix-xp-reward-for-baby-zombies.patch} |   0
 ...lti-Block-Change-API-Implementation.patch} |   2 +-
 ...ent.patch => 0744-Fix-NotePlayEvent.patch} |   0
 ....patch => 0745-Freeze-Tick-Lock-API.patch} |   2 +-
 ...lphin-API.patch => 0746-Dolphin-API.patch} |   0
 ...h => 0747-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   2 +-
 ...-missing-structure-set-seed-configs.patch} |   2 +-
 ...h => 0751-Implement-regenerateChunk.patch} |   2 +-
 ...lled-powdered-snow-bucket-placement.patch} |   2 +-
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   2 +-
 ...gs.patch => 0754-Add-GameEvent-tags.patch} |   2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0756-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   0
 ...-worldlist-before-initing-the-world.patch} |   2 +-
 ... => 0761-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0762-Custom-Potion-Mixes.patch} |   2 +-
 ...63-Force-close-world-loading-screen.patch} |   2 +-
 ...764-Fix-falling-block-spawn-methods.patch} |   4 +-
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0767-More-Projectile-API.patch} |   2 +-
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   2 +-
 ...0770-Implement-getComputedBiome-API.patch} |   0
 ...> 0771-Make-some-itemstacks-nonnull.patch} |   0
 ...772-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0773-Fix-saving-in-unloadWorld.patch} |   2 +-
 ...h => 0774-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0775-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   4 +-
 ...bles-running-when-mob-loot-gamerule.patch} |   2 +-
 ...ssenger-world-matches-ridden-entity.patch} |   2 +-
 ...rd-against-invalid-entity-positions.patch} |   2 +-
 ...s.patch => 0780-cache-resource-keys.patch} |   0
 ...ange-the-podium-for-the-EnderDragon.patch} |   2 +-
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   0
 ...ead-of-display-name-in-PlayerList-g.patch} |   2 +-
 ...-ServerLevel-for-gamerule-callbacks.patch} |   0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   2 +-
 ...> 0788-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
 ...> 0794-Add-PlayerStopUsingItemEvent.patch} |   0
 ...rs.patch => 0795-Don-t-tick-markers.patch} |   2 +-
 ...tch => 0796-Expand-FallingBlock-API.patch} |   0
 ...-not-accept-invalid-client-settings.patch} |   0
 ...0798-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0801-Sanitize-Sent-BlockEntity-NBT.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   2 +-
 ...-on-world-create-while-being-ticked.patch} |   2 +-
 ...ate-Current-redstone-implementation.patch} |   2 +-
 ...06-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0807-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   2 +-
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0810-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   2 +-
 ...pty-items-from-being-added-to-world.patch} |   0
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...atch => 0814-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   2 +-
 ...PE.patch => 0817-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   0
 ...API.patch => 0819-More-Teleport-API.patch} |   0
 ... => 0820-Add-EntityPortalReadyEvent.patch} |   2 +-
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   2 +-
 ...on-plugins-accessing-faraway-chunks.patch} |   2 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |   2 +-
 ...Add-and-fix-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0826-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...API.patch => 0828-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   4 +-
 ...830-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...ok-changes-from-crashing-the-server.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0834-Missing-eating-regain-reason.patch} |   0
 ....patch => 0835-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...8-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0839-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ... 0841-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ... => 0843-Add-getDrops-to-BlockState.patch} |   0
 ...=> 0844-Fix-a-bunch-of-vanilla-bugs.patch} |   0
 ...y-onTrackingStart-during-navigation.patch} |   0
 ... 0846-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0847-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   2 +-
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   2 +-
 ... 0850-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0852-Add-entity-knockback-API.patch} |   0
 ....patch => 0853-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...5-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0856-Added-EntityToggleSitEvent.patch} |   0
 ... => 0857-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0858-Add-Moving-Piston-API.patch} |   0
 ...> 0859-Ignore-impossible-spawn-tick.patch} |   2 +-
 ...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
 ...0864-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0867-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...869-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   0
 ...sync-entity-add-due-to-fungus-trees.patch} |   0
 ....patch => 0872-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0873-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0875-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0876-Sync-offhand-slot-in-menus.patch} |   2 +-
 ... 0877-Player-Entity-Tracking-Events.patch} |   2 +-
 ...tch => 0878-Limit-pet-look-distance.patch} |   0
 ...ch => 0879-Properly-resend-entities.patch} |   2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0881-fix-Instruments.patch} |   2 +-
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ...tch => 0884-Add-BlockLockCheckEvent.patch} |   0
 ... 0885-Add-Sneaking-API-for-Entities.patch} |   0
 ... => 0886-Improve-logging-and-errors.patch} |   2 +-
 ....patch => 0887-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 => 0891-Flying-Fall-Damage.patch} |   0
 ...k-state-to-BlockExplodeEvent-and-En.patch} |   2 +-
 ...ion-moving-velocity-to-VehicleBlock.patch} |   2 +-
 ...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 => 0897-Win-Screen-API.patch} |   2 +-
 ...ItemStack-setAmount-null-assignment.patch} |   0
 ...ix-force-opening-enchantment-tables.patch} |   0
 ...tch => 0900-Add-Entity-Body-Yaw-API.patch} |   0
 ...vent-sleeping-villagers-moving-towa.patch} |   0
 ...hen-a-captured-block-state-is-outda.patch} |   2 +-
 ...=> 0903-Add-EntityFertilizeEggEvent.patch} |   2 +-
 ...ty-drop-not-updating-the-client-inv.patch} |   0
 ...temEvent-and-EntityCompostItemEvent.patch} |   0
 ...ctly-handle-ArmorStand-invisibility.patch} |   0
 ...ancement-triggers-for-entity-damage.patch} |   0
 ...908-Fix-text-display-error-on-spawn.patch} |   0
 ...nventories-returning-null-Locations.patch} |   0
 ...API.patch => 0910-Add-Shearable-API.patch} |   0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |   0
 ...pers.patch => 0912-Optimize-Hoppers.patch} |   2 +-
 ...ives-generating-from-using-bonemeal.patch} |   2 +-
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |   0
 ...ence-violations-like-they-should-be.patch} |   2 +-
 ...uplicate-animate-packet-for-records.patch} |   0
 ...xpired-keys-from-impacting-new-join.patch} |   2 +-
 ...ts-being-fired-from-unloaded-chunks.patch} |   0
 ...0919-Use-array-for-gamerule-storage.patch} |   0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |   0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |   0
 ... 0922-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
 ...26-More-accurate-isInOpenWater-impl.patch} |   0
 ...ccess-to-lookups-field-in-RegistryO.patch} |   0
 ...ecalcBlockCounts-for-empty-sections.patch} |   0
 ... => 0929-Expand-PlayerItemMendEvent.patch} |   2 +-
 ...sh-ProjectileSource-for-projectiles.patch} |   2 +-
 ... => 0931-Add-transient-modifier-API.patch} |   0
 ...patch => 0932-Fix-block-place-logic.patch} |   4 +-
 ...nd-playing-for-BlockItem-ItemStacks.patch} |   2 +-
 ...l-BlockGrowEvent-for-missing-blocks.patch} |   0
 ...nhasbukkit-default-if-alias-block-e.patch} |   2 +-
 ...definitions-of-trim-material-pattern.patch |  19 ---
 ...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
 ...> 0941-Properly-Cancel-Usable-Items.patch} |   2 +-
 ...2-Add-event-for-player-editing-sign.patch} |   2 +-
 ...k-item-frames-if-players-can-see-it.patch} |   0
 ...ermission-levels-for-command-blocks.patch} |   0
 ...Add-option-to-disable-block-updates.patch} |   0
 ...946-Call-missing-BlockDispenseEvent.patch} |   0
 ...-chunks-for-supporting-block-checks.patch} |   2 +-
 ...Optimize-player-lookups-for-beacons.patch} |   0
 ...949-Add-Sign-getInteractableSideFor.patch} |   0
 ...50-Array-backed-synched-entity-data.patch} |   0
 ...1-fix-item-meta-for-tadpole-buckets.patch} |   0
 ...t-API.patch => 0952-Fix-BanList-API.patch} |   0
 ...d-water-fluid-explosion-resistance-.patch} |   0
 ...x-possible-NPE-on-painting-creation.patch} |   2 +-
 ...Suppress-Item-Meta-Validation-Checks.patch |  86 ------------
 ...imer-for-Wandering-Traders-spawned-.patch} |   0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |   2 +-
 ...t-throw-both-Spread-and-Grow-Events.patch} |   0
 ....patch => 0958-Add-whitelist-events.patch} |   0
 ... 0959-Implement-PlayerFailMoveEvent.patch} |   2 +-
 ...olia-scheduler-and-owned-region-API.patch} |   2 +-
 ...se-allay-memory-on-non-item-targets.patch} |   0
 ...API-for-updating-recipes-on-clients.patch} |   2 +-
 ...tion-when-spawning-display-entities.patch} |   2 +-
 ...964-Only-capture-actual-tree-growth.patch} |   4 +-
 ...rce-for-mushroom-block-spread-event.patch} |   0
 ...Data-on-more-entities-when-spawning.patch} |   0
 ...-Use-correct-seed-on-api-world-load.patch} |   2 +-
 ...ta-neighbour-ticks-outside-of-range.patch} |   0
 ...> 0969-Cache-map-ids-on-item-frames.patch} |   0
 ...-custom-statistic-criteria-creation.patch} |   0
 ...atch => 0971-Bandaid-fix-for-Effect.patch} |   4 +-
 ...tch => 0972-SculkCatalyst-bloom-API.patch} |   0
 ...API-for-an-entity-s-scoreboard-name.patch} |   0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |   4 +-
 ...lace-methods-with-old-StructureType.patch} |   2 +-
 ...e-namespaced-commands-if-send-names.patch} |   2 +-
 ...-handle-BlockBreakEvent-isDropItems.patch} |   0
 ...entity-death-event-for-ender-dragon.patch} |   2 +-
 ...tity-tracking-range-by-Y-coordinate.patch} |   2 +-
 ... => 0980-Add-Listing-API-for-Player.patch} |   0
 ...figurable-Region-Compression-Format.patch} |   0
 ...d-BlockFace-during-BlockDamageEvent.patch} |   4 +-
 ...h => 0983-Fix-NPE-on-Boat-getStatus.patch} |   0
 ...e-API.patch => 0984-Expand-Pose-API.patch} |   2 +-
 ...patch => 0985-More-DragonBattle-API.patch} |   0
 ... 0986-Deep-clone-unhandled-nbt-tags.patch} |   4 +-
 ...tch => 0987-Add-PlayerPickItemEvent.patch} |   2 +-
 ...-Improve-performance-of-mass-crafts.patch} |   0
 ...=> 0989-Allow-trident-custom-damage.patch} |   0
 ...pose-hand-during-BlockCanBuildEvent.patch} |   0
 ...-nearest-structure-border-iteration.patch} |   2 +-
 ...Implement-OfflinePlayer-isConnected.patch} |   2 +-
 ....patch => 0993-Fix-inventory-desync.patch} |   0
 ...titleOverride-to-InventoryOpenEvent.patch} |   4 +-
 ...95-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} |   0
 ...ix-silent-equipment-change-for-mobs.patch} |   2 +-
 ...h => 1002-Fix-spigot-s-Forced-Stats.patch} |   0
 ...ing-InventoryHolders-to-inventories.patch} |   0
 ...entities-in-chunks-that-are-positio.patch} |   2 +-
 ...> 1005-Actually-optimise-explosions.patch} |   0
 ...sing-logs-for-log-ips-config-option.patch} |   0
 ...Remove-Spigot-Bug-Fix-for-MC-109346.patch} |   0
 ...atch => 1008-Fix-SuspiciousStewMeta.patch} |   0
 ... 1009-Optimise-chunk-tick-iteration.patch} |   4 +-
 ...atch => 1010-Lag-compensation-ticks.patch} |   2 +-
 ...n-on-UpgradeData.BlockFixers-class-.patch} |   0
 ...-AdvancementProgress-getDateAwarded.patch} |   0
 ...idebar-objectives-not-being-cleared.patch} |   0
 ...14-Optimise-nearby-player-retrieval.patch} |   0
 ...1015-Remove-streams-for-villager-AI.patch} |   0
 ...x-missing-map-initialize-event-call.patch} |   0
 ...a-when-attaching-firework-to-entity.patch} |   0
 ...ble-for-initializing-CraftLootTable.patch} |   0
 ...method-of-Fireballs-change-the-trav.patch} |   0
 ...20-Fix-UnsafeValues-loadAdvancement.patch} |   0
 ...> 1021-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} |   2 +-
 ...Ints.patch => 1025-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} |   0
 ...cure-profile-with-proxy-online-mode.patch} |   0
 ... => 1030-Expand-LingeringPotion-API.patch} |   0
 ....patch => 1031-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
 ...035-Add-UUID-attribute-modifier-API.patch} |   0
 ...-event-call-for-entity-teleport-API.patch} |   2 +-
 ...y-create-LootContext-for-criterions.patch} |   0
 ...-t-fire-sync-events-during-worldgen.patch} |   0
 ...-getAttributeModifier-duplication-c.patch} |   4 +-
 ...store-vanilla-entity-drops-behavior.patch} |   2 +-
 ...tch => 1041-Add-Structure-check-API.patch} |   2 +-
 ...-Dont-resend-blocks-on-interactions.patch} |   4 +-
 ...evious-behavior-for-setResourcePack.patch} |   0
 ...-read-and-store-sus-effect-duration.patch} |   0
 ...e-correct-max-stack-size-in-crafter.patch} |   0
 ...atch => 1046-Fix-scoreboard-entries.patch} |   0
 ...tch => 1047-add-more-scoreboard-API.patch} |   0
 ...stry.patch => 1048-Improve-Registry.patch} |   0
 ...on-null-loc-for-EntityTeleportEvent.patch} |   0
 ...h => 1050-Add-experience-points-API.patch} |   0
 ...h => 1051-Add-missing-InventoryType.patch} |   0
 ...h => 1052-Add-drops-to-shear-events.patch} |   4 +-
 ...> 1053-Add-PlayerShieldDisableEvent.patch} |   0
 ... => 1054-Add-HiddenPotionEffect-API.patch} |   0
 ...f-bucket-dispenses-will-succeed-for.patch} |   2 +-
 ...x-ItemMeta-removing-CustomModelData.patch} |   2 +-
 ...ate-ResourceLocation-in-NBT-reading.patch} |   0
 ...-experience-dropping-on-block-break.patch} |   4 +-
 ...1059-Fixup-ResourceLocation-handling.patch | 124 ++++++++++++++++++
 378 files changed, 300 insertions(+), 286 deletions(-)
 create mode 100644 patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
 rename patches/server/{0687-Distance-manager-tick-timings.patch => 0686-Distance-manager-tick-timings.patch} (100%)
 delete mode 100644 patches/server/0686-Fix-Bukkit-NamespacedKey-shenanigans.patch
 rename patches/server/{0688-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0689-Check-requirement-before-suggesting-root-nodes.patch => 0688-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0690-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (92%)
 rename patches/server/{0691-Add-packet-limiter-config.patch => 0690-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0693-Ensure-valid-vehicle-status.patch => 0692-Ensure-valid-vehicle-status.patch} (90%)
 rename patches/server/{0694-Prevent-softlocked-end-exit-portal-generation.patch => 0693-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0696-Don-t-log-debug-logging-being-disabled.patch => 0695-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0697-fix-various-menus-with-empty-level-accesses.patch => 0696-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0698-Preserve-overstacked-loot.patch => 0697-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0699-Update-head-rotation-in-missing-places.patch => 0698-Update-head-rotation-in-missing-places.patch} (93%)
 rename patches/server/{0700-prevent-unintended-light-block-manipulation.patch => 0699-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0701-Fix-CraftCriteria-defaults-map.patch => 0700-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0702-Fix-upstreams-block-state-factories.patch => 0701-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0703-Configurable-feature-seeds.patch => 0702-Configurable-feature-seeds.patch} (96%)
 rename patches/server/{0704-Add-root-admin-user-detection.patch => 0703-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0705-Always-allow-item-changing-in-Fireball.patch => 0704-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0706-don-t-attempt-to-teleport-dead-entities.patch => 0705-don-t-attempt-to-teleport-dead-entities.patch} (91%)
 rename patches/server/{0707-Prevent-excessive-velocity-through-repeated-crits.patch => 0706-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0708-Remove-client-side-code-using-deprecated-for-removal.patch => 0707-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0709-Fix-removing-recipes-from-RecipeIterator.patch => 0708-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0710-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0709-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0711-Hide-unnecessary-itemmeta-from-clients.patch => 0710-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0712-Fix-Spigot-growth-modifiers.patch => 0711-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0713-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0714-Add-PlayerItemFrameChangeEvent.patch => 0713-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0715-Optimize-HashMapPalette.patch => 0714-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0716-Allow-delegation-to-vanilla-chunk-gen.patch => 0715-Allow-delegation-to-vanilla-chunk-gen.patch} (98%)
 rename patches/server/{0717-Collision-optimisations.patch => 0716-Collision-optimisations.patch} (99%)
 rename patches/server/{0718-Optimise-collision-checking-in-player-move-packet-ha.patch => 0717-Optimise-collision-checking-in-player-move-packet-ha.patch} (99%)
 rename patches/server/{0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0720-Add-more-Campfire-API.patch => 0719-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (97%)
 rename patches/server/{0722-Fix-tripwire-state-inconsistency.patch => 0721-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0723-Forward-CraftEntity-in-teleport-command.patch => 0722-Forward-CraftEntity-in-teleport-command.patch} (94%)
 rename patches/server/{0724-Improve-scoreboard-entries.patch => 0723-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0725-Entity-powdered-snow-API.patch => 0724-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0726-Add-API-for-item-entity-health.patch => 0725-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0727-Fix-entity-type-tags-suggestions-in-selectors.patch => 0726-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0728-Configurable-max-block-light-for-monster-spawning.patch => 0727-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0729-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0728-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0730-Load-effect-amplifiers-greater-than-127-correctly.patch => 0729-Load-effect-amplifiers-greater-than-127-correctly.patch} (91%)
 rename patches/server/{0731-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0730-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0732-Fix-bees-aging-inside-hives.patch => 0731-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0733-Bucketable-API.patch => 0732-Bucketable-API.patch} (100%)
 rename patches/server/{0734-Validate-usernames.patch => 0733-Validate-usernames.patch} (95%)
 rename patches/server/{0735-Make-water-animal-spawn-height-configurable.patch => 0734-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (97%)
 rename patches/server/{0737-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0736-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0738-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch => 0737-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch} (100%)
 rename patches/server/{0739-Multiple-Entries-with-Scoreboards.patch => 0738-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0740-Reset-placed-block-on-exception.patch => 0739-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0741-Add-configurable-height-for-slime-spawn.patch => 0740-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (93%)
 rename patches/server/{0743-Fix-xp-reward-for-baby-zombies.patch => 0742-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0744-Multi-Block-Change-API-Implementation.patch => 0743-Multi-Block-Change-API-Implementation.patch} (97%)
 rename patches/server/{0745-Fix-NotePlayEvent.patch => 0744-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0746-Freeze-Tick-Lock-API.patch => 0745-Freeze-Tick-Lock-API.patch} (97%)
 rename patches/server/{0747-Dolphin-API.patch => 0746-Dolphin-API.patch} (100%)
 rename patches/server/{0748-More-PotionEffectType-API.patch => 0747-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0749-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0750-API-for-creating-command-sender-which-forwards-feedb.patch => 0749-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0751-Add-missing-structure-set-seed-configs.patch => 0750-Add-missing-structure-set-seed-configs.patch} (99%)
 rename patches/server/{0752-Implement-regenerateChunk.patch => 0751-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0753-Fix-cancelled-powdered-snow-bucket-placement.patch => 0752-Fix-cancelled-powdered-snow-bucket-placement.patch} (95%)
 rename patches/server/{0754-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (92%)
 rename patches/server/{0755-Add-GameEvent-tags.patch => 0754-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0756-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0757-Furnace-RecipesUsed-API.patch => 0756-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0758-Configurable-sculk-sensor-listener-range.patch => 0757-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0759-Add-missing-block-data-mins-and-maxes.patch => 0758-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0760-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0761-Put-world-into-worldlist-before-initing-the-world.patch => 0760-Put-world-into-worldlist-before-initing-the-world.patch} (95%)
 rename patches/server/{0762-Fix-Entity-Position-Desync.patch => 0761-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0763-Custom-Potion-Mixes.patch => 0762-Custom-Potion-Mixes.patch} (99%)
 rename patches/server/{0764-Force-close-world-loading-screen.patch => 0763-Force-close-world-loading-screen.patch} (95%)
 rename patches/server/{0765-Fix-falling-block-spawn-methods.patch => 0764-Fix-falling-block-spawn-methods.patch} (95%)
 rename patches/server/{0766-Expose-furnace-minecart-push-values.patch => 0765-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0767-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0766-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0768-More-Projectile-API.patch => 0767-More-Projectile-API.patch} (99%)
 rename patches/server/{0769-Fix-swamp-hut-cat-generation-deadlock.patch => 0768-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0770-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0771-Implement-getComputedBiome-API.patch => 0770-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0772-Make-some-itemstacks-nonnull.patch => 0771-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0773-Implement-enchantWithLevels-API.patch => 0772-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0774-Fix-saving-in-unloadWorld.patch => 0773-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0775-Buffer-OOB-setBlock-calls.patch => 0774-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0776-Add-TameableDeathMessageEvent.patch => 0775-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0777-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (98%)
 rename patches/server/{0778-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0777-fix-player-loottables-running-when-mob-loot-gamerule.patch} (92%)
 rename patches/server/{0779-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0778-Ensure-entity-passenger-world-matches-ridden-entity.patch} (90%)
 rename patches/server/{0780-Guard-against-invalid-entity-positions.patch => 0779-Guard-against-invalid-entity-positions.patch} (95%)
 rename patches/server/{0781-cache-resource-keys.patch => 0780-cache-resource-keys.patch} (100%)
 rename patches/server/{0782-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0781-Allow-to-change-the-podium-for-the-EnderDragon.patch} (99%)
 rename patches/server/{0783-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0782-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0784-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0783-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0785-Prevent-tile-entity-copies-loading-chunks.patch => 0784-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0786-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0785-Use-username-instead-of-display-name-in-PlayerList-g.patch} (92%)
 rename patches/server/{0787-Pass-ServerLevel-for-gamerule-callbacks.patch => 0786-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0788-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (93%)
 rename patches/server/{0789-WorldCreator-keepSpawnLoaded.patch => 0788-WorldCreator-keepSpawnLoaded.patch} (94%)
 rename patches/server/{0790-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0789-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0791-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0790-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0792-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0791-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0793-Fire-CauldronLevelChange-on-initial-fill.patch => 0792-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0794-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0793-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0795-Add-PlayerStopUsingItemEvent.patch => 0794-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0796-Don-t-tick-markers.patch => 0795-Don-t-tick-markers.patch} (97%)
 rename patches/server/{0797-Expand-FallingBlock-API.patch => 0796-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0798-Do-not-accept-invalid-client-settings.patch => 0797-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0799-Add-support-for-Proxy-Protocol.patch => 0798-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0800-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0799-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0801-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0800-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0802-Sanitize-Sent-BlockEntity-NBT.patch => 0801-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0803-Disable-component-selector-resolving-in-books-by-def.patch => 0802-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0804-Prevent-entity-loading-causing-async-lookups.patch => 0803-Prevent-entity-loading-causing-async-lookups.patch} (97%)
 rename patches/server/{0805-Throw-exception-on-world-create-while-being-ticked.patch => 0804-Throw-exception-on-world-create-while-being-ticked.patch} (97%)
 rename patches/server/{0806-Add-Alternate-Current-redstone-implementation.patch => 0805-Add-Alternate-Current-redstone-implementation.patch} (99%)
 rename patches/server/{0807-Dont-resent-entity-on-art-update.patch => 0806-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0808-Add-WardenAngerChangeEvent.patch => 0807-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0809-Add-option-for-strict-advancement-dimension-checks.patch => 0808-Add-option-for-strict-advancement-dimension-checks.patch} (96%)
 rename patches/server/{0810-Add-missing-important-BlockStateListPopulator-method.patch => 0809-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0811-Nameable-Banner-API.patch => 0810-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0812-Don-t-broadcast-messages-to-command-blocks.patch => 0811-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0813-Prevent-empty-items-from-being-added-to-world.patch => 0812-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0814-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0813-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0815-Add-Player-getFishHook.patch => 0814-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0816-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0815-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0817-Add-various-missing-EntityDropItemEvent-calls.patch => 0816-Add-various-missing-EntityDropItemEvent-calls.patch} (98%)
 rename patches/server/{0818-Fix-Bee-flower-NPE.patch => 0817-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0819-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0820-More-Teleport-API.patch => 0819-More-Teleport-API.patch} (100%)
 rename patches/server/{0821-Add-EntityPortalReadyEvent.patch => 0820-Add-EntityPortalReadyEvent.patch} (95%)
 rename patches/server/{0822-Don-t-use-level-random-in-entity-constructors.patch => 0821-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0823-Send-block-entities-after-destroy-prediction.patch => 0822-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0824-Warn-on-plugins-accessing-faraway-chunks.patch => 0823-Warn-on-plugins-accessing-faraway-chunks.patch} (98%)
 rename patches/server/{0825-Custom-Chat-Completion-Suggestions-API.patch => 0824-Custom-Chat-Completion-Suggestions-API.patch} (94%)
 rename patches/server/{0826-Add-and-fix-missing-BlockFadeEvents.patch => 0825-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0827-Collision-API.patch => 0826-Collision-API.patch} (100%)
 rename patches/server/{0828-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0829-Block-Ticking-API.patch => 0828-Block-Ticking-API.patch} (100%)
 rename patches/server/{0830-Add-Velocity-IP-Forwarding-Support.patch => 0829-Add-Velocity-IP-Forwarding-Support.patch} (98%)
 rename patches/server/{0831-Add-NamespacedKey-biome-methods.patch => 0830-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0832-Fix-plugin-loggers-on-server-shutdown.patch => 0831-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0833-Stop-large-look-changes-from-crashing-the-server.patch => 0832-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0834-Fire-EntityChangeBlockEvent-in-more-places.patch => 0833-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0835-Missing-eating-regain-reason.patch => 0834-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0836-Missing-effect-cause.patch => 0835-Missing-effect-cause.patch} (100%)
 rename patches/server/{0837-Added-byte-array-serialization-deserialization-for-P.patch => 0836-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0838-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0837-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0839-Call-BlockPhysicsEvent-more-often.patch => 0838-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0840-Configurable-chat-thread-limit.patch => 0839-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0841-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0840-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0842-fix-Jigsaw-block-kicking-user.patch => 0841-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0843-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0842-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0844-Add-getDrops-to-BlockState.patch => 0843-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0845-Fix-a-bunch-of-vanilla-bugs.patch => 0844-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0846-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0845-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0847-Fix-custom-piglin-loved-items.patch => 0846-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0848-EntityPickupItemEvent-fixes.patch => 0847-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0849-Correctly-handle-interactions-with-items-on-cooldown.patch => 0848-Correctly-handle-interactions-with-items-on-cooldown.patch} (97%)
 rename patches/server/{0850-Add-PlayerInventorySlotChangeEvent.patch => 0849-Add-PlayerInventorySlotChangeEvent.patch} (97%)
 rename patches/server/{0851-Elder-Guardian-appearance-API.patch => 0850-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0852-Allow-changing-bed-s-occupied-property.patch => 0851-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0853-Add-entity-knockback-API.patch => 0852-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0854-Detect-headless-JREs.patch => 0853-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0855-fixed-entity-vehicle-collision-event-not-called.patch => 0854-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0856-optimized-dirt-and-snow-spreading.patch => 0855-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0857-Added-EntityToggleSitEvent.patch => 0856-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0858-Add-fire-tick-delay-option.patch => 0857-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0859-Add-Moving-Piston-API.patch => 0858-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0860-Ignore-impossible-spawn-tick.patch => 0859-Ignore-impossible-spawn-tick.patch} (90%)
 rename patches/server/{0861-Track-projectile-source-for-fireworks-from-dispenser.patch => 0860-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0862-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0861-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0863-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (95%)
 rename patches/server/{0864-Prevent-compass-from-loading-chunks.patch => 0863-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0865-Add-PrePlayerAttackEntityEvent.patch => 0864-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0866-ensure-reset-EnderDragon-boss-event-name.patch => 0865-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0867-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0866-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0868-Add-Player-Warden-Warning-API.patch => 0867-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0869-More-vanilla-friendly-methods-to-update-trades.patch => 0868-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0870-Add-paper-dumplisteners-command.patch => 0869-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0871-check-global-player-list-where-appropriate.patch => 0870-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0872-Fix-async-entity-add-due-to-fungus-trees.patch => 0871-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0873-ItemStack-damage-API.patch => 0872-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0874-Friction-API.patch => 0873-Friction-API.patch} (100%)
 rename patches/server/{0875-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0874-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0876-Fix-player-kick-on-shutdown.patch => 0875-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0877-Sync-offhand-slot-in-menus.patch => 0876-Sync-offhand-slot-in-menus.patch} (97%)
 rename patches/server/{0878-Player-Entity-Tracking-Events.patch => 0877-Player-Entity-Tracking-Events.patch} (96%)
 rename patches/server/{0879-Limit-pet-look-distance.patch => 0878-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0880-Properly-resend-entities.patch => 0879-Properly-resend-entities.patch} (99%)
 rename patches/server/{0881-Fixes-and-additions-to-the-SpawnReason-API.patch => 0880-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0882-fix-Instruments.patch => 0881-fix-Instruments.patch} (96%)
 rename patches/server/{0883-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0884-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0885-Add-BlockLockCheckEvent.patch => 0884-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0886-Add-Sneaking-API-for-Entities.patch => 0885-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0887-Improve-logging-and-errors.patch => 0886-Improve-logging-and-errors.patch} (98%)
 rename patches/server/{0888-Improve-PortalEvents.patch => 0887-Improve-PortalEvents.patch} (93%)
 rename patches/server/{0889-Add-config-option-for-spider-worldborder-climbing.patch => 0888-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0890-Add-missing-SpigotConfig-logCommands-check.patch => 0889-Add-missing-SpigotConfig-logCommands-check.patch} (92%)
 rename patches/server/{0891-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0892-Flying-Fall-Damage.patch => 0891-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0893-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (99%)
 rename patches/server/{0894-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (91%)
 rename patches/server/{0895-config-for-disabling-entity-tag-tags.patch => 0894-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0896-Use-single-player-info-update-packet-on-join.patch => 0895-Use-single-player-info-update-packet-on-join.patch} (97%)
 rename patches/server/{0897-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0896-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0898-Win-Screen-API.patch => 0897-Win-Screen-API.patch} (93%)
 rename patches/server/{0899-Remove-CraftItemStack-setAmount-null-assignment.patch => 0898-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0900-Fix-force-opening-enchantment-tables.patch => 0899-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0901-Add-Entity-Body-Yaw-API.patch => 0900-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0902-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0903-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0902-Update-the-flag-when-a-captured-block-state-is-outda.patch} (90%)
 rename patches/server/{0904-Add-EntityFertilizeEggEvent.patch => 0903-Add-EntityFertilizeEggEvent.patch} (98%)
 rename patches/server/{0905-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0906-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0907-Correctly-handle-ArmorStand-invisibility.patch => 0906-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0908-Fix-advancement-triggers-for-entity-damage.patch => 0907-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0909-Fix-text-display-error-on-spawn.patch => 0908-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0910-Fix-certain-inventories-returning-null-Locations.patch => 0909-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0911-Add-Shearable-API.patch => 0910-Add-Shearable-API.patch} (100%)
 rename patches/server/{0912-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0911-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0913-Optimize-Hoppers.patch => 0912-Optimize-Hoppers.patch} (99%)
 rename patches/server/{0914-Fix-beehives-generating-from-using-bonemeal.patch => 0913-Fix-beehives-generating-from-using-bonemeal.patch} (95%)
 rename patches/server/{0915-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0916-Treat-sequence-violations-like-they-should-be.patch => 0915-Treat-sequence-violations-like-they-should-be.patch} (91%)
 rename patches/server/{0917-remove-duplicate-animate-packet-for-records.patch => 0916-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0918-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0917-Prevent-causing-expired-keys-from-impacting-new-join.patch} (97%)
 rename patches/server/{0919-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%)
 rename patches/server/{0920-Use-array-for-gamerule-storage.patch => 0919-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0921-Fix-a-couple-of-upstream-bed-issues.patch => 0920-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0922-Fix-demo-flag-not-enabling-demo-mode.patch => 0921-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0923-Add-Mob-Experience-reward-API.patch => 0922-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0924-Break-redstone-on-top-of-trap-doors-early.patch => 0923-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0925-Fix-DamageCause-for-Falling-Blocks.patch => 0924-Fix-DamageCause-for-Falling-Blocks.patch} (92%)
 rename patches/server/{0926-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0927-More-accurate-isInOpenWater-impl.patch => 0926-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0928-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0929-Optimise-recalcBlockCounts-for-empty-sections.patch => 0928-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0930-Expand-PlayerItemMendEvent.patch => 0929-Expand-PlayerItemMendEvent.patch} (98%)
 rename patches/server/{0931-Refresh-ProjectileSource-for-projectiles.patch => 0930-Refresh-ProjectileSource-for-projectiles.patch} (97%)
 rename patches/server/{0932-Add-transient-modifier-API.patch => 0931-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0933-Fix-block-place-logic.patch => 0932-Fix-block-place-logic.patch} (95%)
 rename patches/server/{0934-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (93%)
 rename patches/server/{0936-Call-BlockGrowEvent-for-missing-blocks.patch => 0934-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0937-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (94%)
 delete mode 100644 patches/server/0935-Ignore-inline-definitions-of-trim-material-pattern.patch
 rename patches/server/{0938-fix-MapLike-spam-for-missing-key-selector.patch => 0936-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0939-Fix-sniffer-removeExploredLocation.patch => 0937-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0940-Add-method-to-remove-all-active-potion-effects.patch => 0938-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0941-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0942-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0943-Properly-Cancel-Usable-Items.patch => 0941-Properly-Cancel-Usable-Items.patch} (97%)
 rename patches/server/{0944-Add-event-for-player-editing-sign.patch => 0942-Add-event-for-player-editing-sign.patch} (98%)
 rename patches/server/{0945-Only-tick-item-frames-if-players-can-see-it.patch => 0943-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0946-Fix-cmd-permission-levels-for-command-blocks.patch => 0944-Fix-cmd-permission-levels-for-command-blocks.patch} (100%)
 rename patches/server/{0947-Add-option-to-disable-block-updates.patch => 0945-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0948-Call-missing-BlockDispenseEvent.patch => 0946-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0949-Don-t-load-chunks-for-supporting-block-checks.patch => 0947-Don-t-load-chunks-for-supporting-block-checks.patch} (90%)
 rename patches/server/{0950-Optimize-player-lookups-for-beacons.patch => 0948-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0951-Add-Sign-getInteractableSideFor.patch => 0949-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0952-Array-backed-synched-entity-data.patch => 0950-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0953-fix-item-meta-for-tadpole-buckets.patch => 0951-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0955-Fix-BanList-API.patch => 0952-Fix-BanList-API.patch} (100%)
 rename patches/server/{0956-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0953-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0957-Fix-possible-NPE-on-painting-creation.patch => 0954-Fix-possible-NPE-on-painting-creation.patch} (96%)
 delete mode 100644 patches/server/0954-Suppress-Item-Meta-Validation-Checks.patch
 rename patches/server/{0958-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0955-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0959-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0956-ExperienceOrb-should-call-EntitySpawnEvent.patch} (93%)
 rename patches/server/{0960-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0957-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0961-Add-whitelist-events.patch => 0958-Add-whitelist-events.patch} (100%)
 rename patches/server/{0962-Implement-PlayerFailMoveEvent.patch => 0959-Implement-PlayerFailMoveEvent.patch} (98%)
 rename patches/server/{0963-Folia-scheduler-and-owned-region-API.patch => 0960-Folia-scheduler-and-owned-region-API.patch} (99%)
 rename patches/server/{0964-Only-erase-allay-memory-on-non-item-targets.patch => 0961-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0965-API-for-updating-recipes-on-clients.patch => 0962-API-for-updating-recipes-on-clients.patch} (97%)
 rename patches/server/{0966-Fix-rotation-when-spawning-display-entities.patch => 0963-Fix-rotation-when-spawning-display-entities.patch} (96%)
 rename patches/server/{0967-Only-capture-actual-tree-growth.patch => 0964-Only-capture-actual-tree-growth.patch} (96%)
 rename patches/server/{0968-Use-correct-source-for-mushroom-block-spread-event.patch => 0965-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0969-Respect-randomizeData-on-more-entities-when-spawning.patch => 0966-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0970-Use-correct-seed-on-api-world-load.patch => 0967-Use-correct-seed-on-api-world-load.patch} (90%)
 rename patches/server/{0971-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0968-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0972-Cache-map-ids-on-item-frames.patch => 0969-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0973-Fix-custom-statistic-criteria-creation.patch => 0970-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0974-Bandaid-fix-for-Effect.patch => 0971-Bandaid-fix-for-Effect.patch} (97%)
 rename patches/server/{0975-SculkCatalyst-bloom-API.patch => 0972-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0976-API-for-an-entity-s-scoreboard-name.patch => 0973-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0977-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (96%)
 rename patches/server/{0978-Deprecate-and-replace-methods-with-old-StructureType.patch => 0975-Deprecate-and-replace-methods-with-old-StructureType.patch} (96%)
 rename patches/server/{0979-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (95%)
 rename patches/server/{0980-Properly-handle-BlockBreakEvent-isDropItems.patch => 0977-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0981-Fire-entity-death-event-for-ender-dragon.patch => 0978-Fire-entity-death-event-for-ender-dragon.patch} (92%)
 rename patches/server/{0982-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0979-Configurable-entity-tracking-range-by-Y-coordinate.patch} (94%)
 rename patches/server/{0983-Add-Listing-API-for-Player.patch => 0980-Add-Listing-API-for-Player.patch} (100%)
 rename patches/server/{0984-Configurable-Region-Compression-Format.patch => 0981-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0985-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (92%)
 rename patches/server/{0986-Fix-NPE-on-Boat-getStatus.patch => 0983-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0987-Expand-Pose-API.patch => 0984-Expand-Pose-API.patch} (95%)
 rename patches/server/{0988-More-DragonBattle-API.patch => 0985-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0989-Deep-clone-unhandled-nbt-tags.patch => 0986-Deep-clone-unhandled-nbt-tags.patch} (95%)
 rename patches/server/{0990-Add-PlayerPickItemEvent.patch => 0987-Add-PlayerPickItemEvent.patch} (96%)
 rename patches/server/{0991-Improve-performance-of-mass-crafts.patch => 0988-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{0992-Allow-trident-custom-damage.patch => 0989-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0993-Expose-hand-during-BlockCanBuildEvent.patch => 0990-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0994-Optimize-nearest-structure-border-iteration.patch => 0991-Optimize-nearest-structure-border-iteration.patch} (95%)
 rename patches/server/{0995-Implement-OfflinePlayer-isConnected.patch => 0992-Implement-OfflinePlayer-isConnected.patch} (94%)
 rename patches/server/{0996-Fix-inventory-desync.patch => 0993-Fix-inventory-desync.patch} (100%)
 rename patches/server/{0997-Add-titleOverride-to-InventoryOpenEvent.patch => 0994-Add-titleOverride-to-InventoryOpenEvent.patch} (97%)
 rename patches/server/{0998-Configure-sniffer-egg-hatch-time.patch => 0995-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{0999-Do-crystal-portal-proximity-check-before-entity-look.patch => 0996-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{1000-Skip-POI-finding-if-stuck-in-vehicle.patch => 0997-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{1001-Add-slot-sanity-checks-in-container-clicks.patch => 0998-Add-slot-sanity-checks-in-container-clicks.patch} (96%)
 rename patches/server/{1002-Call-BlockRedstoneEvents-for-lecterns.patch => 0999-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{1003-Allow-proper-checking-of-empty-item-stacks.patch => 1000-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{1004-Fix-silent-equipment-change-for-mobs.patch => 1001-Fix-silent-equipment-change-for-mobs.patch} (98%)
 rename patches/server/{1005-Fix-spigot-s-Forced-Stats.patch => 1002-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{1006-Add-missing-InventoryHolders-to-inventories.patch => 1003-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{1007-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (97%)
 rename patches/server/{1008-Actually-optimise-explosions.patch => 1005-Actually-optimise-explosions.patch} (100%)
 rename patches/server/{1009-Add-missing-logs-for-log-ips-config-option.patch => 1006-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{1010-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 1007-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (100%)
 rename patches/server/{1011-Fix-SuspiciousStewMeta.patch => 1008-Fix-SuspiciousStewMeta.patch} (100%)
 rename patches/server/{1012-Optimise-chunk-tick-iteration.patch => 1009-Optimise-chunk-tick-iteration.patch} (99%)
 rename patches/server/{1013-Lag-compensation-ticks.patch => 1010-Lag-compensation-ticks.patch} (98%)
 rename patches/server/{1014-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 1011-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{1015-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 1012-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{1016-Fix-team-sidebar-objectives-not-being-cleared.patch => 1013-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{1017-Optimise-nearby-player-retrieval.patch => 1014-Optimise-nearby-player-retrieval.patch} (100%)
 rename patches/server/{1018-Remove-streams-for-villager-AI.patch => 1015-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{1019-Fix-missing-map-initialize-event-call.patch => 1016-Fix-missing-map-initialize-event-call.patch} (100%)
 rename patches/server/{1020-Update-entity-data-when-attaching-firework-to-entity.patch => 1017-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{1021-Use-correct-variable-for-initializing-CraftLootTable.patch => 1018-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%)
 rename patches/server/{1022-Make-setVelocity-method-of-Fireballs-change-the-trav.patch => 1019-Make-setVelocity-method-of-Fireballs-change-the-trav.patch} (100%)
 rename patches/server/{1023-Fix-UnsafeValues-loadAdvancement.patch => 1020-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{1024-Add-player-idle-duration-API.patch => 1021-Add-player-idle-duration-API.patch} (100%)
 rename patches/server/{1025-Don-t-check-if-we-can-see-non-visible-entities.patch => 1022-Don-t-check-if-we-can-see-non-visible-entities.patch} (90%)
 rename patches/server/{1026-Fix-NPE-in-SculkBloomEvent-world-access.patch => 1023-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{1027-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (90%)
 rename patches/server/{1028-Optimize-VarInts.patch => 1025-Optimize-VarInts.patch} (100%)
 rename patches/server/{1029-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 1026-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{1030-Add-predicate-for-blocks-when-raytracing.patch => 1027-Add-predicate-for-blocks-when-raytracing.patch} (98%)
 rename patches/server/{1031-Broadcast-take-item-packets-with-collector-as-source.patch => 1028-Broadcast-take-item-packets-with-collector-as-source.patch} (100%)
 rename patches/server/{1032-fix-secure-profile-with-proxy-online-mode.patch => 1029-fix-secure-profile-with-proxy-online-mode.patch} (100%)
 rename patches/server/{1033-Expand-LingeringPotion-API.patch => 1030-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{1034-Add-MaterialTagsTest.patch => 1031-Add-MaterialTagsTest.patch} (100%)
 rename patches/server/{1035-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 1032-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%)
 rename patches/server/{1036-Add-hand-to-fish-event-for-all-player-interactions.patch => 1033-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{1037-Fix-several-issues-with-EntityBreedEvent.patch => 1034-Fix-several-issues-with-EntityBreedEvent.patch} (100%)
 rename patches/server/{1038-Add-UUID-attribute-modifier-API.patch => 1035-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{1039-Fix-missing-event-call-for-entity-teleport-API.patch => 1036-Fix-missing-event-call-for-entity-teleport-API.patch} (93%)
 rename patches/server/{1040-Lazily-create-LootContext-for-criterions.patch => 1037-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{1041-Don-t-fire-sync-events-during-worldgen.patch => 1038-Don-t-fire-sync-events-during-worldgen.patch} (100%)
 rename patches/server/{1042-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (88%)
 rename patches/server/{1043-Restore-vanilla-entity-drops-behavior.patch => 1040-Restore-vanilla-entity-drops-behavior.patch} (99%)
 rename patches/server/{1044-Add-Structure-check-API.patch => 1041-Add-Structure-check-API.patch} (91%)
 rename patches/server/{1045-Dont-resend-blocks-on-interactions.patch => 1042-Dont-resend-blocks-on-interactions.patch} (98%)
 rename patches/server/{1046-Keep-previous-behavior-for-setResourcePack.patch => 1043-Keep-previous-behavior-for-setResourcePack.patch} (100%)
 rename patches/server/{1047-properly-read-and-store-sus-effect-duration.patch => 1044-properly-read-and-store-sus-effect-duration.patch} (100%)
 rename patches/server/{1048-Use-correct-max-stack-size-in-crafter.patch => 1045-Use-correct-max-stack-size-in-crafter.patch} (100%)
 rename patches/server/{1049-Fix-scoreboard-entries.patch => 1046-Fix-scoreboard-entries.patch} (100%)
 rename patches/server/{1050-add-more-scoreboard-API.patch => 1047-add-more-scoreboard-API.patch} (100%)
 rename patches/server/{1051-Improve-Registry.patch => 1048-Improve-Registry.patch} (100%)
 rename patches/server/{1052-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 1049-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%)
 rename patches/server/{1053-Add-experience-points-API.patch => 1050-Add-experience-points-API.patch} (100%)
 rename patches/server/{1054-Add-missing-InventoryType.patch => 1051-Add-missing-InventoryType.patch} (100%)
 rename patches/server/{1055-Add-drops-to-shear-events.patch => 1052-Add-drops-to-shear-events.patch} (98%)
 rename patches/server/{1056-Add-PlayerShieldDisableEvent.patch => 1053-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/server/{1057-Add-HiddenPotionEffect-API.patch => 1054-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/server/{1058-Correctly-check-if-bucket-dispenses-will-succeed-for.patch => 1055-Correctly-check-if-bucket-dispenses-will-succeed-for.patch} (96%)
 rename patches/server/{1059-fix-ItemMeta-removing-CustomModelData.patch => 1056-fix-ItemMeta-removing-CustomModelData.patch} (91%)
 rename patches/server/{1060-Validate-ResourceLocation-in-NBT-reading.patch => 1057-Validate-ResourceLocation-in-NBT-reading.patch} (100%)
 rename patches/server/{1061-Properly-handle-experience-dropping-on-block-break.patch => 1058-Properly-handle-experience-dropping-on-block-break.patch} (97%)
 create mode 100644 patches/server/1059-Fixup-ResourceLocation-handling.patch

diff --git a/patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
new file mode 100644
index 0000000000..ac07e2076a
--- /dev/null
+++ b/patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Sat, 6 Jan 2024 14:18:58 +0100
+Subject: [PATCH] Return null for empty String in NamespacedKey.fromString
+
+
+diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
+index 8ac72cb0b05e2c493d98310f2e87c3714d15c5e3..95bc1078e35a92624b6627e78ed80080832d1b57 100644
+--- a/src/main/java/org/bukkit/NamespacedKey.java
++++ b/src/main/java/org/bukkit/NamespacedKey.java
+@@ -89,8 +89,6 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
+         this.namespace = namespace;
+         this.key = key;
+ 
+-        String string = toString();
+-        Preconditions.checkArgument(string.length() < 256, "NamespacedKey must be less than 256 characters", string);
+     }
+ 
+     /**
+@@ -116,8 +114,6 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
+         Preconditions.checkArgument(isValidNamespace(this.namespace), "Invalid namespace. Must be [a-z0-9._-]: %s", this.namespace);
+         Preconditions.checkArgument(isValidKey(this.key), "Invalid key. Must be [a-z0-9/._-]: %s", this.key);
+ 
+-        String string = toString();
+-        Preconditions.checkArgument(string.length() < 256, "NamespacedKey must be less than 256 characters (%s)", string);
+     }
+ 
+     @NotNull
+@@ -206,7 +202,10 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
+      */
+     @Nullable
+     public static NamespacedKey fromString(@NotNull String string, @Nullable Plugin defaultNamespace) {
+-        Preconditions.checkArgument(string != null && !string.isEmpty(), "Input string must not be empty or null");
++        // Paper - Return null for empty string
++        Preconditions.checkArgument(string != null, "Input string must not be null");
++        if (string.isEmpty()) return null;
++        // Paper end - Return null for empty string
+ 
+         String[] components = string.split(":", 3);
+         if (components.length > 2) {
diff --git a/patches/server/0687-Distance-manager-tick-timings.patch b/patches/server/0686-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0687-Distance-manager-tick-timings.patch
rename to patches/server/0686-Distance-manager-tick-timings.patch
diff --git a/patches/server/0686-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0686-Fix-Bukkit-NamespacedKey-shenanigans.patch
deleted file mode 100644
index c77b9ae0d6..0000000000
--- a/patches/server/0686-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Sun, 24 Oct 2021 15:49:35 +0200
-Subject: [PATCH] Fix Bukkit NamespacedKey shenanigans
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-index 9ca389ca789dc54bba3542cac0aac2e1dc66c870..15173e715fa36546820d930a46e0f0c493d07cfc 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-@@ -17,7 +17,7 @@ public class PaperContainerEntityLootableInventory implements PaperLootableEntit
- 
-     @Override
-     public org.bukkit.loot.LootTable getLootTable() {
--        return entity.getLootTable() != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
-+        return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
-     }
- 
-     @Override
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index 9cfa5d36a6991067a3866e0d437749fafcc0158e..2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-@@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
- 
-     @Override
-     public org.bukkit.loot.LootTable getLootTable() {
--        return tileEntityLootable.lootTable != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
-+        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
-index 5f40d240b879e3989897b6e45725a8e5a6a7f194..5014192edb9616ce725fc1592832034789527b6f 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
-@@ -13,7 +13,7 @@ public final class CraftNamespacedKey {
-             return null;
-         }
-         ResourceLocation minecraft = ResourceLocation.tryParse(string);
--        return (minecraft == null) ? null : CraftNamespacedKey.fromMinecraft(minecraft);
-+        return (minecraft == null || minecraft.getPath().isEmpty()) ? null : CraftNamespacedKey.fromMinecraft(minecraft); // Paper - Bukkit's parser does not match Vanilla for empty paths
-     }
- 
-     public static NamespacedKey fromString(String string) {
diff --git a/patches/server/0688-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0688-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0689-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0688-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0689-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0688-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0690-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0690-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 83d21fb834..a0919cf953 100644
--- a/patches/server/0690-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0689-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 93cb76c8e96488051b10ed4a634c681305628fcc..7d059605d2682672fd0cb89ae46c539c3f8f6021 100644
+index 8ad189164db55c8416b07511dc349ee7a94752a0..3fb7e355a86851731f5f11b6b8bb8e4515806a33 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/0691-Add-packet-limiter-config.patch b/patches/server/0690-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0691-Add-packet-limiter-config.patch
rename to patches/server/0690-Add-packet-limiter-config.patch
diff --git a/patches/server/0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0693-Ensure-valid-vehicle-status.patch b/patches/server/0692-Ensure-valid-vehicle-status.patch
similarity index 90%
rename from patches/server/0693-Ensure-valid-vehicle-status.patch
rename to patches/server/0692-Ensure-valid-vehicle-status.patch
index 7faeac013d..79db44c90b 100644
--- a/patches/server/0693-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0692-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a85b4223ab9eb97662f327f6179af6fc9970ab3c..45f2a81cd59434956cc33e489af6032e6ef9947d 100644
+index 87fdc78409fb16c961c04a5551980a8a231b70d0..60164d8ff63bf536ddf46605a9dc7931ebc5b82a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -576,7 +576,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0693-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0693-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0696-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0695-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0696-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0695-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0697-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0696-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0697-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0696-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0698-Preserve-overstacked-loot.patch b/patches/server/0697-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0698-Preserve-overstacked-loot.patch
rename to patches/server/0697-Preserve-overstacked-loot.patch
diff --git a/patches/server/0699-Update-head-rotation-in-missing-places.patch b/patches/server/0698-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0699-Update-head-rotation-in-missing-places.patch
rename to patches/server/0698-Update-head-rotation-in-missing-places.patch
index b45a4c13f8..b0b48b12d9 100644
--- a/patches/server/0699-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0698-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1aac748a6ac485ad66f4501ae22cd6a422a966b5..4be223f2aa5ecf259e7d6551c8ca8876fb343f59 100644
+index bcc6d2cf3300d2e6eadadbcc03dc5aaaf2b5d7e3..61a25a5557309d8640795322d77bc61ca5a91f10 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1916,6 +1916,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0700-prevent-unintended-light-block-manipulation.patch b/patches/server/0699-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0700-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0699-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0701-Fix-CraftCriteria-defaults-map.patch b/patches/server/0700-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0701-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0700-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0702-Fix-upstreams-block-state-factories.patch b/patches/server/0701-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0702-Fix-upstreams-block-state-factories.patch
rename to patches/server/0701-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0703-Configurable-feature-seeds.patch b/patches/server/0702-Configurable-feature-seeds.patch
similarity index 96%
rename from patches/server/0703-Configurable-feature-seeds.patch
rename to patches/server/0702-Configurable-feature-seeds.patch
index 2d825c6c84..85743deb81 100644
--- a/patches/server/0703-Configurable-feature-seeds.patch
+++ b/patches/server/0702-Configurable-feature-seeds.patch
@@ -19,7 +19,7 @@ index 1080e1f67afe5574baca0df50cdb1d029a7a586a..a2f71a6d1a9e98133dff6cd0f625da94
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index c3bfc69e5b8465d40867d4dbe33dd82755099691..53cf0859988dc5f9ec02be7448da7b5152d2809b 100644
+index 0a21632a3e02690a8edcc17ac25d2551a8964bbe..996a49e1ccf827edf28ca92e947014517b7dad6e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -431,7 +431,14 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0704-Add-root-admin-user-detection.patch b/patches/server/0703-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0704-Add-root-admin-user-detection.patch
rename to patches/server/0703-Add-root-admin-user-detection.patch
diff --git a/patches/server/0705-Always-allow-item-changing-in-Fireball.patch b/patches/server/0704-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0705-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0704-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0706-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch
similarity index 91%
rename from patches/server/0706-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch
index e0c851266a..d31fabaa97 100644
--- a/patches/server/0706-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4be223f2aa5ecf259e7d6551c8ca8876fb343f59..09a49aa1f33796ab5947010538f504c49d2af226 100644
+index 61a25a5557309d8640795322d77bc61ca5a91f10..d419ccff995a7d7bd83f31fd961e06899881b254 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -792,7 +792,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0707-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0706-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0707-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0706-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0707-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0707-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0709-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0708-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0709-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0708-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0709-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0709-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0711-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0711-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0712-Fix-Spigot-growth-modifiers.patch b/patches/server/0711-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0712-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0711-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0713-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0713-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0714-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0713-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0714-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0713-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0715-Optimize-HashMapPalette.patch b/patches/server/0714-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0715-Optimize-HashMapPalette.patch
rename to patches/server/0714-Optimize-HashMapPalette.patch
diff --git a/patches/server/0716-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0716-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch
index c7ea8e3ba4..5439e3d13f 100644
--- a/patches/server/0716-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ca605b33c57159add46f6b84c975c25c678fdf17..aa7fa1211b88f14ac01a4562f4819151bc23db27 100644
+index d20ff695dd77e3d8f775db917f0a6056a266d670..23124f8b302e3ac5751c03e3839d2c35e24e5b30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2460,6 +2460,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0717-Collision-optimisations.patch b/patches/server/0716-Collision-optimisations.patch
similarity index 99%
rename from patches/server/0717-Collision-optimisations.patch
rename to patches/server/0716-Collision-optimisations.patch
index 380f7a085c..fff212837e 100644
--- a/patches/server/0717-Collision-optimisations.patch
+++ b/patches/server/0716-Collision-optimisations.patch
@@ -2214,7 +2214,7 @@ index 159932e2807c8d51fbf141c2145a138a39ea8abe..41a5d509a398972db910d32babb70e9b
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 09a49aa1f33796ab5947010538f504c49d2af226..5a6536bf3503ba27df8bdd810b76266aee42e037 100644
+index d419ccff995a7d7bd83f31fd961e06899881b254..4903c0ddff7a7fcfdadb62e92ff285b77bd8eacf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1215,9 +1215,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2600,7 +2600,7 @@ index a25497eec004add7408a63b1a0f09e3fa443b324..9f892de55ab03367daed4c30cc44c9dd
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 126d37e14ff785c17e45d4601131156593f5ace5..096cd97827f4912fc5b538e01d29257195270055 100644
+index 3b13a13c4e7de12ed0cac354701bf3502d788b59..3f196645f2259ed468e0dc3a05ecbd84d3792af0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -300,6 +300,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -3005,7 +3005,7 @@ index 126d37e14ff785c17e45d4601131156593f5ace5..096cd97827f4912fc5b538e01d292571
      // Paper end
  
 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 49aa9020290e4466eb386400b4a6e5284cfe355b..5343a0c20cf87067ba307f001a28b0b18fae2c34 100644
+index 142f9438f75cb7e2d97011fdeb3f9e367ff81599..38d587c93a9ae5706633608f681f18684b7a631d 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -284,7 +284,7 @@ public class Block extends BlockBehaviour implements ItemLike {
diff --git a/patches/server/0718-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0718-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch
index d4c592b083..aac62fe828 100644
--- a/patches/server/0718-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0717-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 64269f1e6c8b5b9911cd36c5d0a11859cd8be599..e5b71a899884c3f26374051a60e026b7a01f6be3 100644
+index 3d2ef1728a54d7612a773dfb7066b7370c9df178..846db5783d85b68ca1f3788fe5434bc88b90c2d9 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/0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0719-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0720-Add-more-Campfire-API.patch b/patches/server/0719-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0720-Add-more-Campfire-API.patch
rename to patches/server/0719-Add-more-Campfire-API.patch
diff --git a/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 97%
rename from patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..e813969283 100644
--- a/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
@@ -47,7 +47,7 @@ index 98c8b676fc5b2add44d6ddf5d32f85bc07ea22cb..84b2fd9db39e0cdf3e1cbe6444579f7c
              ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
  
 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 134a5cf10073c27dfbc19709e81ffa75bcc73743..db571f658f636cdda1dcdbaffa0c4da67fae11ad 100644
+index a2794ec3d846136da64b6888d846587499a5f635..6eaeb2db0da59611501f2b1a63b5b48816a0ba48 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
 @@ -342,10 +342,17 @@ public class RegionFileStorage implements AutoCloseable {
diff --git a/patches/server/0722-Fix-tripwire-state-inconsistency.patch b/patches/server/0721-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0722-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0721-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0723-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0722-Forward-CraftEntity-in-teleport-command.patch
similarity index 94%
rename from patches/server/0723-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0722-Forward-CraftEntity-in-teleport-command.patch
index ee05de0664..7cecf97561 100644
--- a/patches/server/0723-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0722-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 5a6536bf3503ba27df8bdd810b76266aee42e037..72badd1d14107a665f8730c9dc0aba91a1950caf 100644
+index 4903c0ddff7a7fcfdadb62e92ff285b77bd8eacf..0d561537ab767e357c2e4385d0d87f8e3db022d8 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/0724-Improve-scoreboard-entries.patch b/patches/server/0723-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0724-Improve-scoreboard-entries.patch
rename to patches/server/0723-Improve-scoreboard-entries.patch
diff --git a/patches/server/0725-Entity-powdered-snow-API.patch b/patches/server/0724-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0725-Entity-powdered-snow-API.patch
rename to patches/server/0724-Entity-powdered-snow-API.patch
diff --git a/patches/server/0726-Add-API-for-item-entity-health.patch b/patches/server/0725-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0726-Add-API-for-item-entity-health.patch
rename to patches/server/0725-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0727-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0727-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0729-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0728-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0729-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0728-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0729-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 91%
rename from patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0729-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..3e88533e6f 100644
--- a/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0729-Load-effect-amplifiers-greater-than-127-correctly.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Load effect amplifiers greater than 127 correctly
 MOJIRA: MC-118857
 
 diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
-index af7889fbed11ca413124908cb174a285d6d973e2..68e1b8271475996020af50b3b2cf04cd25aa6c85 100644
+index 758a9ddd3489be9502cd4e7f31b709c49ce9e009..bf304db1f9506d3e83d16cd632b9155c39346634 100644
 --- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
 +++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
 @@ -293,7 +293,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
diff --git a/patches/server/0731-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0730-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0731-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0730-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0732-Fix-bees-aging-inside-hives.patch b/patches/server/0731-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0732-Fix-bees-aging-inside-hives.patch
rename to patches/server/0731-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0733-Bucketable-API.patch b/patches/server/0732-Bucketable-API.patch
similarity index 100%
rename from patches/server/0733-Bucketable-API.patch
rename to patches/server/0732-Bucketable-API.patch
diff --git a/patches/server/0734-Validate-usernames.patch b/patches/server/0733-Validate-usernames.patch
similarity index 95%
rename from patches/server/0734-Validate-usernames.patch
rename to patches/server/0733-Validate-usernames.patch
index 39e337ef3e..34670a1c61 100644
--- a/patches/server/0734-Validate-usernames.patch
+++ b/patches/server/0733-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 0c4fb4a7d4fcdc6d724beb13a16bd729a3c525cd..fa6c77391ac40f86e1b679ef21f4ee43177857c8 100644
+index 552568aabcd4910697027c4b578edcd75f56b723..a7a6d3d243bb11101cfe6fce97dad74242597121 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,
@@ -26,7 +26,7 @@ index 0c4fb4a7d4fcdc6d724beb13a16bd729a3c525cd..fa6c77391ac40f86e1b679ef21f4ee43
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 30ad9f878d0b76c6bef594448c3122d614a7aa8c..147fed3b3f0b052bc2892eaf001f0fb5c9198a85 100644
+index 41a5d509a398972db910d32babb70e9bd5fa41da..0bb3940da79733ccdfa75598b86ec0887a995933 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -679,7 +679,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0735-Make-water-animal-spawn-height-configurable.patch b/patches/server/0734-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0735-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0734-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 97%
rename from patches/server/0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index b08fea5776..3739b7c4c7 100644
--- a/patches/server/0736-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0735-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -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 aa7fa1211b88f14ac01a4562f4819151bc23db27..1eeefb6ac8af5928925180a1c5850f8e398a44a8 100644
+index 23124f8b302e3ac5751c03e3839d2c35e24e5b30..be83340a6b2e64883c04a3593199179b856c5722 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 aa7fa1211b88f14ac01a4562f4819151bc23db27..1eeefb6ac8af5928925180a1c5850f8e
              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 dcd5e7cc8bfc5732974bed81256828d011683f5a..1bf088ee3c18830ce613c77453cf471edbbdad82 100644
+index e8d81c1f265001bcf4574c98950296ac99f24a29..83f51cbe9de3fdde19d02a564f873f51f697a828 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/0737-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0736-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0737-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0736-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0738-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0737-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0738-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0737-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0739-Multiple-Entries-with-Scoreboards.patch b/patches/server/0738-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0739-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0738-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0740-Reset-placed-block-on-exception.patch b/patches/server/0739-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0740-Reset-placed-block-on-exception.patch
rename to patches/server/0739-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0741-Add-configurable-height-for-slime-spawn.patch b/patches/server/0740-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0741-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0740-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 93%
rename from patches/server/0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 185664caf6..acc689b55b 100644
--- a/patches/server/0742-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0741-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ 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 fa6c77391ac40f86e1b679ef21f4ee43177857c8..d52d3808a058b6eef57639f1d455986b9681f645 100644
+index a7a6d3d243bb11101cfe6fce97dad74242597121..ec6a56e298872a403e0451944f7139256eab31d6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -294,7 +294,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0743-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0742-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0743-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0742-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0744-Multi-Block-Change-API-Implementation.patch b/patches/server/0743-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0744-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0743-Multi-Block-Change-API-Implementation.patch
index 19998142f7..59ce227273 100644
--- a/patches/server/0744-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0743-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bf5c1e9a7742a327e1d35c3409d6623ae0f8ab48..29a2e22bda0595e9b4bbd42e6b9a0515c5cc2f1c 100644
+index cb72755c1b1e04797dbe99612d7bdd0bfd4b540e..9d12fab078c0625844b5f07b884b5f5978bf590c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -886,6 +886,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0745-Fix-NotePlayEvent.patch b/patches/server/0744-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0745-Fix-NotePlayEvent.patch
rename to patches/server/0744-Fix-NotePlayEvent.patch
diff --git a/patches/server/0746-Freeze-Tick-Lock-API.patch b/patches/server/0745-Freeze-Tick-Lock-API.patch
similarity index 97%
rename from patches/server/0746-Freeze-Tick-Lock-API.patch
rename to patches/server/0745-Freeze-Tick-Lock-API.patch
index 192afb86ce..989b718a9b 100644
--- a/patches/server/0746-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0745-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 72badd1d14107a665f8730c9dc0aba91a1950caf..225ad411a48c156bcd1973f97349db80b0ff6a92 100644
+index 0d561537ab767e357c2e4385d0d87f8e3db022d8..1fd71bd27f601312f6ff00fbcb9b6687af284001 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -407,6 +407,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0747-Dolphin-API.patch b/patches/server/0746-Dolphin-API.patch
similarity index 100%
rename from patches/server/0747-Dolphin-API.patch
rename to patches/server/0746-Dolphin-API.patch
diff --git a/patches/server/0748-More-PotionEffectType-API.patch b/patches/server/0747-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0748-More-PotionEffectType-API.patch
rename to patches/server/0747-More-PotionEffectType-API.patch
diff --git a/patches/server/0749-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0749-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0750-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0750-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch
index f8673ddef4..63a71e24ba 100644
--- a/patches/server/0750-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1eeefb6ac8af5928925180a1c5850f8e398a44a8..37bacd8e83df278d32282d0000a8de112aafbde4 100644
+index be83340a6b2e64883c04a3593199179b856c5722..7aed22672cc9799fd577f225c350f6a6649b7f48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2111,6 +2111,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0751-Add-missing-structure-set-seed-configs.patch b/patches/server/0750-Add-missing-structure-set-seed-configs.patch
similarity index 99%
rename from patches/server/0751-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0750-Add-missing-structure-set-seed-configs.patch
index 51f6e937d8..ec96884a3b 100644
--- a/patches/server/0751-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0750-Add-missing-structure-set-seed-configs.patch
@@ -20,7 +20,7 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 53cf0859988dc5f9ec02be7448da7b5152d2809b..e0a00035b52cb202c5ca6a1d92709407de5d5d79 100644
+index 996a49e1ccf827edf28ca92e947014517b7dad6e..e9239f90e59d1429fc7a2618e0fd3b8a57633b87 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -568,7 +568,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0752-Implement-regenerateChunk.patch b/patches/server/0751-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0752-Implement-regenerateChunk.patch
rename to patches/server/0751-Implement-regenerateChunk.patch
index c9997b3735..b4ba01ed7b 100644
--- a/patches/server/0752-Implement-regenerateChunk.patch
+++ b/patches/server/0751-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 1bf088ee3c18830ce613c77453cf471edbbdad82..9296b518fce2a66ef3a751947e9d9dcb1b4ab53b 100644
+index 83f51cbe9de3fdde19d02a564f873f51f697a828..e709b6fda1703c0787ddeedec9b7cc09f440d652 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/0753-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 95%
rename from patches/server/0753-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch
index 72be2c3420..1a1186ac1a 100644
--- a/patches/server/0753-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -8,7 +8,7 @@ snow bucket didn't revert grass that became snowy because of the
 placement.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 368837172f87ac45e1d58e9905b4693cc0804328..b7d8684968051f7af5462fe98d39fbebe3e96fd7 100644
+index fdcec8496abda362e611b42ef054ea730f47f408..8cf7d514803fd953e068d3436bfd4e50fb4b0da0 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -379,7 +379,7 @@ public final class ItemStack {
diff --git a/patches/server/0754-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 92%
rename from patches/server/0754-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index ed53e0ce44..dc352a98f2 100644
--- a/patches/server/0754-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 37bacd8e83df278d32282d0000a8de112aafbde4..d113f7a4dbe7aabf4d5d26cc8d015ce5ba863dd0 100644
+index 7aed22672cc9799fd577f225c350f6a6649b7f48..d1570b795894cda203154b9efc6f1f23759eab74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2288,6 +2288,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0755-Add-GameEvent-tags.patch b/patches/server/0754-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0755-Add-GameEvent-tags.patch
rename to patches/server/0754-Add-GameEvent-tags.patch
index a6a1398656..f201a89aba 100644
--- a/patches/server/0755-Add-GameEvent-tags.patch
+++ b/patches/server/0754-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d113f7a4dbe7aabf4d5d26cc8d015ce5ba863dd0..ed69f084dc8a0c97ff83932d014d1020e16bd7f8 100644
+index d1570b795894cda203154b9efc6f1f23759eab74..e28cb2db9b93bf3c045563a8df9d1c819f054851 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2709,6 +2709,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0756-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0756-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0757-Furnace-RecipesUsed-API.patch b/patches/server/0756-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0757-Furnace-RecipesUsed-API.patch
rename to patches/server/0756-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0758-Configurable-sculk-sensor-listener-range.patch b/patches/server/0757-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0758-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0757-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0759-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0758-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0759-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0758-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0760-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0760-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0761-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0760-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 95%
rename from patches/server/0761-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0760-Put-world-into-worldlist-before-initing-the-world.patch
index 3930cc57c6..fc02afdc26 100644
--- a/patches/server/0761-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0760-Put-world-into-worldlist-before-initing-the-world.patch
@@ -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 ed69f084dc8a0c97ff83932d014d1020e16bd7f8..be57ec31869e2cf9db131ec64c7581564f2b42e6 100644
+index e28cb2db9b93bf3c045563a8df9d1c819f054851..7efd9766fa1e78127e9f02d8f29da435c7f27e0a 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/0762-Fix-Entity-Position-Desync.patch b/patches/server/0761-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0762-Fix-Entity-Position-Desync.patch
rename to patches/server/0761-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0763-Custom-Potion-Mixes.patch b/patches/server/0762-Custom-Potion-Mixes.patch
similarity index 99%
rename from patches/server/0763-Custom-Potion-Mixes.patch
rename to patches/server/0762-Custom-Potion-Mixes.patch
index c7cc845636..df08adbdbe 100644
--- a/patches/server/0763-Custom-Potion-Mixes.patch
+++ b/patches/server/0762-Custom-Potion-Mixes.patch
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 21e66ea18be81dab53be94f95683b5054d9e1a55..80b9727ffd55f2c6b047f10b73fa71757d1f0633 100644
+index 7efd9766fa1e78127e9f02d8f29da435c7f27e0a..8750983a05da55b0f491a5267965fe939e771c0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -304,6 +304,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0764-Force-close-world-loading-screen.patch b/patches/server/0763-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0764-Force-close-world-loading-screen.patch
rename to patches/server/0763-Force-close-world-loading-screen.patch
index 0b85261bfe..ef0f0822d8 100644
--- a/patches/server/0764-Force-close-world-loading-screen.patch
+++ b/patches/server/0763-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 147fed3b3f0b052bc2892eaf001f0fb5c9198a85..d728e637449ace459b3501fd6a4fb77657a5ca55 100644
+index 0bb3940da79733ccdfa75598b86ec0887a995933..f6f845a1842cb7082e9e3132f91f4addcdaedd97 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -398,6 +398,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0765-Fix-falling-block-spawn-methods.patch b/patches/server/0764-Fix-falling-block-spawn-methods.patch
similarity index 95%
rename from patches/server/0765-Fix-falling-block-spawn-methods.patch
rename to patches/server/0764-Fix-falling-block-spawn-methods.patch
index 48442f86c8..b889a95777 100644
--- a/patches/server/0765-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0764-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ad3d2130879bfaeccc4a67eaec398cec10d877b9..bbd0bc0e0ccd5e895ba054182024f5480416e849 100644
+index e709b6fda1703c0787ddeedec9b7cc09f440d652..6dbd45103571f033daafe085c5ccb962e5d9a17a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1453,7 +1453,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -43,7 +43,7 @@ index ad3d2130879bfaeccc4a67eaec398cec10d877b9..bbd0bc0e0ccd5e895ba054182024f548
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-index 104d68c636870a279cf4451da9c29237d532bdb2..61230477385eda3a806cfccdbb1685bf475a0c6a 100644
+index 0aa6cd6da72c4a48d8bb48adeccc2bb49939fabd..08316493785e0cf1f93f07dda8016ca5956216f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 @@ -378,7 +378,7 @@ public final class CraftEntityTypes {
diff --git a/patches/server/0766-Expose-furnace-minecart-push-values.patch b/patches/server/0765-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0766-Expose-furnace-minecart-push-values.patch
rename to patches/server/0765-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0767-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0766-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0767-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0766-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0768-More-Projectile-API.patch b/patches/server/0767-More-Projectile-API.patch
similarity index 99%
rename from patches/server/0768-More-Projectile-API.patch
rename to patches/server/0767-More-Projectile-API.patch
index c2fd22589b..4657f4b43b 100644
--- a/patches/server/0768-More-Projectile-API.patch
+++ b/patches/server/0767-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 e4d08d4b85f9ce57af50e6aaf4a308a8a6c85ce3..50b26cbd121f57fc0e3c7c958295e38fad756572 100644
+index d26dd7b3931ac99589880e3a02d3e7f19c53112a..595293dba9643ee3823f07ec2b077b805419d63c 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 {
diff --git a/patches/server/0769-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0768-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0769-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0768-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0770-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0770-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0769-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index d919feb56f..016a48a132 100644
--- a/patches/server/0770-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0769-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 e5b71a899884c3f26374051a60e026b7a01f6be3..74cc0b0044b8ad5fe9afc24b44e5e215ca8f8b4b 100644
+index 846db5783d85b68ca1f3788fe5434bc88b90c2d9..f48d6c0b1a9fd86061314d696ff84019667a38a2 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/0771-Implement-getComputedBiome-API.patch b/patches/server/0770-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0771-Implement-getComputedBiome-API.patch
rename to patches/server/0770-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0772-Make-some-itemstacks-nonnull.patch b/patches/server/0771-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0772-Make-some-itemstacks-nonnull.patch
rename to patches/server/0771-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0773-Implement-enchantWithLevels-API.patch b/patches/server/0772-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0773-Implement-enchantWithLevels-API.patch
rename to patches/server/0772-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0774-Fix-saving-in-unloadWorld.patch b/patches/server/0773-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0774-Fix-saving-in-unloadWorld.patch
rename to patches/server/0773-Fix-saving-in-unloadWorld.patch
index 79ad012645..ff2f38db61 100644
--- a/patches/server/0774-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0773-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 37822390d9cf71890a81e66509fa9f5ef77b2f5d..8682503d66ccdd6c6dce5f30c9b71ab3ae2f262a 100644
+index 8750983a05da55b0f491a5267965fe939e771c0e..3366bcb7fe198f4b9681efb1ee201e32d10becb5 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/0775-Buffer-OOB-setBlock-calls.patch b/patches/server/0774-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0775-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0774-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0776-Add-TameableDeathMessageEvent.patch b/patches/server/0775-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0776-Add-TameableDeathMessageEvent.patch
rename to patches/server/0775-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0777-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 98%
rename from patches/server/0777-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 5bd96d2c08..93f129ec9b 100644
--- a/patches/server/0777-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0776-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -78,7 +78,7 @@ index 6e1c67ad757e466d122badd547ee3f8421eba9ba..cf4859814a60468f683e3afe285b4934
                          }
                          // CraftBukkit end
 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 0d1afaecc35b4c7f7656a2d903f08f92a706cb3f..ad6df234b618235b4e08fb45952d4f0f0078fded 100644
+index 2beece01e1b2acc69eeb92810ce14db01a311f23..71bcd55d9d71fbd5bf3014c7e36d1456d8d5c3fd 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
 @@ -374,7 +374,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -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 50b26cbd121f57fc0e3c7c958295e38fad756572..72a33f9e981d7a5e9a30a7ea8ef2a970c986cece 100644
+index 595293dba9643ee3823f07ec2b077b805419d63c..3a6743c81c6740cda1622c60c09088c4cd61f4a3 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/0778-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0777-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 92%
rename from patches/server/0778-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0777-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 0a634e6230..bfb472a6ae 100644
--- a/patches/server/0778-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0777-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 29da0b80aa0a4e6ebf1f0e30c26a6b85f034e8e4..c9424effb591bbe96e803db9eb39640eec07148b 100644
+index 7c8f5ae6bd83bd08403738dcd364b0af06fb1a9b..1f7b13806ffbcf81df67a02129aa2c07dfc7b8f5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -924,12 +924,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0779-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0778-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 90%
rename from patches/server/0779-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0778-Ensure-entity-passenger-world-matches-ridden-entity.patch
index e75d82ac37..aaf6373899 100644
--- a/patches/server/0779-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0778-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 225ad411a48c156bcd1973f97349db80b0ff6a92..32d97353a5f030fa46ea637e546ef0856122b391 100644
+index 1fd71bd27f601312f6ff00fbcb9b6687af284001..624e0b1af20a3595734bc3d59a674e902698b6d6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2845,7 +2845,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0780-Guard-against-invalid-entity-positions.patch b/patches/server/0779-Guard-against-invalid-entity-positions.patch
similarity index 95%
rename from patches/server/0780-Guard-against-invalid-entity-positions.patch
rename to patches/server/0779-Guard-against-invalid-entity-positions.patch
index 27f03de786..22147b5377 100644
--- a/patches/server/0780-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0779-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 32d97353a5f030fa46ea637e546ef0856122b391..7179939c141d4c08e4d52ad8388625024dc8021c 100644
+index 624e0b1af20a3595734bc3d59a674e902698b6d6..bc1b08f778537f7973ed1249dee63d9d12735dd1 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/0781-cache-resource-keys.patch b/patches/server/0780-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0781-cache-resource-keys.patch
rename to patches/server/0780-cache-resource-keys.patch
diff --git a/patches/server/0782-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0781-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 99%
rename from patches/server/0782-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0781-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 0f3a5f092b..8db49ef839 100644
--- a/patches/server/0782-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0781-Allow-to-change-the-podium-for-the-EnderDragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow to change the podium for the EnderDragon
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index ca605316c9c639c096d545e8cdf233ad645bd041..f7f03725de9e72825fbe9516817c7345d2b4eb75 100644
+index 2ede6678a5fe6e1280ee4918b69302f483cc50ff..4bcbfe3f95efd5d8ec2d2d7c66c4c355cdf510b2 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -103,6 +103,10 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0783-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0782-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0783-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0782-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0784-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0783-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0784-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0783-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0785-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0784-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0785-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0784-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0786-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0785-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0786-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0785-Use-username-instead-of-display-name-in-PlayerList-g.patch
index db02db208f..71c2ec984e 100644
--- a/patches/server/0786-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0785-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 311dbc93e1f1aa9e4ea6786a3429f84e6ffa114c..f2e44904db90b43672367740e6e5f09da8db2797 100644
+index f6f845a1842cb7082e9e3132f91f4addcdaedd97..6310d19a42f549fda7446569958019e8d75a0ca6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1451,7 +1451,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0787-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0786-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0787-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0786-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0788-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 93%
rename from patches/server/0788-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 81c4ab47d1..93bdb73d1c 100644
--- a/patches/server/0788-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0787-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b7d8684968051f7af5462fe98d39fbebe3e96fd7..3904c9d3ffde11320306f7c5c01ec2b8b0dfbaf9 100644
+index 8cf7d514803fd953e068d3436bfd4e50fb4b0da0..80682ce58d0b0ce0409d162f447b585163c36753 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -638,10 +638,11 @@ public final class ItemStack {
diff --git a/patches/server/0789-WorldCreator-keepSpawnLoaded.patch b/patches/server/0788-WorldCreator-keepSpawnLoaded.patch
similarity index 94%
rename from patches/server/0789-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0788-WorldCreator-keepSpawnLoaded.patch
index 374c68cec1..7bddd86527 100644
--- a/patches/server/0789-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0788-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 8682503d66ccdd6c6dce5f30c9b71ab3ae2f262a..66844cc781910324cf7ad07033f2493be032bf0d 100644
+index 3366bcb7fe198f4b9681efb1ee201e32d10becb5..90602c2201b50e8b5d300193aef962a70c52625f 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/0790-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0789-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0790-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0789-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0791-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0790-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0791-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0790-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0792-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0791-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0792-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0791-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0793-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0792-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0793-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0792-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0794-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0793-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0794-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0793-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0795-Add-PlayerStopUsingItemEvent.patch b/patches/server/0794-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0795-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0794-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0796-Don-t-tick-markers.patch b/patches/server/0795-Don-t-tick-markers.patch
similarity index 97%
rename from patches/server/0796-Don-t-tick-markers.patch
rename to patches/server/0795-Don-t-tick-markers.patch
index b8d498005c..d5b29209c9 100644
--- a/patches/server/0796-Don-t-tick-markers.patch
+++ b/patches/server/0795-Don-t-tick-markers.patch
@@ -35,7 +35,7 @@ index 0d18158174966245b679954f5a9268c6aac4be32..9e0fb3a13cd4ae0142e3e63995b7eac6
          }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f76b3f410fcc756bb34a5fac21b1d7088ac7a9ce..59103744ac6beeb12719fdefcda54eeff498229e 100644
+index 3495981419a75efe42bce45a89a32378dd6b8372..2d31752478636bd21bbff5b430e5acb76b5d91c2 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -213,8 +213,14 @@ public class ActivationRange
diff --git a/patches/server/0797-Expand-FallingBlock-API.patch b/patches/server/0796-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0797-Expand-FallingBlock-API.patch
rename to patches/server/0796-Expand-FallingBlock-API.patch
diff --git a/patches/server/0798-Do-not-accept-invalid-client-settings.patch b/patches/server/0797-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0798-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0797-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0799-Add-support-for-Proxy-Protocol.patch b/patches/server/0798-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0799-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0798-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0800-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0799-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0800-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0799-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0801-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0800-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0801-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0800-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0802-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0801-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0802-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0801-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0803-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0802-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0803-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0802-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0804-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0803-Prevent-entity-loading-causing-async-lookups.patch
similarity index 97%
rename from patches/server/0804-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0803-Prevent-entity-loading-causing-async-lookups.patch
index d6ab60fc8e..25f15dd7a4 100644
--- a/patches/server/0804-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0803-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7179939c141d4c08e4d52ad8388625024dc8021c..4c4c23df45a951a3d34b801463957b2cf589161a 100644
+index bc1b08f778537f7973ed1249dee63d9d12735dd1..607bcd2ef45f6d77b43e38211e3fe0b3070504a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -801,6 +801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0805-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0804-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 97%
rename from patches/server/0805-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0804-Throw-exception-on-world-create-while-being-ticked.patch
index 4b8e3640fc..744561858b 100644
--- a/patches/server/0805-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0804-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index 3da647154516ded20fd18ee4baa7242e73ab91e8..5b39e4a6b39e73cfe5645d80cd823e58
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 66844cc781910324cf7ad07033f2493be032bf0d..fafea05e8b09fd97f8a98997730af9e5695633b9 100644
+index 90602c2201b50e8b5d300193aef962a70c52625f..4b0ef3a7fbf68fc7687f76350088c129628bb505 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -874,6 +874,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0806-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0805-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0806-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0805-Add-Alternate-Current-redstone-implementation.patch
index cb2ce69dc7..ac60b7935d 100644
--- a/patches/server/0806-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0805-Add-Alternate-Current-redstone-implementation.patch
@@ -2034,7 +2034,7 @@ index 9e0fb3a13cd4ae0142e3e63995b7eac61e48eea6..8587f35706daf5a317035d0f7acee0b3
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 096cd97827f4912fc5b538e01d29257195270055..6ad9e4da7fd9d8b4e482928295b51e13170ed6b9 100644
+index 3f196645f2259ed468e0dc3a05ecbd84d3792af0..dfb2decd624c29c7ef88bccf2b5431eb471a25e5 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/0807-Dont-resent-entity-on-art-update.patch b/patches/server/0806-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0807-Dont-resent-entity-on-art-update.patch
rename to patches/server/0806-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0808-Add-WardenAngerChangeEvent.patch b/patches/server/0807-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0808-Add-WardenAngerChangeEvent.patch
rename to patches/server/0807-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0809-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0808-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 96%
rename from patches/server/0809-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0808-Add-option-for-strict-advancement-dimension-checks.patch
index 1d7e4983b4..d2cc269314 100644
--- a/patches/server/0809-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0808-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 5f9cb2c7a2874e423087d04d3360af0364692b5c..f81aa5adf9a499cef6dc45bf3f9de2df
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e8d527f67e84921a94a2196e86efec96039f06e4..a5893a5e3b22934db533967f515dd5e0eb7fbf2e 100644
+index 1f7b13806ffbcf81df67a02129aa2c07dfc7b8f5..08acf8c6e6c624016ca97eef15da29d338433411 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1321,6 +1321,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0810-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0809-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0810-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0809-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0811-Nameable-Banner-API.patch b/patches/server/0810-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0811-Nameable-Banner-API.patch
rename to patches/server/0810-Nameable-Banner-API.patch
diff --git a/patches/server/0812-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0811-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0812-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0811-Don-t-broadcast-messages-to-command-blocks.patch
index fb129ecb6d..20e1c8170c 100644
--- a/patches/server/0812-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0811-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 fafea05e8b09fd97f8a98997730af9e5695633b9..193a1d096bee81d0b51be7253316d326f604caf4 100644
+index 4b0ef3a7fbf68fc7687f76350088c129628bb505..90eca456db0545de8a8247f7638d2e990fdfd246 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/0813-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0812-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0813-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0812-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0814-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0813-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0814-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0813-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0815-Add-Player-getFishHook.patch b/patches/server/0814-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0815-Add-Player-getFishHook.patch
rename to patches/server/0814-Add-Player-getFishHook.patch
diff --git a/patches/server/0816-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0815-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0816-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0815-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0817-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0816-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 98%
rename from patches/server/0817-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0816-Add-various-missing-EntityDropItemEvent-calls.patch
index 2c9631f498..8c006b9875 100644
--- a/patches/server/0817-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0816-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c4c23df45a951a3d34b801463957b2cf589161a..b583abba5a32468383336c7a354bf96553544fc3 100644
+index 607bcd2ef45f6d77b43e38211e3fe0b3070504a6..9de9a7c204b241e92ab940723a160ede1e2dc97b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2697,6 +2697,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0818-Fix-Bee-flower-NPE.patch b/patches/server/0817-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0818-Fix-Bee-flower-NPE.patch
rename to patches/server/0817-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0819-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0819-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0818-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0820-More-Teleport-API.patch b/patches/server/0819-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0820-More-Teleport-API.patch
rename to patches/server/0819-More-Teleport-API.patch
diff --git a/patches/server/0821-Add-EntityPortalReadyEvent.patch b/patches/server/0820-Add-EntityPortalReadyEvent.patch
similarity index 95%
rename from patches/server/0821-Add-EntityPortalReadyEvent.patch
rename to patches/server/0820-Add-EntityPortalReadyEvent.patch
index e82184bd04..01ff7dc923 100644
--- a/patches/server/0821-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0820-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 b583abba5a32468383336c7a354bf96553544fc3..ab91ff78d943a4b0c0ea6af1781b2e64ec7ca1fa 100644
+index 9de9a7c204b241e92ab940723a160ede1e2dc97b..f431dc7c31d91ee6bd614a303d11b3abbe8c33ed 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/0822-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0821-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0822-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0821-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0823-Send-block-entities-after-destroy-prediction.patch b/patches/server/0822-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0823-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0822-Send-block-entities-after-destroy-prediction.patch
index 40e95e590b..a224614880 100644
--- a/patches/server/0823-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0822-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 5af57f06717cb1fd891acfacfdd795e6f6426e7d..bd5348f00249bf318bba308ef256ad42a69df7f0 100644
+index 95966fdddc81dcc4e65b075a4df6d5dd9af4e65a..7b6c3d1feeb390485e5ef5507e6dae3992155212 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/0824-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0823-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 98%
rename from patches/server/0824-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0823-Warn-on-plugins-accessing-faraway-chunks.patch
index b44ffd26eb..19bebe9530 100644
--- a/patches/server/0824-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0823-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2e96fadbead617096ef6dd96b37f967da9a30395..440e99f24fdbc73fa51d5d3aa8aabfae9fc4deca 100644
+index dfb2decd624c29c7ef88bccf2b5431eb471a25e5..e6c49b780b802fce13451e71be0b36160fabbef7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -813,7 +813,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0825-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0824-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0825-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0824-Custom-Chat-Completion-Suggestions-API.patch
index afd502bd34..6a48907511 100644
--- a/patches/server/0825-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0824-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/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 10e5b244e3a55e4b26b05a7b117a868166abce43..160b25a768969af347917aad00807381a6ba39d1 100644
+index 800b216c2bbc01828005286e604e4cd6610df73c..42729e12e6a19e99d13d8e8d6af3a0e53aa620c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -647,6 +647,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0826-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0825-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0826-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0825-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0827-Collision-API.patch b/patches/server/0826-Collision-API.patch
similarity index 100%
rename from patches/server/0827-Collision-API.patch
rename to patches/server/0826-Collision-API.patch
diff --git a/patches/server/0828-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0828-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0827-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0829-Block-Ticking-API.patch b/patches/server/0828-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0829-Block-Ticking-API.patch
rename to patches/server/0828-Block-Ticking-API.patch
diff --git a/patches/server/0830-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0829-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0830-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0829-Add-Velocity-IP-Forwarding-Support.patch
index c0e8eae7c9..f101876256 100644
--- a/patches/server/0830-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0829-Add-Velocity-IP-Forwarding-Support.patch
@@ -123,7 +123,7 @@ index 5264235c1547c78b8123e2efb07dcb77486cc5bf..db363bca264e37c29fda58291246aba0
                  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 d52d3808a058b6eef57639f1d455986b9681f645..89b3184be952fd0803520dd0f717f3acfc3cb496 100644
+index ec6a56e298872a403e0451944f7139256eab31d6..8ce2fd887d9c2cf86fa4ec0332b70681f1572911 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,
@@ -215,7 +215,7 @@ index d52d3808a058b6eef57639f1d455986b9681f645..89b3184be952fd0803520dd0f717f3ac
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 193a1d096bee81d0b51be7253316d326f604caf4..e85439c7124655f0f078ae395bad250fa1d3c88e 100644
+index 90eca456db0545de8a8247f7638d2e990fdfd246..2836eb1edefc46556d71a23ddbb50cb495b44021 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -803,7 +803,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0831-Add-NamespacedKey-biome-methods.patch b/patches/server/0830-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0831-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0830-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0832-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0832-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0833-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0832-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0833-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0832-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0834-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0833-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0834-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0833-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0835-Missing-eating-regain-reason.patch b/patches/server/0834-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0835-Missing-eating-regain-reason.patch
rename to patches/server/0834-Missing-eating-regain-reason.patch
diff --git a/patches/server/0836-Missing-effect-cause.patch b/patches/server/0835-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0836-Missing-effect-cause.patch
rename to patches/server/0835-Missing-effect-cause.patch
diff --git a/patches/server/0837-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0836-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0837-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0836-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0838-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0837-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0838-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0837-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0839-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0838-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0839-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0838-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0840-Configurable-chat-thread-limit.patch b/patches/server/0839-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0840-Configurable-chat-thread-limit.patch
rename to patches/server/0839-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0841-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0840-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0841-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0840-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0842-fix-Jigsaw-block-kicking-user.patch b/patches/server/0841-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0842-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0841-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0843-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0842-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0843-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0842-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0844-Add-getDrops-to-BlockState.patch b/patches/server/0843-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0844-Add-getDrops-to-BlockState.patch
rename to patches/server/0843-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0845-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0844-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0845-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0844-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0846-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0845-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0846-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0845-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0847-Fix-custom-piglin-loved-items.patch b/patches/server/0846-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0847-Fix-custom-piglin-loved-items.patch
rename to patches/server/0846-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0848-EntityPickupItemEvent-fixes.patch b/patches/server/0847-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0848-EntityPickupItemEvent-fixes.patch
rename to patches/server/0847-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0849-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0848-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 97%
rename from patches/server/0849-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0848-Correctly-handle-interactions-with-items-on-cooldown.patch
index a6e2105024..77d1d6adb1 100644
--- a/patches/server/0849-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0848-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 72a33f9e981d7a5e9a30a7ea8ef2a970c986cece..5d1a2d90363596801b043f8ef11a74c1ee6ae166 100644
+index 3a6743c81c6740cda1622c60c09088c4cd61f4a3..d51bcd5ccda9e923f0e259c187b9f349df974dfb 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/0850-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0849-Add-PlayerInventorySlotChangeEvent.patch
similarity index 97%
rename from patches/server/0850-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0849-Add-PlayerInventorySlotChangeEvent.patch
index 8e3640e3e8..131b4d994d 100644
--- a/patches/server/0850-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0849-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9327f230d80046ec6a33475c2f9fb3823f887c58..96dea7b60248e1905640b983d22a8926ab51137f 100644
+index e6b6dcdb08e71fbcb27757413816c1329510eadc..24e6808e325bd80a55c94309aeab835804b03973 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -379,6 +379,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0851-Elder-Guardian-appearance-API.patch b/patches/server/0850-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0851-Elder-Guardian-appearance-API.patch
rename to patches/server/0850-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0852-Allow-changing-bed-s-occupied-property.patch b/patches/server/0851-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0852-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0851-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0853-Add-entity-knockback-API.patch b/patches/server/0852-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0853-Add-entity-knockback-API.patch
rename to patches/server/0852-Add-entity-knockback-API.patch
diff --git a/patches/server/0854-Detect-headless-JREs.patch b/patches/server/0853-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0854-Detect-headless-JREs.patch
rename to patches/server/0853-Detect-headless-JREs.patch
diff --git a/patches/server/0855-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0854-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0855-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0854-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0856-optimized-dirt-and-snow-spreading.patch b/patches/server/0855-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0856-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0855-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0857-Added-EntityToggleSitEvent.patch b/patches/server/0856-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0857-Added-EntityToggleSitEvent.patch
rename to patches/server/0856-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0858-Add-fire-tick-delay-option.patch b/patches/server/0857-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0858-Add-fire-tick-delay-option.patch
rename to patches/server/0857-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0859-Add-Moving-Piston-API.patch b/patches/server/0858-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0859-Add-Moving-Piston-API.patch
rename to patches/server/0858-Add-Moving-Piston-API.patch
diff --git a/patches/server/0860-Ignore-impossible-spawn-tick.patch b/patches/server/0859-Ignore-impossible-spawn-tick.patch
similarity index 90%
rename from patches/server/0860-Ignore-impossible-spawn-tick.patch
rename to patches/server/0859-Ignore-impossible-spawn-tick.patch
index fb255aaec0..cfdb9da989 100644
--- a/patches/server/0860-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0859-Ignore-impossible-spawn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 9ec83d6eeff22c2ce25374a83f581a675d4fd067..d88a23984dcea9c2119bdc245013af8b25448da3 100644
+index 9f677a695bdb8ebde457452e4b70c674e2016830..3aa4cb526f04a171ace0b95d18ecebc9a002470a 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -82,6 +82,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0861-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0860-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0861-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0860-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0862-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0861-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0862-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0861-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0863-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 95%
rename from patches/server/0863-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0862-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index fb2e8745e3..e99540eca8 100644
--- a/patches/server/0863-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0862-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 ab91ff78d943a4b0c0ea6af1781b2e64ec7ca1fa..89defc6e1e95fdd7d76ae3af0282066819831c9e 100644
+index f431dc7c31d91ee6bd614a303d11b3abbe8c33ed..78201a4bd4f00653d920ab311ed4622d1246ccb2 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/0864-Prevent-compass-from-loading-chunks.patch b/patches/server/0863-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0864-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0863-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0865-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0864-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0865-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0864-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0866-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0865-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0866-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0865-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0867-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0866-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0867-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0866-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0868-Add-Player-Warden-Warning-API.patch b/patches/server/0867-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0868-Add-Player-Warden-Warning-API.patch
rename to patches/server/0867-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0869-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0868-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0869-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0868-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0870-Add-paper-dumplisteners-command.patch b/patches/server/0869-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0870-Add-paper-dumplisteners-command.patch
rename to patches/server/0869-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0871-check-global-player-list-where-appropriate.patch b/patches/server/0870-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0871-check-global-player-list-where-appropriate.patch
rename to patches/server/0870-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0872-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0871-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0872-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0871-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0873-ItemStack-damage-API.patch b/patches/server/0872-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0873-ItemStack-damage-API.patch
rename to patches/server/0872-ItemStack-damage-API.patch
diff --git a/patches/server/0874-Friction-API.patch b/patches/server/0873-Friction-API.patch
similarity index 100%
rename from patches/server/0874-Friction-API.patch
rename to patches/server/0873-Friction-API.patch
diff --git a/patches/server/0875-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0874-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0875-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0874-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0876-Fix-player-kick-on-shutdown.patch b/patches/server/0875-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0876-Fix-player-kick-on-shutdown.patch
rename to patches/server/0875-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0877-Sync-offhand-slot-in-menus.patch b/patches/server/0876-Sync-offhand-slot-in-menus.patch
similarity index 97%
rename from patches/server/0877-Sync-offhand-slot-in-menus.patch
rename to patches/server/0876-Sync-offhand-slot-in-menus.patch
index a6db41e603..8789394eda 100644
--- a/patches/server/0877-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0876-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 96dea7b60248e1905640b983d22a8926ab51137f..846dd10976c3f4d2220eaabd05b7951de7e9fc1d 100644
+index 24e6808e325bd80a55c94309aeab835804b03973..de27b8d578d429564038e01cef5f46d4d3d7e81c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -348,6 +348,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0878-Player-Entity-Tracking-Events.patch b/patches/server/0877-Player-Entity-Tracking-Events.patch
similarity index 96%
rename from patches/server/0878-Player-Entity-Tracking-Events.patch
rename to patches/server/0877-Player-Entity-Tracking-Events.patch
index 1f09177814..02c392bcf0 100644
--- a/patches/server/0878-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0877-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 89defc6e1e95fdd7d76ae3af0282066819831c9e..b5eb4a067cc3b4a2a6b0b6ba2c129c85c4aaa849 100644
+index 78201a4bd4f00653d920ab311ed4622d1246ccb2..bee8fe397c960c4f2ceba8777d0cc4e6e2bd060d 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/0879-Limit-pet-look-distance.patch b/patches/server/0878-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0879-Limit-pet-look-distance.patch
rename to patches/server/0878-Limit-pet-look-distance.patch
diff --git a/patches/server/0880-Properly-resend-entities.patch b/patches/server/0879-Properly-resend-entities.patch
similarity index 99%
rename from patches/server/0880-Properly-resend-entities.patch
rename to patches/server/0879-Properly-resend-entities.patch
index 61e9a971ce..4d74f87857 100644
--- a/patches/server/0880-Properly-resend-entities.patch
+++ b/patches/server/0879-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 8b50f5da94766fdfc31b1b5f7d11795c2942ec72..dc01d6a09d369038677b5a0b61ad91594144ecd9 100644
+index 7b6c3d1feeb390485e5ef5507e6dae3992155212..bdd2909b1ce8932509ab37ff1124a97171658d18 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/0881-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0880-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0880-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0882-fix-Instruments.patch b/patches/server/0881-fix-Instruments.patch
similarity index 96%
rename from patches/server/0882-fix-Instruments.patch
rename to patches/server/0881-fix-Instruments.patch
index 24591a282a..45518ab2ae 100644
--- a/patches/server/0882-fix-Instruments.patch
+++ b/patches/server/0881-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fd01db8a45934cedd8d250a197c47a8e9d386fa7..7f90316c1f56f4829282d388233032bce97abbf5 100644
+index ebbb4e5cbbf505598fb84b39649ff5d27e20d6bc..a0c6902955296da171548618bfcbf629944f8737 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -724,7 +724,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0883-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0883-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0884-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0884-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0885-Add-BlockLockCheckEvent.patch b/patches/server/0884-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0885-Add-BlockLockCheckEvent.patch
rename to patches/server/0884-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0886-Add-Sneaking-API-for-Entities.patch b/patches/server/0885-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0886-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0885-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0887-Improve-logging-and-errors.patch b/patches/server/0886-Improve-logging-and-errors.patch
similarity index 98%
rename from patches/server/0887-Improve-logging-and-errors.patch
rename to patches/server/0886-Improve-logging-and-errors.patch
index 27c2bc8858..7a98293c52 100644
--- a/patches/server/0887-Improve-logging-and-errors.patch
+++ b/patches/server/0886-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 dc01d6a09d369038677b5a0b61ad91594144ecd9..bd72501df7b50c3bc35dd9dde02e632ffc8458f0 100644
+index bdd2909b1ce8932509ab37ff1124a97171658d18..623de7ab6d45f48db7637ecb46e07488c01d4dc6 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/0888-Improve-PortalEvents.patch b/patches/server/0887-Improve-PortalEvents.patch
similarity index 93%
rename from patches/server/0888-Improve-PortalEvents.patch
rename to patches/server/0887-Improve-PortalEvents.patch
index cbe9f06001..26f33f7a45 100644
--- a/patches/server/0888-Improve-PortalEvents.patch
+++ b/patches/server/0887-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 89defc6e1e95fdd7d76ae3af0282066819831c9e..7da95c2c02493c8a472488d7f8e6f63fbe807c8e 100644
+index bee8fe397c960c4f2ceba8777d0cc4e6e2bd060d..250a0ade29d4cf619d99a1c052e521e94482a213 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/0889-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0888-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0889-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0888-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0890-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 92%
rename from patches/server/0890-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch
index 481a9f9576..53541ae431 100644
--- a/patches/server/0890-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0889-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 a7f3a5c054a3f48ab37822585bbc268bd551a63d..a1180623d885870bacb974d8128a61ab80403ab2 100644
+index 623de7ab6d45f48db7637ecb46e07488c01d4dc6..23fe6877cadd780f4db99955fd993e1461a21040 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/0891-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0891-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0892-Flying-Fall-Damage.patch b/patches/server/0891-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0892-Flying-Fall-Damage.patch
rename to patches/server/0891-Flying-Fall-Damage.patch
diff --git a/patches/server/0893-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 99%
rename from patches/server/0893-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 8186bbed81..e9c31357c4 100644
--- a/patches/server/0893-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -130,7 +130,7 @@ index 000724a070f7f053c14cb53ecc45f0ee14454c53..9271ff2a9ea05569e3c81886399aa7ab
      // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity)
      private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5d1a2d90363596801b043f8ef11a74c1ee6ae166..0d488d4553ee604081fb481f4d89ec04882e83ac 100644
+index d51bcd5ccda9e923f0e259c187b9f349df974dfb..a6ccc177a3435d807dd6be3bdfca7f016c094158 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1045,7 +1045,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0894-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 91%
rename from patches/server/0894-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index bd25e0fd3d..35454f2b1b 100644
--- a/patches/server/0894-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7da95c2c02493c8a472488d7f8e6f63fbe807c8e..00c88798099c72f8682ac3547da96af6830567b4 100644
+index 250a0ade29d4cf619d99a1c052e521e94482a213..93f0ecc2eb57d4c999babb838fa2d7575f1326cf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1160,7 +1160,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0895-config-for-disabling-entity-tag-tags.patch b/patches/server/0894-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0895-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0894-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0896-Use-single-player-info-update-packet-on-join.patch b/patches/server/0895-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0896-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0895-Use-single-player-info-update-packet-on-join.patch
index 8a02e1d315..890fc64712 100644
--- a/patches/server/0896-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0895-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 ff1de6758bb6ba0bb41394c4c900cf03ef5bdc75..bd9a5ee3498085b5d117beae4f51093a0050b3f1 100644
+index 23fe6877cadd780f4db99955fd993e1461a21040..00855a1e3519a43ab5b203cf0313b297baa254a0 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/0897-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0896-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0897-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0896-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0898-Win-Screen-API.patch b/patches/server/0897-Win-Screen-API.patch
similarity index 93%
rename from patches/server/0898-Win-Screen-API.patch
rename to patches/server/0897-Win-Screen-API.patch
index e5bba97145..a1212185b0 100644
--- a/patches/server/0898-Win-Screen-API.patch
+++ b/patches/server/0897-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca9c49b1fc1c3e90b2b2aa7afa8a4ecb2dcc779d..3271d5e34df30f4d04c0cae8cfecb2391b5a8cd6 100644
+index b8b23105d37ac2d461d87d0c8e3c83c6fd09c960..b1d12c30dd23e092531c0d4d3af367262ccb5402 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1226,6 +1226,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0899-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0899-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0900-Fix-force-opening-enchantment-tables.patch b/patches/server/0899-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0900-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0899-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0901-Add-Entity-Body-Yaw-API.patch b/patches/server/0900-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0901-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0900-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0902-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0902-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0903-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 90%
rename from patches/server/0903-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch
index afe73c4b09..17e4b0c331 100644
--- a/patches/server/0903-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0902-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 440e99f24fdbc73fa51d5d3aa8aabfae9fc4deca..980064ce70dce5c92e2822b8978425d3dd856c52 100644
+index e6c49b780b802fce13451e71be0b36160fabbef7..9f08ab23b9c0c24c4b6131b110dfc7d4a9cdd1b2 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/0904-Add-EntityFertilizeEggEvent.patch b/patches/server/0903-Add-EntityFertilizeEggEvent.patch
similarity index 98%
rename from patches/server/0904-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0903-Add-EntityFertilizeEggEvent.patch
index ac703119d1..28c9a823c0 100644
--- a/patches/server/0904-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0903-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 0d488d4553ee604081fb481f4d89ec04882e83ac..6570b9c2043a549c0dba71f2683f64300d7b3bfe 100644
+index a6ccc177a3435d807dd6be3bdfca7f016c094158..9ad9f18b62c8c7d2b4f53bf795817e4fcce3c4cc 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/0905-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0905-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0906-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0906-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0907-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0906-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0907-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0906-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0908-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0907-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0908-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0907-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0909-Fix-text-display-error-on-spawn.patch b/patches/server/0908-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0909-Fix-text-display-error-on-spawn.patch
rename to patches/server/0908-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0910-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0909-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0910-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0909-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0911-Add-Shearable-API.patch b/patches/server/0910-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0911-Add-Shearable-API.patch
rename to patches/server/0910-Add-Shearable-API.patch
diff --git a/patches/server/0912-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0911-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0912-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0911-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0913-Optimize-Hoppers.patch b/patches/server/0912-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0913-Optimize-Hoppers.patch
rename to patches/server/0912-Optimize-Hoppers.patch
index 096267e230..de61e1b173 100644
--- a/patches/server/0913-Optimize-Hoppers.patch
+++ b/patches/server/0912-Optimize-Hoppers.patch
@@ -62,7 +62,7 @@ index a2961f1453e3805879941c709ab74a608285db42..50316da08ae259dcc0d02c28081a352f
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3904c9d3ffde11320306f7c5c01ec2b8b0dfbaf9..26d00500831d07f2ef48da89770b3ece2cdc846b 100644
+index 80682ce58d0b0ce0409d162f447b585163c36753..ae7214c6f72b85ec51230809db97b66fd2fcd298 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -749,10 +749,16 @@ public final class ItemStack {
diff --git a/patches/server/0914-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 95%
rename from patches/server/0914-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch
index 05f26545e4..88ae1ee91b 100644
--- a/patches/server/0914-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix beehives generating from using bonemeal
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 26d00500831d07f2ef48da89770b3ece2cdc846b..0822300eaf771d70f887d91a160115eaa7e3ec89 100644
+index ae7214c6f72b85ec51230809db97b66fd2fcd298..3f420bbe8c2b9128a051030c4acd3603ea487132 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -422,6 +422,7 @@ public final class ItemStack {
diff --git a/patches/server/0915-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0915-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0916-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0915-Treat-sequence-violations-like-they-should-be.patch
similarity index 91%
rename from patches/server/0916-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0915-Treat-sequence-violations-like-they-should-be.patch
index 5ed27bdad3..9eb3ebf470 100644
--- a/patches/server/0916-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0915-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 2c5870846a3833da3da899a60dd6a69a2e7b195a..d48ea4f9d2968a4d8af426058d01cc17a090a1fa 100644
+index 00855a1e3519a43ab5b203cf0313b297baa254a0..6f1602e5e077b9dd401a1ca80aef445b257801fd 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/0917-remove-duplicate-animate-packet-for-records.patch b/patches/server/0916-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0917-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0916-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0918-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0918-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch
index b0ce93b4d8..2df3ae6626 100644
--- a/patches/server/0918-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0917-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 bdac192dc1ca4038d7a54cebb1cc58a78081f682..156217773320b53842224c8f45c612808703236a 100644
+index 6f1602e5e077b9dd401a1ca80aef445b257801fd..70adc48f7126425b43a667c4d82d511f92909807 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/0919-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0919-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0920-Use-array-for-gamerule-storage.patch b/patches/server/0919-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0920-Use-array-for-gamerule-storage.patch
rename to patches/server/0919-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0921-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0920-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0921-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0920-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0922-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0922-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0923-Add-Mob-Experience-reward-API.patch b/patches/server/0922-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0923-Add-Mob-Experience-reward-API.patch
rename to patches/server/0922-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0924-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0923-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0924-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0923-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0925-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 92%
rename from patches/server/0925-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch
index 37456569e2..cbe24321bd 100644
--- a/patches/server/0925-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0924-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 6570b9c2043a549c0dba71f2683f64300d7b3bfe..8d423a7ace9c140119dd49866c3a4c42017cfb60 100644
+index 9ad9f18b62c8c7d2b4f53bf795817e4fcce3c4cc..7bd1147362d057a16cdac0893615483479233c66 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/0926-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0926-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0927-More-accurate-isInOpenWater-impl.patch b/patches/server/0926-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0927-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0926-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0928-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0928-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0929-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0928-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0929-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0928-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0930-Expand-PlayerItemMendEvent.patch b/patches/server/0929-Expand-PlayerItemMendEvent.patch
similarity index 98%
rename from patches/server/0930-Expand-PlayerItemMendEvent.patch
rename to patches/server/0929-Expand-PlayerItemMendEvent.patch
index 88c95af975..b0c81d037f 100644
--- a/patches/server/0930-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0929-Expand-PlayerItemMendEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand PlayerItemMendEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index cab5636fe6be9ee7f23ffbd5a399d2aeea1cd538..fb74f13ab2a977224e843a468ea8c72d923a75eb 100644
+index 5685951b71a8b81c7a71fd93b099b276d535b401..2a689581565bebc01ba354a3564d30327486953d 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -337,7 +337,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0931-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch
similarity index 97%
rename from patches/server/0931-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch
index bdb6f8747a..03a90a486e 100644
--- a/patches/server/0931-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 00c88798099c72f8682ac3547da96af6830567b4..96cfc5323cf080540c934c54ac00488e5babcea5 100644
+index 93f0ecc2eb57d4c999babb838fa2d7575f1326cf..9357bedf69bc9709b74e05ca7514c6802757059d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0932-Add-transient-modifier-API.patch b/patches/server/0931-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0932-Add-transient-modifier-API.patch
rename to patches/server/0931-Add-transient-modifier-API.patch
diff --git a/patches/server/0933-Fix-block-place-logic.patch b/patches/server/0932-Fix-block-place-logic.patch
similarity index 95%
rename from patches/server/0933-Fix-block-place-logic.patch
rename to patches/server/0932-Fix-block-place-logic.patch
index 181bc5cfc5..5437387225 100644
--- a/patches/server/0933-Fix-block-place-logic.patch
+++ b/patches/server/0932-Fix-block-place-logic.patch
@@ -22,7 +22,7 @@ index e581dc10f3c805f7f8b6e4c842092609e7e1a0f8..6819cea2858f0035a4fbf3671612d43f
                      if ((entityhuman == null || !entityhuman.getAbilities().instabuild) && itemstack != ItemStack.EMPTY) { // CraftBukkit
                          itemstack.shrink(1);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0822300eaf771d70f887d91a160115eaa7e3ec89..11173571f3589d4301a2528db96718c0fd81efed 100644
+index 3f420bbe8c2b9128a051030c4acd3603ea487132..453f48b540560a340721d762ca80eadf229c4dce 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -493,13 +493,7 @@ public final class ItemStack {
@@ -41,7 +41,7 @@ index 0822300eaf771d70f887d91a160115eaa7e3ec89..11173571f3589d4301a2528db96718c0
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 980064ce70dce5c92e2822b8978425d3dd856c52..c5eebb8bd05748d22d9cf688e510cca6bca111e1 100644
+index 9f08ab23b9c0c24c4b6131b110dfc7d4a9cdd1b2..3a6615df0e9e0043cebe35268509b882893725fb 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/0934-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 93%
rename from patches/server/0934-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 432233fa2b..c65f4bdd36 100644
--- a/patches/server/0934-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 11173571f3589d4301a2528db96718c0fd81efed..e1de186632baa6ee58a071aabf8967b9095f9aa1 100644
+index 453f48b540560a340721d762ca80eadf229c4dce..b5e91462e403f4f53879be82301f5bae6cf564d2 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -544,7 +544,11 @@ public final class ItemStack {
diff --git a/patches/server/0936-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0934-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0936-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0934-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0937-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 94%
rename from patches/server/0937-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 5108d60fea..26067bee3d 100644
--- a/patches/server/0937-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0935-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 e85439c7124655f0f078ae395bad250fa1d3c88e..940f79b4456e94fd15b3e6eec38e8fa59ab01d14 100644
+index 2836eb1edefc46556d71a23ddbb50cb495b44021..036d1d133dbe39194ba8bc5201bdae1a3bdae56c 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/0935-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0935-Ignore-inline-definitions-of-trim-material-pattern.patch
deleted file mode 100644
index 2b71534642..0000000000
--- a/patches/server/0935-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 8 Jun 2023 21:51:50 -0700
-Subject: [PATCH] Ignore inline definitions of trim material & pattern
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
-index 24b87a1566b48be1367970a9ba887a6b3a785bb9..f393e0844889c967d9e83d9a1e73c134fcb6e33b 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
-@@ -67,7 +67,7 @@ public class CraftMetaArmor extends CraftMetaItem implements ArmorMeta {
-         if (tag.contains(CraftMetaArmor.TRIM.NBT)) {
-             CompoundTag trimCompound = tag.getCompound(CraftMetaArmor.TRIM.NBT);
- 
--            if (trimCompound.contains(CraftMetaArmor.TRIM_MATERIAL.NBT) && trimCompound.contains(CraftMetaArmor.TRIM_PATTERN.NBT)) {
-+            if (trimCompound.contains(CraftMetaArmor.TRIM_MATERIAL.NBT, net.minecraft.nbt.Tag.TAG_STRING) && trimCompound.contains(CraftMetaArmor.TRIM_PATTERN.NBT, net.minecraft.nbt.Tag.TAG_STRING)) { // Paper - for now, ignore inline definitions of trim material & pattern
-                 TrimMaterial trimMaterial = Registry.TRIM_MATERIAL.get(NamespacedKey.fromString(trimCompound.getString(CraftMetaArmor.TRIM_MATERIAL.NBT)));
-                 TrimPattern trimPattern = Registry.TRIM_PATTERN.get(NamespacedKey.fromString(trimCompound.getString(CraftMetaArmor.TRIM_PATTERN.NBT)));
- 
diff --git a/patches/server/0938-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0936-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0938-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0936-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0939-Fix-sniffer-removeExploredLocation.patch b/patches/server/0937-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0939-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0937-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0940-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0938-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0940-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0938-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0941-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0941-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0942-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0942-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0943-Properly-Cancel-Usable-Items.patch b/patches/server/0941-Properly-Cancel-Usable-Items.patch
similarity index 97%
rename from patches/server/0943-Properly-Cancel-Usable-Items.patch
rename to patches/server/0941-Properly-Cancel-Usable-Items.patch
index 5cb98f64e2..2055eb8ac7 100644
--- a/patches/server/0943-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0941-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 aa1c1418559265deaf755d65c9d57e9592ee0a6e..4a03a67194b963f45abc8febb48d0d7f9eaa6e4d 100644
+index 70adc48f7126425b43a667c4d82d511f92909807..9fc1ed35896563ba5fd3e19512db6a2bc79fd0ad 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/0944-Add-event-for-player-editing-sign.patch b/patches/server/0942-Add-event-for-player-editing-sign.patch
similarity index 98%
rename from patches/server/0944-Add-event-for-player-editing-sign.patch
rename to patches/server/0942-Add-event-for-player-editing-sign.patch
index 7013aab028..a434075f6d 100644
--- a/patches/server/0944-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0942-Add-event-for-player-editing-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index e1de186632baa6ee58a071aabf8967b9095f9aa1..db523ded8132f2010391c9f909319d0ae042a741 100644
+index b5e91462e403f4f53879be82301f5bae6cf564d2..b44c596194f3e9fdd29f3eef1065612f46e7cd66 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -523,7 +523,7 @@ public final class ItemStack {
diff --git a/patches/server/0945-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0943-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0945-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0943-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0946-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0946-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0947-Add-option-to-disable-block-updates.patch b/patches/server/0945-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0947-Add-option-to-disable-block-updates.patch
rename to patches/server/0945-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0948-Call-missing-BlockDispenseEvent.patch b/patches/server/0946-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0948-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0946-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0949-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0947-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 90%
rename from patches/server/0949-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0947-Don-t-load-chunks-for-supporting-block-checks.patch
index 333650ab84..70fca1ce10 100644
--- a/patches/server/0949-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0947-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 96cfc5323cf080540c934c54ac00488e5babcea5..903fa8c1489541e141bef59239ecd645955ffca4 100644
+index 9357bedf69bc9709b74e05ca7514c6802757059d..184267a5a64423e73682bdda22690eaa12c4ae79 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1360,7 +1360,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0950-Optimize-player-lookups-for-beacons.patch b/patches/server/0948-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0950-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0948-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0951-Add-Sign-getInteractableSideFor.patch b/patches/server/0949-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0951-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0949-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0952-Array-backed-synched-entity-data.patch b/patches/server/0950-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0952-Array-backed-synched-entity-data.patch
rename to patches/server/0950-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0953-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0951-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0953-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0951-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0955-Fix-BanList-API.patch b/patches/server/0952-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0955-Fix-BanList-API.patch
rename to patches/server/0952-Fix-BanList-API.patch
diff --git a/patches/server/0956-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0953-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0956-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0953-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0957-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0954-Fix-possible-NPE-on-painting-creation.patch
similarity index 96%
rename from patches/server/0957-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0954-Fix-possible-NPE-on-painting-creation.patch
index fb9d72c762..a503b8ac40 100644
--- a/patches/server/0957-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0954-Fix-possible-NPE-on-painting-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix possible NPE on painting creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-index 61230477385eda3a806cfccdbb1685bf475a0c6a..10d45c36b8ea2c6906a24298ba2b288b48c68d5b 100644
+index 08316493785e0cf1f93f07dda8016ca5956216f8..a97ceea235f756cbca3c82aa1965d90cf7767580 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 @@ -318,8 +318,13 @@ public final class CraftEntityTypes {
diff --git a/patches/server/0954-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0954-Suppress-Item-Meta-Validation-Checks.patch
deleted file mode 100644
index f7f76e0b7c..0000000000
--- a/patches/server/0954-Suppress-Item-Meta-Validation-Checks.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Mon, 12 Jun 2023 14:42:49 -0400
-Subject: [PATCH] Suppress Item Meta Validation Checks
-
-In some cases ItemMeta could validate tags in an ItemStack. This suppresses those warnings and ignores reading the value.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
-index f393e0844889c967d9e83d9a1e73c134fcb6e33b..f8996ee643a46db301577f6c523f24e973e8f309 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
-@@ -68,13 +68,33 @@ public class CraftMetaArmor extends CraftMetaItem implements ArmorMeta {
-             CompoundTag trimCompound = tag.getCompound(CraftMetaArmor.TRIM.NBT);
- 
-             if (trimCompound.contains(CraftMetaArmor.TRIM_MATERIAL.NBT, net.minecraft.nbt.Tag.TAG_STRING) && trimCompound.contains(CraftMetaArmor.TRIM_PATTERN.NBT, net.minecraft.nbt.Tag.TAG_STRING)) { // Paper - for now, ignore inline definitions of trim material & pattern
--                TrimMaterial trimMaterial = Registry.TRIM_MATERIAL.get(NamespacedKey.fromString(trimCompound.getString(CraftMetaArmor.TRIM_MATERIAL.NBT)));
--                TrimPattern trimPattern = Registry.TRIM_PATTERN.get(NamespacedKey.fromString(trimCompound.getString(CraftMetaArmor.TRIM_PATTERN.NBT)));
-+                // Paper start
-+                TrimMaterial trimMaterial = getRegistry(Registry.TRIM_MATERIAL, trimCompound.getString(TRIM_MATERIAL.NBT));
-+                TrimPattern trimPattern = getRegistry(Registry.TRIM_PATTERN, trimCompound.getString(TRIM_PATTERN.NBT));
-+                // Paper end
- 
--                this.trim = new ArmorTrim(trimMaterial, trimPattern);
-+                this.trim = trimMaterial == null || trimPattern == null ? null : new ArmorTrim(trimMaterial, trimPattern); // Paper
-             }
-         }
-     }
-+    // Paper start
-+    public <T extends org.bukkit.Keyed> T getRegistry(Registry<T> registry, String value) {
-+        if (value == null || value.isEmpty()) {
-+            return null;
-+        }
-+        NamespacedKey namespacedKey = NamespacedKey.fromString(value);
-+        if (namespacedKey == null) {
-+            return null;
-+        }
-+
-+        T registryValue = registry.get(namespacedKey);
-+        if (registryValue == null) {
-+            return null;
-+        }
-+
-+        return registryValue;
-+    }
-+    // Paper end
- 
-     CraftMetaArmor(Map<String, Object> map) {
-         super(map);
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 582ec1782c82a45fe258bd8efe8015958fa1d945..f87b656c49b3524519e1976ae6b7ec80d9cd2423 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -489,7 +489,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                 continue;
-             }
- 
--            Attribute attribute = CraftAttribute.stringToBukkit(attributeName);
-+            // Paper start
-+            Attribute attribute;
-+            try {
-+                attribute = CraftAttribute.stringToBukkit(attributeName);
-+            } catch (IllegalArgumentException e) {
-+                attribute = null;
-+            }
-+            // Paper end
-             if (attribute == null) {
-                 continue;
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index b2bab2d79c969bc81b160312a996fb9cd87d0f95..173d2ae0b4fd6677250ded24576c5420a93e73bf 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -71,11 +71,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-     CraftMetaSkull(CompoundTag tag) {
-         super(tag);
- 
-+        try { // Paper - Ignore invalid game profiles
-         if (tag.contains(CraftMetaSkull.SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
-             this.setProfile(NbtUtils.readGameProfile(tag.getCompound(CraftMetaSkull.SKULL_OWNER.NBT)));
-         } else if (tag.contains(CraftMetaSkull.SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !tag.getString(CraftMetaSkull.SKULL_OWNER.NBT).isEmpty()) {
-             this.setProfile(new GameProfile(Util.NIL_UUID, tag.getString(CraftMetaSkull.SKULL_OWNER.NBT)));
-         }
-+        } catch (Exception ignored) {} // Paper
- 
-         if (tag.contains(CraftMetaSkull.BLOCK_ENTITY_TAG.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
-             CompoundTag nbtTagCompound = tag.getCompound(CraftMetaSkull.BLOCK_ENTITY_TAG.NBT).copy();
diff --git a/patches/server/0958-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0955-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0958-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0955-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0959-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0956-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 93%
rename from patches/server/0959-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0956-ExperienceOrb-should-call-EntitySpawnEvent.patch
index c02e259652..cf76e413fb 100644
--- a/patches/server/0959-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0956-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 c62396041c1546f3136ab6de3b174983f49287b3..68bc859fe8615fd59ef98f69f0190bea8261c15a 100644
+index eeed64faf94e55b247ae13eba67336a48834bba6..e568862e235e35ba1b34061b0cf0584f33d08451 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/0960-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0957-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0960-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0957-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0961-Add-whitelist-events.patch b/patches/server/0958-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0961-Add-whitelist-events.patch
rename to patches/server/0958-Add-whitelist-events.patch
diff --git a/patches/server/0962-Implement-PlayerFailMoveEvent.patch b/patches/server/0959-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0962-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0959-Implement-PlayerFailMoveEvent.patch
index 615a8d6c3f..8c33214290 100644
--- a/patches/server/0962-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0959-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 4a03a67194b963f45abc8febb48d0d7f9eaa6e4d..9cfc131d7c41e63f49baaca4d7e545f62fd7856e 100644
+index 9fc1ed35896563ba5fd3e19512db6a2bc79fd0ad..775d88a8f6b42cec2bcbf98378e40487a81eb157 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/0963-Folia-scheduler-and-owned-region-API.patch b/patches/server/0960-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0963-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0960-Folia-scheduler-and-owned-region-API.patch
index 098320b457..ed5d2fc165 100644
--- a/patches/server/0963-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0960-Folia-scheduler-and-owned-region-API.patch
@@ -1185,7 +1185,7 @@ index a9cc3d7213f51a2a2cdc915fd9ab3cf97767b698..69e75aec30e8c25f621c8e7d024abe67
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0b34913980a8def4af28bbc8d7308aa237bdadf0..c07eac5b7d3a5c21ea043ae56f036a5f396d92de 100644
+index 184267a5a64423e73682bdda22690eaa12c4ae79..d10c3c7e50a8972126e72a482c56394e11ed7d9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -247,11 +247,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0964-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0961-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0964-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0961-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0965-API-for-updating-recipes-on-clients.patch b/patches/server/0962-API-for-updating-recipes-on-clients.patch
similarity index 97%
rename from patches/server/0965-API-for-updating-recipes-on-clients.patch
rename to patches/server/0962-API-for-updating-recipes-on-clients.patch
index 57138cebf1..2541a96b77 100644
--- a/patches/server/0965-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0962-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b54f1d7da0e6aa39172848871bd4b0073f43380d..09196224b9b5362918726265a8daad814118f83b 100644
+index 69e75aec30e8c25f621c8e7d024abe672395a0ef..683317e8c008fdb501e981490fd62f94597f2fee 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1545,6 +1545,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0966-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0963-Fix-rotation-when-spawning-display-entities.patch
similarity index 96%
rename from patches/server/0966-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0963-Fix-rotation-when-spawning-display-entities.patch
index 684533b377..afe854d47e 100644
--- a/patches/server/0966-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0963-Fix-rotation-when-spawning-display-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotation when spawning display entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-index 10d45c36b8ea2c6906a24298ba2b288b48c68d5b..8504509346c4ac113e4bde0253476dc2e779f880 100644
+index a97ceea235f756cbca3c82aa1965d90cf7767580..2c60f2d82daacfcfc1eb9f64267ca8ae70726d17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 @@ -216,6 +216,7 @@ public final class CraftEntityTypes {
diff --git a/patches/server/0967-Only-capture-actual-tree-growth.patch b/patches/server/0964-Only-capture-actual-tree-growth.patch
similarity index 96%
rename from patches/server/0967-Only-capture-actual-tree-growth.patch
rename to patches/server/0964-Only-capture-actual-tree-growth.patch
index df56cb2401..e938f15f1e 100644
--- a/patches/server/0967-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0964-Only-capture-actual-tree-growth.patch
@@ -17,7 +17,7 @@ index 0286740aabe04e6e78ad6efd003a1e1a1ab6a460..f42a86549e389ec53962f7a5e7a625f3
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index db523ded8132f2010391c9f909319d0ae042a741..852727221d5cb8bcc14c57664622c13d8d03c159 100644
+index b44c596194f3e9fdd29f3eef1065612f46e7cd66..666533627e772e5e85ba04e65dd2b376efc0b139 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -422,6 +422,7 @@ public final class ItemStack {
@@ -29,7 +29,7 @@ index db523ded8132f2010391c9f909319d0ae042a741..852727221d5cb8bcc14c57664622c13d
                      }
                      entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9bcbc7ca5da57aa80dacaa89c1af51fab3548152..6e46124d67b6c25155a9942b04c09f3dc946a249 100644
+index 3a6615df0e9e0043cebe35268509b882893725fb..d5890f295350ae5fb6e4844c90f6ab8e3a5f5516 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1898,4 +1898,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0968-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0965-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0968-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0965-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0969-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0966-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0969-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0966-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0970-Use-correct-seed-on-api-world-load.patch b/patches/server/0967-Use-correct-seed-on-api-world-load.patch
similarity index 90%
rename from patches/server/0970-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0967-Use-correct-seed-on-api-world-load.patch
index f290584fb1..2d4a244153 100644
--- a/patches/server/0970-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0967-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 8a8cc2da46eac78c2871e4920eb78d04d4cbc0d6..9a022a79b7a5357bfc640e8dbe414f50645e6d33 100644
+index 7155948d803bdea48602d10ca9f18b64c9fd1991..4a1e8936b6e20551946fc4e0dda7527a4a8672f9 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/0971-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0968-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0971-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0968-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0972-Cache-map-ids-on-item-frames.patch b/patches/server/0969-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0972-Cache-map-ids-on-item-frames.patch
rename to patches/server/0969-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0973-Fix-custom-statistic-criteria-creation.patch b/patches/server/0970-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0973-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0970-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0974-Bandaid-fix-for-Effect.patch b/patches/server/0971-Bandaid-fix-for-Effect.patch
similarity index 97%
rename from patches/server/0974-Bandaid-fix-for-Effect.patch
rename to patches/server/0971-Bandaid-fix-for-Effect.patch
index c87d7aa559..5691a64aa7 100644
--- a/patches/server/0974-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0971-Bandaid-fix-for-Effect.patch
@@ -60,7 +60,7 @@ index 5a5a8945c786e16ff0df62494ddd1ac85c42b53f..4ce0e1e557a844fb3add866a257a8424
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c96d1956049eecfb395ad75b971c07dcd4c71107..fdabd0f6a9aba1d5375453d8f7fd5b2922a64de2 100644
+index 4c5d7988e3feea1b8f50d8c1795a4c4301fe2ecb..4f89f38e1d2d9cdb34af8d1d217577e9a437eea5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1430,7 +1430,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -73,7 +73,7 @@ index c96d1956049eecfb395ad75b971c07dcd4c71107..fdabd0f6a9aba1d5375453d8f7fd5b29
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 99966f102518decd5f62b5b58837f93bfdb9390f..1ed523128383e2f8b9090607af982645133338d5 100644
+index 5e17e19b79e6d98e95e1daae33c6430b3dfb151e..07312502b4cc95d83e8cadebe7bbc906e01f7f7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -873,7 +873,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0975-SculkCatalyst-bloom-API.patch b/patches/server/0972-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0975-SculkCatalyst-bloom-API.patch
rename to patches/server/0972-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0976-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0973-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0976-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0973-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0977-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 96%
rename from patches/server/0977-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 9b074d41ce..028651b9f3 100644
--- a/patches/server/0977-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0974-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1e838661ced07b69e50e7ad3935ed0d676570860..0120b30a981944ef230bcb4ead26e34e86367088 100644
+index 526b52bbf7c5d82645d26710f05e62b781e3cb0e..4af505a8b6074c49f2d16a6447eeaf038c7804e6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -386,8 +386,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -61,7 +61,7 @@ index 1483007b79e18107e41037c279e048f04f666d1d..5152979bf81345fc365e7b16028c7d97
                      spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 846dd10976c3f4d2220eaabd05b7951de7e9fc1d..222d41d9d730d245063bc93c1cd5c40b9163ef38 100644
+index de27b8d578d429564038e01cef5f46d4d3d7e81c..42c42d599d5b4827693cfe3f6cf9a32e67f2e16c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0978-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0975-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 96%
rename from patches/server/0978-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0975-Deprecate-and-replace-methods-with-old-StructureType.patch
index 109b9af768..fdfc43e958 100644
--- a/patches/server/0978-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0975-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 9a022a79b7a5357bfc640e8dbe414f50645e6d33..e011cfcdda2e0a609d4158b0454bdf046b04c9d9 100644
+index 4a1e8936b6e20551946fc4e0dda7527a4a8672f9..142d2c48239d4ebe3896218536656d116cd24d7c 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/0979-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0979-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0976-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index c1391a859f..368d0c5a79 100644
--- a/patches/server/0979-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0976-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 9cfc131d7c41e63f49baaca4d7e545f62fd7856e..971d4f3503f065dee0435249919aa8ed36f087d4 100644
+index 775d88a8f6b42cec2bcbf98378e40487a81eb157..4d92df7fce000e1286cc4e17df0db8e686af8b16 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/0980-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0977-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0980-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0977-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0981-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0978-Fire-entity-death-event-for-ender-dragon.patch
similarity index 92%
rename from patches/server/0981-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0978-Fire-entity-death-event-for-ender-dragon.patch
index 5401a9dbc6..3a071f226e 100644
--- a/patches/server/0981-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0978-Fire-entity-death-event-for-ender-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fire entity death event for ender dragon
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 389c45748732781595b773bc033446ace06fcbb0..f56bb431be7d5f1a1b8edec41af1f3a28289316d 100644
+index 4bcbfe3f95efd5d8ec2d2d7c66c4c355cdf510b2..e5b4aaa9e08dbafa46c92e3fce8b2ee9b0167530 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -642,6 +642,15 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0982-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0979-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 94%
rename from patches/server/0982-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0979-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 804527999c..24d83cbe74 100644
--- a/patches/server/0982-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0979-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0120b30a981944ef230bcb4ead26e34e86367088..b6e9893baa13bc2a860922d3a9ced4538b8d0911 100644
+index 4af505a8b6074c49f2d16a6447eeaf038c7804e6..0405bc1e17975a74af3d56edf34354f5cb553a1c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1419,6 +1419,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0983-Add-Listing-API-for-Player.patch b/patches/server/0980-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0983-Add-Listing-API-for-Player.patch
rename to patches/server/0980-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0984-Configurable-Region-Compression-Format.patch b/patches/server/0981-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0984-Configurable-Region-Compression-Format.patch
rename to patches/server/0981-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0985-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 92%
rename from patches/server/0985-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index a15bf1988b..a7b5bdc7b4 100644
--- a/patches/server/0985-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/server/0982-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose clicked BlockFace during BlockDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 511221a686c1d2cad3b4abf79ee32b26058dad27..899439e0af639e8d9124522b3cb6a10601b17fe2 100644
+index 3088cf508427ca03804bfa4c081bb6dfcce07d45..cc1c077c3e91d1f8852fcd6ea939864cfce398a8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -253,7 +253,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 511221a686c1d2cad3b4abf79ee32b26058dad27..899439e0af639e8d9124522b3cb6a106
                  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 68bc859fe8615fd59ef98f69f0190bea8261c15a..b21729eea9c65d1262ab9a78cb08278ffc431b7a 100644
+index e568862e235e35ba1b34061b0cf0584f33d08451..e4ceb292248ee737eab3e9a8ea9ac9b72312ce56 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/0986-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0983-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0986-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0983-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0987-Expand-Pose-API.patch b/patches/server/0984-Expand-Pose-API.patch
similarity index 95%
rename from patches/server/0987-Expand-Pose-API.patch
rename to patches/server/0984-Expand-Pose-API.patch
index 07abf95f55..94ef30e156 100644
--- a/patches/server/0987-Expand-Pose-API.patch
+++ b/patches/server/0984-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a561da947df33d85a6bb6f61e88a2b5fe57b5c32..1f2e74969f9d459cf3bc123c96309fc0a6165ea0 100644
+index d10c3c7e50a8972126e72a482c56394e11ed7d9f..c4d7d668bab1546c8196b2c570298038d767220a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -421,6 +421,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0988-More-DragonBattle-API.patch b/patches/server/0985-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0988-More-DragonBattle-API.patch
rename to patches/server/0985-More-DragonBattle-API.patch
diff --git a/patches/server/0989-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0986-Deep-clone-unhandled-nbt-tags.patch
similarity index 95%
rename from patches/server/0989-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0986-Deep-clone-unhandled-nbt-tags.patch
index 8028419b5b..5dcf7cc634 100644
--- a/patches/server/0989-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/0986-Deep-clone-unhandled-nbt-tags.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deep clone unhandled nbt tags
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index f87b656c49b3524519e1976ae6b7ec80d9cd2423..c6575325ba341b6feccdcc6f32fd41a7c5c54b7a 100644
+index 31880b9e82824a184a52b7fac93197f442ff5d34..49da00feb8dfab26483b36c830b880b38ca57eb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -304,7 +304,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -30,7 +30,7 @@ index f87b656c49b3524519e1976ae6b7ec80d9cd2423..c6575325ba341b6feccdcc6f32fd41a7
  
          this.internalTag = meta.internalTag;
          if (this.internalTag != null) {
-@@ -1392,7 +1394,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1385,7 +1387,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
              }
diff --git a/patches/server/0990-Add-PlayerPickItemEvent.patch b/patches/server/0987-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0990-Add-PlayerPickItemEvent.patch
rename to patches/server/0987-Add-PlayerPickItemEvent.patch
index bc5ce35a54..1eb83a8c9c 100644
--- a/patches/server/0990-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0987-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 971d4f3503f065dee0435249919aa8ed36f087d4..4510fbf86cc1b7b02f705ad9e304ace337604ffb 100644
+index 4d92df7fce000e1286cc4e17df0db8e686af8b16..684895e16db25308cb9a7efe5fdcb8691b8f8fe9 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/0991-Improve-performance-of-mass-crafts.patch b/patches/server/0988-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0991-Improve-performance-of-mass-crafts.patch
rename to patches/server/0988-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0992-Allow-trident-custom-damage.patch b/patches/server/0989-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0992-Allow-trident-custom-damage.patch
rename to patches/server/0989-Allow-trident-custom-damage.patch
diff --git a/patches/server/0993-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0990-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0993-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/0990-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/0994-Optimize-nearest-structure-border-iteration.patch b/patches/server/0991-Optimize-nearest-structure-border-iteration.patch
similarity index 95%
rename from patches/server/0994-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0991-Optimize-nearest-structure-border-iteration.patch
index 611e3ac80a..a817c71823 100644
--- a/patches/server/0994-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0991-Optimize-nearest-structure-border-iteration.patch
@@ -14,7 +14,7 @@ ensure that the returned found structure (which may for example be a buried
 treasure that will be marked on a treasure map) is the same as in vanilla.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index e0a00035b52cb202c5ca6a1d92709407de5d5d79..2238bb007169cfab8e29238a270508356eb90d40 100644
+index e9239f90e59d1429fc7a2618e0fd3b8a57633b87..0708aaa7d25c674ab2ce431a262fed2459fd633d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -260,12 +260,15 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0995-Implement-OfflinePlayer-isConnected.patch b/patches/server/0992-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/0995-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0992-Implement-OfflinePlayer-isConnected.patch
index 7c78f8d588..b69e2d1858 100644
--- a/patches/server/0995-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0992-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index af4b96c5b6b6cea3edf0eaca22d62288bda05ea4..ff3e42fe78b2ef7d6346d6b46a1fc664e1bf6352 100644
+index 274e001882c0fe1127fc636ea42e3a540edfabbf..3507696d2b83b09b781ac0e6f3eefd6eed632ab4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -279,6 +279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0996-Fix-inventory-desync.patch b/patches/server/0993-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0996-Fix-inventory-desync.patch
rename to patches/server/0993-Fix-inventory-desync.patch
diff --git a/patches/server/0997-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0994-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 97%
rename from patches/server/0997-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0994-Add-titleOverride-to-InventoryOpenEvent.patch
index f49a9e8051..1afdbdb5fa 100644
--- a/patches/server/0997-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0994-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 567f02ed8d48fcdc389e94c7cb422667a79e6b22..0becd123bf2211a8ccfb6469d9a824b3c948f68a 100644
+index 42c42d599d5b4827693cfe3f6cf9a32e67f2e16c..7f370d7f6e576ef719e69734dd81ec950a1f5022 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1573,12 +1573,17 @@ public class ServerPlayer extends Player {
@@ -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 b21729eea9c65d1262ab9a78cb08278ffc431b7a..a7da88af0a41f16b3a54b28023a5afb6d9396262 100644
+index e4ceb292248ee737eab3e9a8ea9ac9b72312ce56..e15e60b67c17a0ea4fedb4882ea839e1b9b1ae60 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/0998-Configure-sniffer-egg-hatch-time.patch b/patches/server/0995-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0998-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0995-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0999-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0996-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0999-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0996-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1000-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0997-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1000-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0997-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1001-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0998-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 96%
rename from patches/server/1001-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0998-Add-slot-sanity-checks-in-container-clicks.patch
index 80a6268b03..d80e316e7d 100644
--- a/patches/server/1001-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0998-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 d6b46ea6ae3b61de9ac1f11c7e6426b059554d46..64255f7db85886421d5029766e8a6d1eadb94cff 100644
+index 684895e16db25308cb9a7efe5fdcb8691b8f8fe9..8b630fc4da8a7fda08c416e70c22463f04c3b6b5 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/1002-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0999-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1002-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0999-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1003-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1000-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1003-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1000-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1004-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1001-Fix-silent-equipment-change-for-mobs.patch
similarity index 98%
rename from patches/server/1004-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1001-Fix-silent-equipment-change-for-mobs.patch
index 2b994e5be5..d831681586 100644
--- a/patches/server/1004-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/1001-Fix-silent-equipment-change-for-mobs.patch
@@ -47,7 +47,7 @@ index 8e9469fec42f7b6a132cf173f6f5a95777a29b3b..b319021b22c5dceba6199ed27814b2dc
              this.reassessWeaponGoal();
          }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6e46124d67b6c25155a9942b04c09f3dc946a249..cdd03a1602cef13d2e62e6a6655ec2929e0d590f 100644
+index d5890f295350ae5fb6e4844c90f6ab8e3a5f5516..a7d40d41a332f0612a2f1ff60c7082e4a8825ba1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1900,7 +1900,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1005-Fix-spigot-s-Forced-Stats.patch b/patches/server/1002-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1005-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1002-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1006-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1003-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1006-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1003-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1007-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 97%
rename from patches/server/1007-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..0b09e35be7 100644
--- a/patches/server/1007-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/1004-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
@@ -10,7 +10,7 @@ which would cause a crash on Folia but would appear to function
 fine on Paper.
 
 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 e1ad2152bbd55435495bdad57a0984842e55fcb8..1379084a80ce25644f13736b4a5ee5fabbd9ec1f 100644
+index df9ae808c5a59ea25145c9df62f42fb33d159021..daa7525074facfbf31c1183e872f083a02697700 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
 @@ -381,6 +381,13 @@ public class ChunkSerializer {
diff --git a/patches/server/1008-Actually-optimise-explosions.patch b/patches/server/1005-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1008-Actually-optimise-explosions.patch
rename to patches/server/1005-Actually-optimise-explosions.patch
diff --git a/patches/server/1009-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1006-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/1009-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/1006-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1010-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1007-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/1010-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/1007-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1011-Fix-SuspiciousStewMeta.patch b/patches/server/1008-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/1011-Fix-SuspiciousStewMeta.patch
rename to patches/server/1008-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1012-Optimise-chunk-tick-iteration.patch b/patches/server/1009-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/1012-Optimise-chunk-tick-iteration.patch
rename to patches/server/1009-Optimise-chunk-tick-iteration.patch
index 6649482170..c9fcf37242 100644
--- a/patches/server/1012-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1009-Optimise-chunk-tick-iteration.patch
@@ -108,7 +108,7 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..5afeb59ff25fed2d565407acacffec83
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b6e9893baa13bc2a860922d3a9ced4538b8d0911..69549b501e8a72ce535091f1b20f07a1c000ea45 100644
+index 0405bc1e17975a74af3d56edf34354f5cb553a1c..d08b4ff04362a5a9add88d060beb48e4119b594d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -191,6 +191,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -365,7 +365,7 @@ index 5152979bf81345fc365e7b16028c7d970d2f5856..44ada45d9bf2d9b48e5de1c3cb1a8559
              gameprofilerfiller.pop();
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c993553383f3b417884bc161d58a9ab72455a55d..bcdda70cb55113c37f5f1fbd511dc1ce973361e3 100644
+index 7f370d7f6e576ef719e69734dd81ec950a1f5022..3ca06c5dfed3bc2006bf2f42444353bfab14096d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -325,6 +325,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1013-Lag-compensation-ticks.patch b/patches/server/1010-Lag-compensation-ticks.patch
similarity index 98%
rename from patches/server/1013-Lag-compensation-ticks.patch
rename to patches/server/1010-Lag-compensation-ticks.patch
index 196ed51498..c406c13c08 100644
--- a/patches/server/1013-Lag-compensation-ticks.patch
+++ b/patches/server/1010-Lag-compensation-ticks.patch
@@ -52,7 +52,7 @@ index c17d8e00cd43f2f969c81be2ee65fab2b8578eae..15dc5af10041f71b5d377353302fb09a
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 899439e0af639e8d9124522b3cb6a10601b17fe2..b214c934b9a537f52cef142c519c2b9b55a89ae3 100644
+index cc1c077c3e91d1f8852fcd6ea939864cfce398a8..4634f4fbb0c06c68436c5e30069621c9fcd4ffb5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -124,7 +124,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/1014-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1011-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/1014-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/1011-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1015-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1012-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/1015-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/1012-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1016-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1013-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1016-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/1013-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1017-Optimise-nearby-player-retrieval.patch b/patches/server/1014-Optimise-nearby-player-retrieval.patch
similarity index 100%
rename from patches/server/1017-Optimise-nearby-player-retrieval.patch
rename to patches/server/1014-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1018-Remove-streams-for-villager-AI.patch b/patches/server/1015-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/1018-Remove-streams-for-villager-AI.patch
rename to patches/server/1015-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1019-Fix-missing-map-initialize-event-call.patch b/patches/server/1016-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/1019-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1016-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1020-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1017-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1020-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1017-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1021-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1018-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1021-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1018-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1022-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1019-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1022-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1019-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1023-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1020-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1023-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1020-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1024-Add-player-idle-duration-API.patch b/patches/server/1021-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/1024-Add-player-idle-duration-API.patch
rename to patches/server/1021-Add-player-idle-duration-API.patch
diff --git a/patches/server/1025-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1022-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 90%
rename from patches/server/1025-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1022-Don-t-check-if-we-can-see-non-visible-entities.patch
index e9946933b6..8f415a41b2 100644
--- a/patches/server/1025-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/1022-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 69549b501e8a72ce535091f1b20f07a1c000ea45..d9cd497bc1b654030ff1a597f038b6a881df9f6b 100644
+index d08b4ff04362a5a9add88d060beb48e4119b594d..ecb09c74153349e78bb81d1188c282e4be4000bf 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/1026-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1023-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1026-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1023-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1027-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 90%
rename from patches/server/1027-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 4b09ae6d52..f8f4d1525a 100644
--- a/patches/server/1027-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1024-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d62678f58080d9c0514c9f2cfab7af597c07921a..fe6e1e23b94d35ab5a2ba9c70bbc41820636c7df 100644
+index f125cff31de52c4d761b75e82e1577888da72667..558b446cf58f6b66bea23236b24f08f6e281e533 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1083,7 +1083,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1028-Optimize-VarInts.patch b/patches/server/1025-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1028-Optimize-VarInts.patch
rename to patches/server/1025-Optimize-VarInts.patch
diff --git a/patches/server/1029-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1026-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/1029-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1026-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1030-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1027-Add-predicate-for-blocks-when-raytracing.patch
similarity index 98%
rename from patches/server/1030-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1027-Add-predicate-for-blocks-when-raytracing.patch
index f9640f9d9d..8b02c19873 100644
--- a/patches/server/1030-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/1027-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,7 +47,7 @@ index 799837c172a5f7856c78e6fe2595c575f3058a5e..7205865bbe0f83fb35678bddc0977f92
              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 bc65aa051a8115bc198268a89a690cc287ec638a..9369e929b92548d4323a74c63c2185f7cab115b7 100644
+index 4f89f38e1d2d9cdb34af8d1d217577e9a437eea5..5fc06ade042f96ae9f623b18faaa1069d769153f 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/1031-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1028-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/1031-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1028-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/1032-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1029-fix-secure-profile-with-proxy-online-mode.patch
similarity index 100%
rename from patches/server/1032-fix-secure-profile-with-proxy-online-mode.patch
rename to patches/server/1029-fix-secure-profile-with-proxy-online-mode.patch
diff --git a/patches/server/1033-Expand-LingeringPotion-API.patch b/patches/server/1030-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/1033-Expand-LingeringPotion-API.patch
rename to patches/server/1030-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1034-Add-MaterialTagsTest.patch b/patches/server/1031-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1034-Add-MaterialTagsTest.patch
rename to patches/server/1031-Add-MaterialTagsTest.patch
diff --git a/patches/server/1035-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1032-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/1035-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1032-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1036-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1033-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1036-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1033-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1037-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1034-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/1037-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1034-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/1038-Add-UUID-attribute-modifier-API.patch b/patches/server/1035-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1038-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1035-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1039-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1036-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 93%
rename from patches/server/1039-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1036-Fix-missing-event-call-for-entity-teleport-API.patch
index 39027c9f9b..11ae1c6386 100644
--- a/patches/server/1039-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/1036-Fix-missing-event-call-for-entity-teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing event call for entity teleport API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0349d9b6ad12e0a426cb1307be8633240b7426fe..2121bcf4517bf5b2aa595479720c8ed95d65b62b 100644
+index ed49b04d3918e46cd0769838b81cd0fae0d4e43a..1c3e1153d08b59d29b3613fc3b50a4780aa7a3ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -255,6 +255,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/1040-Lazily-create-LootContext-for-criterions.patch b/patches/server/1037-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1040-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1037-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1041-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/1038-Don-t-fire-sync-events-during-worldgen.patch
similarity index 100%
rename from patches/server/1041-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/1038-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/1042-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 88%
rename from patches/server/1042-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 2aff6c5523..ed7402be07 100644
--- a/patches/server/1042-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/1039-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index c6575325ba341b6feccdcc6f32fd41a7c5c54b7a..ec0d2d93cdf212cbdf56a0bf6f453c1b1e93a030 100644
+index 49da00feb8dfab26483b36c830b880b38ca57eb9..d4eb344c3609f3902531c15e9c7444c0930a908e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1173,7 +1173,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1166,7 +1166,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          Preconditions.checkNotNull(modifier, "AttributeModifier cannot be null");
          this.checkAttributeList();
          for (Map.Entry<Attribute, AttributeModifier> entry : this.attributeModifiers.entries()) {
diff --git a/patches/server/1043-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1040-Restore-vanilla-entity-drops-behavior.patch
similarity index 99%
rename from patches/server/1043-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1040-Restore-vanilla-entity-drops-behavior.patch
index 1c215b3510..0ab1a149a4 100644
--- a/patches/server/1043-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/1040-Restore-vanilla-entity-drops-behavior.patch
@@ -50,7 +50,7 @@ index 3ca06c5dfed3bc2006bf2f42444353bfab14096d..be05a52be037042c6158100e2ce880b8
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1271ddb14a483cd1c4c07cb79a4720d52ff52593..581d6f36cd0d20ada4fbf718c67918bad0af89dd 100644
+index cc86993aa7bf95ed5ae861feedc7e1049f12e210..1be10c57e374ad4018c08d96cfb69397a2f541d3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2701,6 +2701,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1044-Add-Structure-check-API.patch b/patches/server/1041-Add-Structure-check-API.patch
similarity index 91%
rename from patches/server/1044-Add-Structure-check-API.patch
rename to patches/server/1041-Add-Structure-check-API.patch
index fb168d6531..1fa24104a9 100644
--- a/patches/server/1044-Add-Structure-check-API.patch
+++ b/patches/server/1041-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 f74e9c64a02d4c9507f6e89354309712b89ecf19..1632aad58338017a4102df78409feb6694bf479c 100644
+index fd37494da843e70cbb5e707714ff77724d7ff0bb..38d842bc0fb7d9c39a3673983a643248e9563fe2 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/1045-Dont-resend-blocks-on-interactions.patch b/patches/server/1042-Dont-resend-blocks-on-interactions.patch
similarity index 98%
rename from patches/server/1045-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1042-Dont-resend-blocks-on-interactions.patch
index 8f8f7102fb..94ea359faf 100644
--- a/patches/server/1045-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/1042-Dont-resend-blocks-on-interactions.patch
@@ -8,7 +8,7 @@ In general, the client now has an acknowledgment system which will prevent block
 It should be noted that this system does not yet support block entities, so those still need to resynced when needed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index b214c934b9a537f52cef142c519c2b9b55a89ae3..58f972832c39a27a8ccd606f9144e1c54adbf6f3 100644
+index 4634f4fbb0c06c68436c5e30069621c9fcd4ffb5..a0d69082f5fdeee15bba0d76b940aa48cff36fa9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -199,7 +199,7 @@ public class ServerPlayerGameMode {
@@ -149,7 +149,7 @@ index 277555a26e8281dd1a626e572794b08cf51d00c5..aa0f09a18ea781e027ea70928b30d3e9
                      return false;
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 852727221d5cb8bcc14c57664622c13d8d03c159..de277d61b718fe07a87d75a2547bb1c7f8553aa1 100644
+index 666533627e772e5e85ba04e65dd2b376efc0b139..5b8a1f31e0b55da15daa4ab271317e4393a87e96 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -457,10 +457,12 @@ public final class ItemStack {
diff --git a/patches/server/1046-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1043-Keep-previous-behavior-for-setResourcePack.patch
similarity index 100%
rename from patches/server/1046-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1043-Keep-previous-behavior-for-setResourcePack.patch
diff --git a/patches/server/1047-properly-read-and-store-sus-effect-duration.patch b/patches/server/1044-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/1047-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/1044-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/1048-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1045-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/1048-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/1045-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/1049-Fix-scoreboard-entries.patch b/patches/server/1046-Fix-scoreboard-entries.patch
similarity index 100%
rename from patches/server/1049-Fix-scoreboard-entries.patch
rename to patches/server/1046-Fix-scoreboard-entries.patch
diff --git a/patches/server/1050-add-more-scoreboard-API.patch b/patches/server/1047-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/1050-add-more-scoreboard-API.patch
rename to patches/server/1047-add-more-scoreboard-API.patch
diff --git a/patches/server/1051-Improve-Registry.patch b/patches/server/1048-Improve-Registry.patch
similarity index 100%
rename from patches/server/1051-Improve-Registry.patch
rename to patches/server/1048-Improve-Registry.patch
diff --git a/patches/server/1052-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/1049-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/1052-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/1049-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/1053-Add-experience-points-API.patch b/patches/server/1050-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/1053-Add-experience-points-API.patch
rename to patches/server/1050-Add-experience-points-API.patch
diff --git a/patches/server/1054-Add-missing-InventoryType.patch b/patches/server/1051-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/1054-Add-missing-InventoryType.patch
rename to patches/server/1051-Add-missing-InventoryType.patch
diff --git a/patches/server/1055-Add-drops-to-shear-events.patch b/patches/server/1052-Add-drops-to-shear-events.patch
similarity index 98%
rename from patches/server/1055-Add-drops-to-shear-events.patch
rename to patches/server/1052-Add-drops-to-shear-events.patch
index ba87b67650..2c0b632e8d 100644
--- a/patches/server/1055-Add-drops-to-shear-events.patch
+++ b/patches/server/1052-Add-drops-to-shear-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add drops to shear events
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
-index e17090003988ad2c890d48666c2234b14d511345..ec43e8294d7e7112478a2fc1475f0852690a4882 100644
+index 45d356c1ed888b4d749379ceaa8a95d7d7c876d5..887e75c940ab5089f4e42e4553ab95adf172df46 100644
 --- a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
 @@ -103,11 +103,14 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
@@ -233,7 +233,7 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..b5d6857eaf2bed14adcb5f5e80d91b44
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f67ec3f5f4b7e2f678609f2387cc8afa2adce161..a36ffbbab5bbfec5a4a224dc5ee8812b98dd4d7c 100644
+index 7d9fc84dd684093098fdefdcaf7c92a0fbc158de..2aab68bac670dcd134d817940020214c7b0797f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1718,20 +1718,20 @@ public class CraftEventFactory {
diff --git a/patches/server/1056-Add-PlayerShieldDisableEvent.patch b/patches/server/1053-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/1056-Add-PlayerShieldDisableEvent.patch
rename to patches/server/1053-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/1057-Add-HiddenPotionEffect-API.patch b/patches/server/1054-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1057-Add-HiddenPotionEffect-API.patch
rename to patches/server/1054-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1058-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1055-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 96%
rename from patches/server/1058-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/1055-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 3ef6af7dc0..1d50317302 100644
--- a/patches/server/1058-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/1055-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
@@ -8,7 +8,7 @@ in order to fire the BlockDispenseEvent. This patch corrects
 that.
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index e6ac20a38f31bb0cd6b8840b2518f6992ef7f518..175715cd53941b14ec517e4ba7606498b664a369 100644
+index f42a86549e389ec53962f7a5e7a625f351cd4724..bf1c5834717758991c1520afd4b2a5c3fa68a558 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -628,7 +628,13 @@ public interface DispenseItemBehavior {
diff --git a/patches/server/1059-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1056-fix-ItemMeta-removing-CustomModelData.patch
similarity index 91%
rename from patches/server/1059-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/1056-fix-ItemMeta-removing-CustomModelData.patch
index 9a0894b240..66b19df19b 100644
--- a/patches/server/1059-fix-ItemMeta-removing-CustomModelData.patch
+++ b/patches/server/1056-fix-ItemMeta-removing-CustomModelData.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix ItemMeta removing CustomModelData
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 182bc05a839781794188352120968fdf67e794e7..aa013e778df40b0ea5fbfd8604f76f9de873d087 100644
+index d4eb344c3609f3902531c15e9c7444c0930a908e..91bbea5cb169f96910cc8661151c04dbff057091 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -380,7 +380,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/1060-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1057-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/1060-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/1057-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/1061-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1058-Properly-handle-experience-dropping-on-block-break.patch
similarity index 97%
rename from patches/server/1061-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/1058-Properly-handle-experience-dropping-on-block-break.patch
index 24147f07cb..18ebb95147 100644
--- a/patches/server/1061-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/1058-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,7 +7,7 @@ This causes spawnAfterBreak to spawn xp by default, removing the need to manuall
 For classes that use custom xp amounts, they can drop the resources with disabling
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 380b6bc69429ec8bd92f0adf90b02028fec23d52..c7021d31fe392536efdfbf08b7e7df834d3d8a98 100644
+index a7d40d41a332f0612a2f1ff60c7082e4a8825ba1..6403341f2e9d7ac4251336cb0bcc5d79dbb7bb0e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1103,7 +1103,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -21,7 +21,7 @@ index 380b6bc69429ec8bd92f0adf90b02028fec23d52..c7021d31fe392536efdfbf08b7e7df83
  
              boolean flag1 = this.setBlock(pos, fluid.createLegacyBlock(), 3, maxUpdateDepth);
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 0011bbb22fcfba267818c55b03042db5e67be562..c390fe88a6756e6759050d88e3c6df2b0e0efaed 100644
+index c450caed1a8d14f3bd56d0336a9bf72a5adca14f..e21867d3956078bb0db4ceed45e5811e9acd7377 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -333,23 +333,31 @@ public class Block extends BlockBehaviour implements ItemLike {
diff --git a/patches/server/1059-Fixup-ResourceLocation-handling.patch b/patches/server/1059-Fixup-ResourceLocation-handling.patch
new file mode 100644
index 0000000000..64e0d748b5
--- /dev/null
+++ b/patches/server/1059-Fixup-ResourceLocation-handling.patch
@@ -0,0 +1,124 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Sat, 6 Jan 2024 14:31:00 +0100
+Subject: [PATCH] Fixup ResourceLocation handling
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
+index 9ca389ca789dc54bba3542cac0aac2e1dc66c870..15173e715fa36546820d930a46e0f0c493d07cfc 100644
+--- a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
++++ b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
+@@ -17,7 +17,7 @@ public class PaperContainerEntityLootableInventory implements PaperLootableEntit
+ 
+     @Override
+     public org.bukkit.loot.LootTable getLootTable() {
+-        return entity.getLootTable() != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
++        return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
+     }
+ 
+     @Override
+diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
+index 9cfa5d36a6991067a3866e0d437749fafcc0158e..2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99 100644
+--- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
++++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
+@@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
+ 
+     @Override
+     public org.bukkit.loot.LootTable getLootTable() {
+-        return tileEntityLootable.lootTable != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
++        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
+     }
+ 
+     @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttribute.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttribute.java
+index 8c9ce07f6a9c2799ce4d8b6a7d8eccd37cce6d43..f9e8c1f8416c4e5ae11e1d742cf3655faa480ce9 100644
+--- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttribute.java
++++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttribute.java
+@@ -24,7 +24,10 @@ public class CraftAttribute {
+     public static Attribute stringToBukkit(String bukkit) {
+         Preconditions.checkArgument(bukkit != null);
+ 
+-        return Registry.ATTRIBUTE.get(NamespacedKey.fromString(bukkit));
++        // Paper start - Fixup NamespacedKey handling
++        final NamespacedKey key = NamespacedKey.fromString(bukkit);
++        return key != null ? Registry.ATTRIBUTE.get(key) : null;
++        // Paper end - Fixup NamespacedKey handling
+     }
+ 
+     public static net.minecraft.world.entity.ai.attributes.Attribute bukkitToMinecraft(Attribute bukkit) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
+index 24b87a1566b48be1367970a9ba887a6b3a785bb9..9f2626c8c5cb8e713f7263b73d6a31d39f024f31 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
+@@ -67,14 +67,22 @@ public class CraftMetaArmor extends CraftMetaItem implements ArmorMeta {
+         if (tag.contains(CraftMetaArmor.TRIM.NBT)) {
+             CompoundTag trimCompound = tag.getCompound(CraftMetaArmor.TRIM.NBT);
+ 
+-            if (trimCompound.contains(CraftMetaArmor.TRIM_MATERIAL.NBT) && trimCompound.contains(CraftMetaArmor.TRIM_PATTERN.NBT)) {
+-                TrimMaterial trimMaterial = Registry.TRIM_MATERIAL.get(NamespacedKey.fromString(trimCompound.getString(CraftMetaArmor.TRIM_MATERIAL.NBT)));
+-                TrimPattern trimPattern = Registry.TRIM_PATTERN.get(NamespacedKey.fromString(trimCompound.getString(CraftMetaArmor.TRIM_PATTERN.NBT)));
++            // Paper start - Fixup NamedspacedKey handling
++            if (trimCompound.contains(CraftMetaArmor.TRIM_MATERIAL.NBT, net.minecraft.nbt.Tag.TAG_STRING) && trimCompound.contains(CraftMetaArmor.TRIM_PATTERN.NBT, net.minecraft.nbt.Tag.TAG_STRING)) { // TODO Can also be inlined in a compound tag
++                TrimMaterial trimMaterial = registryEntry(Registry.TRIM_MATERIAL, trimCompound.getString(TRIM_MATERIAL.NBT));
++                TrimPattern trimPattern = registryEntry(Registry.TRIM_PATTERN, trimCompound.getString(TRIM_PATTERN.NBT));
+ 
+-                this.trim = new ArmorTrim(trimMaterial, trimPattern);
++                this.trim = trimMaterial != null && trimPattern != null ? new ArmorTrim(trimMaterial, trimPattern) : null;
++                // Paper end - Fixup NamedspacedKey handling
+             }
+         }
+     }
++    // Paper start - Fixup NamedspacedKey handling
++    private <T extends org.bukkit.Keyed> T registryEntry(final Registry<T> registry, final String value) {
++        final NamespacedKey key = NamespacedKey.fromString(value);
++        return key != null ? registry.get(key) : null;
++    }
++    // Paper end - Fixup NamedspacedKey handling
+ 
+     CraftMetaArmor(Map<String, Object> map) {
+         super(map);
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java
+index fad6295e75179edfc4e88d15c21b0b09f9156692..63e3c5c3f5aff273498d25db0fc9feb76ab27c2f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java
+@@ -30,7 +30,10 @@ public class CraftMetaMusicInstrument extends CraftMetaItem implements MusicInst
+ 
+         if (tag.contains(CraftMetaMusicInstrument.GOAT_HORN_INSTRUMENT.NBT)) {
+             String string = tag.getString(CraftMetaMusicInstrument.GOAT_HORN_INSTRUMENT.NBT);
+-            this.instrument = Registry.INSTRUMENT.get(NamespacedKey.fromString(string));
++            // Paper start - Fixup NamespacedKey handling
++            final NamespacedKey key = NamespacedKey.fromString(string);
++            this.instrument = key != null ? Registry.INSTRUMENT.get(key) : null;
++            // Paper end - Fixup NamespacedKey handling
+         }
+     }
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionType.java
+index 1ce2cf121c0768d06cbd4f9238286b02e139768b..afeb1f634a8d9e46136d8b425453e6c745132fbe 100644
+--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionType.java
++++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionType.java
+@@ -43,7 +43,10 @@ public class CraftPotionType implements PotionType.InternalPotionData {
+     public static PotionType stringToBukkit(String string) {
+         Preconditions.checkArgument(string != null);
+ 
+-        return Registry.POTION.get(NamespacedKey.fromString(string));
++        // Paper start - Fixup NamespacedKey handling
++        final NamespacedKey key = NamespacedKey.fromString(string);
++        return key != null ? Registry.POTION.get(key) : null;
++        // Paper end - Fixup NamespacedKey handling
+     }
+ 
+     private final NamespacedKey key;
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
+index 5f40d240b879e3989897b6e45725a8e5a6a7f194..5014192edb9616ce725fc1592832034789527b6f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
+@@ -13,7 +13,7 @@ public final class CraftNamespacedKey {
+             return null;
+         }
+         ResourceLocation minecraft = ResourceLocation.tryParse(string);
+-        return (minecraft == null) ? null : CraftNamespacedKey.fromMinecraft(minecraft);
++        return (minecraft == null || minecraft.getPath().isEmpty()) ? null : CraftNamespacedKey.fromMinecraft(minecraft); // Paper - Bukkit's parser does not match Vanilla for empty paths
+     }
+ 
+     public static NamespacedKey fromString(String string) {