From 1c956abfbc3eac650ff9df99cd5918a8afba331b Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 19 Jan 2024 17:54:05 +0100
Subject: [PATCH] [ci skip] Add more identifying patch comments, merge related
 patches

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

diff --git a/patches/server/0531-Expand-EntityUnleashEvent.patch b/patches/server/0531-Expand-EntityUnleashEvent.patch
index 8242a0da2a..990b7010b8 100644
--- a/patches/server/0531-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0531-Expand-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d330b6d291cd2967358e892ccbc480bb3bd8022d..f9743f8705a7f5f3ede4c869070d5735e24348a0 100644
+index d330b6d291cd2967358e892ccbc480bb3bd8022d..16d84042e2575418880897c728a99d1b8bbcdd15 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1305,12 +1305,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -62,14 +62,14 @@ index d330b6d291cd2967358e892ccbc480bb3bd8022d..f9743f8705a7f5f3ede4c869070d5735
 -        this.dropLeash(true, false);
 +        // Paper start - drop leash variable
 +        EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.UNKNOWN, false);
-+        if (!event.callEvent()) { return; }
++        this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
 +        this.dropLeash(true, event.isDropLeash());
 +        // Paper end
          this.getAllSlots().forEach((itemstack) -> {
              if (!itemstack.isEmpty()) {
                  itemstack.setCount(0);
 diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index 452f219fde958fb4dc775cd2c56c0576c45a8045..8e362ad31208d87f4a69a1747485610e0588be51 100644
+index 452f219fde958fb4dc775cd2c56c0576c45a8045..7ed610c67fcfa200c30e13a49146907f765bc5ed 100644
 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 @@ -57,8 +57,11 @@ public abstract class PathfinderMob extends Mob {
@@ -80,7 +80,7 @@ index 452f219fde958fb4dc775cd2c56c0576c45a8045..8e362ad31208d87f4a69a1747485610e
 -                    this.dropLeash(true, true);
 +                    // Paper start - drop leash variable
 +                    EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
-+                    this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
++                    if (!event.callEvent()) return;
 +                    this.dropLeash(true, event.isDropLeash());
 +                    // Paper end
                  }
@@ -94,7 +94,7 @@ index 452f219fde958fb4dc775cd2c56c0576c45a8045..8e362ad31208d87f4a69a1747485610e
 -                this.dropLeash(true, true);
 +                // Paper start - drop leash variable
 +                EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
-+                this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
++                if (!event.callEvent()) return;
 +                this.dropLeash(true, event.isDropLeash());
 +                // Paper end
                  this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
diff --git a/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
index b1ef73a2a0..4056cd23e9 100644
--- a/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 48815e94a0eacbdd03ea8630ae4a53f1a4747520..06f6f39e8ac9f2ebc05d63c3c34eb2b1bdb6aa1d 100644
+index 48815e94a0eacbdd03ea8630ae4a53f1a4747520..49914e966296b23736ecf5efc2dbaa0e1fefa091 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1757,7 +1757,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -13,7 +13,7 @@ index 48815e94a0eacbdd03ea8630ae4a53f1a4747520..06f6f39e8ac9f2ebc05d63c3c34eb2b1
  
                      if (blockposition.getY() < i) {
 -                        if (this.awaitingPositionFromClient == null && this.player.distanceToSqr((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && worldserver.mayInteract(this.player, blockposition)) {
-+                        if (this.awaitingPositionFromClient == null && this.player.distanceToSqr((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && (worldserver.mayInteract(this.player, blockposition)  || (worldserver.paperConfig().spawn.allowUsingSignsInsideSpawnProtection && worldserver.getBlockState(blockposition).getBlock() instanceof net.minecraft.world.level.block.SignBlock))) { // Paper - sign check
++                        if (this.awaitingPositionFromClient == null && this.player.distanceToSqr((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && (worldserver.mayInteract(this.player, blockposition)  || (worldserver.paperConfig().spawn.allowUsingSignsInsideSpawnProtection && worldserver.getBlockState(blockposition).getBlock() instanceof net.minecraft.world.level.block.SignBlock))) { // Paper - Allow using signs inside spawn protection
                              this.player.stopUsingItem(); // CraftBukkit - SPIGOT-4706
                              InteractionResult enuminteractionresult = this.player.gameMode.useItemOn(this.player, worldserver, itemstack, enumhand, movingobjectpositionblock);
  
diff --git a/patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..9b38f8f90d 100644
--- a/patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch
@@ -3,10 +3,9 @@ From: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
 Date: Wed, 10 Mar 2021 21:26:31 +0100
 Subject: [PATCH] Add fast alternative constructor for Rotations
 
-Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
 
 diff --git a/src/main/java/net/minecraft/core/Rotations.java b/src/main/java/net/minecraft/core/Rotations.java
-index e4b4e78de933b93be87805501d9cbfec429cf68c..152b1a2cb88c6456282b537611c18975d6da5f57 100644
+index e4b4e78de933b93be87805501d9cbfec429cf68c..95ef904bebeaff3275f25c401ef13c68504f3514 100644
 --- a/src/main/java/net/minecraft/core/Rotations.java
 +++ b/src/main/java/net/minecraft/core/Rotations.java
 @@ -19,6 +19,18 @@ public class Rotations {
@@ -23,7 +22,7 @@ index e4b4e78de933b93be87805501d9cbfec429cf68c..152b1a2cb88c6456282b537611c18975
 +    public static Rotations createWithoutValidityChecks(float x, float y, float z) {
 +        return new Rotations(x, y, z, null);
 +    }
-+    // Paper end
++    // Paper end - faster alternative constructor
 +
      public ListTag save() {
          ListTag listTag = new ListTag();
diff --git a/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
index c157596526..dc7dcd11a8 100644
--- a/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 72b9c50024e82356491a3d35bf248223f3088b5c..dfaedfb4996d9edfb5c50851abf4f5a91f41527c 100644
+index 72b9c50024e82356491a3d35bf248223f3088b5c..5c63a7719b2a4a4bb2c64d460b007d2976cbdbf9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -597,6 +597,14 @@ public abstract class PlayerList {
@@ -20,7 +20,7 @@ index 72b9c50024e82356491a3d35bf248223f3088b5c..dfaedfb4996d9edfb5c50851abf4f5a9
 +            entityplayer.containerMenu.setCarried(net.minecraft.world.item.ItemStack.EMPTY);
 +            entityplayer.drop(carried, false);
 +        }
-+        // Paper end
++        // Paper end - Drop carried item when player has disconnected
 +
          this.save(entityplayer);
          if (entityplayer.isPassenger()) {
diff --git a/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
index eea0310f55..b0a14d7816 100644
--- a/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b5acccc3339e3e2b817116ecf2af228cb641b175..d3e5235d4aa7240ba91bd40c3e1809e1fc1c4632 100644
+index b5acccc3339e3e2b817116ecf2af228cb641b175..d0551eb2aae8a26222827fdd7c1b7ee81c8c95b9 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -216,7 +216,7 @@ index b5acccc3339e3e2b817116ecf2af228cb641b175..d3e5235d4aa7240ba91bd40c3e1809e1
          thread.setDaemon(true);
          thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER));
 -        thread.start();
-+        // thread.start(); // Paper - moved down
++        // thread.start(); // Paper - Enhance console tab completions for brigadier commands; moved down
          DedicatedServer.LOGGER.info("Starting minecraft server version {}", SharedConstants.getCurrentVersion().getName());
          if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
              DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
@@ -224,23 +224,23 @@ index b5acccc3339e3e2b817116ecf2af228cb641b175..d3e5235d4aa7240ba91bd40c3e1809e1
          this.getPlayerList().loadAndSaveFiles(); // Must be after convertNames
          // Paper end - convert old users earlier after PlayerList creation but before file load/save
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
-+        thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
++        thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 8f82041f0482df22a6a9ea38d50d56228131775d..12eeabafbad9da8796dc6fc383b732cf75bb7ddb 100644
+index 8f82041f0482df22a6a9ea38d50d56228131775d..3e93a6c489972ff2b4ecff3d83cc72b2d5c970f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -18,9 +18,11 @@ import org.bukkit.event.server.TabCompleteEvent;
  
  public class ConsoleCommandCompleter implements Completer {
      private final DedicatedServer server; // Paper - CraftServer -> DedicatedServer
-+    private final io.papermc.paper.console.BrigadierCommandCompleter brigadierCompleter; // Paper
++    private final io.papermc.paper.console.BrigadierCommandCompleter brigadierCompleter; // Paper - Enhance console tab completions for brigadier commands
  
      public ConsoleCommandCompleter(DedicatedServer server) { // Paper - CraftServer -> DedicatedServer
          this.server = server;
-+        this.brigadierCompleter = new io.papermc.paper.console.BrigadierCommandCompleter(this.server); // Paper
++        this.brigadierCompleter = new io.papermc.paper.console.BrigadierCommandCompleter(this.server); // Paper - Enhance console tab completions for brigadier commands
      }
  
      // Paper start - Change method signature for JLine update
@@ -265,7 +265,7 @@ index 8f82041f0482df22a6a9ea38d50d56228131775d..12eeabafbad9da8796dc6fc383b732cf
          try {
              List<String> offers = waitable.get();
              if (offers == null) {
-+                this.addCompletions(reader, line, candidates, Collections.emptyList()); // Paper
++                this.addCompletions(reader, line, candidates, Collections.emptyList()); // Paper - Enhance console tab completions for brigadier commands
                  return; // Paper - Method returns void
              }
  
diff --git a/patches/server/0560-Add-bypass-host-check.patch b/patches/server/0560-Add-bypass-host-check.patch
index 7faab28de4..8e53305847 100644
--- a/patches/server/0560-Add-bypass-host-check.patch
+++ b/patches/server/0560-Add-bypass-host-check.patch
@@ -8,7 +8,7 @@ Paper.bypassHostCheck
 Seriously, fix your firewalls. -.-
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 5d7f092e966d5b0496f48bd5c9d274157ac6d250..3068e25f2df958689627fb31783a2d356547f1be 100644
+index 5d7f092e966d5b0496f48bd5c9d274157ac6d250..7fa8efd6b0cd7a7684d9bd4ff89d4955a69a8dd5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -24,7 +24,7 @@ index 5d7f092e966d5b0496f48bd5c9d274157ac6d250..3068e25f2df958689627fb31783a2d35
                          // Paper end
                      // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
 -                        if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) {
-+                        if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper
++                        if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper - Add bypass host check
                              this.connection.hostname = split[0];
                              this.connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getPort());
                              this.connection.spoofedUUID = com.mojang.util.UndashedUuid.fromStringLenient( split[2] );
diff --git a/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
index 2876903f08..aa992bf879 100644
--- a/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 97b8dc205fb22e17ab457e8d1f4d73a7b2f8cc47..11ee20c6dc87baa063e8293ebdd9d5247a3e932e 100644
+index 97b8dc205fb22e17ab457e8d1f4d73a7b2f8cc47..b7760cc0f85b5db37d5a309aae3c26a00a65e32e 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -359,7 +359,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -13,7 +13,7 @@ index 97b8dc205fb22e17ab457e8d1f4d73a7b2f8cc47..11ee20c6dc87baa063e8293ebdd9d524
                      // CraftBukkit end
                      flag1 = true;
 -                    if (flag3) {
-+                    if (flag3 && furnaceBurnEvent.willConsumeFuel()) { // Paper
++                    if (flag3 && furnaceBurnEvent.willConsumeFuel()) { // Paper - add consumeFuel to FurnaceBurnEvent
                          Item item = itemstack.getItem();
  
                          itemstack.shrink(1);
diff --git a/patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..8b29ccdead 100644
--- a/patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] fix PigZombieAngerEvent cancellation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 7e703bf1ca3cf824b06b6be731b866cd407aaff1..1afe8a8694c1fd0bf43ce3c0c36a83fda9aec141 100644
+index 7e703bf1ca3cf824b06b6be731b866cd407aaff1..fbabbd0808304f5d0d12f987d00c9e43a89fb1c9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -57,6 +57,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
      private int ticksUntilNextAlert;
      private static final float ZOMBIFIED_PIGLIN_EYE_HEIGHT = 1.79F;
      private static final float ZOMBIFIED_PIGLIN_BABY_EYE_HEIGHT_ADJUSTMENT = 0.82F;
-+    private HurtByTargetGoal pathfinderGoalHurtByTarget; // Paper
++    private HurtByTargetGoal pathfinderGoalHurtByTarget; // Paper - fix PigZombieAngerEvent cancellation
  
      public ZombifiedPiglin(EntityType<? extends ZombifiedPiglin> type, Level world) {
          super(type, world);
@@ -21,7 +21,7 @@ index 7e703bf1ca3cf824b06b6be731b866cd407aaff1..1afe8a8694c1fd0bf43ce3c0c36a83fd
          this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
 -        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
-+        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); // Paper - assign field
++        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); // Paper - fix PigZombieAngerEvent cancellation
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
          this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
      }
@@ -29,7 +29,7 @@ index 7e703bf1ca3cf824b06b6be731b866cd407aaff1..1afe8a8694c1fd0bf43ce3c0c36a83fd
          this.level().getCraftServer().getPluginManager().callEvent(event);
          if (event.isCancelled()) {
              this.setPersistentAngerTarget(null);
-+            pathfinderGoalHurtByTarget.stop(); // Paper - clear goalTargets to fix cancellation
++            pathfinderGoalHurtByTarget.stop(); // Paper - fix PigZombieAngerEvent cancellation
              return;
          }
          this.setRemainingPersistentAngerTime(event.getNewAnger());
diff --git a/patches/server/0567-Added-PlayerDeepSleepEvent.patch b/patches/server/0567-Add-PlayerDeepSleepEvent.patch
similarity index 78%
rename from patches/server/0567-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0567-Add-PlayerDeepSleepEvent.patch
index 50e7ec7f4c..1bb9060320 100644
--- a/patches/server/0567-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0567-Add-PlayerDeepSleepEvent.patch
@@ -1,22 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Wed, 21 Apr 2021 15:58:19 -0700
-Subject: [PATCH] Added PlayerDeepSleepEvent
+Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2957b3929c1e92af1b1a2636b83b757a0fbc789d..51fe3687f6f8c2ce5a5f0ac7749bc7cad135a69a 100644
+index 2957b3929c1e92af1b1a2636b83b757a0fbc789d..482eaa28277eca1dbb25d1f3cf6c27328a8879de 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity {
  
          if (this.isSleeping()) {
              ++this.sleepCounter;
-+            // Paper start
++            // Paper start - Add PlayerDeepSleepEvent
 +            if (this.sleepCounter == 100) {
 +                if (!new io.papermc.paper.event.player.PlayerDeepSleepEvent((org.bukkit.entity.Player) getBukkitEntity()).callEvent()) { this.sleepCounter = Integer.MIN_VALUE; }
 +            }
-+            // Paper end
++            // Paper end - Add PlayerDeepSleepEvent
              if (this.sleepCounter > 100) {
                  this.sleepCounter = 100;
              }
diff --git a/patches/server/0569-Added-PlayerBedFailEnterEvent.patch b/patches/server/0569-Add-PlayerBedFailEnterEvent.patch
similarity index 82%
rename from patches/server/0569-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0569-Add-PlayerBedFailEnterEvent.patch
index 3aaa99a580..7ce3f44006 100644
--- a/patches/server/0569-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0569-Add-PlayerBedFailEnterEvent.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Thu, 24 Dec 2020 12:27:41 -0800
-Subject: [PATCH] Added PlayerBedFailEnterEvent
+Subject: [PATCH] Add PlayerBedFailEnterEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 77438ea56b83f6aecd5f9acb9c55d4cd6e86ff95..0e63fa3b49b1a275254cf108a51ab18e816aad49 100644
+index 77438ea56b83f6aecd5f9acb9c55d4cd6e86ff95..40559727591278f44dbf50e2d3406054ffeb8ae9 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -119,14 +119,23 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
@@ -18,19 +18,19 @@ index 77438ea56b83f6aecd5f9acb9c55d4cd6e86ff95..0e63fa3b49b1a275254cf108a51ab18e
 +                        if (!event.callEvent()) {
 +                            return;
 +                        }
-+                        // Paper end
++                        // Paper end - PlayerBedFailEnterEvent
                      // CraftBukkit start - handling bed explosion from below here
 -                    if (!world.dimensionType().bedWorks()) {
-+                    if (event.getWillExplode()) { // Paper
++                    if (event.getWillExplode()) { // Paper - PlayerBedFailEnterEvent
                          this.explodeBed(finaliblockdata, world, finalblockposition);
                      } else
                      // CraftBukkit end
                      if (entityhuman_enumbedresult.getMessage() != null) {
 -                        player.displayClientMessage(entityhuman_enumbedresult.getMessage(), true);
-+                        final net.kyori.adventure.text.Component message = event.getMessage(); // Paper
-+                        if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper
++                        final net.kyori.adventure.text.Component message = event.getMessage(); // Paper - PlayerBedFailEnterEvent
++                        if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper - PlayerBedFailEnterEvent
                      }
-+                    } // Paper
++                    } // Paper - PlayerBedFailEnterEvent
  
                  });
                  return InteractionResult.SUCCESS;
diff --git a/patches/server/0573-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0571-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 66%
rename from patches/server/0573-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0571-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index fd3a8af4c0..c035a6b430 100644
--- a/patches/server/0573-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0571-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -1,11 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 22 Apr 2021 17:17:47 -0700
-Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
+From: HexedHero <6012891+HexedHero@users.noreply.github.com>
+Date: Fri, 23 Apr 2021 22:42:42 +0100
+Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
 
+Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 91e1a5fb981dd8468bb13098424b54da1c90a998..206c0a1e783699ed272e3640a29fe349eb0b465e 100644
+index d58d0748e218349fca1927263ad986ca824d4bda..8a6d9ae5b0735884a39fa2ded6f1d94909043eb7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2644,7 +2644,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -13,33 +14,49 @@ index 91e1a5fb981dd8468bb13098424b54da1c90a998..206c0a1e783699ed272e3640a29fe349
                  if (this.player.wonGame) {
                      this.player.wonGame = false;
 -                    this.player = this.server.getPlayerList().respawn(this.player, true, RespawnReason.END_PORTAL);
-+                    this.player = this.server.getPlayerList().respawn(this.player, this.server.getLevel(this.player.getRespawnDimension()), true, null, true, RespawnReason.END_PORTAL, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL); // Paper - add isEndCreditsRespawn argument
++                    this.player = this.server.getPlayerList().respawn(this.player, this.server.getLevel(this.player.getRespawnDimension()), true, null, true, RespawnReason.END_PORTAL, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL); // Paper - Expand PlayerRespawnEvent
                      CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, Level.END, Level.OVERWORLD);
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index af1c4caa17e8b6ae597af123abe6b056bd8fd87d..c3e058cb24fc6cf3e7508ad689af9214d9a20f7d 100644
+index 5c63a7719b2a4a4bb2c64d460b007d2976cbdbf9..a622d91ecdea6ab4deaf0ef4ae90cba71c49b319 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -781,6 +781,12 @@ public abstract class PlayerList {
      }
  
      public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason) {
-+        // Paper start
++        // Paper start - Expand PlayerRespawnEvent
 +        return respawn(entityplayer, worldserver, flag, location, avoidSuffocation, reason, new org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[0]);
 +    }
 +
 +    public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) {
-+        // Paper end
++        // Paper end - Expand PlayerRespawnEvent
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -872,7 +878,7 @@ public abstract class PlayerList {
+@@ -822,6 +828,7 @@ public abstract class PlayerList {
+ 
+         // Paper start
+         boolean isBedSpawn = false;
++        boolean isAnchorSpawn = false; // Paper - Fix PlayerRespawnEvent
+         boolean isRespawn = false;
+         boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
+         // Paper end
+@@ -842,6 +849,7 @@ public abstract class PlayerList {
+                 if (optional.isPresent()) {
+                     BlockState iblockdata = worldserver1.getBlockState(blockposition);
+                     boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
++                    isAnchorSpawn = flag3; // Paper - Fix PlayerRespawnEvent
+                     Vec3 vec3d = (Vec3) optional.get();
+                     float f1;
+ 
+@@ -870,7 +878,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
--            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, reason); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-+            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, reason, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
+-            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2, reason);
++            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, reason, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - PlayerRespawnEvent changes
              this.cserver.getPluginManager().callEvent(respawnEvent);
              // Spigot Start
              if (entityplayer.connection.isDisconnected()) {
diff --git a/patches/server/0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
deleted file mode 100644
index b7084efce8..0000000000
--- a/patches/server/0571-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Fri, 23 Apr 2021 22:42:42 +0100
-Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
- portal
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dfaedfb4996d9edfb5c50851abf4f5a91f41527c..af1c4caa17e8b6ae597af123abe6b056bd8fd87d 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -822,6 +822,7 @@ public abstract class PlayerList {
- 
-         // Paper start
-         boolean isBedSpawn = false;
-+        boolean isAnchorSpawn = false;
-         boolean isRespawn = false;
-         boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
-         // Paper end
-@@ -842,6 +843,7 @@ public abstract class PlayerList {
-                 if (optional.isPresent()) {
-                     BlockState iblockdata = worldserver1.getBlockState(blockposition);
-                     boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
-+                    isAnchorSpawn = flag3; // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-                     Vec3 vec3d = (Vec3) optional.get();
-                     float f1;
- 
-@@ -870,7 +872,7 @@ public abstract class PlayerList {
-             }
- 
-             Player respawnPlayer = entityplayer1.getBukkitEntity();
--            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2, reason);
-+            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, reason); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-             this.cserver.getPluginManager().callEvent(respawnEvent);
-             // Spigot Start
-             if (entityplayer.connection.isDisconnected()) {
diff --git a/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d4053227a1 100644
--- a/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Introduce beacon activation/deactivation events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 3a50fe20294048a1c818ae717a918bb1aed74dea..ca91b82a21a46b1a62564b5157882a845eae8737 100644
+index 3a50fe20294048a1c818ae717a918bb1aed74dea..d3e2fd7fcfeec133a7baa0007c979c9e379c2f10 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -221,6 +221,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
@@ -20,7 +20,7 @@ index 3a50fe20294048a1c818ae717a918bb1aed74dea..ca91b82a21a46b1a62564b5157882a84
 +            org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
 +            new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
 +        }
-+        // Paper end
++        // Paper end - beacon activation/deactivation events
  
          if (blockEntity.lastCheckY >= l) {
              blockEntity.lastCheckY = world.getMinBuildHeight() - 1;
@@ -28,10 +28,10 @@ index 3a50fe20294048a1c818ae717a918bb1aed74dea..ca91b82a21a46b1a62564b5157882a84
  
      @Override
      public void setRemoved() {
-+        // Paper start - BeaconDeactivatedEvent
++        // Paper start - beacon activation/deactivation events
 +        org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
 +        new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-+        // Paper end
++        // Paper end - beacon activation/deactivation events
          BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
          super.setRemoved();
      }
diff --git a/patches/server/0574-Add-Channel-initialization-listeners.patch b/patches/server/0573-Add-Channel-initialization-listeners.patch
similarity index 94%
rename from patches/server/0574-Add-Channel-initialization-listeners.patch
rename to patches/server/0573-Add-Channel-initialization-listeners.patch
index 0be8c3d181..9ae80dfd00 100644
--- a/patches/server/0574-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0573-Add-Channel-initialization-listeners.patch
@@ -122,14 +122,14 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 2db208427447b94cdfdb22b38b6dc6697b1067bd..d4e23bfb6135d52c1359d7ccfabc6a0e595afe6e 100644
+index 2db208427447b94cdfdb22b38b6dc6697b1067bd..7e966e072476c085d41942a02a5f0f3ff1ac72bc 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -717,6 +717,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              } else {
                  this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
              }
-+            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper
++            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper - Add Channel initialization listeners
          } else {
              if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
                  this.channel.pipeline().remove("decompress");
@@ -137,19 +137,19 @@ index 2db208427447b94cdfdb22b38b6dc6697b1067bd..d4e23bfb6135d52c1359d7ccfabc6a0e
              if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
                  this.channel.pipeline().remove("compress");
              }
-+            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_DISABLED); // Paper
++            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_DISABLED); // Paper - Add Channel initialization listeners
          }
  
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index b2bfb3893200362ac35ae60982f203f86a1148ec..6641fd04821240b1bbeff1bd8d996a8f2fff8385 100644
+index b2bfb3893200362ac35ae60982f203f86a1148ec..4414b12218a5693fecaa8c1e7c7676a58bcad324 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -116,6 +116,7 @@ public class ServerConnectionListener {
                      pending.add(object); // Paper
                      ((Connection) object).configurePacketHandler(channelpipeline);
                      ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
-+                    io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
++                    io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper - Add Channel initialization listeners
                  }
              }).group(eventloopgroup).localAddress(address, port)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
          }
diff --git a/patches/server/0575-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0574-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 81%
rename from patches/server/0575-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0574-Send-empty-commands-if-tab-completion-is-disabled.patch
index 5ac1f00009..8335cf2728 100644
--- a/patches/server/0575-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0574-Send-empty-commands-if-tab-completion-is-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Send empty commands if tab completion is disabled
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 2de557a5ed91e2036a7f558cfca8b174cd534959..3b3fa067ee5a95d52645147c2d9d1e43d7a789b6 100644
+index 2de557a5ed91e2036a7f558cfca8b174cd534959..565685d0f41311bc2281d11ee9d751bf4d4c93a3 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -456,7 +456,12 @@ public class Commands {
@@ -14,11 +14,11 @@ index 2de557a5ed91e2036a7f558cfca8b174cd534959..3b3fa067ee5a95d52645147c2d9d1e43
      public void sendCommands(ServerPlayer player) {
 -        if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) return; // Spigot
 +        // Paper start - Send empty commands if tab completion is disabled
-+        if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) { //return; // Spigot
++        if (org.spigotmc.SpigotConfig.tabComplete < 0) {
 +            player.connection.send(new ClientboundCommandsPacket(new RootCommandNode<>()));
 +            return;
 +        }
-+        // Paper end
++        // Paper end - Send empty commands if tab completion is disabled
          // CraftBukkit start
          // Register Vanilla commands into builtRoot as before
          // Paper start - Async command map building
diff --git a/patches/server/0576-Add-more-WanderingTrader-API.patch b/patches/server/0575-Add-more-WanderingTrader-API.patch
similarity index 95%
rename from patches/server/0576-Add-more-WanderingTrader-API.patch
rename to patches/server/0575-Add-more-WanderingTrader-API.patch
index e7542c5ef9..9e049337bc 100644
--- a/patches/server/0576-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0575-Add-more-WanderingTrader-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more WanderingTrader API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 0321b4bb622930bfe57661b0e6b893d7635668fb..96115fe8a8c32ce5992d779b5db540b9d81e3b82 100644
+index 0321b4bb622930bfe57661b0e6b893d7635668fb..594e82a09d21c39331c391f2aec5bc8d87649ea3 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -60,6 +60,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
@@ -15,7 +15,7 @@ index 0321b4bb622930bfe57661b0e6b893d7635668fb..96115fe8a8c32ce5992d779b5db540b9
 +    // Paper start - Add more WanderingTrader API
 +    public boolean canDrinkPotion = true;
 +    public boolean canDrinkMilk = true;
-+    // Paper end
++    // Paper end - Add more WanderingTrader API
  
      public WanderingTrader(EntityType<? extends WanderingTrader> type, Level world) {
          super(type, world);
diff --git a/patches/server/0577-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0576-Add-EntityBlockStorage-clearEntities.patch
similarity index 91%
rename from patches/server/0577-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0576-Add-EntityBlockStorage-clearEntities.patch
index 440b15481b..2d4e55a930 100644
--- a/patches/server/0577-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0576-Add-EntityBlockStorage-clearEntities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityBlockStorage#clearEntities()
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 5f2042d565974a5509aec8f744e091fe7c576c98..8c4fba5369e5e25f144291c43e086b7417b013aa 100644
+index 5f2042d565974a5509aec8f744e091fe7c576c98..6c42f7e7fbd776a59fbd5aa3723752a130d3090f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -139,6 +139,11 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -16,7 +16,7 @@ index 5f2042d565974a5509aec8f744e091fe7c576c98..8c4fba5369e5e25f144291c43e086b74
 +    public void clearBees() {
 +        this.stored.clear();
 +    }
-+    // Paper end
++    // Paper end - Add EntityBlockStorage clearEntities
      public static int getHoneyLevel(BlockState state) {
          return (Integer) state.getValue(BeehiveBlock.HONEY_LEVEL);
      }
diff --git a/patches/server/0578-Entity-load-save-limit-per-chunk.patch b/patches/server/0577-Entity-load-save-limit-per-chunk.patch
similarity index 84%
rename from patches/server/0578-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0577-Entity-load-save-limit-per-chunk.patch
index 89c43c4b06..d8ae6c8586 100644
--- a/patches/server/0578-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0577-Entity-load-save-limit-per-chunk.patch
@@ -9,18 +9,18 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 9d16fc698b0771bcb3c95f5fb017879c37ebb39b..823f3b3093cffb49ccdcbcfbe6d348009a553ad7 100644
+index 9d16fc698b0771bcb3c95f5fb017879c37ebb39b..2fa2e5cada590c0f44a4735bcf20de51892f428b 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -631,9 +631,20 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          final Spliterator<? extends Tag> spliterator = entityNbtList.spliterator();
  
          return StreamSupport.stream(new Spliterator<Entity>() {
-+            final java.util.Map<EntityType<?>, Integer> loadedEntityCounts = new java.util.HashMap<>(); // Paper
++            final java.util.Map<EntityType<?>, Integer> loadedEntityCounts = new java.util.HashMap<>(); // Paper - Entity load/save limit per chunk
              public boolean tryAdvance(Consumer<? super Entity> consumer) {
                  return spliterator.tryAdvance((nbtbase) -> {
                      EntityType.loadEntityRecursive((CompoundTag) nbtbase, world, (entity) -> {
-+                        // Paper start
++                        // Paper start - Entity load/save limit per chunk
 +                        final EntityType<?> entityType = entity.getType();
 +                        final int saveLimit = world.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
 +                        if (saveLimit > -1) {
@@ -29,21 +29,21 @@ index 9d16fc698b0771bcb3c95f5fb017879c37ebb39b..823f3b3093cffb49ccdcbcfbe6d34800
 +                            }
 +                            this.loadedEntityCounts.merge(entityType, 1, Integer::sum);
 +                        }
-+                        // Paper end
++                        // Paper end - Entity load/save limit per chunk
                          consumer.accept(entity);
                          return entity;
                      });
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 0ec0be22f7292d57c40da6f1f4575bdebf8dbd09..060e064625969610539dbf969ce773b877a7c579 100644
+index 0ec0be22f7292d57c40da6f1f4575bdebf8dbd09..23dc37ff1f92951817864963bf93220d5aae91bb 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 @@ -110,7 +110,18 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
          }
  
          ListTag listTag = new ListTag();
-+        final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper
++        final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper - Entity load/save limit per chunk
          entities.forEach((entity) -> { // diff here: use entities parameter
-+            // Paper start
++            // Paper start - Entity load/save limit per chunk
 +            final EntityType<?> entityType = entity.getType();
 +            final int saveLimit = level.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
 +            if (saveLimit > -1) {
@@ -52,7 +52,7 @@ index 0ec0be22f7292d57c40da6f1f4575bdebf8dbd09..060e064625969610539dbf969ce773b8
 +                }
 +                savedEntityCounts.merge(entityType, 1, Integer::sum);
 +            }
-+            // Paper end
++            // Paper end - Entity load/save limit per chunk
              CompoundTag compoundTag = new CompoundTag();
              if (entity.save(compoundTag)) {
                  listTag.add(compoundTag);
diff --git a/patches/server/0579-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0578-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0579-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0578-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0580-Inventory-close.patch b/patches/server/0579-Inventory-close.patch
similarity index 100%
rename from patches/server/0580-Inventory-close.patch
rename to patches/server/0579-Inventory-close.patch
diff --git a/patches/server/0581-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0580-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 91%
rename from patches/server/0581-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0580-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..b0ef068d7f 100644
--- a/patches/server/0581-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0580-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -6,23 +6,23 @@ Subject: [PATCH] Add a "should burn in sunlight" API for Phantoms and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 6be9e8d693bbb084791d7b30a1891ddb803d6b02..8e9469fec42f7b6a132cf173f6f5a95777a29b3b 100644
+index 6be9e8d693bbb084791d7b30a1891ddb803d6b02..9af5a4b46dcec727c7c862332759ffbe3ebd87b5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -98,9 +98,15 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          return MobType.UNDEAD;
      }
  
-+    // Paper start
++    // Paper start - shouldBurnInDay API
 +    private boolean shouldBurnInDay = true;
 +    public boolean shouldBurnInDay() { return shouldBurnInDay; }
 +    public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-+    // Paper end
++    // Paper end - shouldBurnInDay API
 +
      @Override
      public void aiStep() {
 -        boolean flag = this.isSunBurnTick();
-+        boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - Configurable Burning
++        boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - shouldBurnInDay API
  
          if (flag) {
              ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
@@ -30,25 +30,25 @@ index 6be9e8d693bbb084791d7b30a1891ddb803d6b02..8e9469fec42f7b6a132cf173f6f5a957
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
          this.reassessWeaponGoal();
-+        // Paper start
++        // Paper start - shouldBurnInDay API
 +        if (nbt.contains("Paper.ShouldBurnInDay")) {
 +            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
 +        }
-+        // Paper end
++        // Paper end - shouldBurnInDay API
 +    }
 +
-+    // Paper start
++    // Paper start - shouldBurnInDay API
 +    @Override
 +    public void addAdditionalSaveData(CompoundTag nbt) {
 +        super.addAdditionalSaveData(nbt);
 +        nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay);
      }
-+    // Paper end
++    // Paper end - shouldBurnInDay API
  
      @Override
      public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index a40852acf5d175cc3a06bc17fb021c76f0c11a28..5b4719dd7c3b8f93c898779f45239568f6a5fe43 100644
+index a40852acf5d175cc3a06bc17fb021c76f0c11a28..bb52085d706293fa86df16a1b8e76d17a90ea9e9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -145,7 +145,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -56,7 +56,7 @@ index a40852acf5d175cc3a06bc17fb021c76f0c11a28..5b4719dd7c3b8f93c898779f45239568
      @Override
      public void aiStep() {
 -        if (this.isAlive() && this.isSunBurnTick()) {
-+        if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
++        if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - shouldBurnInDay API
              this.setSecondsOnFire(8);
          }
  
diff --git a/patches/server/0582-Add-basic-Datapack-API.patch b/patches/server/0581-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0582-Add-basic-Datapack-API.patch
rename to patches/server/0581-Add-basic-Datapack-API.patch
diff --git a/patches/server/0583-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0582-Add-environment-variable-to-disable-server-gui.patch
similarity index 85%
rename from patches/server/0583-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0582-Add-environment-variable-to-disable-server-gui.patch
index f143fe1787..0a4e816455 100644
--- a/patches/server/0583-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0582-Add-environment-variable-to-disable-server-gui.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Add environment variable to disable server gui
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 1c64c81980739bbf09b71e1d1dd6d86dbf924e0d..415d55285bb02442d8d1ec907d37b07fad4f3fcc 100644
+index 1c64c81980739bbf09b71e1d1dd6d86dbf924e0d..bea88fee71f0233839ea240cb8fcfb70228e986e 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -326,6 +326,7 @@ public class Main {
                  */
                  boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");
  
-+                if(!Boolean.parseBoolean(System.getenv().getOrDefault("PAPER_DISABLE_SERVER_GUI", String.valueOf(false)))) // Paper
++                if(!Boolean.parseBoolean(System.getenv().getOrDefault("PAPER_DISABLE_SERVER_GUI", String.valueOf(false)))) // Paper - Add environment variable to disable server gui
                  if (flag1 && !GraphicsEnvironment.isHeadless()) {
                      dedicatedserver1.showGui();
                  }
diff --git a/patches/server/0584-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0583-Expand-PlayerGameModeChangeEvent.patch
similarity index 84%
rename from patches/server/0584-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0583-Expand-PlayerGameModeChangeEvent.patch
index 1323b067ea..61a2d175ef 100644
--- a/patches/server/0584-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0583-Expand-PlayerGameModeChangeEvent.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Sat, 15 May 2021 10:04:43 -0700
-Subject: [PATCH] additions to PlayerGameModeChangeEvent
+Subject: [PATCH] Expand PlayerGameModeChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
-index 50e581613156cca765dfd8e3596dcb3b58520cec..12d4c141a1bc72e53e18f73d7ee4d5a2467e08e1 100644
+index 50e581613156cca765dfd8e3596dcb3b58520cec..21d6a2a5d1722d44146384c28a3cba2df9b42771 100644
 --- a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
 +++ b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
 @@ -25,9 +25,13 @@ public class DefaultGameModeCommands {
@@ -14,18 +14,18 @@ index 50e581613156cca765dfd8e3596dcb3b58520cec..12d4c141a1bc72e53e18f73d7ee4d5a2
              for(ServerPlayer serverPlayer : minecraftServer.getPlayerList().getPlayers()) {
 -                if (serverPlayer.setGameMode(gameType)) {
 -                    ++i;
-+                // Paper start - extend PlayerGameModeChangeEvent
++                // Paper start - Expand PlayerGameModeChangeEvent
 +                org.bukkit.event.player.PlayerGameModeChangeEvent event = serverPlayer.setGameMode(gameType, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, net.kyori.adventure.text.Component.empty());
 +                if (event != null && event.isCancelled()) {
 +                    source.sendSuccess(() -> io.papermc.paper.adventure.PaperAdventure.asVanilla(event.cancelMessage()), false);
                  }
-+                // Paper end
++                // Paper end - Expand PlayerGameModeChangeEvent
 +                    ++i;
              }
          }
  
 diff --git a/src/main/java/net/minecraft/server/commands/GameModeCommand.java b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e75584271 100644
+index aee8618e27b893b72931e925724dd683d2e6d2aa..f7c9127346261d83413ca03a1cdaa84975ae17d6 100644
 --- a/src/main/java/net/minecraft/server/commands/GameModeCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
 @@ -48,9 +48,14 @@ public class GameModeCommand {
@@ -33,19 +33,19 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e
  
          for(ServerPlayer serverPlayer : targets) {
 -            if (serverPlayer.setGameMode(gameMode)) {
-+            // Paper start - extend PlayerGameModeChangeEvent
++            // Paper start - Expand PlayerGameModeChangeEvent
 +            org.bukkit.event.player.PlayerGameModeChangeEvent event = serverPlayer.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.COMMAND, net.kyori.adventure.text.Component.empty());
 +            if (event != null && !event.isCancelled()) {
                  logGamemodeChange(context.getSource(), serverPlayer, gameMode);
                  ++i;
 +            } else if (event != null && event.cancelMessage() != null) {
 +                context.getSource().sendSuccess(() -> io.papermc.paper.adventure.PaperAdventure.asVanilla(event.cancelMessage()), true);
-+                // Paper end
++                // Paper end - Expand PlayerGameModeChangeEvent
              }
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd5ba826de 100644
+index 33477a639304c1491b5eea8585051e266ec93bc7..ce9555b3ccb3c3caa85e549e05e471230ee27680 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1989,8 +1989,16 @@ public class ServerPlayer extends Player {
@@ -54,7 +54,7 @@ index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd
      public boolean setGameMode(GameType gameMode) {
 -        if (!this.gameMode.changeGameModeForPlayer(gameMode)) {
 -            return false;
-+        // Paper start - Add cause and nullable message to event
++        // Paper start - Expand PlayerGameModeChangeEvent
 +        org.bukkit.event.player.PlayerGameModeChangeEvent event = this.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.UNKNOWN, null);
 +        return event == null ? false : event.isCancelled();
 +    }
@@ -62,8 +62,8 @@ index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd
 +    public org.bukkit.event.player.PlayerGameModeChangeEvent setGameMode(GameType gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause cause, @Nullable net.kyori.adventure.text.Component message) {
 +        org.bukkit.event.player.PlayerGameModeChangeEvent event = this.gameMode.changeGameModeForPlayer(gameMode, cause, message);
 +        if (event == null || event.isCancelled()) {
-+            // Paper end
 +            return null;
++            // Paper end - Expand PlayerGameModeChangeEvent
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
@@ -72,7 +72,7 @@ index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd
              this.onUpdateAbilities();
              this.updateEffectVisibility();
 -            return true;
-+            return event; // Paper
++            return event; // Paper - Expand PlayerGameModeChangeEvent
          }
      }
  
@@ -80,7 +80,7 @@ index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
-+        // Paper start
++        // Paper start - Expand PlayerGameModeChangeEvent
 +        if (this.server.getForcedGameType() != null && this.server.getForcedGameType() != ServerPlayer.readPlayerMode(nbt, "playerGameType")) {
 +            if (new org.bukkit.event.player.PlayerGameModeChangeEvent(this.getBukkitEntity(), org.bukkit.GameMode.getByValue(this.server.getDefaultGameType().getId()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null).callEvent()) {
 +                this.gameMode.setGameModeForPlayer(this.server.getForcedGameType(), GameType.DEFAULT_MODE);
@@ -89,28 +89,28 @@ index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd
 +            }
 +            return;
 +        }
-+        // Paper end
++        // Paper end - Expand PlayerGameModeChangeEvent
          this.gameMode.setGameModeForPlayer(this.calculateGameModeForNewPlayer(ServerPlayer.readPlayerMode(nbt, "playerGameType")), ServerPlayer.readPlayerMode(nbt, "previousPlayerGameType"));
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index c61754976fab6654f55b1403d769eb1721871dca..236dabc1d4ae9dc9a2a2c07a4a27fc0bfae72f66 100644
+index c61754976fab6654f55b1403d769eb1721871dca..2e80e2d80bc2ec981e47a42b9c30257898afa4ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -73,21 +73,28 @@ public class ServerPlayerGameMode {
      }
  
      public boolean changeGameModeForPlayer(GameType gameMode) {
-+        // Paper end
++        // Paper end - Expand PlayerGameModeChangeEvent
 +        PlayerGameModeChangeEvent event = this.changeGameModeForPlayer(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.UNKNOWN, null);
 +        return event != null && event.isCancelled();
 +    }
 +    @Nullable
 +    public PlayerGameModeChangeEvent changeGameModeForPlayer(GameType gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause cause, @Nullable net.kyori.adventure.text.Component cancelMessage) {
-+        // Paper end
++        // Paper end - Expand PlayerGameModeChangeEvent
          if (gameMode == this.gameModeForPlayer) {
 -            return false;
-+            return null; // Paper
++            return null; // Paper - Expand PlayerGameModeChangeEvent
          } else {
              // CraftBukkit start
 -            PlayerGameModeChangeEvent event = new PlayerGameModeChangeEvent(this.player.getBukkitEntity(), GameMode.getByValue(gameMode.getId()));
@@ -118,7 +118,7 @@ index c61754976fab6654f55b1403d769eb1721871dca..236dabc1d4ae9dc9a2a2c07a4a27fc0b
              this.level.getCraftServer().getPluginManager().callEvent(event);
              if (event.isCancelled()) {
 -                return false;
-+                return event; // Paper
++                return event; // Paper - Expand PlayerGameModeChangeEvent
              }
              // CraftBukkit end
              this.setGameModeForPlayer(gameMode, this.previousGameModeForPlayer);
@@ -126,12 +126,12 @@ index c61754976fab6654f55b1403d769eb1721871dca..236dabc1d4ae9dc9a2a2c07a4a27fc0b
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 -            return true;
-+            return event; // Paper
++            return event; // Paper - Expand PlayerGameModeChangeEvent
          }
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 206c0a1e783699ed272e3640a29fe349eb0b465e..4ea889c12a6750914b82d796ed641cdd810ea957 100644
+index 8a6d9ae5b0735884a39fa2ded6f1d94909043eb7..f6f57a349fc7385a88299526f563df6e022f1feb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2653,7 +2653,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -139,12 +139,12 @@ index 206c0a1e783699ed272e3640a29fe349eb0b465e..4ea889c12a6750914b82d796ed641cdd
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
 -                        this.player.setGameMode(GameType.SPECTATOR);
-+                        this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
++                        this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper - Expand PlayerGameModeChangeEvent
                          ((GameRules.BooleanValue) this.player.level().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.server);
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8a924ae677a93a177651aa1ec0728e3b8d5528a6..6cbb672bc76647e923ec1c16b6e56ee6a4982875 100644
+index 8a924ae677a93a177651aa1ec0728e3b8d5528a6..b7abab7eaa4f7401396a27fee79bf6367c3d4cc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1559,7 +1559,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -152,7 +152,7 @@ index 8a924ae677a93a177651aa1ec0728e3b8d5528a6..6cbb672bc76647e923ec1c16b6e56ee6
          if (this.getHandle().connection == null) return;
  
 -        this.getHandle().setGameMode(GameType.byId(mode.getValue()));
-+        this.getHandle().setGameMode(GameType.byId(mode.getValue()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.PLUGIN, null); // Paper
++        this.getHandle().setGameMode(GameType.byId(mode.getValue()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.PLUGIN, null); // Paper - Expand PlayerGameModeChangeEvent
      }
  
      @Override
diff --git a/patches/server/0585-ItemStack-repair-check-API.patch b/patches/server/0584-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0585-ItemStack-repair-check-API.patch
rename to patches/server/0584-ItemStack-repair-check-API.patch
diff --git a/patches/server/0586-More-Enchantment-API.patch b/patches/server/0585-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0586-More-Enchantment-API.patch
rename to patches/server/0585-More-Enchantment-API.patch
diff --git a/patches/server/0587-Move-range-check-for-block-placing-up.patch b/patches/server/0586-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0587-Move-range-check-for-block-placing-up.patch
rename to patches/server/0586-Move-range-check-for-block-placing-up.patch
index efb4d256ab..cdcaf9df80 100644
--- a/patches/server/0587-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0586-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4ea889c12a6750914b82d796ed641cdd810ea957..8d6254c7f63bae10d3e09771d484ee9e44c2c3de 100644
+index f6f57a349fc7385a88299526f563df6e022f1feb..886b47805a1abdabcd05e8463620c1e211b9ece1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1743,6 +1743,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0588-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0587-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0588-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0587-Fix-and-optimise-world-force-upgrading.patch
index 5392bdad15..12dd09168c 100644
--- a/patches/server/0588-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0587-Fix-and-optimise-world-force-upgrading.patch
@@ -247,7 +247,7 @@ index 0000000000000000000000000000000000000000..513833c2ea23df5b079d157bc5cb89d5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 415d55285bb02442d8d1ec907d37b07fad4f3fcc..9b0bbaf23b90a04b6e6f6c97d9174fe31af557ce 100644
+index bea88fee71f0233839ea240cb8fcfb70228e986e..7b996a1c24e66d87c95b9f075248eb1d72ad0476 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -385,6 +385,15 @@ public class Main {
diff --git a/patches/server/0589-Add-Mob-lookAt-API.patch b/patches/server/0588-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0589-Add-Mob-lookAt-API.patch
rename to patches/server/0588-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0590-Add-Unix-domain-socket-support.patch b/patches/server/0589-Add-Unix-domain-socket-support.patch
similarity index 94%
rename from patches/server/0590-Add-Unix-domain-socket-support.patch
rename to patches/server/0589-Add-Unix-domain-socket-support.patch
index a65bf6654a..b80ece90b6 100644
--- a/patches/server/0590-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0589-Add-Unix-domain-socket-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Unix domain socket support
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 019dd5a66b883e6ac8d0f07abc2636768a373664..bc157cd71bb6dbc109990533f622f78bcc103918 100644
+index e30efd5b0715ac777b9284ba441358bc4b7a5d03..3389fca10dac966b8ec61e5bb3ef3f78c3d1dc7f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -47,7 +47,7 @@ index 019dd5a66b883e6ac8d0f07abc2636768a373664..bc157cd71bb6dbc109990533f622f78b
              DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
              DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..4bbb370c5d26749c566216bac079a0cb6d0b4507 100644
+index 4414b12218a5693fecaa8c1e7c7676a58bcad324..c0ae3ccf4ddf14a4967c86548ec7305cfcc0b48a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -78,7 +78,12 @@ public class ServerConnectionListener {
@@ -79,7 +79,7 @@ index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..4bbb370c5d26749c566216bac079a0cb
              } else {
 @@ -118,7 +129,7 @@ public class ServerConnectionListener {
                      ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
-                     io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
+                     io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper - Add Channel initialization listeners
                  }
 -            }).group(eventloopgroup).localAddress(address, port)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
 +            }).group(eventloopgroup).localAddress(address)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit // Paper - Unix domain socket support
@@ -87,7 +87,7 @@ index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..4bbb370c5d26749c566216bac079a0cb
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8d6254c7f63bae10d3e09771d484ee9e44c2c3de..73b825b16f02e254a1e2313ff1c93c642c5dceeb 100644
+index 886b47805a1abdabcd05e8463620c1e211b9ece1..364c010be9cc32efa05f58e9a4cdd9acd8a23200 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2476,6 +2476,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -103,7 +103,7 @@ index 8d6254c7f63bae10d3e09771d484ee9e44c2c3de..73b825b16f02e254a1e2313ff1c93c64
      }
      // Spigot End
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 3068e25f2df958689627fb31783a2d356547f1be..f1a002ddfa55ba3bf4313639d0e82f0c8b036c65 100644
+index 7fa8efd6b0cd7a7684d9bd4ff89d4955a69a8dd5..6a3be2fe851e14f2c9f8b38ad8d27fe36b5240d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -45,6 +45,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -125,7 +125,7 @@ index 3068e25f2df958689627fb31783a2d356547f1be..f1a002ddfa55ba3bf4313639d0e82f0c
 @@ -131,8 +133,11 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
                          // Paper end
                      // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
-                         if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper
+                         if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper - Add bypass host check
 +                            // Paper start - Unix domain socket support
 +                            java.net.SocketAddress socketAddress = this.connection.getRemoteAddress();
                              this.connection.hostname = split[0];
diff --git a/patches/server/0591-Add-EntityInsideBlockEvent.patch b/patches/server/0590-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0591-Add-EntityInsideBlockEvent.patch
rename to patches/server/0590-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0592-Attributes-API-for-item-defaults.patch b/patches/server/0591-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0592-Attributes-API-for-item-defaults.patch
rename to patches/server/0591-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0593-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0592-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0593-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0592-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0594-More-Lidded-Block-API.patch b/patches/server/0593-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0594-More-Lidded-Block-API.patch
rename to patches/server/0593-More-Lidded-Block-API.patch
diff --git a/patches/server/0595-Limit-item-frame-cursors-on-maps.patch b/patches/server/0594-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0595-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0594-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0596-Add-PlayerKickEvent-causes.patch b/patches/server/0595-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0596-Add-PlayerKickEvent-causes.patch
rename to patches/server/0595-Add-PlayerKickEvent-causes.patch
index 5943afcd8b..e9e78a487d 100644
--- a/patches/server/0596-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0595-Add-PlayerKickEvent-causes.patch
@@ -209,7 +209,7 @@ index 0616a8e89931680602da2dbc640906708aebd5ca..70458ff8c9bf6f3263868b0f5570840f
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 73b825b16f02e254a1e2313ff1c93c642c5dceeb..005116339cce73b555415f8deb0e1333f0a2a4bd 100644
+index 364c010be9cc32efa05f58e9a4cdd9acd8a23200..4f7dea59cd4aed5a9acb6be5fbbbc9ea492ee1dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -342,7 +342,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -437,7 +437,7 @@ index 73b825b16f02e254a1e2313ff1c93c642c5dceeb..005116339cce73b555415f8deb0e1333
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c3e058cb24fc6cf3e7508ad689af9214d9a20f7d..ff387a1b9ef7165dc755daf672df5d83315b6b7c 100644
+index a622d91ecdea6ab4deaf0ef4ae90cba71c49b319..f3f8c7b7391370455fe913206a1bc9b80bdaadf8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -684,7 +684,7 @@ public abstract class PlayerList {
@@ -491,7 +491,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6cbb672bc76647e923ec1c16b6e56ee6a4982875..11507cbf0f213079b39b35d06f8fc675d437469b 100644
+index b7abab7eaa4f7401396a27fee79bf6367c3d4cc8..f1b52cccb8bb82def47c6dee8a63d51a095c112b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -591,7 +591,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0597-Add-PufferFishStateChangeEvent.patch b/patches/server/0596-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0597-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0596-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0598-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0597-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0598-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0597-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0599-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0598-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0599-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0598-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0600-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0599-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0600-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0599-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0601-Add-BellRevealRaiderEvent.patch b/patches/server/0600-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0601-Add-BellRevealRaiderEvent.patch
rename to patches/server/0600-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0602-Fix-invulnerable-end-crystals.patch b/patches/server/0601-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0602-Fix-invulnerable-end-crystals.patch
rename to patches/server/0601-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0603-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0602-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0603-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0602-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0604-Fix-dangerous-end-portal-logic.patch b/patches/server/0603-Fix-dangerous-end-portal-logic.patch
similarity index 95%
rename from patches/server/0604-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0603-Fix-dangerous-end-portal-logic.patch
index cfe7d2c110..53af813f2f 100644
--- a/patches/server/0604-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0603-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 025ec74fe0ada57e1809d7e16c27b3a08007ad78..486a4d9e5cd421e2444327e2c28e4f674c98894a 100644
+index b3f33d74bf86943dd7ce05ce44541ae3e6db2fef..72f50fe74695e32167d414c1c9ee38deb95afb79 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -492,6 +492,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -60,7 +60,7 @@ index 025ec74fe0ada57e1809d7e16c27b3a08007ad78..486a4d9e5cd421e2444327e2c28e4f67
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index c8f1bdbfcb2df3d4be05d185e97857a6181b076e..c82ebcac07033d887af499f81520982fbe5ed4f1 100644
+index 9ee2fd0914ff7836517ca143d51db6150967cb0e..a0c1db8cfebaa0344012cc0af18d6231cdcdcbb8 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 @@ -61,16 +61,10 @@ public class EndPortalBlock extends BaseEntityBlock {
diff --git a/patches/server/0605-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0604-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0605-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0604-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0606-Make-item-validations-configurable.patch b/patches/server/0605-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0606-Make-item-validations-configurable.patch
rename to patches/server/0605-Make-item-validations-configurable.patch
diff --git a/patches/server/0607-Line-Of-Sight-Changes.patch b/patches/server/0606-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0607-Line-Of-Sight-Changes.patch
rename to patches/server/0606-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0608-add-per-world-spawn-limits.patch b/patches/server/0607-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0608-add-per-world-spawn-limits.patch
rename to patches/server/0607-add-per-world-spawn-limits.patch
diff --git a/patches/server/0609-Fix-potions-splash-events.patch b/patches/server/0608-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0609-Fix-potions-splash-events.patch
rename to patches/server/0608-Fix-potions-splash-events.patch
diff --git a/patches/server/0610-Add-more-LimitedRegion-API.patch b/patches/server/0609-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0610-Add-more-LimitedRegion-API.patch
rename to patches/server/0609-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0611-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0610-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 89%
rename from patches/server/0611-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0610-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 1d7d9b224f..43a209bfc8 100644
--- a/patches/server/0611-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0610-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8766c1a6485b371c1d95804d7ad364fd5ba826de..b5ee665fecb3e9e96cb937c92cef8579f9cbeb3d 100644
+index ce9555b3ccb3c3caa85e549e05e471230ee27680..592f8a1277cba26bf07623782bf85110e959be8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2391,7 +2391,7 @@ public class ServerPlayer extends Player {
@@ -18,7 +18,7 @@ index 8766c1a6485b371c1d95804d7ad364fd5ba826de..b5ee665fecb3e9e96cb937c92cef8579
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 51fe3687f6f8c2ce5a5f0ac7749bc7cad135a69a..e77a2d3a321313e8476068d895dfb39cb152f7e6 100644
+index 482eaa28277eca1dbb25d1f3cf6c27328a8879de..00c40d6b61a293786ead2dd66daa6d213a341b23 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -725,6 +725,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0612-Missing-Entity-API.patch b/patches/server/0611-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0612-Missing-Entity-API.patch
rename to patches/server/0611-Missing-Entity-API.patch
diff --git a/patches/server/0613-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0612-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0613-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0612-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 0e9946cfe0..dd15248d3f 100644
--- a/patches/server/0613-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0612-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1a85755ad62498c263783d1d54130d023105ec8d..fe969ecdca0e93319449f2fe3c3f41b4e17b385e 100644
+index 4f7dea59cd4aed5a9acb6be5fbbbc9ea492ee1dd..b502b3bf5f4f0a820b75434e8f620b3df01e18e2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1099,7 +1099,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0614-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0613-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0614-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0613-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0615-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0614-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0615-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0614-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0616-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0615-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0616-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0615-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0617-Add-PlayerArmSwingEvent.patch b/patches/server/0616-Add-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0617-Add-PlayerArmSwingEvent.patch
rename to patches/server/0616-Add-PlayerArmSwingEvent.patch
index b75864e768..4de7fd714c 100644
--- a/patches/server/0617-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0616-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0f0edc347beb179d96ed81e389a71aecd1e0e367..a7984c2454e40137b535c4a14034975339d66407 100644
+index b502b3bf5f4f0a820b75434e8f620b3df01e18e2..17cf920cc7bbd662a08b075466b8c534f0493802 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2333,7 +2333,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0618-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0617-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 96%
rename from patches/server/0618-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0617-Fix-kick-event-leave-message-not-being-sent.patch
index d75e0723f7..c36233af11 100644
--- a/patches/server/0618-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0617-Fix-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b5ee665fecb3e9e96cb937c92cef8579f9cbeb3d..4d1978b43a0b95a5fbdcd87a215d63163ec459b4 100644
+index 592f8a1277cba26bf07623782bf85110e959be8c..c9842d0641b43c10b857ccc89f90b167150f359d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -273,7 +273,6 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 70458ff8c9bf6f3263868b0f5570840fe3d89ed2..134a84841a1e05b212794c00477f20eb
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a7984c2454e40137b535c4a14034975339d66407..acde997a61660c1afd4d2a265de553c45bf8a11f 100644
+index 17cf920cc7bbd662a08b075466b8c534f0493802..d3d1195522e50b00663b274f68fae1cc5ed9d021 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1887,6 +1887,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -96,7 +96,7 @@ index a7984c2454e40137b535c4a14034975339d66407..acde997a61660c1afd4d2a265de553c4
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ff387a1b9ef7165dc755daf672df5d83315b6b7c..75b81f0852241a8edc931e514f06d46583b6ac43 100644
+index f3f8c7b7391370455fe913206a1bc9b80bdaadf8..2a1b64e5d30cde7b2b2696a6cf5f3163071ab2d6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -570,6 +570,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0619-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0618-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0619-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0618-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0620-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0619-Don-t-apply-cramming-damage-to-players.patch
similarity index 94%
rename from patches/server/0620-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0619-Don-t-apply-cramming-damage-to-players.patch
index c14d98b487..6d554a71a1 100644
--- a/patches/server/0620-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0619-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ae9acf496b866309d336ebd480a0b99aa03694df..b49b56848bdbbd07c49e44d85997fa36192332c5 100644
+index c9842d0641b43c10b857ccc89f90b167150f359d..68c9e9e6185abdff5b7239002f4005417079c083 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0621-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0620-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0621-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0620-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0622-Add-missing-forceDrop-toggles.patch b/patches/server/0621-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0622-Add-missing-forceDrop-toggles.patch
rename to patches/server/0621-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0623-Stinger-API.patch b/patches/server/0622-Stinger-API.patch
similarity index 100%
rename from patches/server/0623-Stinger-API.patch
rename to patches/server/0622-Stinger-API.patch
diff --git a/patches/server/0624-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0623-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0624-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0623-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0625-Add-System.out-err-catcher.patch b/patches/server/0624-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0625-Add-System.out-err-catcher.patch
rename to patches/server/0624-Add-System.out-err-catcher.patch
index 0bcf18a567..046d8fa2ab 100644
--- a/patches/server/0625-Add-System.out-err-catcher.patch
+++ b/patches/server/0624-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c82a367ceacb1d2ae1a0503f5920d5919289502..7df30c0d3f647b74dd812fc9d286feb95b52dfae 100644
+index b28212bbf7678d73282d160bfeb0d246e93a8492..f4b1d6ed1e1065e6be175b7b68e29517ebfa2da8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0626-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0625-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0626-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0625-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0627-Improve-boat-collision-performance.patch b/patches/server/0626-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0627-Improve-boat-collision-performance.patch
rename to patches/server/0626-Improve-boat-collision-performance.patch
diff --git a/patches/server/0628-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0627-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0628-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0627-Prevent-AFK-kick-while-watching-end-credits.patch
index c65dc42ee2..3247d8d77b 100644
--- a/patches/server/0628-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0627-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index acde997a61660c1afd4d2a265de553c45bf8a11f..9573db9b35b1eae861af18d5eb4ce54a6648786f 100644
+index d3d1195522e50b00663b274f68fae1cc5ed9d021..a1cb119e52005e09138930f5a07f919015402424 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,7 +390,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0629-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0628-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0629-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0628-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0630-Add-PlayerSetSpawnEvent.patch b/patches/server/0629-Add-PlayerSetSpawnEvent.patch
similarity index 97%
rename from patches/server/0630-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0629-Add-PlayerSetSpawnEvent.patch
index 1fe455032e..9fbf8b329f 100644
--- a/patches/server/0630-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0629-Add-PlayerSetSpawnEvent.patch
@@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 29e94d937f88763fef3c1f748e110cd1dae9a27b..b14f65b657c1a00923bec4a338e06e39f6642dfc 100644
+index 68c9e9e6185abdff5b7239002f4005417079c083..36e01f491565e70601464d957143c21aba17dfa1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player {
@@ -154,7 +154,7 @@ index 29e94d937f88763fef3c1f748e110cd1dae9a27b..b14f65b657c1a00923bec4a338e06e39
  
      public SectionPos getLastSectionPos() {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 75b81f0852241a8edc931e514f06d46583b6ac43..a0a17fa35c5333655afa8e4e8b3a66ffa41bcc24 100644
+index 2a1b64e5d30cde7b2b2696a6cf5f3163071ab2d6..1bbcae2411205799b00dba7ee82c3ceb461289cf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -872,7 +872,7 @@ public abstract class PlayerList {
@@ -187,7 +187,7 @@ index ecaa7f0b2bf795f16187f11fa27f6d5d435ccbfe..acd5ec218b8d4c096f44ae2eec1379ee
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 11507cbf0f213079b39b35d06f8fc675d437469b..97d489d0130e5854b82be73cd538c3305737f3be 100644
+index f1b52cccb8bb82def47c6dee8a63d51a095c112b..4475a59e867b0e2f64cdac41911af0e7fe721ad2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1318,9 +1318,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0631-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0630-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0631-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0630-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0632-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0631-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0632-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0631-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0633-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0632-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0633-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0632-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0634-Add-EntityDamageItemEvent.patch b/patches/server/0633-Add-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0634-Add-EntityDamageItemEvent.patch
rename to patches/server/0633-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0635-Optimize-indirect-passenger-iteration.patch b/patches/server/0634-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0635-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0634-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0636-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0635-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0636-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0635-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0637-Clear-bucket-NBT-after-dispense.patch b/patches/server/0636-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0637-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0636-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0638-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0637-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0638-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0637-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0639-Add-BlockBreakBlockEvent.patch b/patches/server/0638-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0639-Add-BlockBreakBlockEvent.patch
rename to patches/server/0638-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0640-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0639-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0640-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0639-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0641-More-CommandBlock-API.patch b/patches/server/0640-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0641-More-CommandBlock-API.patch
rename to patches/server/0640-More-CommandBlock-API.patch
diff --git a/patches/server/0642-Add-missing-team-sidebar-display-slots.patch b/patches/server/0641-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0642-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0641-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0643-Add-back-EntityPortalExitEvent.patch b/patches/server/0642-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0643-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0642-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0644-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0643-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 94%
rename from patches/server/0644-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0643-Add-methods-to-find-targets-for-lightning-strikes.patch
index 50dd1e74aa..86f9829d7b 100644
--- a/patches/server/0644-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0643-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dbfd4a642e862f46a8b4fd1f3fc52c13ecf74284..1e67fd45b4449b46992cb0617db22e74ce517b4d 100644
+index 45d5e5bd1ed37c4a3a658b27dc8571344580b65b..c8e8d8c8c49b28cbaed3072a211a79aacd5f0c34 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -998,6 +998,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,7 +31,7 @@ index dbfd4a642e862f46a8b4fd1f3fc52c13ecf74284..1e67fd45b4449b46992cb0617db22e74
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a920936018a2e05ea72d68a83e6debb3807df353..59ca5a224561f59bf1f44e11db9bc323ac2f6d71 100644
+index d6b402d0bae4d16932e059f1da59ac4523d974b8..ca0af0011159834919c8e071ceac051a0e600b84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0645-Get-entity-default-attributes.patch b/patches/server/0644-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0645-Get-entity-default-attributes.patch
rename to patches/server/0644-Get-entity-default-attributes.patch
diff --git a/patches/server/0646-Left-handed-API.patch b/patches/server/0645-Left-handed-API.patch
similarity index 100%
rename from patches/server/0646-Left-handed-API.patch
rename to patches/server/0645-Left-handed-API.patch
diff --git a/patches/server/0647-Add-more-advancement-API.patch b/patches/server/0646-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0647-Add-more-advancement-API.patch
rename to patches/server/0646-Add-more-advancement-API.patch
diff --git a/patches/server/0648-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0647-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0648-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0647-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0649-Add-critical-damage-API.patch b/patches/server/0648-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0649-Add-critical-damage-API.patch
rename to patches/server/0648-Add-critical-damage-API.patch
index 3c62cf890e..05c26d3cc0 100644
--- a/patches/server/0649-Add-critical-damage-API.patch
+++ b/patches/server/0648-Add-critical-damage-API.patch
@@ -28,7 +28,7 @@ index df8c88bfa749e02f633350446101dcce05db7ac1..ed1277fad60992344b94f8a939febaca
 +    // Paper end - add critical damage API
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e77a2d3a321313e8476068d895dfb39cb152f7e6..21a02cab65506a3746ddc709d92c6fde244446eb 100644
+index 00c40d6b61a293786ead2dd66daa6d213a341b23..e90bfeca52d74d147616773640517995d98e19bc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1263,7 +1263,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0650-Fix-issues-with-mob-conversion.patch b/patches/server/0649-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0650-Fix-issues-with-mob-conversion.patch
rename to patches/server/0649-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0651-Add-isCollidable-methods-to-various-places.patch b/patches/server/0650-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0651-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0650-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0652-Goat-ram-API.patch b/patches/server/0651-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0652-Goat-ram-API.patch
rename to patches/server/0651-Goat-ram-API.patch
diff --git a/patches/server/0653-Add-API-for-resetting-a-single-score.patch b/patches/server/0652-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0653-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0652-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0654-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0653-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0654-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0653-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0655-Vanilla-command-permission-fixes.patch b/patches/server/0654-Vanilla-command-permission-fixes.patch
similarity index 97%
rename from patches/server/0655-Vanilla-command-permission-fixes.patch
rename to patches/server/0654-Vanilla-command-permission-fixes.patch
index 6b39bdbefb..5c126666ab 100644
--- a/patches/server/0655-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0654-Vanilla-command-permission-fixes.patch
@@ -33,7 +33,7 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..d5f7da3502575f6847f3c22ab0e94284
      private RedirectModifier<S> modifier = null;
      private boolean forks;
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 3b3fa067ee5a95d52645147c2d9d1e43d7a789b6..9a01905bdbf0b721a129984d71c5745fa5e3c8a5 100644
+index 565685d0f41311bc2281d11ee9d751bf4d4c93a3..2bad211edde8b494cae726915a332217ae232855 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -257,6 +257,13 @@ public class Commands {
diff --git a/patches/server/0656-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0655-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 92%
rename from patches/server/0656-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0655-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index ee3ea5e0f7..54357f73a3 100644
--- a/patches/server/0656-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0655-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1e67fd45b4449b46992cb0617db22e74ce517b4d..dfbec0bd98f58f7e01d0f45f2ab2c433f9094cc3 100644
+index c8e8d8c8c49b28cbaed3072a211a79aacd5f0c34..6b4b505ae0c6f95309243aaa149967b2d728fa87 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1578,9 +1578,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -28,7 +28,7 @@ index 1e67fd45b4449b46992cb0617db22e74ce517b4d..dfbec0bd98f58f7e01d0f45f2ab2c433
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9f7c149d3ad1175d55ec02e295ee43bc571c3280..87fdc78409fb16c961c04a5551980a8a231b70d0 100644
+index 36e01f491565e70601464d957143c21aba17dfa1..ca66a8ebb4ae2d3ee9cf88412bbb20d5f812d050 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1630,6 +1630,18 @@ public class ServerPlayer extends Player {
@@ -51,7 +51,7 @@ index 9f7c149d3ad1175d55ec02e295ee43bc571c3280..87fdc78409fb16c961c04a5551980a8a
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 21a02cab65506a3746ddc709d92c6fde244446eb..6018717ea7ff9d3947e48aacd3dbedc075a8376e 100644
+index e90bfeca52d74d147616773640517995d98e19bc..c21b6e9b013c31342e1a47500f5262ddfb7cd6d0 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -508,6 +508,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0657-Fix-GameProfileCache-concurrency.patch b/patches/server/0656-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0657-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0656-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0658-Improve-and-expand-AsyncCatcher.patch b/patches/server/0657-Improve-and-expand-AsyncCatcher.patch
similarity index 97%
rename from patches/server/0658-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0657-Improve-and-expand-AsyncCatcher.patch
index 37e69538d5..dd10d64299 100644
--- a/patches/server/0658-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0657-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 28fdf5f4df4b61383e6d132f603c50ec35f62024..b203c945e7c013e202013f7bce6b3c7077bf2d42 100644
+index a1cb119e52005e09138930f5a07f919015402424..2168a16bd954f07de004d9b98ea1dbfecf1f23ae 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1575,6 +1575,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -29,7 +29,7 @@ index 28fdf5f4df4b61383e6d132f603c50ec35f62024..b203c945e7c013e202013f7bce6b3c70
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b137ce3be71fa92cb196f5725dd7cfc71f93fcf7..1f3363da6642673d286cb7704aa61cb910c5d23f 100644
+index 394af8382455d2a039534b87142679f52dc8f2a6..b49ae2a36a426deb5ce393d854df762c5a256fbd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1118,7 +1118,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -166,7 +166,7 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 59ca5a224561f59bf1f44e11db9bc323ac2f6d71..b882e8d1b3e45277b5e9e3a359f51d9703bdb2d0 100644
+index ca0af0011159834919c8e071ceac051a0e600b84..305a525815d7a3ea3f5dd3c093a76af0252c2f7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1803,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0659-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0658-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0659-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0658-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 3e9c79b5ea..6f1824e9d3 100644
--- a/patches/server/0659-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0658-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,7 +278,7 @@ index 9df761f5cf043e8d2dffa711c20ab32fe2992331..48cc5623973713e07d95639e5359fc15
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7df30c0d3f647b74dd812fc9d286feb95b52dfae..65809db4522c3b1ce0b5bf11828de129713d7d21 100644
+index f4b1d6ed1e1065e6be175b7b68e29517ebfa2da8..9491eb5b47defd7949fe2e691d63d3767be1f337 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2279,6 +2279,11 @@ public final class CraftServer implements Server {
@@ -294,7 +294,7 @@ index 7df30c0d3f647b74dd812fc9d286feb95b52dfae..65809db4522c3b1ce0b5bf11828de129
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b882e8d1b3e45277b5e9e3a359f51d9703bdb2d0..3eeb878924827861f79c6bc1b510d0167b9ac10b 100644
+index 305a525815d7a3ea3f5dd3c093a76af0252c2f7e..b49580716ff1dc85adcd466d1df9ce678a58546f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1761,9 +1761,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0660-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0659-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0660-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0659-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0661-Optimise-general-POI-access.patch b/patches/server/0660-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0661-Optimise-general-POI-access.patch
rename to patches/server/0660-Optimise-general-POI-access.patch
diff --git a/patches/server/0662-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0661-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0662-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0661-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0663-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0662-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0663-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0662-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0664-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0663-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0664-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0663-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0665-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0664-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0665-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0664-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 1c15bbb35a..c5df221bd7 100644
--- a/patches/server/0665-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0664-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -10,7 +10,7 @@ chunks did get inlined, but the standard CPS.getChunkAt
 method was not inlined.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 35ca44c88497e0b07f43ba7bf092360365b1c53a..69730027a70e91ec32604b1fb32820363ea20a71 100644
+index 2069cad866a3fd2ed5512fa8fc6dc2ef8bc9758e..7718db906ed1b97f1b55a891c2ea3b59ac1307fb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -458,6 +458,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0666-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0665-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0666-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0665-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0667-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0666-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0667-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0666-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0668-Time-scoreboard-search.patch b/patches/server/0667-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0668-Time-scoreboard-search.patch
rename to patches/server/0667-Time-scoreboard-search.patch
diff --git a/patches/server/0669-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0668-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0669-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0668-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0670-Execute-chunk-tasks-mid-tick.patch b/patches/server/0669-Execute-chunk-tasks-mid-tick.patch
similarity index 96%
rename from patches/server/0670-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0669-Execute-chunk-tasks-mid-tick.patch
index a8921da3d4..a999b59233 100644
--- a/patches/server/0670-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0669-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..46449728f69ee7d4f78470f8da23c055
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 26f4516f20336ddfaf868337cab3a05166f01b8d..6873036e7d24a2b8e85ab7ae270eec63bd7e7b5b 100644
+index 970dafebf8143ab6de44bfffdeff2475685f99fa..0b0e415adafb5f614259291c1c501fa1b85ddb14 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1341,8 +1341,79 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -123,7 +123,7 @@ index 63fad53a9184d7ab97f143b7d85ae9ef2ca9f8bc..1483007b79e18107e41037c279e048f0
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dfbec0bd98f58f7e01d0f45f2ab2c433f9094cc3..1be545d545dcd165fd76b5bb70ac00ddfc49b8bb 100644
+index 6b4b505ae0c6f95309243aaa149967b2d728fa87..2c2d731aaeb7a633ce647ba49a5f2962e01b4c8f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -216,6 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -151,7 +151,7 @@ index dfbec0bd98f58f7e01d0f45f2ab2c433f9094cc3..1be545d545dcd165fd76b5bb70ac00dd
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 69730027a70e91ec32604b1fb32820363ea20a71..4691008f0f3a5802af880aa2149f5360dee76920 100644
+index 7718db906ed1b97f1b55a891c2ea3b59ac1307fb..9489fa61ca43d5d0f1a3c6e23bf1f9c3a1795063 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -927,6 +927,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0671-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0670-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0671-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0670-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0672-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0671-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0672-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0671-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0673-Optimise-random-block-ticking.patch b/patches/server/0672-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0673-Optimise-random-block-ticking.patch
rename to patches/server/0672-Optimise-random-block-ticking.patch
index e9c5661ef5..1a30403506 100644
--- a/patches/server/0673-Optimise-random-block-ticking.patch
+++ b/patches/server/0672-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1be545d545dcd165fd76b5bb70ac00ddfc49b8bb..8117a0334fdf59904e31a0419f7b5bf231d198c5 100644
+index 2c2d731aaeb7a633ce647ba49a5f2962e01b4c8f..bff754626913969c6946757cee968c02281f59b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -860,6 +860,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -324,7 +324,7 @@ index 722e323d2ae3f4ac8aa3197fed79f7d926d5ccfa..f8c1dfc8e121a406955348a1ec00c264
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4691008f0f3a5802af880aa2149f5360dee76920..0d685f1f446061cc723d190b16eedcb2ddedfa46 100644
+index 9489fa61ca43d5d0f1a3c6e23bf1f9c3a1795063..fb86d06e8e420410e3cf9d918abd3369fa2f033e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1398,10 +1398,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0674-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0673-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0674-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0673-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0675-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0674-Use-Velocity-compression-and-cipher-natives.patch
similarity index 98%
rename from patches/server/0675-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0674-Use-Velocity-compression-and-cipher-natives.patch
index 8ba39c1f5d..547a0d6619 100644
--- a/patches/server/0675-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0674-Use-Velocity-compression-and-cipher-natives.patch
@@ -264,7 +264,7 @@ index 859af8c845bae9781a62fa4acae56c6e2d449e10..f67f59f287d9a5cdd685b6b56ed1daf3
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index d4e23bfb6135d52c1359d7ccfabc6a0e595afe6e..7f611f575c231dd459ae8ef17a10f71ef361a2cb 100644
+index 7e966e072476c085d41942a02a5f0f3ff1ac72bc..634b20f73d51141cb36115d2a0dda4c6d10cf266 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -669,11 +669,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -318,10 +318,10 @@ index d4e23bfb6135d52c1359d7ccfabc6a0e595afe6e..7f611f575c231dd459ae8ef17a10f71e
 -                this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
 +                this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressor, compressionThreshold)); // Paper - Use Velocity cipher
              }
-             this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper
+             this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper - Add Channel initialization listeners
          } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 5f625acf04ddb56e3596d086252f9bfccfdb95f2..f7d5af5e6a39469914bd9c496582929c9b8e0300 100644
+index c0ae3ccf4ddf14a4967c86548ec7305cfcc0b48a..7288a942397d223d97d7afd11b9c9e5dc6a96901 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -106,6 +106,11 @@ public class ServerConnectionListener {
diff --git a/patches/server/0676-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0675-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/0676-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0675-Detail-more-information-in-watchdog-dumps.patch
index 248cb54950..2b3363f4c1 100644
--- a/patches/server/0676-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0675-Detail-more-information-in-watchdog-dumps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Detail more information in watchdog dumps
 - Dump player name, player uuid, position, and world for packet handling
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 7f611f575c231dd459ae8ef17a10f71ef361a2cb..5e0793a1bfeaca021206b0b7cce20598ba6ed1d2 100644
+index 634b20f73d51141cb36115d2a0dda4c6d10cf266..f4807a005442111909fa0a1cffa2decb85667a63 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -521,7 +521,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -76,7 +76,7 @@ index 7de24c39b460e43d27839b3821e67213508ece81..7297bca9224c12d7ace0e1967340d994
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8117a0334fdf59904e31a0419f7b5bf231d198c5..569fbb2f6c5f1ec286ecafe5c7f1b1fe6b547908 100644
+index bff754626913969c6946757cee968c02281f59b3..b4711272fb36b631d4426ee5b5e29fb6f11e3d1d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1244,7 +1244,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0677-Distance-manager-tick-timings.patch b/patches/server/0676-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0677-Distance-manager-tick-timings.patch
rename to patches/server/0676-Distance-manager-tick-timings.patch
diff --git a/patches/server/0678-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0677-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 94%
rename from patches/server/0678-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0677-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 843fb89f53..edc9520194 100644
--- a/patches/server/0678-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0677-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 569fbb2f6c5f1ec286ecafe5c7f1b1fe6b547908..8f249587b873c5768bb5ebf13d5f378355e17556 100644
+index b4711272fb36b631d4426ee5b5e29fb6f11e3d1d..15224b31e926ab16b1ef8f2ebdca4dba20637789 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2696,6 +2696,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0679-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0678-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0679-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0678-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0680-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0679-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0680-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0679-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 23944724e9..d1b33c32f3 100644
--- a/patches/server/0680-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0679-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 b203c945e7c013e202013f7bce6b3c7077bf2d42..648530ce3183362ed71cbd2de534471da65ab787 100644
+index 2168a16bd954f07de004d9b98ea1dbfecf1f23ae..c067bbd0f333c0604554c6314cc19d4a121b7e27 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/0681-Add-packet-limiter-config.patch b/patches/server/0680-Add-packet-limiter-config.patch
similarity index 98%
rename from patches/server/0681-Add-packet-limiter-config.patch
rename to patches/server/0680-Add-packet-limiter-config.patch
index ae09f84ca9..591d54d5d9 100644
--- a/patches/server/0681-Add-packet-limiter-config.patch
+++ b/patches/server/0680-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 5e0793a1bfeaca021206b0b7cce20598ba6ed1d2..c0306ca996bb32b6a478c8d7158757af722a27ab 100644
+index f4807a005442111909fa0a1cffa2decb85667a63..81fb880cdcd433bd692461b3d7b315f30d2747f7 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -132,6 +132,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0682-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0681-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0682-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0681-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0683-Ensure-valid-vehicle-status.patch b/patches/server/0682-Ensure-valid-vehicle-status.patch
similarity index 91%
rename from patches/server/0683-Ensure-valid-vehicle-status.patch
rename to patches/server/0682-Ensure-valid-vehicle-status.patch
index ba23f6ae94..870a699ba3 100644
--- a/patches/server/0683-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0682-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 87fdc78409fb16c961c04a5551980a8a231b70d0..f99498d6864bc48683f8156e0365f1175edce0ba 100644
+index ca66a8ebb4ae2d3ee9cf88412bbb20d5f812d050..6571692d00f88947316454e2f10cac30e3756ac0 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/0684-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0683-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0684-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0683-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0685-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0684-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0685-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0684-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0686-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0685-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0686-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0685-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0687-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0686-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0687-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0686-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0688-Preserve-overstacked-loot.patch b/patches/server/0687-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0688-Preserve-overstacked-loot.patch
rename to patches/server/0687-Preserve-overstacked-loot.patch
diff --git a/patches/server/0689-Update-head-rotation-in-missing-places.patch b/patches/server/0688-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0689-Update-head-rotation-in-missing-places.patch
rename to patches/server/0688-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0690-prevent-unintended-light-block-manipulation.patch b/patches/server/0689-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0690-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0689-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0691-Fix-CraftCriteria-defaults-map.patch b/patches/server/0690-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0691-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0690-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0692-Fix-upstreams-block-state-factories.patch b/patches/server/0691-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0692-Fix-upstreams-block-state-factories.patch
rename to patches/server/0691-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0693-Configurable-feature-seeds.patch b/patches/server/0692-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0693-Configurable-feature-seeds.patch
rename to patches/server/0692-Configurable-feature-seeds.patch
diff --git a/patches/server/0694-Add-root-admin-user-detection.patch b/patches/server/0693-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0694-Add-root-admin-user-detection.patch
rename to patches/server/0693-Add-root-admin-user-detection.patch
index d5a79a0018..04fc988ec4 100644
--- a/patches/server/0694-Add-root-admin-user-detection.patch
+++ b/patches/server/0693-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f0d6e6f85dc2a9ae8d70dd691b144fac0298bf33..63bfc209c7d77170ae7b60595d800bb19f1b5da6 100644
+index 3389fca10dac966b8ec61e5bb3ef3f78c3d1dc7f..753bec96a829a153dc54b5e1013359b86f1776b3 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0695-Always-allow-item-changing-in-Fireball.patch b/patches/server/0694-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0695-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0694-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0696-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0695-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0696-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0695-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0697-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0696-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 94%
rename from patches/server/0697-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0696-Prevent-excessive-velocity-through-repeated-crits.patch
index 92a76565ed..17cabbe4f0 100644
--- a/patches/server/0697-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0696-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1f3363da6642673d286cb7704aa61cb910c5d23f..f76c6360408a4d804143770d71eaf9c2146bcfa6 100644
+index b49ae2a36a426deb5ce393d854df762c5a256fbd..f601b043edb51afbd040b7ec72e00dcc7786d3da 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2677,13 +2677,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0698-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0697-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 93%
rename from patches/server/0698-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0697-Remove-client-side-code-using-deprecated-for-removal.patch
index a495f1b8a5..727f2cdce9 100644
--- a/patches/server/0698-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0697-Remove-client-side-code-using-deprecated-for-removal.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Remove client-side code using deprecated for removal
 Fixes warnings on build
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 485eba54061b1f7ad17435bce244135634c62b90..983aae5e9b381f34cbd5a3e167a46dd4b5f8a209 100644
+index 006a7876a0c8e1180dada6694992f596948be53b..169edd91e25f3c1d27f8a9e2bca58a6143c8a891 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -952,17 +952,7 @@ public class Util {
diff --git a/patches/server/0699-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0698-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0699-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0698-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0700-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0699-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 98%
rename from patches/server/0700-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0699-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 276abcde9e..ee7e6297f1 100644
--- a/patches/server/0700-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0699-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..945a0317e9e49a159a1f42882a0a267a
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f76c6360408a4d804143770d71eaf9c2146bcfa6..b63c4510cb6a14d754776967ccc7020d85fc2abd 100644
+index f601b043edb51afbd040b7ec72e00dcc7786d3da..de1e496c2cb75932dee84eb2b7532ad48340c504 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3188,7 +3188,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0701-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0700-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 97%
rename from patches/server/0701-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0700-Hide-unnecessary-itemmeta-from-clients.patch
index d0b98fb05c..32711be5fa 100644
--- a/patches/server/0701-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0700-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 945a0317e9e49a159a1f42882a0a267a2141e86d..e9fd9590e90e58fd4c31985a704a4511
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 648530ce3183362ed71cbd2de534471da65ab787..bfbbb0f6e73e9d59e73944b77e08802132f2a739 100644
+index c067bbd0f333c0604554c6314cc19d4a121b7e27..c44c07776006cd447946a53f2a1aca17e6067986 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2566,8 +2566,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -33,7 +33,7 @@ index 648530ce3183362ed71cbd2de534471da65ab787..bfbbb0f6e73e9d59e73944b77e088021
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b63c4510cb6a14d754776967ccc7020d85fc2abd..95c9b69934fb1d8b49caf9e5c6184435bd18b66d 100644
+index de1e496c2cb75932dee84eb2b7532ad48340c504..d3a1fcd144f513d20fbc9a5688a45fa750f512ae 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3190,7 +3190,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0702-Fix-Spigot-growth-modifiers.patch b/patches/server/0701-Fix-Spigot-growth-modifiers.patch
similarity index 97%
rename from patches/server/0702-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0701-Fix-Spigot-growth-modifiers.patch
index 9add019b72..ddc7bdbf9b 100644
--- a/patches/server/0702-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0701-Fix-Spigot-growth-modifiers.patch
@@ -37,7 +37,7 @@ index 95f897b9ef73c880aff1cfe35fe490683badfd44..788d8a04398482fdfd0fe89e519b2a6c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 76c12b34aac276fc9375135dac1c2018fdd7d756..a0b48e5270e2523fa7c7237d5cfef5a13a45a430 100644
+index aa029bee9839497e48ff639e286a024280150362..5b96d1ae4bd8546311e986bc312b1f85883a67f4 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
 @@ -91,6 +91,10 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
@@ -89,7 +89,7 @@ index 3c0b0732cdea6c98c58c9639be3a6971575df85b..d5257272ac8b0cf36e9f92e32a4a4ae6
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
-index c80a3ee02f3af146926a3611779fd0af298a8ac1..73d9ad9e24727a81c5ff1645316aee003600c0cc 100644
+index 690abba9d27ab4061de4dd3676292b1859036868..591f32f7c0a7a9c843933d17dad8a34b672f49ac 100644
 --- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
 @@ -119,7 +119,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl
diff --git a/patches/server/0703-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0702-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0703-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0702-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0704-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0703-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0704-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0703-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0705-Optimize-HashMapPalette.patch b/patches/server/0704-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0705-Optimize-HashMapPalette.patch
rename to patches/server/0704-Optimize-HashMapPalette.patch
diff --git a/patches/server/0706-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0705-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0706-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0705-Allow-delegation-to-vanilla-chunk-gen.patch
index 51927546b9..1566d8e666 100644
--- a/patches/server/0706-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0705-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 65809db4522c3b1ce0b5bf11828de129713d7d21..4195bdfef0916f18cd448ba2c47e44f4c3996943 100644
+index 9491eb5b47defd7949fe2e691d63d3767be1f337..ad0323b8db375134f6bbb9a6e944c822a994aa19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2459,6 +2459,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0707-Collision-optimisations.patch b/patches/server/0706-Collision-optimisations.patch
similarity index 99%
rename from patches/server/0707-Collision-optimisations.patch
rename to patches/server/0706-Collision-optimisations.patch
index 1a3f24ba35..c430a0452c 100644
--- a/patches/server/0707-Collision-optimisations.patch
+++ b/patches/server/0706-Collision-optimisations.patch
@@ -2179,7 +2179,7 @@ index d0a8092bf57a29ab7c00ec0ddf52a9fdb2a33267..392406722b0a040c1d41fdc1154d75d3
      private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
          this.data3d = id;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f99498d6864bc48683f8156e0365f1175edce0ba..f62f3a904ca09b7a5edf40b739a70c00de927429 100644
+index 6571692d00f88947316454e2f10cac30e3756ac0..0492704f7f365310d7ea930c30330a468a39c0de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -469,7 +469,7 @@ public class ServerPlayer extends Player {
@@ -2201,7 +2201,7 @@ index f99498d6864bc48683f8156e0365f1175edce0ba..f62f3a904ca09b7a5edf40b739a70c00
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f7588787769902506e317bdb052483c5dc377693..8f0d1e9e8a191a2049f3ad2d9b4ffdbd15c45d9f 100644
+index 1bbcae2411205799b00dba7ee82c3ceb461289cf..5921b4c5c38354c4782783d0debddb8bf4e356c7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -909,7 +909,7 @@ public abstract class PlayerList {
@@ -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 0d685f1f446061cc723d190b16eedcb2ddedfa46..b8188a5d0ac9be4d4ca52bd4faaf5a677029f1dc 100644
+index fb86d06e8e420410e3cf9d918abd3369fa2f033e..0c2654986b9a5c7f210ba387851997ecec1ebb00 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 {
diff --git a/patches/server/0708-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0707-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0708-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0707-Optimise-collision-checking-in-player-move-packet-ha.patch
index ccdf60c47d..41a6ec808f 100644
--- a/patches/server/0708-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0707-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 bfbbb0f6e73e9d59e73944b77e08802132f2a739..027bc0d89b7ade602565ed3717e87c56de7265e1 100644
+index c44c07776006cd447946a53f2a1aca17e6067986..af43b1cf239a319f765058ff082485764528e01e 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/0709-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0708-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0709-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0708-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0710-Add-more-Campfire-API.patch b/patches/server/0709-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0710-Add-more-Campfire-API.patch
rename to patches/server/0709-Add-more-Campfire-API.patch
diff --git a/patches/server/0711-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0710-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0711-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0710-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0712-Fix-tripwire-state-inconsistency.patch b/patches/server/0711-Fix-tripwire-state-inconsistency.patch
similarity index 98%
rename from patches/server/0712-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0711-Fix-tripwire-state-inconsistency.patch
index 93bece80f7..1933c02617 100644
--- a/patches/server/0712-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0711-Fix-tripwire-state-inconsistency.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix tripwire state inconsistency
 This patch prevents updating and re-setting the tripwire when being removed in certain conditions
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index bbb7d1b03c78758d608e89129aacec151242831c..634a8d25fede36f848cf621bdada71eb4b32c67e 100644
+index 003fd247b12323cca5fd82a6cdf31bd897afd682..a93a085b2e9564a2ff950fff505d856be7904863 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
 @@ -87,7 +87,7 @@ public class TripWireBlock extends Block {
diff --git a/patches/server/0713-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0712-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0713-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0712-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0714-Improve-scoreboard-entries.patch b/patches/server/0713-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0714-Improve-scoreboard-entries.patch
rename to patches/server/0713-Improve-scoreboard-entries.patch
diff --git a/patches/server/0715-Entity-powdered-snow-API.patch b/patches/server/0714-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0715-Entity-powdered-snow-API.patch
rename to patches/server/0714-Entity-powdered-snow-API.patch
diff --git a/patches/server/0716-Add-API-for-item-entity-health.patch b/patches/server/0715-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0716-Add-API-for-item-entity-health.patch
rename to patches/server/0715-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0717-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0716-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 99%
rename from patches/server/0717-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0716-Fix-entity-type-tags-suggestions-in-selectors.patch
index 736faffc8d..13e42ccab9 100644
--- a/patches/server/0717-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0716-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -35,7 +35,7 @@ index 79732086bc4cdbca8364d78eb60d68c758055966..e65d7980b7ebed60786bc31e2f8156fd
 +    // Paper end - tell clients to ask server for suggestions for EntityArguments
  }
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 9a01905bdbf0b721a129984d71c5745fa5e3c8a5..4ef2f90809b946dcdb52a4ab58cd1c15b682f790 100644
+index 2bad211edde8b494cae726915a332217ae232855..cb1898f6daa79a0ac379a5caa7283a9155a70a15 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -532,6 +532,7 @@ public class Commands {
diff --git a/patches/server/0718-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0717-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0718-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0717-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0719-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0718-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0719-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0718-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0720-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0719-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0720-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0719-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0721-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0720-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0721-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0720-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0722-Fix-bees-aging-inside-hives.patch b/patches/server/0721-Fix-bees-aging-inside-hives.patch
similarity index 97%
rename from patches/server/0722-Fix-bees-aging-inside-hives.patch
rename to patches/server/0721-Fix-bees-aging-inside-hives.patch
index 275679e177..10b750e853 100644
--- a/patches/server/0722-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0721-Fix-bees-aging-inside-hives.patch
@@ -7,7 +7,7 @@ Fixes bees incorrectly being aged up due to upstream's
 resetting the ticks inside hive on a failed release
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 8c4fba5369e5e25f144291c43e086b7417b013aa..3ba04d615fae9748c144b3dc7e7442be2e5a659f 100644
+index 6c42f7e7fbd776a59fbd5aa3723752a130d3090f..560a6e7b7888a87011aa48d7c9a17949bf086f8d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -328,7 +328,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0723-Bucketable-API.patch b/patches/server/0722-Bucketable-API.patch
similarity index 100%
rename from patches/server/0723-Bucketable-API.patch
rename to patches/server/0722-Bucketable-API.patch
diff --git a/patches/server/0724-Validate-usernames.patch b/patches/server/0723-Validate-usernames.patch
similarity index 95%
rename from patches/server/0724-Validate-usernames.patch
rename to patches/server/0723-Validate-usernames.patch
index a4e3af4972..2f1055b355 100644
--- a/patches/server/0724-Validate-usernames.patch
+++ b/patches/server/0723-Validate-usernames.patch
@@ -26,7 +26,7 @@ index 67c1cf5eb198079bd146a4a8ca0492b94cca788c..c03329267a2a97af32a0c2c9d7e94fa0
          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 8f0d1e9e8a191a2049f3ad2d9b4ffdbd15c45d9f..1038bdb761c4b413cb92e08aa7ef634b2e8237d4 100644
+index 5921b4c5c38354c4782783d0debddb8bf4e356c7..8364d86a75174d1b37cfbf6cf9dbc5ed952c432e 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 {
@@ -39,7 +39,7 @@ index 8f0d1e9e8a191a2049f3ad2d9b4ffdbd15c45d9f..1038bdb761c4b413cb92e08aa7ef634b
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6018717ea7ff9d3947e48aacd3dbedc075a8376e..548343be02a627d2c2475a4452363876a126b3a8 100644
+index c21b6e9b013c31342e1a47500f5262ddfb7cd6d0..f6ca517fbe3742381a932958e9893e32b81e390b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2340,9 +2340,23 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0725-Make-water-animal-spawn-height-configurable.patch b/patches/server/0724-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0725-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0724-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0726-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0725-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0726-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0725-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index ccd43f3ca1..93eaf6fd90 100644
--- a/patches/server/0726-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0725-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6873036e7d24a2b8e85ab7ae270eec63bd7e7b5b..70adb35d0f267666e44c61ac0578a12f107f65b7 100644
+index 0b0e415adafb5f614259291c1c501fa1b85ddb14..e6ad7c2b8eac76bcc2083b3921d45b83ecf2f875 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -596,7 +596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 6873036e7d24a2b8e85ab7ae270eec63bd7e7b5b..70adb35d0f267666e44c61ac0578a12f
                  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 4195bdfef0916f18cd448ba2c47e44f4c3996943..fe0a12e0f8a5318f7a8d2d336da62aa9f7710832 100644
+index ad0323b8db375134f6bbb9a6e944c822a994aa19..2b2bd85133886e2892ab681152114734773a1282 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 4195bdfef0916f18cd448ba2c47e44f4c3996943..fe0a12e0f8a5318f7a8d2d336da62aa9
              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 3eeb878924827861f79c6bc1b510d0167b9ac10b..d17454114ced443b576ca0fa608a4846364efbe5 100644
+index b49580716ff1dc85adcd466d1df9ce678a58546f..5c8b161559595071da52057dd5652a3447bca822 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/0727-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0726-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0727-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0726-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0728-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0727-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0728-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0727-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0729-Multiple-Entries-with-Scoreboards.patch b/patches/server/0728-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0729-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0728-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0730-Reset-placed-block-on-exception.patch b/patches/server/0729-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0730-Reset-placed-block-on-exception.patch
rename to patches/server/0729-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0731-Add-configurable-height-for-slime-spawn.patch b/patches/server/0730-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0731-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0730-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0732-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0731-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0732-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0731-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0733-Multi-Block-Change-API-Implementation.patch b/patches/server/0732-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0733-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0732-Multi-Block-Change-API-Implementation.patch
index 61988ad9d0..57d7b3202f 100644
--- a/patches/server/0733-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0732-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7
      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 cb72755c1b1e04797dbe99612d7bdd0bfd4b540e..9d12fab078c0625844b5f07b884b5f5978bf590c 100644
+index 4475a59e867b0e2f64cdac41911af0e7fe721ad2..4a900f3026d9fffbf528c944871b8763f9807352 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/0734-Fix-NotePlayEvent.patch b/patches/server/0733-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0734-Fix-NotePlayEvent.patch
rename to patches/server/0733-Fix-NotePlayEvent.patch
diff --git a/patches/server/0735-Freeze-Tick-Lock-API.patch b/patches/server/0734-Freeze-Tick-Lock-API.patch
similarity index 97%
rename from patches/server/0735-Freeze-Tick-Lock-API.patch
rename to patches/server/0734-Freeze-Tick-Lock-API.patch
index c84e7d4860..2bd66a4d41 100644
--- a/patches/server/0735-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0734-Freeze-Tick-Lock-API.patch
@@ -46,7 +46,7 @@ index a5820d750e88918ef819be0d0896e31b628ab302..e61cb14e9451b242c8324d81b462e808
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 95c9b69934fb1d8b49caf9e5c6184435bd18b66d..861f0d81501f63fdfa25f5f6f9da4701957fc7d8 100644
+index d3a1fcd144f513d20fbc9a5688a45fa750f512ae..9561bbe37c57f36edee9f77d69fff363db886b2d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3452,7 +3452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0736-More-PotionEffectType-API.patch b/patches/server/0735-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0736-More-PotionEffectType-API.patch
rename to patches/server/0735-More-PotionEffectType-API.patch
diff --git a/patches/server/0737-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0736-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0737-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0736-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0738-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0737-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0738-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0737-API-for-creating-command-sender-which-forwards-feedb.patch
index 2fe3b44279..c4ef08b5d4 100644
--- a/patches/server/0738-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0737-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 fe0a12e0f8a5318f7a8d2d336da62aa9f7710832..9f4d929e0e248cc2cc02ccb0c8915aeb6d9c03b5 100644
+index 2b2bd85133886e2892ab681152114734773a1282..f6bba55b843acf4614b4403e78d944decc7ee7c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2110,6 +2110,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0739-Add-missing-structure-set-seed-configs.patch b/patches/server/0738-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0739-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0738-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0740-Implement-regenerateChunk.patch b/patches/server/0739-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0740-Implement-regenerateChunk.patch
rename to patches/server/0739-Implement-regenerateChunk.patch
index 93947b77e2..407bd0a03b 100644
--- a/patches/server/0740-Implement-regenerateChunk.patch
+++ b/patches/server/0739-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 d17454114ced443b576ca0fa608a4846364efbe5..0f5b125a307769c6430dbb9f3289efd66c2c8601 100644
+index 5c8b161559595071da52057dd5652a3447bca822..abc2a152a33805dfe30f0f657ec55c704cf3fa31 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/0741-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0740-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0741-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0740-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0742-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0741-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 92%
rename from patches/server/0742-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0741-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 3f96eb8cf8..7c079022fd 100644
--- a/patches/server/0742-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0741-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 9f4d929e0e248cc2cc02ccb0c8915aeb6d9c03b5..630048f21d794cd2f5c10e7b1a7fca30a14e6856 100644
+index f6bba55b843acf4614b4403e78d944decc7ee7c0..75728879da9d365e3a825b6639313375e5407290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2287,6 +2287,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0743-Add-GameEvent-tags.patch b/patches/server/0742-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0743-Add-GameEvent-tags.patch
rename to patches/server/0742-Add-GameEvent-tags.patch
index 29a529cde1..b78905aa51 100644
--- a/patches/server/0743-Add-GameEvent-tags.patch
+++ b/patches/server/0742-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 630048f21d794cd2f5c10e7b1a7fca30a14e6856..1278e02a723aac491af24b42c6268164b5f16ddb 100644
+index 75728879da9d365e3a825b6639313375e5407290..63c0ea96f67eb7a8a05fc63ecc50d49f19a0e444 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2708,6 +2708,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0744-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0743-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0744-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0743-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index eeec58006b..7b522430ec 100644
--- a/patches/server/0744-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0743-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 70adb35d0f267666e44c61ac0578a12f107f65b7..5799fd10f6dc95057f0ac9bf69931ee56ff62d90 100644
+index e6ad7c2b8eac76bcc2083b3921d45b83ecf2f875..d621320097f38d2339624852c59d47598b01603b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1416,6 +1416,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0745-Furnace-RecipesUsed-API.patch b/patches/server/0744-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0745-Furnace-RecipesUsed-API.patch
rename to patches/server/0744-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0746-Configurable-sculk-sensor-listener-range.patch b/patches/server/0745-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0746-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0745-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0747-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0746-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0747-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0746-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0748-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0747-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0748-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0747-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index b3629f58b9..6725dea7a3 100644
--- a/patches/server/0748-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0747-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5799fd10f6dc95057f0ac9bf69931ee56ff62d90..27ef9e114f2951c0874e853ba866c6e27fc531cc 100644
+index d621320097f38d2339624852c59d47598b01603b..d5ee1f01bbe38dffb91c12d0d60477cafea3b4bb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -623,7 +623,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0749-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0748-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 92%
rename from patches/server/0749-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0748-Put-world-into-worldlist-before-initing-the-world.patch
index 8858cc1a7d..a4411396ba 100644
--- a/patches/server/0749-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0748-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 27ef9e114f2951c0874e853ba866c6e27fc531cc..db7345c936816c4bea12969853cf743c028b972c 100644
+index d5ee1f01bbe38dffb91c12d0d60477cafea3b4bb..a9060243cc9231af2b0e2783eb87131d458f4275 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -635,9 +635,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index 27ef9e114f2951c0874e853ba866c6e27fc531cc..db7345c936816c4bea12969853cf743c
  
              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 1278e02a723aac491af24b42c6268164b5f16ddb..8c08cf509faccc202222471eed06c6393aaeb594 100644
+index 63c0ea96f67eb7a8a05fc63ecc50d49f19a0e444..2049b78d91addb93ffd5322abf1621a91a25d468 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/0750-Fix-Entity-Position-Desync.patch b/patches/server/0749-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0750-Fix-Entity-Position-Desync.patch
rename to patches/server/0749-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0751-Custom-Potion-Mixes.patch b/patches/server/0750-Custom-Potion-Mixes.patch
similarity index 98%
rename from patches/server/0751-Custom-Potion-Mixes.patch
rename to patches/server/0750-Custom-Potion-Mixes.patch
index 204d5bc36b..e7b64a38f8 100644
--- a/patches/server/0751-Custom-Potion-Mixes.patch
+++ b/patches/server/0750-Custom-Potion-Mixes.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db7345c936816c4bea12969853cf743c028b972c..c1ef4dd08b39adf3ab8dbfe286c6378f3efbf54e 100644
+index a9060243cc9231af2b0e2783eb87131d458f4275..8f338bc3f6418eae5c25078d8938d449b1d688c6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2213,6 +2213,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..bc01481ac5990ad1cfd1def5a16dd0ed
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8c08cf509faccc202222471eed06c6393aaeb594..a55abfd40b7151e0eaf057bce4d3a2f6508d4ba4 100644
+index 2049b78d91addb93ffd5322abf1621a91a25d468..8a1583ce1f55d74e1516f62f730674bbadc4ed34 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/0752-Force-close-world-loading-screen.patch b/patches/server/0751-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0752-Force-close-world-loading-screen.patch
rename to patches/server/0751-Force-close-world-loading-screen.patch
index caf53da81b..bc5f26e530 100644
--- a/patches/server/0752-Force-close-world-loading-screen.patch
+++ b/patches/server/0751-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 1038bdb761c4b413cb92e08aa7ef634b2e8237d4..8bf39ebc7c04e54fc46ca267af06a3a84b240fbb 100644
+index 8364d86a75174d1b37cfbf6cf9dbc5ed952c432e..f173b0f4cd2cffc90a0f609cbc8bf29fdc1cf122 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/0753-Fix-falling-block-spawn-methods.patch b/patches/server/0752-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0753-Fix-falling-block-spawn-methods.patch
rename to patches/server/0752-Fix-falling-block-spawn-methods.patch
index 5ecbeebf33..d434ed98a7 100644
--- a/patches/server/0753-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0752-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 0f5b125a307769c6430dbb9f3289efd66c2c8601..b73488765daa9c734dc711839f444ce831b16e8e 100644
+index abc2a152a33805dfe30f0f657ec55c704cf3fa31..cd7367672b91829d1ffef73e32062af730df7d95 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 {
diff --git a/patches/server/0754-Expose-furnace-minecart-push-values.patch b/patches/server/0753-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0754-Expose-furnace-minecart-push-values.patch
rename to patches/server/0753-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0755-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0754-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0755-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0754-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0756-More-Projectile-API.patch b/patches/server/0755-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0756-More-Projectile-API.patch
rename to patches/server/0755-More-Projectile-API.patch
diff --git a/patches/server/0757-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0756-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0757-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0756-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0758-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0757-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 94%
rename from patches/server/0758-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0757-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index cfd207604f..00860841de 100644
--- a/patches/server/0758-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0757-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 027bc0d89b7ade602565ed3717e87c56de7265e1..a7e02f7b294795d7cac6df3a95658cf63f2fdb38 100644
+index af43b1cf239a319f765058ff082485764528e01e..fb8b6fa69bf516bbaf50541e742e5375fc8c00ff 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/0759-Implement-getComputedBiome-API.patch b/patches/server/0758-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0759-Implement-getComputedBiome-API.patch
rename to patches/server/0758-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0760-Make-some-itemstacks-nonnull.patch b/patches/server/0759-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0760-Make-some-itemstacks-nonnull.patch
rename to patches/server/0759-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0761-Implement-enchantWithLevels-API.patch b/patches/server/0760-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0761-Implement-enchantWithLevels-API.patch
rename to patches/server/0760-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0762-Fix-saving-in-unloadWorld.patch b/patches/server/0761-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0762-Fix-saving-in-unloadWorld.patch
rename to patches/server/0761-Fix-saving-in-unloadWorld.patch
index fa5308fba9..769c10ebee 100644
--- a/patches/server/0762-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0761-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 a55abfd40b7151e0eaf057bce4d3a2f6508d4ba4..d86a49c0afaee47d2dd0f0bad1e833b2a80ced53 100644
+index 8a1583ce1f55d74e1516f62f730674bbadc4ed34..382e369aa6e5606abae431764e09c95078dfd8b8 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/0763-Buffer-OOB-setBlock-calls.patch b/patches/server/0762-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0763-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0762-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0764-Add-TameableDeathMessageEvent.patch b/patches/server/0763-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0764-Add-TameableDeathMessageEvent.patch
rename to patches/server/0763-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0765-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0764-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0765-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0764-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0766-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0765-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 93%
rename from patches/server/0766-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0765-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 4b6b9f12ab..d2eae9e01e 100644
--- a/patches/server/0766-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0765-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 f62f3a904ca09b7a5edf40b739a70c00de927429..6e139b278d4f14a92190b93942a0d43884dc4315 100644
+index 0492704f7f365310d7ea930c30330a468a39c0de..fb46ba1b36c0a62dce022c86b742784828a31f2a 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/0767-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0766-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0767-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0766-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0768-cache-resource-keys.patch b/patches/server/0767-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0768-cache-resource-keys.patch
rename to patches/server/0767-cache-resource-keys.patch
diff --git a/patches/server/0769-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0768-Allow-changing-the-EnderDragon-podium.patch
similarity index 100%
rename from patches/server/0769-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0768-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0770-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0769-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0770-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0769-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0771-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0770-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0771-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0770-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0772-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0771-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 94%
rename from patches/server/0772-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0771-Prevent-tile-entity-copies-loading-chunks.patch
index 9c908631e8..331b456be1 100644
--- a/patches/server/0772-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0771-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a7e02f7b294795d7cac6df3a95658cf63f2fdb38..ecd3ce99d01bc2367ffadaab41f237c4f3516a28 100644
+index fb8b6fa69bf516bbaf50541e742e5375fc8c00ff..5e0466b0522ea325b2c37e3d4c80f3d61c1816fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3197,7 +3197,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0773-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0772-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0773-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0772-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 181baff8f4..8187d4b8c3 100644
--- a/patches/server/0773-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0772-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 8bf39ebc7c04e54fc46ca267af06a3a84b240fbb..57fa7cdcb2feb959cb413d4675fca11544236628 100644
+index f173b0f4cd2cffc90a0f609cbc8bf29fdc1cf122..6e47d01db9e7f8519e560681922a0f15980d6acc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1449,7 +1449,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0774-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0773-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 97%
rename from patches/server/0774-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0773-Pass-ServerLevel-for-gamerule-callbacks.patch
index f84d3c303a..af0055bdcd 100644
--- a/patches/server/0774-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0773-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 63bfc209c7d77170ae7b60595d800bb19f1b5da6..24fd1c18f20752679b5679e1f882b4c1ec2416b2 100644
+index 753bec96a829a153dc54b5e1013359b86f1776b3..d721c96b2b76209176f295896bff3bd03c241c4f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,13 +18,13 @@ index 63bfc209c7d77170ae7b60595d800bb19f1b5da6..24fd1c18f20752679b5679e1f882b4c1
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ecd3ce99d01bc2367ffadaab41f237c4f3516a28..93ac02c915455f688062f9ef721f2cea7f91a09d 100644
+index 5e0466b0522ea325b2c37e3d4c80f3d61c1816fe..5433681fc3765d744193556217169995fbbb3c7d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2761,7 +2761,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
-                         this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
+                         this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper - Expand PlayerGameModeChangeEvent
 -                        ((GameRules.BooleanValue) this.player.level().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.server);
 +                        ((GameRules.BooleanValue) this.player.level().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.player.serverLevel()); // Paper - Pass ServerLevel for gamerule callbacks
                      }
@@ -167,7 +167,7 @@ index 2a480026c3bfb06e6556fe5b11d9712c8e02debe..dd03426943dd380cefe12afe3e63c318
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b73488765daa9c734dc711839f444ce831b16e8e..75e573ef6e211c1a7fe6168595179eccdb8fd4d2 100644
+index cd7367672b91829d1ffef73e32062af730df7d95..19f91e08664c996b540447a46cc79e89c8e55023 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2038,7 +2038,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0775-Expand-PlayerItemDamageEvent.patch b/patches/server/0774-Expand-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0775-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0774-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0776-WorldCreator-keepSpawnLoaded.patch b/patches/server/0775-WorldCreator-keepSpawnLoaded.patch
similarity index 94%
rename from patches/server/0776-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0775-WorldCreator-keepSpawnLoaded.patch
index 8813177e0f..5f84a84054 100644
--- a/patches/server/0776-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0775-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 d86a49c0afaee47d2dd0f0bad1e833b2a80ced53..4b8814cbbcc91798653e6d66face1d9b03c66d1d 100644
+index 382e369aa6e5606abae431764e09c95078dfd8b8..aaa31bdb80754d100f4f751ad4a8b4f8957cbaa3 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/0777-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0776-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0777-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0776-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0778-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0777-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 97%
rename from patches/server/0778-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0777-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index d77d4323a7..40f73296bd 100644
--- a/patches/server/0778-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0777-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 236dabc1d4ae9dc9a2a2c07a4a27fc0bfae72f66..a7c0db6aebef3aec931513c726447091088cc546 100644
+index 2e80e2d80bc2ec981e47a42b9c30257898afa4ad..3574fe0ce7c161a13a78b66ab881463def8cc461 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -423,12 +423,16 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0779-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0778-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0779-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0778-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0780-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0779-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 98%
rename from patches/server/0780-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0779-Fire-CauldronLevelChange-on-initial-fill.patch
index 2f02c180d2..a5bfb82f01 100644
--- a/patches/server/0780-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0779-Fire-CauldronLevelChange-on-initial-fill.patch
@@ -94,7 +94,7 @@ index 588b3e911d9b22dad2928ea9e32e8a8a3a8e9b96..274dc56a71fb05060de42169df34dfd8
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-index a8b2c49ebf531d730d681ca3bceb4dc74b433fdb..b9383a9992e940fc3442d52344744cfe2fadfb74 100644
+index 18ca086e28f4295cb9303919222d7c8ae0ca5d9a..9c828328f5b8c1fe723437ed4a42cc1fe6a23d3d 100644
 --- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
 @@ -101,7 +101,13 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
diff --git a/patches/server/0781-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0780-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 96%
rename from patches/server/0781-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0780-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f60f04609d..d6e697f773 100644
--- a/patches/server/0781-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0780-fix-powder-snow-cauldrons-not-turning-to-water.patch
@@ -7,7 +7,7 @@ Powder snow cauldrons should turn to water when
 extinguishing an entity
 
 diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-index b9383a9992e940fc3442d52344744cfe2fadfb74..db8d2157df0b276313493af224be343ae0de0917 100644
+index 9c828328f5b8c1fe723437ed4a42cc1fe6a23d3d..5199ad9ca36ccd18eb2ff191feaf4331404049d2 100644
 --- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
 @@ -69,7 +69,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
diff --git a/patches/server/0782-Add-PlayerStopUsingItemEvent.patch b/patches/server/0781-Add-PlayerStopUsingItemEvent.patch
similarity index 91%
rename from patches/server/0782-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0781-Add-PlayerStopUsingItemEvent.patch
index 4af671aa5e..a59dc0b495 100644
--- a/patches/server/0782-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0781-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 861f0d81501f63fdfa25f5f6f9da4701957fc7d8..1666a06f64826da9b9e122d3811ecfce16255d1a 100644
+index 9561bbe37c57f36edee9f77d69fff363db886b2d..dfdd9200bb9998ffd4631459d9be978480f76e83 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4025,6 +4025,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0783-Don-t-tick-markers.patch b/patches/server/0782-Don-t-tick-markers.patch
similarity index 97%
rename from patches/server/0783-Don-t-tick-markers.patch
rename to patches/server/0782-Don-t-tick-markers.patch
index 1dbbc6a019..6e0c3d6db3 100644
--- a/patches/server/0783-Don-t-tick-markers.patch
+++ b/patches/server/0782-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612d
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8f249587b873c5768bb5ebf13d5f378355e17556..4c7369e222166a2342038ed5640eeb17030246fa 100644
+index 15224b31e926ab16b1ef8f2ebdca4dba20637789..cb2f5d727971c809bcb3eea0db04de4fa91459fb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2605,6 +2605,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0784-Expand-FallingBlock-API.patch b/patches/server/0783-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0784-Expand-FallingBlock-API.patch
rename to patches/server/0783-Expand-FallingBlock-API.patch
diff --git a/patches/server/0785-Do-not-accept-invalid-client-settings.patch b/patches/server/0784-Do-not-accept-invalid-client-settings.patch
similarity index 94%
rename from patches/server/0785-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0784-Do-not-accept-invalid-client-settings.patch
index 9f9a9c534c..9de555bfd8 100644
--- a/patches/server/0785-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0784-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93ac02c915455f688062f9ef721f2cea7f91a09d..b97394a20d1308f254252adfd10eff018c594d6e 100644
+index 5433681fc3765d744193556217169995fbbb3c7d..97f95c0732aef7dd9d125f183994373414584432 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3321,6 +3321,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0786-Add-support-for-Proxy-Protocol.patch b/patches/server/0785-Add-support-for-Proxy-Protocol.patch
similarity index 97%
rename from patches/server/0786-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0785-Add-support-for-Proxy-Protocol.patch
index 20e01676af..1995403e42 100644
--- a/patches/server/0786-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0785-Add-support-for-Proxy-Protocol.patch
@@ -17,7 +17,7 @@ index ff1636d3e047e124c73496f4942e991abe01c150..376e8983fdfdbb6c3e5fd8ad0f6a05e6
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm-commons:9.5")
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index f7d5af5e6a39469914bd9c496582929c9b8e0300..2cdb427eb7d88778ef4b6831336814cdc45e5ef9 100644
+index 7288a942397d223d97d7afd11b9c9e5dc6a96901..1e33cabcdf2c6c4894024bdcc1a479b2d120f944 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -111,6 +111,12 @@ public class ServerConnectionListener {
diff --git a/patches/server/0787-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0786-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0787-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0786-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0788-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0787-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0788-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0787-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0789-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0788-Sanitize-sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0789-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0788-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0790-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0789-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0790-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0789-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0791-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0790-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0791-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0790-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0792-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0791-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 95%
rename from patches/server/0792-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0791-Throw-exception-on-world-create-while-being-ticked.patch
index 8f980b01ff..e005ee53a4 100644
--- a/patches/server/0792-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0791-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c1ef4dd08b39adf3ab8dbfe286c6378f3efbf54e..4d4617635c9dc0d011cf8fc57ece6e2300573bad 100644
+index 8f338bc3f6418eae5c25078d8938d449b1d688c6..9a1c27bc7bee1f915675b82717dd82f6dd0f3ee6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,7 +45,7 @@ index c1ef4dd08b39adf3ab8dbfe286c6378f3efbf54e..4d4617635c9dc0d011cf8fc57ece6e23
          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 4b8814cbbcc91798653e6d66face1d9b03c66d1d..22eca67fb5781f2b60cdbbd228a607cec05c501b 100644
+index aaa31bdb80754d100f4f751ad4a8b4f8957cbaa3..5327445d9cced0b4e3875587d747f4f6a6cfbb07 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/0793-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0792-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0793-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0792-Add-Alternate-Current-redstone-implementation.patch
index d379fbe248..28ea7638a8 100644
--- a/patches/server/0793-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0792-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4c7369e222166a2342038ed5640eeb17030246fa..234740b7ff58734753e7a2bd6f3c8c3991a96239 100644
+index cb2f5d727971c809bcb3eea0db04de4fa91459fb..17f753ac54e73f3644d71c3ef5cbdfb850f5766c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2034,7 +2034,7 @@ index 4c7369e222166a2342038ed5640eeb17030246fa..234740b7ff58734753e7a2bd6f3c8c39
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b8188a5d0ac9be4d4ca52bd4faaf5a677029f1dc..15200db3bc2fde3858d55156b039996366e72dd4 100644
+index 0c2654986b9a5c7f210ba387851997ecec1ebb00..a03dedf6fb845e9435b5171046bb6cd5dda94b71 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/0794-Dont-resent-entity-on-art-update.patch b/patches/server/0793-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0794-Dont-resent-entity-on-art-update.patch
rename to patches/server/0793-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0795-Add-WardenAngerChangeEvent.patch b/patches/server/0794-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0795-Add-WardenAngerChangeEvent.patch
rename to patches/server/0794-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0796-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0795-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 96%
rename from patches/server/0796-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0795-Add-option-for-strict-advancement-dimension-checks.patch
index 2ecf58d074..7901e28a13 100644
--- a/patches/server/0796-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0795-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 5f9cb2c7a2874e423087d04d3360af0364692b5c..428e0afef2cac9f2a19d8cfe8f2504dd
          } 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 6e139b278d4f14a92190b93942a0d43884dc4315..202077ef20e15e7e02a37babc1fb31478db4e92b 100644
+index fb46ba1b36c0a62dce022c86b742784828a31f2a..c03ea45afb5537058cdeecc654184338b9aa0bd8 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/0797-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0796-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0797-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0796-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0798-Nameable-Banner-API.patch b/patches/server/0797-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0798-Nameable-Banner-API.patch
rename to patches/server/0797-Nameable-Banner-API.patch
diff --git a/patches/server/0799-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0798-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0799-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0798-Don-t-broadcast-messages-to-command-blocks.patch
index af4d6c1e4d..af775fb13c 100644
--- a/patches/server/0799-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0798-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index c56f5173fda6b38c2dcaea196217f2f5a7d7c641..524b0f1086c01888fe0b76e180c40915
              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 22eca67fb5781f2b60cdbbd228a607cec05c501b..b0a058139d7e57b575382162408bb3687e237de3 100644
+index 5327445d9cced0b4e3875587d747f4f6a6cfbb07..3e84d684e113e42331aec4780144f62996b8841e 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/0800-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0799-Prevent-empty-items-from-being-added-to-world.patch
similarity index 93%
rename from patches/server/0800-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0799-Prevent-empty-items-from-being-added-to-world.patch
index 4207cb10b4..bb9ca4b521 100644
--- a/patches/server/0800-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0799-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 234740b7ff58734753e7a2bd6f3c8c3991a96239..cf9f2d309a2b8ff67bd43bf191ab37e50baacaff 100644
+index 17f753ac54e73f3644d71c3ef5cbdfb850f5766c..1089c0ad619784d25b1384db2f09eebb53fa4536 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1587,6 +1587,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0801-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0800-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0801-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0800-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0802-Add-Player-getFishHook.patch b/patches/server/0801-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0802-Add-Player-getFishHook.patch
rename to patches/server/0801-Add-Player-getFishHook.patch
diff --git a/patches/server/0803-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0802-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0803-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0802-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0804-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0803-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0804-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0803-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0805-Fix-Bee-flower-NPE.patch b/patches/server/0804-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0805-Fix-Bee-flower-NPE.patch
rename to patches/server/0804-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0806-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0805-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0806-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0805-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 2d72a81825..5818b76836 100644
--- a/patches/server/0806-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0805-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b97394a20d1308f254252adfd10eff018c594d6e..af987502f1c685fc49dddd1ba5d998b88692ab87 100644
+index 97f95c0732aef7dd9d125f183994373414584432..4f26336ce8c9a6ca245b95a0014b8190b54466fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2378,7 +2378,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0807-More-Teleport-API.patch b/patches/server/0806-More-Teleport-API.patch
similarity index 98%
rename from patches/server/0807-More-Teleport-API.patch
rename to patches/server/0806-More-Teleport-API.patch
index 21db7b4f63..431378fe20 100644
--- a/patches/server/0807-More-Teleport-API.patch
+++ b/patches/server/0806-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index af987502f1c685fc49dddd1ba5d998b88692ab87..6b2042263e7463ffdd6dce5a9eb3cfd35f23bcfa 100644
+index 4f26336ce8c9a6ca245b95a0014b8190b54466fe..aa37c08c4ede225439f4c52ac7787b757461f3e1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1637,11 +1637,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -72,7 +72,7 @@ index 1879ec9e275194cb83f30ec47930a3814fbe1da3..027fa02e855e14b1554ddd141d0a937a
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9d12fab078c0625844b5f07b884b5f5978bf590c..800b216c2bbc01828005286e604e4cd6610df73c 100644
+index 4a900f3026d9fffbf528c944871b8763f9807352..8850e7af1bc3668a7bec95ffc8c25053cfb07f21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1207,13 +1207,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0808-Add-EntityPortalReadyEvent.patch b/patches/server/0807-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0808-Add-EntityPortalReadyEvent.patch
rename to patches/server/0807-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0809-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0808-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0809-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0808-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0810-Send-block-entities-after-destroy-prediction.patch b/patches/server/0809-Send-block-entities-after-destroy-prediction.patch
similarity index 96%
rename from patches/server/0810-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0809-Send-block-entities-after-destroy-prediction.patch
index a7c49026c6..7ebc3b0cdd 100644
--- a/patches/server/0810-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0809-Send-block-entities-after-destroy-prediction.patch
@@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua
 block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a7c0db6aebef3aec931513c726447091088cc546..5333488e606f2966271e1d25bacfa4196ca5145b 100644
+index 3574fe0ce7c161a13a78b66ab881463def8cc461..c14ab35c4336c025c242e8a350ac4b8d1b1d5c78 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -62,6 +62,8 @@ public class ServerPlayerGameMode {
@@ -57,7 +57,7 @@ index a7c0db6aebef3aec931513c726447091088cc546..5333488e606f2966271e1d25bacfa419
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6b2042263e7463ffdd6dce5a9eb3cfd35f23bcfa..5fdc7c39d6b565e2e87ebb6bf0219ee2c7d50d10 100644
+index aa37c08c4ede225439f4c52ac7787b757461f3e1..ff7a6977166892421e3ae8348aa15a847ebde30e 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/0811-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0810-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 96%
rename from patches/server/0811-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0810-Warn-on-plugins-accessing-faraway-chunks.patch
index 0c7ce5648b..0e9a764669 100644
--- a/patches/server/0811-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0810-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 15200db3bc2fde3858d55156b039996366e72dd4..2ef137e93f88b98812fc5b2c36f32d7d7b4216ae 100644
+index a03dedf6fb845e9435b5171046bb6cd5dda94b71..2b0ee0cbc6d204de31027aef9621ac6c026cb22f 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 {
@@ -18,7 +18,7 @@ index 15200db3bc2fde3858d55156b039996366e72dd4..2ef137e93f88b98812fc5b2c36f32d7d
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 75e573ef6e211c1a7fe6168595179eccdb8fd4d2..56a98b297f3f8742d400cd3a1f335cec1d50b331 100644
+index 19f91e08664c996b540447a46cc79e89c8e55023..cd2b1a0441d478f50a4d45159e506628dafaa9fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0812-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0811-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0812-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0811-Custom-Chat-Completion-Suggestions-API.patch
index 6a48907511..059a0f3ae2 100644
--- a/patches/server/0812-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0811-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 800b216c2bbc01828005286e604e4cd6610df73c..42729e12e6a19e99d13d8e8d6af3a0e53aa620c2 100644
+index 8850e7af1bc3668a7bec95ffc8c25053cfb07f21..80856e4dc50bbcc3b210a6599f12a85f64865bba 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/0813-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0812-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 98%
rename from patches/server/0813-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0812-Add-and-fix-missing-BlockFadeEvents.patch
index e43c29d3d8..2813257f0f 100644
--- a/patches/server/0813-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0812-Add-and-fix-missing-BlockFadeEvents.patch
@@ -10,7 +10,7 @@ potentially waterlogged block states fading.
 Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-index a4ca58384ae2a39ec568b153cc1a4f7704136108..3777e60d0b81e242b1a6e9b0be3e2f21a1642335 100644
+index 68978e1629381ada161225c53a236a54deae6481..4a1f2d326c4ece9da717a50b802af86fd9338a0b 100644
 --- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
 @@ -92,6 +92,11 @@ public class FrogspawnBlock extends Block {
diff --git a/patches/server/0814-Collision-API.patch b/patches/server/0813-Collision-API.patch
similarity index 100%
rename from patches/server/0814-Collision-API.patch
rename to patches/server/0813-Collision-API.patch
diff --git a/patches/server/0815-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0814-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 92%
rename from patches/server/0815-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0814-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 468dd8c012..b979460404 100644
--- a/patches/server/0815-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0814-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions
 This is a bug accidentally introduced in upstream CB
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 4ef2f90809b946dcdb52a4ab58cd1c15b682f790..1bf9cff3c1446be74ded3ac14658e283290b438b 100644
+index cb1898f6daa79a0ac379a5caa7283a9155a70a15..34b1d9853dc44f9bba32421ad2c2e3ccff9daa29 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -392,7 +392,7 @@ public class Commands {
diff --git a/patches/server/0816-Block-Ticking-API.patch b/patches/server/0815-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0816-Block-Ticking-API.patch
rename to patches/server/0815-Block-Ticking-API.patch
diff --git a/patches/server/0817-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0816-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0817-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0816-Add-Velocity-IP-Forwarding-Support.patch
index ba835bdc6a..6bcc358807 100644
--- a/patches/server/0817-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0816-Add-Velocity-IP-Forwarding-Support.patch
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..3c31ff3330c2e925e205c0c9ff4f0b83
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 24fd1c18f20752679b5679e1f882b4c1ec2416b2..78687afe9dade0e64cb4868cfd51f8349acdd786 100644
+index d721c96b2b76209176f295896bff3bd03c241c4f..00c47942a3690df565bd0ea76b8abbf2dc50c4e2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -228,7 +228,7 @@ index c03329267a2a97af32a0c2c9d7e94fa00596e1cf..399786839bb9dbf96d2ecd654f999cb9
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b0a058139d7e57b575382162408bb3687e237de3..1c7f88d71ee7262a31d75e1462e45f3f5e8da232 100644
+index 3e84d684e113e42331aec4780144f62996b8841e..65daec67e955a7e1d36ffc1455ec561fb02d795a 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/0818-Add-NamespacedKey-biome-methods.patch b/patches/server/0817-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0818-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0817-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0819-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0818-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0819-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0818-Fix-plugin-loggers-on-server-shutdown.patch
index 896850052f..8584c59f5a 100644
--- a/patches/server/0819-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0818-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4d4617635c9dc0d011cf8fc57ece6e2300573bad..b46e1d09a949eee8c7df2c2dced24ffba17a251a 100644
+index 9a1c27bc7bee1f915675b82717dd82f6dd0f3ee6..bb8381c51bc6b37111b837710da7e1ccbca6df5d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0820-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0819-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 96%
rename from patches/server/0820-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0819-Stop-large-look-changes-from-crashing-the-server.patch
index 70102e6029..94fa4c6c7f 100644
--- a/patches/server/0820-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0819-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1666a06f64826da9b9e122d3811ecfce16255d1a..085ab9cd7e0898313ad4542ca2fc949377dad521 100644
+index dfdd9200bb9998ffd4631459d9be978480f76e83..a027d4b0769b7ee549dc25aac4a232fb1943e443 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3056,37 +3056,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0821-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0820-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0821-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0820-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0822-Missing-eating-regain-reason.patch b/patches/server/0821-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0822-Missing-eating-regain-reason.patch
rename to patches/server/0821-Missing-eating-regain-reason.patch
diff --git a/patches/server/0823-Missing-effect-cause.patch b/patches/server/0822-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0823-Missing-effect-cause.patch
rename to patches/server/0822-Missing-effect-cause.patch
diff --git a/patches/server/0824-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0823-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0824-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0823-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0825-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0824-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0825-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0824-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0826-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0825-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0826-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0825-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0827-Configurable-chat-thread-limit.patch b/patches/server/0826-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0827-Configurable-chat-thread-limit.patch
rename to patches/server/0826-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0828-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0827-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0828-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0827-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0829-fix-Jigsaw-block-kicking-user.patch b/patches/server/0828-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0829-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0828-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0830-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0829-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0830-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0829-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0831-Add-getDrops-to-BlockState.patch b/patches/server/0830-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0831-Add-getDrops-to-BlockState.patch
rename to patches/server/0830-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0832-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0831-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 97%
rename from patches/server/0832-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0831-Fix-a-bunch-of-vanilla-bugs.patch
index dbf556d50c..38b9535b2d 100644
--- a/patches/server/0832-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0831-Fix-a-bunch-of-vanilla-bugs.patch
@@ -142,7 +142,7 @@ index 1089c0ad619784d25b1384db2f09eebb53fa4536..4ffb462f051744d5f7f7b4cf0c49f5d1
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a4031882dfbded253c53e5e225fbcf0f06475fb5..6b7c52a190bf2e69887dd68c88f1c6707c321924 100644
+index c03ea45afb5537058cdeecc654184338b9aa0bd8..6251e68eff87a0b26d6123fdb658749e90fcfc42 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -468,14 +468,14 @@ public class ServerPlayer extends Player {
@@ -163,11 +163,11 @@ index a4031882dfbded253c53e5e225fbcf0f06475fb5..6b7c52a190bf2e69887dd68c88f1c670
              while (!world.noCollision(this, this.getBoundingBox(), true) && this.getY() < (double) (world.getMaxBuildHeight() - 1)) { // Paper - make sure this loads chunks, we default to NOT loading now
                  this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 5333488e606f2966271e1d25bacfa4196ca5145b..9a68d910b0629c0dc7dce482f81752de7900304c 100644
+index c14ab35c4336c025c242e8a350ac4b8d1b1d5c78..15f6bd2e61c02392e8383dc93d734990c8c7edca 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -92,7 +92,7 @@ public class ServerPlayerGameMode {
-                 return event; // Paper
+                 return event; // Paper - Expand PlayerGameModeChangeEvent
              }
              // CraftBukkit end
 -            this.setGameModeForPlayer(gameMode, this.previousGameModeForPlayer);
@@ -176,7 +176,7 @@ index 5333488e606f2966271e1d25bacfa4196ca5145b..9a68d910b0629c0dc7dce482f81752de
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 633be3e140a17ac65d13f72382e2ef73bf815e47..71d5ffd9a5ac54d5acd25d07466e79d64996444e 100644
+index 6e47d01db9e7f8519e560681922a0f15980d6acc..cd0f6f3c1cf2a4004e238d0e23104209d6384c4e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -711,8 +711,10 @@ public abstract class PlayerList {
@@ -455,7 +455,7 @@ index 5199ad9ca36ccd18eb2ff191feaf4331404049d2..f41ffeb9062b661c2b8cf09c0d684855
                      return;
                  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 11ee20c6dc87baa063e8293ebdd9d5247a3e932e..712382f800fbafa5386205e97cb76dfceaba15a3 100644
+index b7760cc0f85b5db37d5a309aae3c26a00a65e32e..d493136283ae5100c0dc22f8da5f7e5b64fdc5f5 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -675,13 +675,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -477,13 +477,13 @@ index 11ee20c6dc87baa063e8293ebdd9d5247a3e932e..712382f800fbafa5386205e97cb76dfc
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index ca91b82a21a46b1a62564b5157882a845eae8737..db38c178543e221251ae8c6ad618ad9372af7f40 100644
+index d3e2fd7fcfeec133a7baa0007c979c9e379c2f10..1ef558bdd27e9b64413e64f0fa9c68a35f43c39d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -291,7 +291,11 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
          new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-         // Paper end
+         // Paper end - beacon activation/deactivation events
 +        // Paper start - fix MC-153086
 +        if (this.levels > 0 && !this.beamSections.isEmpty()) {
          BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
diff --git a/patches/server/0833-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0832-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 94%
rename from patches/server/0833-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0832-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 0e00a33a69..155b92b230 100644
--- a/patches/server/0833-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0832-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 81db115871c524209adec41e79e37bbfb876805b..616fe8522736600722a8ab4cce0b36ec359699bd 100644
+index 4ffb462f051744d5f7f7b4cf0c49f5d1533d1d53..9eacc0c96d96f026dcc75479606567a47c7bb008 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2641,7 +2641,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0834-Fix-custom-piglin-loved-items.patch b/patches/server/0833-Fix-custom-piglin-loved-items.patch
similarity index 93%
rename from patches/server/0834-Fix-custom-piglin-loved-items.patch
rename to patches/server/0833-Fix-custom-piglin-loved-items.patch
index 41c934194f..59a92c2464 100644
--- a/patches/server/0834-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0833-Fix-custom-piglin-loved-items.patch
@@ -7,7 +7,7 @@ Upstream didn't modify the isLovedItem check in wantsToPickup
 so piglins never actually tried to pickup interestItems
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index b98179602f5b26ecd4df46837b15ca186f65cb38..f0059bd69705ecc7964867b103c93e1df9985803 100644
+index 9c979aee4d1e6e72f599d3c5751267e17aa3d32a..965cef329f1c0aa80ee95f932ab60c98ebd4d2ec 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 @@ -402,7 +402,7 @@ public class PiglinAi {
diff --git a/patches/server/0835-EntityPickupItemEvent-fixes.patch b/patches/server/0834-EntityPickupItemEvent-fixes.patch
similarity index 93%
rename from patches/server/0835-EntityPickupItemEvent-fixes.patch
rename to patches/server/0834-EntityPickupItemEvent-fixes.patch
index a494192695..91ccd6c8ad 100644
--- a/patches/server/0835-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0834-EntityPickupItemEvent-fixes.patch
@@ -12,7 +12,7 @@ Fires the event when a Raider tries to pick up a raid banner
 to become raid leader.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 1c42425b9211bea7cb189e967e566ad80fd278c2..7c1715c9f29eda23b9b517769fdd338c94ecbf8d 100644
+index ea0902b4ba68a89b1f51281b10c1dfd1bfb42833..a9813da7f2b248f98f22e0ad2e7842915025ec12 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -424,7 +424,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -25,7 +25,7 @@ index 1c42425b9211bea7cb189e967e566ad80fd278c2..7c1715c9f29eda23b9b517769fdd338c
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index f0059bd69705ecc7964867b103c93e1df9985803..abf3d76c3f50536ba9b4e0acdc6f654bba7dd5e8 100644
+index 965cef329f1c0aa80ee95f932ab60c98ebd4d2ec..fc93dc1c402c29dba7751c0f873a1e87d6abc358 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 @@ -241,11 +241,16 @@ public class PiglinAi {
@@ -47,7 +47,7 @@ index f0059bd69705ecc7964867b103c93e1df9985803..abf3d76c3f50536ba9b4e0acdc6f654b
              itemstack = PiglinAi.removeOneItemFromItemEntity(drop);
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 5538f7a9024d8708b70de836aa78a4015656a828..0df80ba3af983c0947aca64e6940df1e584f14db 100644
+index 798a774c19361bfaf8583a602192e9e547fa85e8..226fb5c88dd43c8008c5237299ef80db9e847af7 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -245,6 +245,11 @@ public abstract class Raider extends PatrollingMonster {
diff --git a/patches/server/0836-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0835-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 97%
rename from patches/server/0836-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0835-Correctly-handle-interactions-with-items-on-cooldown.patch
index bf1b2c07c7..73e9357baa 100644
--- a/patches/server/0836-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0835-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 9a68d910b0629c0dc7dce482f81752de7900304c..a4058e8ce468ef515236813b034f1a08d5d9589f 100644
+index 15f6bd2e61c02392e8383dc93d734990c8c7edca..6c415090035fdbba6e0e3533aa2f1c3b401ab9ff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -516,6 +516,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0837-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0836-Add-PlayerInventorySlotChangeEvent.patch
similarity index 97%
rename from patches/server/0837-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0836-Add-PlayerInventorySlotChangeEvent.patch
index 5ef2fc8d5d..066ab1476e 100644
--- a/patches/server/0837-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0836-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 62110908f3230aa3e3b81772fed67aee8171cc53..4b843912ad87efe41524d5889645f2e8795130b3 100644
+index 6251e68eff87a0b26d6123fdb658749e90fcfc42..6fd2e6b6400f8fc6e1cb82a25275c48fae5a18dc 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/0838-Elder-Guardian-appearance-API.patch b/patches/server/0837-Elder-Guardian-appearance-API.patch
similarity index 90%
rename from patches/server/0838-Elder-Guardian-appearance-API.patch
rename to patches/server/0837-Elder-Guardian-appearance-API.patch
index b1cfd1919b..81d06d0601 100644
--- a/patches/server/0838-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0837-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 42729e12e6a19e99d13d8e8d6af3a0e53aa620c2..05871198b38e7dcedd44057bcc1de2673f4561c8 100644
+index 80856e4dc50bbcc3b210a6599f12a85f64865bba..c0ebd4c5714e6005b27af56512a07db22e28093e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3189,6 +3189,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0839-Allow-changing-bed-s-occupied-property.patch b/patches/server/0838-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0839-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0838-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0840-Add-entity-knockback-API.patch b/patches/server/0839-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0840-Add-entity-knockback-API.patch
rename to patches/server/0839-Add-entity-knockback-API.patch
diff --git a/patches/server/0841-Detect-headless-JREs.patch b/patches/server/0840-Detect-headless-JREs.patch
similarity index 96%
rename from patches/server/0841-Detect-headless-JREs.patch
rename to patches/server/0840-Detect-headless-JREs.patch
index 1d987d6dd8..5861f80bb1 100644
--- a/patches/server/0841-Detect-headless-JREs.patch
+++ b/patches/server/0840-Detect-headless-JREs.patch
@@ -27,7 +27,7 @@ index 6bd0afddbcc461149dfe9a5c7a86fff6ea13a5f1..148d233f4f5278ff39eacdaa0f4f0e7d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 9b0bbaf23b90a04b6e6f6c97d9174fe31af557ce..a2d7ed6c68729d1d46b1ac949b7e98cd6badedba 100644
+index 7b996a1c24e66d87c95b9f075248eb1d72ad0476..e65546ab25b9dc814ea14aabfbae8f80017ab88b 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -175,6 +175,18 @@ public class Main {
diff --git a/patches/server/0842-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0841-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0842-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0841-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0843-optimize-dirt-and-snow-spreading.patch b/patches/server/0842-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0843-optimize-dirt-and-snow-spreading.patch
rename to patches/server/0842-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/0844-Add-EntityToggleSitEvent.patch b/patches/server/0843-Add-EntityToggleSitEvent.patch
similarity index 98%
rename from patches/server/0844-Add-EntityToggleSitEvent.patch
rename to patches/server/0843-Add-EntityToggleSitEvent.patch
index f7035ccd1e..f8933f4f78 100644
--- a/patches/server/0844-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0843-Add-EntityToggleSitEvent.patch
@@ -57,7 +57,7 @@ index 94bb69a7f5795e0fbee171433632b5c3bca3b902..287e52dc844c2a64dac74dad117b775f
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 130761afcaa6723e0a9d9a518f1b526c344484b4..25a7602670b9f736b3b9ff4523bc867e65c0998a 100644
+index eb61d539fcf15dfc51b3ea52c232a0c7ef4f1ca9..3a6483c29803acbbb9a5b4b49fae22de7575504f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -138,6 +138,7 @@ public class Panda extends Animal {
diff --git a/patches/server/0845-Add-fire-tick-delay-option.patch b/patches/server/0844-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0845-Add-fire-tick-delay-option.patch
rename to patches/server/0844-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0846-Add-Moving-Piston-API.patch b/patches/server/0845-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0846-Add-Moving-Piston-API.patch
rename to patches/server/0845-Add-Moving-Piston-API.patch
diff --git a/patches/server/0847-Ignore-impossible-spawn-tick.patch b/patches/server/0846-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0847-Ignore-impossible-spawn-tick.patch
rename to patches/server/0846-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0848-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0847-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0848-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0847-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0849-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0848-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0849-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0848-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0850-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0849-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 95%
rename from patches/server/0850-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0849-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 7b9426fb6f..03ce1c0393 100644
--- a/patches/server/0850-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0849-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -21,7 +21,7 @@ index 0d427f0a70c8d85762fededfe920418d66636ebb..0c1cb3d5892b81b9f8a1894e429bc237
              // CraftBukkit end
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-index 02cbb25b8b1fdaf6e2b771067ca132245eab13dc..c203aa71acc01fa802c2b1ebd253c0e1718ec4cd 100644
+index 450f87ea7f4c5ef3b26a3c75bc7c8bd08a982075..cd076da69e89d843d06ab5be854e8dce122ecb1d 100644
 --- a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
 @@ -134,6 +134,10 @@ public abstract class BaseFireBlock extends Block {
diff --git a/patches/server/0851-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0850-Add-PrePlayerAttackEntityEvent.patch
similarity index 93%
rename from patches/server/0851-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0850-Add-PrePlayerAttackEntityEvent.patch
index 4f1c589826..ef0c58aa92 100644
--- a/patches/server/0851-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0850-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 548343be02a627d2c2475a4452363876a126b3a8..cc9835f7ee449098d442eeb5d6e77abeb72f108e 100644
+index f6ca517fbe3742381a932958e9893e32b81e390b..618aaee0abebef15078c90859a7aa815288e655a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1240,8 +1240,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0852-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0851-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0852-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0851-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0853-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0852-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0853-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0852-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0854-Add-Player-Warden-Warning-API.patch b/patches/server/0853-Add-Player-Warden-Warning-API.patch
similarity index 95%
rename from patches/server/0854-Add-Player-Warden-Warning-API.patch
rename to patches/server/0853-Add-Player-Warden-Warning-API.patch
index eb8e612233..8b8ddd6d03 100644
--- a/patches/server/0854-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0853-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 05871198b38e7dcedd44057bcc1de2673f4561c8..ebbb4e5cbbf505598fb84b39649ff5d27e20d6bc 100644
+index c0ebd4c5714e6005b27af56512a07db22e28093e..0dbb8d77b79ae2ae3aca4a96aeb92a981c07292a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3194,6 +3194,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0855-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0854-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0855-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0854-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0856-Add-paper-dumplisteners-command.patch b/patches/server/0855-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0856-Add-paper-dumplisteners-command.patch
rename to patches/server/0855-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0857-check-global-player-list-where-appropriate.patch b/patches/server/0856-check-global-player-list-where-appropriate.patch
similarity index 96%
rename from patches/server/0857-check-global-player-list-where-appropriate.patch
rename to patches/server/0856-check-global-player-list-where-appropriate.patch
index cce3063d5c..16c079cd6a 100644
--- a/patches/server/0857-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0856-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 616fe8522736600722a8ab4cce0b36ec359699bd..88f2feed0c0612b588a332da59d1e17416bd8982 100644
+index 9eacc0c96d96f026dcc75479606567a47c7bb008..8c919616acbe571710bd8bb39eef4355b6d3d2b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2764,4 +2764,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -24,7 +24,7 @@ index 616fe8522736600722a8ab4cce0b36ec359699bd..88f2feed0c0612b588a332da59d1e174
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 085ab9cd7e0898313ad4542ca2fc949377dad521..6f7990b7dd6d30bd07ec7910d341e2aadca63f2d 100644
+index a027d4b0769b7ee549dc25aac4a232fb1943e443..c726af466c1156a3b2c1ee18d1ac1b4613ee2431 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3678,7 +3678,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0858-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0857-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0858-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0857-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0859-ItemStack-damage-API.patch b/patches/server/0858-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0859-ItemStack-damage-API.patch
rename to patches/server/0858-ItemStack-damage-API.patch
diff --git a/patches/server/0860-Friction-API.patch b/patches/server/0859-Friction-API.patch
similarity index 98%
rename from patches/server/0860-Friction-API.patch
rename to patches/server/0859-Friction-API.patch
index 0106603392..f6d0ae44e4 100644
--- a/patches/server/0860-Friction-API.patch
+++ b/patches/server/0859-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6f7990b7dd6d30bd07ec7910d341e2aadca63f2d..d5d8620bc4cc639daedd424ca137e99811084d78 100644
+index c726af466c1156a3b2c1ee18d1ac1b4613ee2431..0e66212733665307840d10bd6ea049d45f674ddb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0861-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0860-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0861-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0860-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0862-Fix-player-kick-on-shutdown.patch b/patches/server/0861-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0862-Fix-player-kick-on-shutdown.patch
rename to patches/server/0861-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0863-Sync-offhand-slot-in-menus.patch b/patches/server/0862-Sync-offhand-slot-in-menus.patch
similarity index 97%
rename from patches/server/0863-Sync-offhand-slot-in-menus.patch
rename to patches/server/0862-Sync-offhand-slot-in-menus.patch
index ba4012865e..abb074b19f 100644
--- a/patches/server/0863-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0862-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 4b843912ad87efe41524d5889645f2e8795130b3..ea649799341a3f446469048924aae792e211de49 100644
+index 6fd2e6b6400f8fc6e1cb82a25275c48fae5a18dc..3abcb4470bbf8f83204532ff5f3f5e152866a9f0 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/0864-Player-Entity-Tracking-Events.patch b/patches/server/0863-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0864-Player-Entity-Tracking-Events.patch
rename to patches/server/0863-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0865-Limit-pet-look-distance.patch b/patches/server/0864-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0865-Limit-pet-look-distance.patch
rename to patches/server/0864-Limit-pet-look-distance.patch
diff --git a/patches/server/0866-Properly-resend-entities.patch b/patches/server/0865-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0866-Properly-resend-entities.patch
rename to patches/server/0865-Properly-resend-entities.patch
index 9652ca13e4..68df7df396 100644
--- a/patches/server/0866-Properly-resend-entities.patch
+++ b/patches/server/0865-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 5fdc7c39d6b565e2e87ebb6bf0219ee2c7d50d10..e55e253898b61cc4eb611592e8310bb4e005362a 100644
+index ff7a6977166892421e3ae8348aa15a847ebde30e..3af7160fc36b6f706e9448f584c19b8859919cea 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
@@ -98,7 +98,7 @@ index 5fdc7c39d6b565e2e87ebb6bf0219ee2c7d50d10..e55e253898b61cc4eb611592e8310bb4
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 423aa9b56c9e9152bba00f47a71ae41612bebdbd..0223b11df825964f205193268e5c96d7e2d13b6c 100644
+index cd0f6f3c1cf2a4004e238d0e23104209d6384c4e..824bd2bf2ad24001b7f3aa3d8f5a78f36b0baef4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -376,7 +376,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0867-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0866-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 95%
rename from patches/server/0867-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0866-Fixes-and-additions-to-the-SpawnReason-API.patch
index 021c52f132..deab687e21 100644
--- a/patches/server/0867-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0866-Fixes-and-additions-to-the-SpawnReason-API.patch
@@ -8,7 +8,7 @@ Fixes some wrong reasons, and adds missing spawn reasons for entities.
 Co-authored-by: Doc <nachito94@msn.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 823f3b3093cffb49ccdcbcfbe6d348009a553ad7..e754a294645e1af9e39bde32dd1387cd54335e7e 100644
+index 2fa2e5cada590c0f44a4735bcf20de51892f428b..3c4a57bc6159eac53fe37e817e765018d4b2bec9 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -353,7 +353,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -34,7 +34,7 @@ index 9652e3385ad10e5d825dd141f6be3522c596916d..baea154a24d1b888af18b9b792db9ede
                  this.discard();
              }
 diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-index 3777e60d0b81e242b1a6e9b0be3e2f21a1642335..bb45605e1ef3e6cfa1976cf9e449456b19cc7c9c 100644
+index 4a1f2d326c4ece9da717a50b802af86fd9338a0b..94618709e742ebe1a7893d418124e309eaab6c5f 100644
 --- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
 @@ -117,7 +117,7 @@ public class FrogspawnBlock extends Block {
diff --git a/patches/server/0868-fix-Instruments.patch b/patches/server/0867-fix-Instruments.patch
similarity index 96%
rename from patches/server/0868-fix-Instruments.patch
rename to patches/server/0867-fix-Instruments.patch
index 45518ab2ae..ad87dc712d 100644
--- a/patches/server/0868-fix-Instruments.patch
+++ b/patches/server/0867-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 ebbb4e5cbbf505598fb84b39649ff5d27e20d6bc..a0c6902955296da171548618bfcbf629944f8737 100644
+index 0dbb8d77b79ae2ae3aca4a96aeb92a981c07292a..73019b008afaa88d2e068ed4e8f006dfb1dbaf5f 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/0869-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0868-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0869-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0868-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0870-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0869-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0870-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0869-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0871-Add-BlockLockCheckEvent.patch b/patches/server/0870-Add-BlockLockCheckEvent.patch
similarity index 98%
rename from patches/server/0871-Add-BlockLockCheckEvent.patch
rename to patches/server/0870-Add-BlockLockCheckEvent.patch
index dd261092ef..72fd17bc24 100644
--- a/patches/server/0871-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0870-Add-BlockLockCheckEvent.patch
@@ -56,7 +56,7 @@ index fce3a45d09a93ca68a3d49f2e666afa4c860d042..b8b4d74076fa5ed6eb3b2045384db77e
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index db38c178543e221251ae8c6ad618ad9372af7f40..afb20f58655e958bd64efd1a1265da9c94857f79 100644
+index 1ef558bdd27e9b64413e64f0fa9c68a35f43c39d..c7b0590b742a57d524de41151fc08fc596097d9c 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -470,7 +470,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0872-Add-Sneaking-API-for-Entities.patch b/patches/server/0871-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0872-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0871-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0873-Improve-logging-and-errors.patch b/patches/server/0872-Improve-logging-and-errors.patch
similarity index 98%
rename from patches/server/0873-Improve-logging-and-errors.patch
rename to patches/server/0872-Improve-logging-and-errors.patch
index 89c2660995..feaac0554c 100644
--- a/patches/server/0873-Improve-logging-and-errors.patch
+++ b/patches/server/0872-Improve-logging-and-errors.patch
@@ -40,7 +40,7 @@ index 536f0c496ce36ca3248fc6eeac9bbd77214a36f9..31718823250a1490b783f426fff65bf5
  
          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 e55e253898b61cc4eb611592e8310bb4e005362a..a39101fc6ecfa414a1a5e41e61e5fa9077c03c04 100644
+index 3af7160fc36b6f706e9448f584c19b8859919cea..8ccfa8b68b1f43da0a4730d3b09e100bf846ef73 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/0874-Improve-PortalEvents.patch b/patches/server/0873-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0874-Improve-PortalEvents.patch
rename to patches/server/0873-Improve-PortalEvents.patch
diff --git a/patches/server/0875-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0874-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 92%
rename from patches/server/0875-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0874-Add-config-option-for-spider-worldborder-climbing.patch
index 4ea94b6836..8d59d9f5d1 100644
--- a/patches/server/0875-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0874-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 9e5d68fe86d17118df3d6a1c36b296f32b4d7fc1..5a9f4a022c8e7a0804543335bfe91e1328d040e6 100644
+index 4d5cfaa58bdf4e6cb975134004d14c591f6e85fa..ff004d5c0dee027acea51aa4886065636335e2a9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -86,7 +86,7 @@ public class Spider extends Monster {
diff --git a/patches/server/0876-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0875-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 93%
rename from patches/server/0876-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0875-Add-missing-SpigotConfig-logCommands-check.patch
index 940d96f11d..9a642caca1 100644
--- a/patches/server/0876-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0875-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 a39101fc6ecfa414a1a5e41e61e5fa9077c03c04..0b83618d8ca6f5f6694ec5ba4b7635146a5be60c 100644
+index 8ccfa8b68b1f43da0a4730d3b09e100bf846ef73..21331fb6f71aeb80504f516271c5eb99dd94727a 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/0877-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0876-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0877-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0876-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0878-Flying-Fall-Damage.patch b/patches/server/0877-Flying-Fall-Damage.patch
similarity index 92%
rename from patches/server/0878-Flying-Fall-Damage.patch
rename to patches/server/0877-Flying-Fall-Damage.patch
index e882ff3518..5be2b42d65 100644
--- a/patches/server/0878-Flying-Fall-Damage.patch
+++ b/patches/server/0877-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index cc9835f7ee449098d442eeb5d6e77abeb72f108e..a623b22e02647d2b14e0b5a662920c4cc5d4361e 100644
+index 618aaee0abebef15078c90859a7aa815288e655a..f07b79cced4fa47dbb6b4aa75a384a2a08a53b03 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index cc9835f7ee449098d442eeb5d6e77abeb72f108e..a623b22e02647d2b14e0b5a662920c4c
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a0c6902955296da171548618bfcbf629944f8737..a917c616043f7e17144a52ff4cfe0cc0217087b8 100644
+index 73019b008afaa88d2e068ed4e8f006dfb1dbaf5f..6b2f69187ed85ba197fbcd04b22e6d81a1d15dbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2472,6 +2472,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0879-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0878-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 98%
rename from patches/server/0879-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0878-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index dbe8948243..e09b5ff99d 100644
--- a/patches/server/0879-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0878-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -54,7 +54,7 @@ index 5a2e322d349340fa58f133c2034765f90319b2be..7bb8dc1f4697960cdc6bac0daec4b7a0
                  this.wasCanceled = event.isCancelled();
                  bukkitBlocks = event.blockList();
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 0e63fa3b49b1a275254cf108a51ab18e816aad49..e302fdf76d013826804108cb6444e2de5658b84f 100644
+index 40559727591278f44dbf50e2d3406054ffeb8ae9..c6322da14262b8cc2a37ffef5149d008b74bd5e5 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -96,6 +96,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
@@ -92,7 +92,7 @@ index 0e63fa3b49b1a275254cf108a51ab18e816aad49..e302fdf76d013826804108cb6444e2de
              }
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index c83ffba568f33323b0f8b9a03fa0b7bbbfed4355..ec7b5e089c2911c7833e3fd7db4018ca2e0d4e85 100644
+index acd5ec218b8d4c096f44ae2eec1379eeaf30ddc5..088262f306755a9cb785c7a0cf0a9c66ed0965a8 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 @@ -131,6 +131,7 @@ public class RespawnAnchorBlock extends Block {
diff --git a/patches/server/0880-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0879-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0880-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0879-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0881-config-for-disabling-entity-tag-tags.patch b/patches/server/0880-config-for-disabling-entity-tag-tags.patch
similarity index 94%
rename from patches/server/0881-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0880-config-for-disabling-entity-tag-tags.patch
index 4028bb8e3b..d9fd989731 100644
--- a/patches/server/0881-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0880-config-for-disabling-entity-tag-tags.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] config for disabling entity tag tags
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index e754a294645e1af9e39bde32dd1387cd54335e7e..82695b6f25011a315027bd7a5cb305af31663d4a 100644
+index 3c4a57bc6159eac53fe37e817e765018d4b2bec9..dd4cf9011bf48623e95d5d0f3ff27ee962c88200 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -497,6 +497,13 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0882-Use-single-player-info-update-packet-on-join.patch b/patches/server/0881-Use-single-player-info-update-packet-on-join.patch
similarity index 94%
rename from patches/server/0882-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0881-Use-single-player-info-update-packet-on-join.patch
index b23b39cb98..493e289d70 100644
--- a/patches/server/0882-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0881-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 0b83618d8ca6f5f6694ec5ba4b7635146a5be60c..ef25aea4b0bb34b638cb5036de4cf412d3e73b5a 100644
+index 21331fb6f71aeb80504f516271c5eb99dd94727a..2d67f8126850bf3efe91cd6a7c6180776b8e83fc 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
@@ -18,7 +18,7 @@ index 0b83618d8ca6f5f6694ec5ba4b7635146a5be60c..ef25aea4b0bb34b638cb5036de4cf412
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0223b11df825964f205193268e5c96d7e2d13b6c..8d8cc5463f261334d0aabf4fd31854a2af862acc 100644
+index 824bd2bf2ad24001b7f3aa3d8f5a78f36b0baef4..0e3f2b10a3edf129263783c68c4b25c1f7dfb8f1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -358,6 +358,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0883-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0882-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 95%
rename from patches/server/0883-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0882-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 478a6e9f71..082a9af27a 100644
--- a/patches/server/0883-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0882-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d5d8620bc4cc639daedd424ca137e99811084d78..1dfef0d35561e0af76ccddcb38ff9a3a99c47691 100644
+index 0e66212733665307840d10bd6ea049d45f674ddb..9f3b88a30e76d82f5e02f317a5f2676be44acaa9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1611,7 +1611,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0884-Win-Screen-API.patch b/patches/server/0883-Win-Screen-API.patch
similarity index 93%
rename from patches/server/0884-Win-Screen-API.patch
rename to patches/server/0883-Win-Screen-API.patch
index 3ebb9a80e9..837c6b728e 100644
--- a/patches/server/0884-Win-Screen-API.patch
+++ b/patches/server/0883-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 a917c616043f7e17144a52ff4cfe0cc0217087b8..351f6667b76cd4943159fc9c130ff8595f7e3a6b 100644
+index 6b2f69187ed85ba197fbcd04b22e6d81a1d15dbc..d42d2692c34660b82ef19d8eed60322b5fceece0 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/0885-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0884-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0885-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0884-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0886-Fix-force-opening-enchantment-tables.patch b/patches/server/0885-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0886-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0885-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0887-Add-Entity-Body-Yaw-API.patch b/patches/server/0886-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0887-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0886-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0888-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0887-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0888-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0887-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0889-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0888-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 90%
rename from patches/server/0889-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0888-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 006fae5113..8ed5ba6cdf 100644
--- a/patches/server/0889-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0888-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 2ef137e93f88b98812fc5b2c36f32d7d7b4216ae..ba1e041e856261643f0d64528f6fbe2f5279b476 100644
+index 2b0ee0cbc6d204de31027aef9621ac6c026cb22f..6f828ff4c54c2ddd4cc03c0e368afda2521e24dd 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/0890-Add-EntityFertilizeEggEvent.patch b/patches/server/0889-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0890-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0889-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0891-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0890-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0891-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0890-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0892-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0891-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0892-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0891-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0893-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0892-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0893-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0892-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0894-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0893-Fix-advancement-triggers-for-entity-damage.patch
similarity index 97%
rename from patches/server/0894-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0893-Fix-advancement-triggers-for-entity-damage.patch
index 4568aa9c21..4b04d3a488 100644
--- a/patches/server/0894-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0893-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1dfef0d35561e0af76ccddcb38ff9a3a99c47691..0a274d7ca72c75c9a36e8e688f22097c4abd8ba2 100644
+index 9f3b88a30e76d82f5e02f317a5f2676be44acaa9..202819877d5920e8d0429a8c1bf06af4b9af950f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2302,7 +2302,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0895-Fix-text-display-error-on-spawn.patch b/patches/server/0894-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0895-Fix-text-display-error-on-spawn.patch
rename to patches/server/0894-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0896-Fix-inventories-returning-null-Locations.patch b/patches/server/0895-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0896-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0895-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0897-Add-Shearable-API.patch b/patches/server/0896-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0897-Add-Shearable-API.patch
rename to patches/server/0896-Add-Shearable-API.patch
diff --git a/patches/server/0898-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0897-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0898-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0897-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0899-Optimize-Hoppers.patch b/patches/server/0898-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0899-Optimize-Hoppers.patch
rename to patches/server/0898-Optimize-Hoppers.patch
diff --git a/patches/server/0900-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0899-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0900-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0899-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0901-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0900-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 93%
rename from patches/server/0901-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0900-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index e5cc265ab4..bedd123fea 100644
--- a/patches/server/0901-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0900-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix crash relating to bad recipes in furnace-like tile
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 712382f800fbafa5386205e97cb76dfceaba15a3..5eaab97a0c3b93a44a45e2ed11033fe01c0c95c2 100644
+index d493136283ae5100c0dc22f8da5f7e5b64fdc5f5..b39c6c91e088dbe2187ed7fd598076f41c53bd49 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -643,6 +643,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0902-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0901-Treat-sequence-violations-like-they-should-be.patch
similarity index 92%
rename from patches/server/0902-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0901-Treat-sequence-violations-like-they-should-be.patch
index 93c890ea58..d2ea0a2c8c 100644
--- a/patches/server/0902-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0901-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 ef25aea4b0bb34b638cb5036de4cf412d3e73b5a..b537c2d1e00eee4da9ca53c731791f46ae5013cb 100644
+index 2d67f8126850bf3efe91cd6a7c6180776b8e83fc..73494f622e86bb6141f49e6d73aca1a0c1a78d21 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/0903-remove-duplicate-animate-packet-for-records.patch b/patches/server/0902-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0903-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0902-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0904-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0903-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0904-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0903-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 4af54190d6..24d6bab05d 100644
--- a/patches/server/0904-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0903-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..d43106eb89b14667e85cd6e8fa047d64
          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 b537c2d1e00eee4da9ca53c731791f46ae5013cb..294dd52de7b0b19b19bbef9bb6ec6b5b2845cdeb 100644
+index 73494f622e86bb6141f49e6d73aca1a0c1a78d21..a6870c5f386905a4a2f4b884683aff7640649a50 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/0905-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0904-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 91%
rename from patches/server/0905-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0904-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index bee1419087..898506348d 100644
--- a/patches/server/0905-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0904-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 88f2feed0c0612b588a332da59d1e17416bd8982..720d5275199e73b0c9d0b1d1a9f6a4463c9bb3bb 100644
+index 8c919616acbe571710bd8bb39eef4355b6d3d2b3..df40ffecfa6d34aa3cdffbbec03e049a271364ab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1724,6 +1724,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0906-Use-array-for-gamerule-storage.patch b/patches/server/0905-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0906-Use-array-for-gamerule-storage.patch
rename to patches/server/0905-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0907-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0906-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 95%
rename from patches/server/0907-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0906-Fix-a-couple-of-upstream-bed-issues.patch
index 46bc18a26a..5e51d9930e 100644
--- a/patches/server/0907-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0906-Fix-a-couple-of-upstream-bed-issues.patch
@@ -10,7 +10,7 @@ but then replaced it with a bed, you could respawn
 at the bed in that world.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index e302fdf76d013826804108cb6444e2de5658b84f..2c1d03237d5b24b93807c7e97d969ace13d6a917 100644
+index c6322da14262b8cc2a37ffef5149d008b74bd5e5..8677dc684bd2e0bb3cf5f77b659ce02b79627e76 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -109,6 +109,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
diff --git a/patches/server/0908-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0907-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 91%
rename from patches/server/0908-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0907-Fix-demo-flag-not-enabling-demo-mode.patch
index eb7ea6ae10..80f51e2120 100644
--- a/patches/server/0908-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0907-Fix-demo-flag-not-enabling-demo-mode.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix demo flag not enabling demo mode
 https://github.com/PaperMC/Paper/issues/9046
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index a2d7ed6c68729d1d46b1ac949b7e98cd6badedba..a5e6b99b95e8408136f4c665aec070c5adc448da 100644
+index e65546ab25b9dc814ea14aabfbae8f80017ab88b..4a565321174d9230823a07cf37fb104f9f92245f 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -333,7 +333,9 @@ public class Main {
diff --git a/patches/server/0909-Add-Mob-Experience-reward-API.patch b/patches/server/0908-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0909-Add-Mob-Experience-reward-API.patch
rename to patches/server/0908-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0910-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0909-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0910-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0909-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0911-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0910-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0911-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0910-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0912-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0911-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0912-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0911-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0913-More-accurate-isInOpenWater-impl.patch b/patches/server/0912-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0913-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0912-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0914-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0913-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0914-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0913-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0915-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0914-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0915-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0914-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0916-Expand-PlayerItemMendEvent.patch b/patches/server/0915-Expand-PlayerItemMendEvent.patch
similarity index 98%
rename from patches/server/0916-Expand-PlayerItemMendEvent.patch
rename to patches/server/0915-Expand-PlayerItemMendEvent.patch
index 5b1f473acb..c53087c237 100644
--- a/patches/server/0916-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0915-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index 5685951b71a8b81c7a71fd93b099b276d535b401..b37e13c5de1a0a22a3713d04b203afc6
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 351f6667b76cd4943159fc9c130ff8595f7e3a6b..09cbd4dadfc2c2984fc5f50152e1c3a0f1d5a5b6 100644
+index d42d2692c34660b82ef19d8eed60322b5fceece0..c21f3ca67672fffa0b2ae0a0e241932efbaedc8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1754,11 +1754,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0917-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0916-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0917-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0916-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0918-Add-transient-modifier-API.patch b/patches/server/0917-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0918-Add-transient-modifier-API.patch
rename to patches/server/0917-Add-transient-modifier-API.patch
diff --git a/patches/server/0919-Fix-block-place-logic.patch b/patches/server/0918-Fix-block-place-logic.patch
similarity index 97%
rename from patches/server/0919-Fix-block-place-logic.patch
rename to patches/server/0918-Fix-block-place-logic.patch
index b8f54129f9..051d3982db 100644
--- a/patches/server/0919-Fix-block-place-logic.patch
+++ b/patches/server/0918-Fix-block-place-logic.patch
@@ -41,7 +41,7 @@ index 63cd9cd79217a9bcedb6647e6f61d9bccc28d9f0..6070711b9825612fbc485d840ed3ed80
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ba1e041e856261643f0d64528f6fbe2f5279b476..3660ebab9164146fb75075462802f5ba383dd9c5 100644
+index 6f828ff4c54c2ddd4cc03c0e368afda2521e24dd..a57b7e85f068c3131c6fc41cd8e79dec2f053748 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/0920-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0919-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0920-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0919-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0921-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0920-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 96%
rename from patches/server/0921-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0920-Call-BlockGrowEvent-for-missing-blocks.patch
index 7f41f99941..9054b42b6b 100644
--- a/patches/server/0921-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0920-Call-BlockGrowEvent-for-missing-blocks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Call BlockGrowEvent for missing blocks
 Call the event for pitcher crops and sniffer egg
 
 diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
-index 73d9ad9e24727a81c5ff1645316aee003600c0cc..7d8907477cc2b60e48538aaf32e00c0352b926b9 100644
+index 591f32f7c0a7a9c843933d17dad8a34b672f49ac..d20c009baf69d083bf8a14000028991b6518cd50 100644
 --- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
 @@ -130,7 +130,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl
diff --git a/patches/server/0922-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0921-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 94%
rename from patches/server/0922-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0921-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index c4f54468e4..c8c82e2a7e 100644
--- a/patches/server/0922-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0921-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 1c7f88d71ee7262a31d75e1462e45f3f5e8da232..758ca700cfa0f05357f051962e41a215ade3724f 100644
+index 65daec67e955a7e1d36ffc1455ec561fb02d795a..5f24bab8b21452e502af70a925ceeaecbedd4a6c 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/0923-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0922-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0923-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0922-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0924-Fix-sniffer-removeExploredLocation.patch b/patches/server/0923-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0924-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0923-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0925-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0924-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0925-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0924-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0926-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0925-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0926-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0925-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0927-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0926-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0927-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0926-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0928-Properly-cancel-usable-items.patch b/patches/server/0927-Properly-cancel-usable-items.patch
similarity index 92%
rename from patches/server/0928-Properly-cancel-usable-items.patch
rename to patches/server/0927-Properly-cancel-usable-items.patch
index aa63be117a..cd167bc646 100644
--- a/patches/server/0928-Properly-cancel-usable-items.patch
+++ b/patches/server/0927-Properly-cancel-usable-items.patch
@@ -10,7 +10,7 @@ The underlying issue of this is that the client modifies their synced data value
 them in order for the client to reset their using item state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a4058e8ce468ef515236813b034f1a08d5d9589f..0357e190f6cc0724223ed705b19651d865bf853b 100644
+index 6c415090035fdbba6e0e3533aa2f1c3b401ab9ff..41c647c46585d454f3b10a860a2b6d979d1199a3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -557,6 +557,7 @@ public class ServerPlayerGameMode {
@@ -34,7 +34,7 @@ index a4058e8ce468ef515236813b034f1a08d5d9589f..0357e190f6cc0724223ed705b19651d8
          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 294dd52de7b0b19b19bbef9bb6ec6b5b2845cdeb..ac41dc96a4aee7b0bb71cbf71d3109ff05a66eff 100644
+index a6870c5f386905a4a2f4b884683aff7640649a50..ead7c202ba8ed11ee180767f3acaa003f60c2b28 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
@@ -46,7 +46,7 @@ index 294dd52de7b0b19b19bbef9bb6ec6b5b2845cdeb..ac41dc96a4aee7b0bb71cbf71d3109ff
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0a274d7ca72c75c9a36e8e688f22097c4abd8ba2..03caab6d49f74402c5c6c932e3a85e72a6edf3bc 100644
+index 202819877d5920e8d0429a8c1bf06af4b9af950f..e9839d0dc8339ce62a6eb01c7094a2a3cf0fa816 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3814,6 +3814,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0929-Add-event-for-player-editing-sign.patch b/patches/server/0928-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0929-Add-event-for-player-editing-sign.patch
rename to patches/server/0928-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0930-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0929-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0930-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0929-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0931-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0930-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 98%
rename from patches/server/0931-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0930-Fix-cmd-permission-levels-for-command-blocks.patch
index 772d421a4a..509c920615 100644
--- a/patches/server/0931-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0930-Fix-cmd-permission-levels-for-command-blocks.patch
@@ -41,7 +41,7 @@ index e65d7980b7ebed60786bc31e2f8156fda3b59556..6978d0a9abc9cc5870ac5ee6308f2e99
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 1bf9cff3c1446be74ded3ac14658e283290b438b..4f627f80811b06d27311a39d00fdc3d39b9887b2 100644
+index 34b1d9853dc44f9bba32421ad2c2e3ccff9daa29..c1907c3095f095be0ee08681f5aed587c962328c 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -296,16 +296,7 @@ public class Commands {
diff --git a/patches/server/0932-Add-option-to-disable-block-updates.patch b/patches/server/0931-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0932-Add-option-to-disable-block-updates.patch
rename to patches/server/0931-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0933-Call-missing-BlockDispenseEvent.patch b/patches/server/0932-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0933-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0932-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0934-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0933-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0934-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0933-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0935-Optimize-player-lookups-for-beacons.patch b/patches/server/0934-Optimize-player-lookups-for-beacons.patch
similarity index 94%
rename from patches/server/0935-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0934-Optimize-player-lookups-for-beacons.patch
index 65212bc207..d1184a5b92 100644
--- a/patches/server/0935-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0934-Optimize-player-lookups-for-beacons.patch
@@ -7,7 +7,7 @@ For larger ranges, it's better to iterate over the player list
 than the entity slices.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index afb20f58655e958bd64efd1a1265da9c94857f79..5a1da6316ff56ea94a1ba1b68ce51bdffcee9736 100644
+index c7b0590b742a57d524de41151fc08fc596097d9c..6efd46c2c5a83a3e4f5ab8fee4519476de3459c0 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -329,7 +329,22 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0936-Add-Sign-getInteractableSideFor.patch b/patches/server/0935-Add-Sign-getInteractableSideFor.patch
similarity index 96%
rename from patches/server/0936-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0935-Add-Sign-getInteractableSideFor.patch
index 3e0f85b62d..e03e64bf9b 100644
--- a/patches/server/0936-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0935-Add-Sign-getInteractableSideFor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sign#getInteractableSideFor
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index da3d947c58bdb79372e64b2cea6e49b99a4a9ad8..9bc1e7f03106cc35ac79bc9d7cced2bc5871b36c 100644
+index 393e6e5fb2c901cdf369cfe5bcde454dee2b1b0d..6a883c185eb7ae228cb767044f7395ef1d08ab28 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -66,13 +66,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0937-Array-backed-synched-entity-data.patch b/patches/server/0936-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0937-Array-backed-synched-entity-data.patch
rename to patches/server/0936-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0938-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0937-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0938-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0937-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0939-Fix-BanList-API.patch b/patches/server/0938-Fix-BanList-API.patch
similarity index 99%
rename from patches/server/0939-Fix-BanList-API.patch
rename to patches/server/0938-Fix-BanList-API.patch
index f7a8267da4..12638cd645 100644
--- a/patches/server/0939-Fix-BanList-API.patch
+++ b/patches/server/0938-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 09cbd4dadfc2c2984fc5f50152e1c3a0f1d5a5b6..28d1c112a0526162c9886cabb54c4be93e16fbb6 100644
+index c21f3ca67672fffa0b2ae0a0e241932efbaedc8a..ce1ba360df24798ea3e45918b4a18c2944b53f95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1652,23 +1652,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0940-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0939-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0940-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0939-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0941-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0940-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0941-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0940-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0942-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0941-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 96%
rename from patches/server/0942-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0941-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index d72ec05289..f4fab00ad3 100644
--- a/patches/server/0942-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0941-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only set despawnTimer for Wandering Traders spawned by
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 96115fe8a8c32ce5992d779b5db540b9d81e3b82..833563e237462ccfc1b730b8f5fb35340d0db854 100644
+index 594e82a09d21c39331c391f2aec5bc8d87649ea3..1c89f20debfad9807c90a21cc336d5790294ebce 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -67,7 +67,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
diff --git a/patches/server/0943-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0942-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0943-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0942-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0944-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0943-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0944-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0943-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0945-Add-whitelist-events.patch b/patches/server/0944-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0945-Add-whitelist-events.patch
rename to patches/server/0944-Add-whitelist-events.patch
diff --git a/patches/server/0946-Implement-PlayerFailMoveEvent.patch b/patches/server/0945-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0946-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0945-Implement-PlayerFailMoveEvent.patch
index 5a885c26dd..f047d7f3bd 100644
--- a/patches/server/0946-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0945-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 ac41dc96a4aee7b0bb71cbf71d3109ff05a66eff..7f326ac109af10f3d653f2ef0b63415c7075e058 100644
+index ead7c202ba8ed11ee180767f3acaa003f60c2b28..4453c4238182bdee6a955a51bc219a4d8a92e3f2 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/0947-Folia-scheduler-and-owned-region-API.patch b/patches/server/0946-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0947-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0946-Folia-scheduler-and-owned-region-API.patch
index f421a9d3be..f054695a56 100644
--- a/patches/server/0947-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0946-Folia-scheduler-and-owned-region-API.patch
@@ -1148,7 +1148,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e865a887eab9c43291b73661e8748330167cc682..140dd3283eb2bb0e1ea76034f71f9184b9761789 100644
+index 5868f13fa3a3791704ba8e344b9c51d88786f41b..2344efd039773a0b3052d6e08ba204b1efe8963c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1629,6 +1629,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1173,7 +1173,7 @@ index e865a887eab9c43291b73661e8748330167cc682..140dd3283eb2bb0e1ea76034f71f9184
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8d8cc5463f261334d0aabf4fd31854a2af862acc..e05bfebf51d210dad08292489bae89300abf99da 100644
+index 0e3f2b10a3edf129263783c68c4b25c1f7dfb8f1..492ffa9eae3978dd352c68952e10b3c9c1e4aaa1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -649,6 +649,7 @@ public abstract class PlayerList {
@@ -1251,7 +1251,7 @@ index d08ce34e1d1ce4ac239f6b7ecf0579ab130fa976..c59494078ee587c8dd89e7943db85863
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 758ca700cfa0f05357f051962e41a215ade3724f..ac5abd9da8205e72f8b422a06ef77ad8b6e5da7b 100644
+index 5f24bab8b21452e502af70a925ceeaecbedd4a6c..78acd7d97608c4862f1d39e36785d3f396cd0019 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,76 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0948-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0947-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0948-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0947-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0949-API-for-updating-recipes-on-clients.patch b/patches/server/0948-API-for-updating-recipes-on-clients.patch
similarity index 95%
rename from patches/server/0949-API-for-updating-recipes-on-clients.patch
rename to patches/server/0948-API-for-updating-recipes-on-clients.patch
index 138e49502f..c9617e8d92 100644
--- a/patches/server/0949-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0948-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 e05bfebf51d210dad08292489bae89300abf99da..7c054f3b431171a296549bc2aa597df819fd3457 100644
+index 492ffa9eae3978dd352c68952e10b3c9c1e4aaa1..abab7ec6e0d96c7ab979d6285a35e326970e00fe 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 {
@@ -39,7 +39,7 @@ index e05bfebf51d210dad08292489bae89300abf99da..7c054f3b431171a296549bc2aa597df8
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ac5abd9da8205e72f8b422a06ef77ad8b6e5da7b..be176bbb17e871d7ff99e7136cbb0a5bbc25f047 100644
+index 78acd7d97608c4862f1d39e36785d3f396cd0019..37cac3fcb1d7cb5ca7725bc2447ed1603e2cec20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1129,6 +1129,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0950-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0949-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0950-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0949-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0951-Only-capture-actual-tree-growth.patch b/patches/server/0950-Only-capture-actual-tree-growth.patch
similarity index 98%
rename from patches/server/0951-Only-capture-actual-tree-growth.patch
rename to patches/server/0950-Only-capture-actual-tree-growth.patch
index d60275516c..c15bba6fc1 100644
--- a/patches/server/0951-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0950-Only-capture-actual-tree-growth.patch
@@ -29,7 +29,7 @@ index 064b86c80e12af1e1e7f9b28484f51e9a3474e82..dc6a1a1fb78d25834f3f97c5ce3b1356
                      }
                      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 3660ebab9164146fb75075462802f5ba383dd9c5..315dc7b198179f2f1384ab898d36d66f3c592d95 100644
+index a57b7e85f068c3131c6fc41cd8e79dec2f053748..ca48664d3e7a9efcac8a0e1fa23f71034d74e2d6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1898,4 +1898,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0952-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0951-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0952-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0951-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0953-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0952-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0953-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0952-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0954-Use-correct-seed-on-api-world-load.patch b/patches/server/0953-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0954-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0953-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0955-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0954-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0955-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0954-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0956-Cache-map-ids-on-item-frames.patch b/patches/server/0955-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0956-Cache-map-ids-on-item-frames.patch
rename to patches/server/0955-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0957-Fix-custom-statistic-criteria-creation.patch b/patches/server/0956-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0957-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0956-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0958-Bandaid-fix-for-Effect.patch b/patches/server/0957-Bandaid-fix-for-Effect.patch
similarity index 97%
rename from patches/server/0958-Bandaid-fix-for-Effect.patch
rename to patches/server/0957-Bandaid-fix-for-Effect.patch
index a99ca4e333..fcd496e191 100644
--- a/patches/server/0958-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0957-Bandaid-fix-for-Effect.patch
@@ -60,7 +60,7 @@ index a4519762175c68256b1f303daca8b9408ac182bb..457e9093adb99d31ffc7f061d8c858f9
          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 56a98b297f3f8742d400cd3a1f335cec1d50b331..0cc5c04f121860180e5886b484aa3cf8f2002131 100644
+index cd2b1a0441d478f50a4d45159e506628dafaa9fc..dff7bfaef05290b07ca6cbfbdefb3fd02a1cf8f6 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 56a98b297f3f8742d400cd3a1f335cec1d50b331..0cc5c04f121860180e5886b484aa3cf8
              // 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 28d1c112a0526162c9886cabb54c4be93e16fbb6..8bc528408164427380277f3805d5275ebd7c7bb4 100644
+index ce1ba360df24798ea3e45918b4a18c2944b53f95..f5066806e7d62cd17c73397b8fc7b5bbab3227ea 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/0959-SculkCatalyst-bloom-API.patch b/patches/server/0958-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0959-SculkCatalyst-bloom-API.patch
rename to patches/server/0958-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0960-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0959-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0960-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0959-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0961-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0960-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 98%
rename from patches/server/0961-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0960-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 07588bde77..8ceca395b6 100644
--- a/patches/server/0961-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0960-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -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 ea649799341a3f446469048924aae792e211de49..0dd61a4baee77fec577ca23d9e356c0b4327dded 100644
+index 3abcb4470bbf8f83204532ff5f3f5e152866a9f0..e32a2ea53f61410f0470bdccf1e479af1a571469 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/0962-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0961-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 96%
rename from patches/server/0962-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0961-Deprecate-and-replace-methods-with-old-StructureType.patch
index fc6082d962..91f2d5d235 100644
--- a/patches/server/0962-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0961-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 d9aecf9f930b0cd4b21b7c29628ea4b49f087209..86554e595e0b61b3ad0d180b94bd73aa05079cec 100644
+index 8c4021967c22deb60eab6a6fe8110b746c642e07..eb617d659c701e512aac8a1ff822c147b69d3a3b 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/0963-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0962-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0963-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0962-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 1567c44892..d9e00bdc29 100644
--- a/patches/server/0963-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0962-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 7f326ac109af10f3d653f2ef0b63415c7075e058..334be829f5a6e8feef67f789130fc8a5ac38157e 100644
+index 4453c4238182bdee6a955a51bc219a4d8a92e3f2..cf94050bc6dc4b2f0aff9bf3ca5241d9caafb0bf 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/0964-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0963-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 99%
rename from patches/server/0964-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0963-Properly-handle-BlockBreakEvent-isDropItems.patch
index 76d4a5c48b..e0a72f63bd 100644
--- a/patches/server/0964-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0963-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -9,7 +9,7 @@ food consumption, turtle egg count decreases, ice to water
 conversions and beehive releases
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0357e190f6cc0724223ed705b19651d865bf853b..f6c5e29a821c3bda6ab8158ca6b9fb66bb11cfa2 100644
+index 41c647c46585d454f3b10a860a2b6d979d1199a3..9b32f0951d99db42b75ee6303842f97811d1906c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -433,8 +433,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0965-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0964-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0965-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0964-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0966-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0965-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0966-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0965-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0967-Add-Listing-API-for-Player.patch b/patches/server/0966-Add-Listing-API-for-Player.patch
similarity index 98%
rename from patches/server/0967-Add-Listing-API-for-Player.patch
rename to patches/server/0966-Add-Listing-API-for-Player.patch
index 9ccfd980f0..0460337eb9 100644
--- a/patches/server/0967-Add-Listing-API-for-Player.patch
+++ b/patches/server/0966-Add-Listing-API-for-Player.patch
@@ -74,7 +74,7 @@ index d43106eb89b14667e85cd6e8fa047d64f2e8ec87..56eddd28429cf42c02d88b8bf79f8b61
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7c054f3b431171a296549bc2aa597df819fd3457..be474729d41b37968b53b84eb87ac96a4d7d46a4 100644
+index abab7ec6e0d96c7ab979d6285a35e326970e00fe..e6b84e4891927d79f993944ea4d3525c68c6c1b9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -356,14 +356,22 @@ public abstract class PlayerList {
@@ -111,7 +111,7 @@ index 7c054f3b431171a296549bc2aa597df819fd3457..be474729d41b37968b53b84eb87ac96a
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8bc528408164427380277f3805d5275ebd7c7bb4..5c3a9c7d6b2d9a810edbb356fb3cdde40b3194b1 100644
+index f5066806e7d62cd17c73397b8fc7b5bbab3227ea..26a6a46ed8571193476676984559513c21b43293 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0968-Configurable-Region-Compression-Format.patch b/patches/server/0967-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0968-Configurable-Region-Compression-Format.patch
rename to patches/server/0967-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0969-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0968-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 96%
rename from patches/server/0969-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0968-Add-BlockFace-to-BlockDamageEvent.patch
index e29dfa7340..6c4795fa83 100644
--- a/patches/server/0969-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0968-Add-BlockFace-to-BlockDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockFace to BlockDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f6c5e29a821c3bda6ab8158ca6b9fb66bb11cfa2..9024cd25faabb4d5aed3681d4389baad6ad7b964 100644
+index 9b32f0951d99db42b75ee6303842f97811d1906c..27d22a6aef3f71179ea102062f1338cce5d46fea 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 {
diff --git a/patches/server/0970-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0969-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0970-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0969-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0971-Expand-Pose-API.patch b/patches/server/0970-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0971-Expand-Pose-API.patch
rename to patches/server/0970-Expand-Pose-API.patch
diff --git a/patches/server/0972-More-DragonBattle-API.patch b/patches/server/0971-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0972-More-DragonBattle-API.patch
rename to patches/server/0971-More-DragonBattle-API.patch
diff --git a/patches/server/0973-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0972-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0973-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0972-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0974-Add-PlayerPickItemEvent.patch b/patches/server/0973-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0974-Add-PlayerPickItemEvent.patch
rename to patches/server/0973-Add-PlayerPickItemEvent.patch
index 4932c33b38..608b6329d7 100644
--- a/patches/server/0974-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0973-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 334be829f5a6e8feef67f789130fc8a5ac38157e..00b3d32d6c4f12fd287fa3086893f4e6160807d4 100644
+index cf94050bc6dc4b2f0aff9bf3ca5241d9caafb0bf..1abbd10f1d5c298fbc5e18e80ee8854c3f0ba187 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -944,8 +944,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0975-Improve-performance-of-mass-crafts.patch b/patches/server/0974-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0975-Improve-performance-of-mass-crafts.patch
rename to patches/server/0974-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0976-Allow-trident-custom-damage.patch b/patches/server/0975-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0976-Allow-trident-custom-damage.patch
rename to patches/server/0975-Allow-trident-custom-damage.patch
diff --git a/patches/server/0977-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0976-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0977-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0976-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0978-Optimize-nearest-structure-border-iteration.patch b/patches/server/0977-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0978-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0977-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0979-Implement-OfflinePlayer-isConnected.patch b/patches/server/0978-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/0979-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0978-Implement-OfflinePlayer-isConnected.patch
index 7c630654e4..4b01206372 100644
--- a/patches/server/0979-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0978-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 5c3a9c7d6b2d9a810edbb356fb3cdde40b3194b1..874036b417471d4eeb14e0ab387f219c7b3e7975 100644
+index 26a6a46ed8571193476676984559513c21b43293..875a195a3cb9d6330f7768fe24cc4a40f82b850b 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/0980-Fix-inventory-desync.patch b/patches/server/0979-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0980-Fix-inventory-desync.patch
rename to patches/server/0979-Fix-inventory-desync.patch
diff --git a/patches/server/0981-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0980-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 98%
rename from patches/server/0981-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0980-Add-titleOverride-to-InventoryOpenEvent.patch
index 5d37d11cdc..3a604472c7 100644
--- a/patches/server/0981-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0980-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 0dd61a4baee77fec577ca23d9e356c0b4327dded..52f50d89cbbde6898acb61c227c06c9c587d59c0 100644
+index e32a2ea53f61410f0470bdccf1e479af1a571469..23ede7bc9fcf923a70715a6f60449779ae52c62a 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 {
diff --git a/patches/server/0982-Configure-sniffer-egg-hatch-time.patch b/patches/server/0981-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0982-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0981-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0983-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0982-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0983-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0982-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0984-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0983-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0984-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0983-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0985-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0984-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 96%
rename from patches/server/0985-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0984-Add-slot-sanity-checks-in-container-clicks.patch
index 0b5f891a12..66a58e33cf 100644
--- a/patches/server/0985-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0984-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 00b3d32d6c4f12fd287fa3086893f4e6160807d4..cafd0cde26a623861c7d3d01b496cb32fdc77335 100644
+index 1abbd10f1d5c298fbc5e18e80ee8854c3f0ba187..e5d734234ae0543b0772e8a12da3f60b3a97a6cb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2992,6 +2992,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0986-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0985-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0986-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0985-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0987-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0986-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0987-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0986-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0988-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0987-Fix-silent-equipment-change-for-mobs.patch
similarity index 95%
rename from patches/server/0988-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0987-Fix-silent-equipment-change-for-mobs.patch
index bd49e4c8ce..5ad357386c 100644
--- a/patches/server/0988-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0987-Fix-silent-equipment-change-for-mobs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix silent equipment change for mobs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index f9743f8705a7f5f3ede4c869070d5735e24348a0..1ce75edb716bd775d7a0528fae27819cfd6207ec 100644
+index 16d84042e2575418880897c728a99d1b8bbcdd15..c81c72bf1027fcbaac67808fbcf6e0af112176bc 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1059,13 +1059,20 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -32,11 +32,11 @@ index f9743f8705a7f5f3ede4c869070d5735e24348a0..1ce75edb716bd775d7a0528fae27819c
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 8e9469fec42f7b6a132cf173f6f5a95777a29b3b..a383c0c8b5c89ef1eef7d18edc3a09f749fdd310 100644
+index 9af5a4b46dcec727c7c862332759ffbe3ebd87b5..8527388f7cb5fce43ff485c903d6b78c10c4259e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -250,8 +250,8 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-     // Paper end
+     // Paper end - shouldBurnInDay API
  
      @Override
 -    public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
diff --git a/patches/server/0989-Fix-spigot-s-Forced-Stats.patch b/patches/server/0988-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0989-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0988-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0990-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0989-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/0990-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0989-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0991-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0990-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/0991-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0990-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0992-Actually-optimise-explosions.patch b/patches/server/0991-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/0992-Actually-optimise-explosions.patch
rename to patches/server/0991-Actually-optimise-explosions.patch
diff --git a/patches/server/0993-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0992-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0993-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0992-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0994-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0993-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/0994-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/0993-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/0995-Fix-SuspiciousStewMeta.patch b/patches/server/0994-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/0995-Fix-SuspiciousStewMeta.patch
rename to patches/server/0994-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/0996-Optimise-chunk-tick-iteration.patch b/patches/server/0995-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/0996-Optimise-chunk-tick-iteration.patch
rename to patches/server/0995-Optimise-chunk-tick-iteration.patch
index 9995794ed7..617d6849fd 100644
--- a/patches/server/0996-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0995-Optimise-chunk-tick-iteration.patch
@@ -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 52f50d89cbbde6898acb61c227c06c9c587d59c0..1bdc710ae8ad0629eb715e00254f8465e69fb9d1 100644
+index 23ede7bc9fcf923a70715a6f60449779ae52c62a..86038d8e2998b1100706171c814b0ef34a20ee14 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/0997-Lag-compensation-ticks.patch b/patches/server/0996-Lag-compensation-ticks.patch
similarity index 95%
rename from patches/server/0997-Lag-compensation-ticks.patch
rename to patches/server/0996-Lag-compensation-ticks.patch
index a7f23bbb82..0bcd96d0b1 100644
--- a/patches/server/0997-Lag-compensation-ticks.patch
+++ b/patches/server/0996-Lag-compensation-ticks.patch
@@ -8,7 +8,7 @@ Areas affected by lag comepnsation:
  - Eating food items
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 140dd3283eb2bb0e1ea76034f71f9184b9761789..c1c1763de0ad0376c504946cbfd7bbd5b0cff0fd 100644
+index 2344efd039773a0b3052d6e08ba204b1efe8963c..712708f62fadb6698c4231f38deeb39bed91e529 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -311,6 +311,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -30,7 +30,7 @@ index 140dd3283eb2bb0e1ea76034f71f9184b9761789..c1c1763de0ad0376c504946cbfd7bbd5
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 720d5275199e73b0c9d0b1d1a9f6a4463c9bb3bb..6d1e96e971d03026a5583455193c023188fa8157 100644
+index df40ffecfa6d34aa3cdffbbec03e049a271364ab..048bcbd730ee87cf2f040bda1080ae1f6e4ef414 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -570,6 +570,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -52,7 +52,7 @@ index 720d5275199e73b0c9d0b1d1a9f6a4463c9bb3bb..6d1e96e971d03026a5583455193c0231
      // 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 9024cd25faabb4d5aed3681d4389baad6ad7b964..82aabd5234102c3763891ebe3009e75f243e539b 100644
+index 27d22a6aef3f71179ea102062f1338cce5d46fea..52aadf7336c1486ccf0d192e27b742f9e63cfe9b 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 {
@@ -65,7 +65,7 @@ index 9024cd25faabb4d5aed3681d4389baad6ad7b964..82aabd5234102c3763891ebe3009e75f
  
          if (this.hasDelayedDestroy) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 03caab6d49f74402c5c6c932e3a85e72a6edf3bc..85d743315ae0083636c6ffee2f5081e3def4c4ee 100644
+index e9839d0dc8339ce62a6eb01c7094a2a3cf0fa816..f9de831797bff3707115f03c24bdca78889003a3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3819,6 +3819,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0998-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0997-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0998-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0997-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0999-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0998-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0999-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0998-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1000-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0999-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1000-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0999-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1001-Optimise-nearby-player-retrieval.patch b/patches/server/1000-Optimise-nearby-player-retrieval.patch
similarity index 99%
rename from patches/server/1001-Optimise-nearby-player-retrieval.patch
rename to patches/server/1000-Optimise-nearby-player-retrieval.patch
index 602c0b77e1..86a14dbd3e 100644
--- a/patches/server/1001-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1000-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6d1e96e971d03026a5583455193c023188fa8157..575a2be5b5d2062b7b8629e8691a604ad801720e 100644
+index 048bcbd730ee87cf2f040bda1080ae1f6e4ef414..c764e236ea3678bba9dd05adc16cc4640c27d4bf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -581,6 +581,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1002-Fix-missing-map-initialize-event-call.patch b/patches/server/1001-Fix-missing-map-initialize-event-call.patch
similarity index 95%
rename from patches/server/1002-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1001-Fix-missing-map-initialize-event-call.patch
index 4dfd28acb4..9632e4597a 100644
--- a/patches/server/1002-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1001-Fix-missing-map-initialize-event-call.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 575a2be5b5d2062b7b8629e8691a604ad801720e..a89d3bcfe24d70d8764fe6931dafdeaf1111117e 100644
+index c764e236ea3678bba9dd05adc16cc4640c27d4bf..fa16260652c0c47df2a02f728850d6e949ae774f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2133,13 +2133,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1003-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1002-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1003-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1002-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1004-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1003-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1004-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1003-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1005-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1004-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1005-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1004-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1006-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1005-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1006-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1005-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1007-Add-player-idle-duration-API.patch b/patches/server/1006-Add-player-idle-duration-API.patch
similarity index 91%
rename from patches/server/1007-Add-player-idle-duration-API.patch
rename to patches/server/1006-Add-player-idle-duration-API.patch
index d57581e539..dcbfc33021 100644
--- a/patches/server/1007-Add-player-idle-duration-API.patch
+++ b/patches/server/1006-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 874036b417471d4eeb14e0ab387f219c7b3e7975..8e7d4c52b95a85e97152c810dd93fe0575c063a5 100644
+index 875a195a3cb9d6330f7768fe24cc4a40f82b850b..aa1747fe82af5b5eafc5742d47007873aa20f652 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3311,6 +3311,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1008-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1007-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/1008-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1007-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1009-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1008-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1009-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1008-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1010-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1009-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 90%
rename from patches/server/1010-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1009-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 90d3ad7a75..96a7e94ec3 100644
--- a/patches/server/1010-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1009-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 8e7d4c52b95a85e97152c810dd93fe0575c063a5..0b9a29c0e36d18282e8a65aa8b05523334fffe74 100644
+index aa1747fe82af5b5eafc5742d47007873aa20f652..e27f65114e4a916089e3c6929838f44e93fdac35 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/1011-Optimize-VarInts.patch b/patches/server/1010-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1011-Optimize-VarInts.patch
rename to patches/server/1010-Optimize-VarInts.patch
diff --git a/patches/server/1012-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1011-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/1012-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1011-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1013-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1012-Add-predicate-for-blocks-when-raytracing.patch
similarity index 98%
rename from patches/server/1013-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1012-Add-predicate-for-blocks-when-raytracing.patch
index b658f2d1c5..2653ec0472 100644
--- a/patches/server/1013-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/1012-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,7 +47,7 @@ index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..4b7ea18a34675702c5b17c4819f79778
              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 0cc5c04f121860180e5886b484aa3cf8f2002131..c292895e7295077f513271df1bad90cbdac08f2f 100644
+index dff7bfaef05290b07ca6cbfbdefb3fd02a1cf8f6..5e4587148f1558dafccbdeb788384047e9fbfdbe 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/1014-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1013-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 92%
rename from patches/server/1014-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1013-Broadcast-take-item-packets-with-collector-as-source.patch
index 57c8463ee8..17735a1c70 100644
--- a/patches/server/1014-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/1013-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 85d743315ae0083636c6ffee2f5081e3def4c4ee..9fb5b4df574db63f005dc321ba76dcd92ffe67e3 100644
+index f9de831797bff3707115f03c24bdca78889003a3..eb0e6cff1d93b06fea3e9b28a4ea1067e416183c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3704,7 +3704,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1015-Expand-LingeringPotion-API.patch b/patches/server/1014-Expand-LingeringPotion-API.patch
similarity index 94%
rename from patches/server/1015-Expand-LingeringPotion-API.patch
rename to patches/server/1014-Expand-LingeringPotion-API.patch
index 1a12487d60..6036e51ec0 100644
--- a/patches/server/1015-Expand-LingeringPotion-API.patch
+++ b/patches/server/1014-Expand-LingeringPotion-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand LingeringPotion API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-index d945c0a7b8ba87301e12b49f859e6fbe65de04f3..4f6e0161694c2f51642fffcf1ce1cb0ed45b194d 100644
+index aaed936c7b6a6ebcd69c8c51f5c92c3b1c51ec27..8bfe0e87c6db0fc89dd64a7ed2a0b4f5cb90b207 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 @@ -288,7 +288,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
diff --git a/patches/server/1016-Add-MaterialTagsTest.patch b/patches/server/1015-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1016-Add-MaterialTagsTest.patch
rename to patches/server/1015-Add-MaterialTagsTest.patch
diff --git a/patches/server/1017-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1016-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 97%
rename from patches/server/1017-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1016-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 8e7b748c6a..d0ef9bee8a 100644
--- a/patches/server/1017-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/1016-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -45,7 +45,7 @@ index 0db0d67f9ac15372becc1166c37f7f0aede4a4da..a9e70484b01fc082ea25d43d1d428334
              BlockState iblockdata = BaseFireBlock.getState(this.level(), blockposition);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c292895e7295077f513271df1bad90cbdac08f2f..e8859ba3ec67d14de09e4fdf737e3c938375c23d 100644
+index 5e4587148f1558dafccbdeb788384047e9fbfdbe..851c186834b16a2ac18d74cc40d321eb988a5e0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -773,7 +773,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1018-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1017-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1018-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1017-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1019-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1018-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 98%
rename from patches/server/1019-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1018-Fix-several-issues-with-EntityBreedEvent.patch
index 1b42ca075f..b578662648 100644
--- a/patches/server/1019-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/1018-Fix-several-issues-with-EntityBreedEvent.patch
@@ -54,7 +54,7 @@ index 907ed82fea71254d6624eda878e2668cd26422a7..081d1e38b7b1f286e138b0981aaa760e
          this.level().broadcastEntityEvent(this, (byte) 18);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 25a7602670b9f736b3b9ff4523bc867e65c0998a..ead5060ae2840a0519c5bf8b4b84aa12cc41b02a 100644
+index 3a6483c29803acbbb9a5b4b49fae22de7575504f..387aa050235c944818617e8896d0d5f1e7e4cecb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -649,8 +649,9 @@ public class Panda extends Animal {
diff --git a/patches/server/1020-Add-UUID-attribute-modifier-API.patch b/patches/server/1019-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1020-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1019-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1021-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1020-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/1021-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1020-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1022-Lazily-create-LootContext-for-criterions.patch b/patches/server/1021-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1022-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1021-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1023-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/1022-Don-t-fire-sync-events-during-worldgen.patch
similarity index 96%
rename from patches/server/1023-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/1022-Don-t-fire-sync-events-during-worldgen.patch
index d38e55a120..5974b5b93a 100644
--- a/patches/server/1023-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/1022-Don-t-fire-sync-events-during-worldgen.patch
@@ -19,7 +19,7 @@ where generation happened directly to a ServerLevel and the
 entity still has the flag set.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a89d3bcfe24d70d8764fe6931dafdeaf1111117e..c1560ea2be24f2f4173c2552597527dfd739a776 100644
+index fa16260652c0c47df2a02f728850d6e949ae774f..9b0b2510edb4984b0714244bbe513e077af7b455 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1681,6 +1681,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -48,7 +48,7 @@ index f0e40ea053ca7b6749b443b2733271f71755329b..a70633d9585f94e673c58fc69660d984
          this.entityData.set(Entity.DATA_POSE, pose);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 82695b6f25011a315027bd7a5cb305af31663d4a..d362a06d0600003d40f632eac602ff552cafb9da 100644
+index dd4cf9011bf48623e95d5d0f3ff27ee962c88200..a039217f9293ad3b0cc74c49450472eb44c6a139 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -588,9 +588,15 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -68,7 +68,7 @@ index 82695b6f25011a315027bd7a5cb305af31663d4a..d362a06d0600003d40f632eac602ff55
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9fb5b4df574db63f005dc321ba76dcd92ffe67e3..060a5069f71ada46e97828560d06448547c2107e 100644
+index eb0e6cff1d93b06fea3e9b28a4ea1067e416183c..6860e588ad9daaf3d9afa11132967a50eeefe860 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1134,6 +1134,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -107,7 +107,7 @@ index 9fb5b4df574db63f005dc321ba76dcd92ffe67e3..060a5069f71ada46e97828560d064485
                  this.onEffectUpdated(mobeffect1, true, entity);
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 5a9f4a022c8e7a0804543335bfe91e1328d040e6..8094c133f9e934c98eee09738220bacd87a0a364 100644
+index ff004d5c0dee027acea51aa4886065636335e2a9..0c68ed759421d6bce4435399f1b4980510081cac 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -182,7 +182,7 @@ public class Spider extends Monster {
diff --git a/patches/server/1024-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1023-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/1024-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1023-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1025-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1024-Restore-vanilla-entity-drops-behavior.patch
similarity index 98%
rename from patches/server/1025-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1024-Restore-vanilla-entity-drops-behavior.patch
index 1e6224b701..6e51929640 100644
--- a/patches/server/1025-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/1024-Restore-vanilla-entity-drops-behavior.patch
@@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped
 items like CB does.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1bdc710ae8ad0629eb715e00254f8465e69fb9d1..a43d37d074f89d645ff4a30b38a81f1841594cd9 100644
+index 86038d8e2998b1100706171c814b0ef34a20ee14..6872e223ff4b450af89a838f4caf7cf2ebcb818e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -944,22 +944,20 @@ public class ServerPlayer extends Player {
@@ -104,7 +104,7 @@ index a70633d9585f94e673c58fc69660d984ca169561..8814ffc0f3ebe352cd72f50d9f68704e
              return this.spawnAtLocation(entityitem);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 060a5069f71ada46e97828560d06448547c2107e..aa389e1f67cbd1cbb7fcb9c340303bbe37bd48a4 100644
+index 6860e588ad9daaf3d9afa11132967a50eeefe860..7fc84405bc96d768fd373dd6844de4204a39cd6a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -254,7 +254,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -117,7 +117,7 @@ index 060a5069f71ada46e97828560d06448547c2107e..aa389e1f67cbd1cbb7fcb9c340303bbe
      public boolean collides = true;
      public Set<UUID> collidableExemptions = new HashSet<>();
 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 71bcd55d9d71fbd5bf3014c7e36d1456d8d5c3fd..68ecf0203e23cb6360d05bec18d9c1c413d84650 100644
+index 45906d273e6d6ec20cf44b4d07efdac68752ee9b..ac9eaeaf7df1e84ee588f371628c0a10784d50bc 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
 @@ -534,10 +534,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
diff --git a/patches/server/1026-Add-Structure-check-API.patch b/patches/server/1025-Add-Structure-check-API.patch
similarity index 91%
rename from patches/server/1026-Add-Structure-check-API.patch
rename to patches/server/1025-Add-Structure-check-API.patch
index 7bca0ec250..52303f67ed 100644
--- a/patches/server/1026-Add-Structure-check-API.patch
+++ b/patches/server/1025-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 e8859ba3ec67d14de09e4fdf737e3c938375c23d..649f264226eaf88ce9a95521adbe48dd067bdb85 100644
+index 851c186834b16a2ac18d74cc40d321eb988a5e0c..67a3aa7db064fe680ae25ad446ab3170b1c3c453 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/1027-Dont-resend-blocks-on-interactions.patch b/patches/server/1026-Dont-resend-blocks-on-interactions.patch
similarity index 98%
rename from patches/server/1027-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1026-Dont-resend-blocks-on-interactions.patch
index 7f4f93afcc..cca46cbd54 100644
--- a/patches/server/1027-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/1026-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 82aabd5234102c3763891ebe3009e75f243e539b..f8fd44500fb2a5b8273d317dbb1789fae24252fd 100644
+index 52aadf7336c1486ccf0d192e27b742f9e63cfe9b..73823d637d9859797d57507932d132b21ba46d70 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 {
@@ -127,7 +127,7 @@ index 82aabd5234102c3763891ebe3009e75f243e539b..f8fd44500fb2a5b8273d317dbb1789fa
              } else if (iblockdata.getBlock() instanceof net.minecraft.world.level.block.StructureBlock) {
                  player.connection.send(new net.minecraft.network.protocol.game.ClientboundContainerClosePacket(this.player.containerMenu.containerId));
 diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 277555a26e8281dd1a626e572794b08cf51d00c5..aa0f09a18ea781e027ea70928b30d3e93061120f 100644
+index 4b9e726e6ac255e743479d5c2e0cdb98464399a4..6371f326fc86cfc53e39bf8ed13b646f7705fbbc 100644
 --- a/src/main/java/net/minecraft/world/item/BucketItem.java
 +++ b/src/main/java/net/minecraft/world/item/BucketItem.java
 @@ -77,7 +77,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
diff --git a/patches/server/1028-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1027-Keep-previous-behavior-for-setResourcePack.patch
similarity index 94%
rename from patches/server/1028-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1027-Keep-previous-behavior-for-setResourcePack.patch
index 7281666cd5..722245e2ae 100644
--- a/patches/server/1028-Keep-previous-behavior-for-setResourcePack.patch
+++ b/patches/server/1027-Keep-previous-behavior-for-setResourcePack.patch
@@ -10,7 +10,7 @@ packs before sending the new pack. Other API exists
 for adding a new pack to the existing packs on a client.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0b9a29c0e36d18282e8a65aa8b05523334fffe74..3d9f54b10b274815b8d7a0d770153a34f28a6742 100644
+index e27f65114e4a916089e3c6929838f44e93fdac35..02f97a9ec7b1b8354cfb97babd57595ef6503679 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2351,8 +2351,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1029-properly-read-and-store-sus-effect-duration.patch b/patches/server/1028-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/1029-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/1028-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/1030-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1029-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/1030-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/1029-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/1031-add-more-scoreboard-API.patch b/patches/server/1030-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/1031-add-more-scoreboard-API.patch
rename to patches/server/1030-add-more-scoreboard-API.patch
diff --git a/patches/server/1032-Improve-Registry.patch b/patches/server/1031-Improve-Registry.patch
similarity index 100%
rename from patches/server/1032-Improve-Registry.patch
rename to patches/server/1031-Improve-Registry.patch
diff --git a/patches/server/1033-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/1032-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 97%
rename from patches/server/1033-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/1032-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 97116f9ab8..910c95d430 100644
--- a/patches/server/1033-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/1032-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -26,7 +26,7 @@ index 3fec07b250a8f145e30c8c41888e47d2a3c902e1..2ddd033e1c3a2e5c8950b93c83849192
                  x = to.getX();
                  y = to.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index aa389e1f67cbd1cbb7fcb9c340303bbe37bd48a4..c0f931dcd6c40c33d8a92bb01516b383f2bf7bec 100644
+index 7fc84405bc96d768fd373dd6844de4204a39cd6a..353f8598ae940b15a71e71d7c6b80f9d063decb6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4205,7 +4205,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1034-Add-experience-points-API.patch b/patches/server/1033-Add-experience-points-API.patch
similarity index 95%
rename from patches/server/1034-Add-experience-points-API.patch
rename to patches/server/1033-Add-experience-points-API.patch
index a2ed55757a..68e09bcd32 100644
--- a/patches/server/1034-Add-experience-points-API.patch
+++ b/patches/server/1033-Add-experience-points-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a623b22e02647d2b14e0b5a662920c4cc5d4361e..9bcb3b01ec3726f1ba77f63878e0eef7dc92bb6f 100644
+index f07b79cced4fa47dbb6b4aa75a384a2a08a53b03..5174ae8b039bdbb96f92d0059ad25b10b962ba7b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1833,7 +1833,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index a623b22e02647d2b14e0b5a662920c4cc5d4361e..9bcb3b01ec3726f1ba77f63878e0eef7
      // Paper start - send SoundEffect to everyone who can see fromEntity
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d9f54b10b274815b8d7a0d770153a34f28a6742..99830dfacc0d4ff78f43f970b2d1486710c83ef3 100644
+index 02f97a9ec7b1b8354cfb97babd57595ef6503679..e7ec441824e034a488deeede093cb9ea7add7c3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1821,6 +1821,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1035-Add-missing-InventoryType.patch b/patches/server/1034-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/1035-Add-missing-InventoryType.patch
rename to patches/server/1034-Add-missing-InventoryType.patch
diff --git a/patches/server/1036-Add-drops-to-shear-events.patch b/patches/server/1035-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/1036-Add-drops-to-shear-events.patch
rename to patches/server/1035-Add-drops-to-shear-events.patch
diff --git a/patches/server/1037-Add-PlayerShieldDisableEvent.patch b/patches/server/1036-Add-PlayerShieldDisableEvent.patch
similarity index 95%
rename from patches/server/1037-Add-PlayerShieldDisableEvent.patch
rename to patches/server/1036-Add-PlayerShieldDisableEvent.patch
index bf2ec49181..511ecbf410 100644
--- a/patches/server/1037-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/1036-Add-PlayerShieldDisableEvent.patch
@@ -16,7 +16,7 @@ sideeffects, meaning the disable event cannot share a handlerlist with
 the cooldown event
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 1ce75edb716bd775d7a0528fae27819cfd6207ec..22d057e459c46a51079b2f8f41dff7b9d17dc371 100644
+index c81c72bf1027fcbaac67808fbcf6e0af112176bc..42e2be9286b75a1d34845f303ffc65e96fdd5416 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1703,7 +1703,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -33,7 +33,7 @@ index 1ce75edb716bd775d7a0528fae27819cfd6207ec..22d057e459c46a51079b2f8f41dff7b9
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9bcb3b01ec3726f1ba77f63878e0eef7dc92bb6f..708a4b9ba6605bd0c2a4624f9af6777452cf29b3 100644
+index 5174ae8b039bdbb96f92d0059ad25b10b962ba7b..9044458491fc9a33923852e324a15ac59d6660b2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -979,7 +979,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/1038-Add-HiddenPotionEffect-API.patch b/patches/server/1037-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1038-Add-HiddenPotionEffect-API.patch
rename to patches/server/1037-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1039-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1038-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/1039-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/1038-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/1040-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1039-fix-ItemMeta-removing-CustomModelData.patch
similarity index 100%
rename from patches/server/1040-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/1039-fix-ItemMeta-removing-CustomModelData.patch
diff --git a/patches/server/1041-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1040-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 96%
rename from patches/server/1041-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/1040-Validate-ResourceLocation-in-NBT-reading.patch
index 9f5df4c73b..42fc20efc7 100644
--- a/patches/server/1041-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/1040-Validate-ResourceLocation-in-NBT-reading.patch
@@ -40,7 +40,7 @@ index 5f9dcab27a07969c93555ad0892683c62cbebc8c..a4d875df936b6de16f0233482b03af05
          this.path = path;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index d362a06d0600003d40f632eac602ff552cafb9da..081937597a8984b52a1e92d4c6032c04c942116e 100644
+index a039217f9293ad3b0cc74c49450472eb44c6a139..e52f3da3b63cc3dba59d3e874a8420dd312b5e96 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -618,7 +618,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -53,7 +53,7 @@ index d362a06d0600003d40f632eac602ff552cafb9da..081937597a8984b52a1e92d4c6032c04
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 22d057e459c46a51079b2f8f41dff7b9d17dc371..2056ce8b168dc4f767e55923a0c4d3edc0e7c5f6 100644
+index 42e2be9286b75a1d34845f303ffc65e96fdd5416..0b5334004b9d0489e8465824870662b467ce321b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -620,7 +620,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/1042-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1041-Properly-handle-experience-dropping-on-block-break.patch
similarity index 98%
rename from patches/server/1042-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/1041-Properly-handle-experience-dropping-on-block-break.patch
index c8ed4a99ac..21ea21c71b 100644
--- a/patches/server/1042-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/1041-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 315dc7b198179f2f1384ab898d36d66f3c592d95..5c6f656200111cc171a4c789894732d3164c37bc 100644
+index ca48664d3e7a9efcac8a0e1fa23f71034d74e2d6..dce7be16854faa3e297815e794cae6b0bd42bd4f 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 {
diff --git a/patches/server/1043-Fixup-NamespacedKey-handling.patch b/patches/server/1042-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/1043-Fixup-NamespacedKey-handling.patch
rename to patches/server/1042-Fixup-NamespacedKey-handling.patch