From e6ee4cdffee29366cb3ddade19222be7f6c001c1 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 9 Nov 2022 16:05:46 -0800
Subject: [PATCH] Updated Upstream (CraftBukkit) (#8548)

---
 patches/server/0009-Adventure.patch           |  8 ++---
 ...43-Implement-PlayerLocaleChangeEvent.patch |  6 ++--
 ...22-Properly-fix-item-duplication-bug.patch |  4 +--
 .../0217-InventoryCloseEvent-Reason-API.patch | 10 +++---
 ...tator-target-events-and-improve-impl.patch |  4 +--
 ...76-Reset-players-airTicks-on-respawn.patch |  4 +--
 ...entity-dismount-during-teleportation.patch |  4 +--
 ...vehicle-tracking-issue-on-disconnect.patch |  4 +--
 ...vent-opening-inventories-when-frozen.patch |  4 +--
 ...-Implement-Player-Client-Options-API.patch |  4 +--
 ...0522-Player-Chunk-Load-Unload-Events.patch |  4 +--
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...CreateEvent-players-and-end-platform.patch | 33 -------------------
 ...=> 0624-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0625-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  8 ++---
 ... => 0628-ItemStack-repair-check-API.patch} |  0
 ....patch => 0629-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  2 +-
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0632-Add-Mob-lookAt-API.patch} |  0
 ...0633-Add-Unix-domain-socket-support.patch} |  0
 ... => 0634-Add-EntityInsideBlockEvent.patch} |  0
 ...35-Attributes-API-for-item-defaults.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  2 +-
 ...patch => 0637-More-Lidded-Block-API.patch} |  0
 ...38-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0639-Add-PlayerKickEvent-causes.patch} |  0
 ...0640-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0644-Add-BellRevealRaiderEvent.patch} |  0
 ... 0645-Fix-invulnerable-end-crystals.patch} |  0
 ...46-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0647-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0650-Line-Of-Sight-Changes.patch} |  0
 ... => 0651-add-per-world-spawn-limits.patch} |  2 +-
 ...plashEvent-for-water-splash-potions.patch} |  0
 ... => 0653-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  4 +--
 ...=> 0655-Missing-Entity-Behavior-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
 ...ch => 0660-Adds-PlayerArmSwingEvent.patch} |  2 +-
 ...-event-leave-message-not-being-sent.patch} |  4 +--
 ...-for-mobs-immune-to-default-effects.patch} |  0
 ...correct-message-for-outdated-client.patch} |  0
 ...-t-apply-cramming-damage-to-players.patch} |  4 +--
 ...d-timings-for-sensors-and-behaviors.patch} |  0
 ...-bunch-of-missing-forceDrop-toggles.patch} |  0
 ...inger-API.patch => 0667-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0669-Add-System.out-err-catcher.patch} |  0
 ... => 0670-Fix-test-not-bootstrapping.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...-Improve-boat-collision-performance.patch} |  0
 ...AFK-kick-while-watching-end-credits.patch} |  2 +-
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0675-Add-PlayerSetSpawnEvent.patch} |  8 ++---
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0679-Added-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  0
 ...osition-losing-precision-millions-o.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...684-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0686-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0688-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0690-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  2 +-
 ... 0692-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0693-Left-handed-API.patch} |  0
 ...ch => 0694-Add-more-advancement-API.patch} |  0
 ...5-Add-ItemFactory-getMonsterEgg-API.patch} |  0
 ...tch => 0696-Add-critical-damage-API.patch} |  0
 ...0697-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0699-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...1-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...02-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  4 +--
 ...04-Fix-GameProfileCache-concurrency.patch} |  0
 ...g-when-the-async-catcher-is-tripped.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  2 +-
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  0
 ...=> 0709-Optimise-general-POI-access.patch} |  0
 ... 0710-Optimise-chunk-tick-iteration.patch} |  2 +-
 ...> 0711-Execute-chunk-tasks-mid-tick.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ... 0716-Distance-manager-tick-timings.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...h => 0719-Add-packet-limiter-config.patch} |  0
 ...Stem-registry-when-loading-default-.patch} |  0
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...sh-calls-for-entity-tracker-packets.patch} |  0
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0724-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...6-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  2 +-
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ... 0729-Optimise-random-block-ticking.patch} |  0
 ...0-Optimise-non-flush-packet-sending.patch} |  0
 ...0731-Optimise-nearby-player-lookups.patch} |  2 +-
 ...0732-Remove-streams-for-villager-AI.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  0
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...ifications-to-critical-entity-state.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  2 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0741-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 => 0746-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...0749-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ...ion-for-logging-player-ip-addresses.patch} |  0
 ... => 0752-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0754-Add-root-admin-user-detection.patch} |  0
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  0
 ...ive-velocity-through-repeated-crits.patch} |  0
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...ochunk-light-sources-unless-it-is-m.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...=> 0763-Fix-Spigot-growth-modifiers.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0765-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0766-Add-player-health-update-API.patch} |  0
 ...tch => 0767-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  2 +-
 ...n-checking-in-player-move-packet-ha.patch} |  2 +-
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...te-Log4j.patch => 0772-Update-Log4j.patch} |  0
 ...patch => 0773-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...75-Fix-tripwire-state-inconsistency.patch} |  0
 ...uid-logging-on-Block-breakNaturally.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0778-Improve-scoreboard-entries.patch} |  0
 ...ch => 0779-Entity-powdered-snow-API.patch} |  0
 ...0780-Add-API-for-item-entity-health.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...ax-block-light-for-monster-spawning.patch} |  0
 ...pistons-and-BlockPistonRetractEvent.patch} |  0
 ...plifiers-greater-than-127-correctly.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0786-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0787-Bucketable-API.patch} |  0
 ...es.patch => 0788-Validate-usernames.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  2 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...3-Multiple-Entries-with-Scoreboards.patch} |  0
 ...794-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...0797-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0798-Kick-on-main-for-illegal-chat.patch} |  2 +-
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0800-Fix-NotePlayEvent.patch} |  0
 ....patch => 0801-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0802-Dolphin-API.patch} |  0
 ...h => 0803-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...-missing-structure-set-seed-configs.patch} |  0
 ...h => 0807-Implement-regenerateChunk.patch} |  2 +-
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0810-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0812-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...fault-CustomSpawners-in-custom-worl.patch} |  0
 ...-worldlist-before-initing-the-world.patch} |  0
 ... => 0817-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0818-Custom-Potion-Mixes.patch} |  0
 ...0819-Fix-Fluid-tags-isTagged-method.patch} |  0
 ...20-Force-close-world-loading-screen.patch} |  0
 ...821-Fix-falling-block-spawn-methods.patch} |  2 +-
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  0
 ...I.patch => 0824-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  2 +-
 ...0827-Implement-getComputedBiome-API.patch} |  0
 ...> 0828-Make-some-itemstacks-nonnull.patch} |  0
 ...alid-GameProfiles-on-skull-blocks-i.patch} |  0
 ...830-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0831-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0832-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0833-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
 ...rd-against-invalid-entity-positions.patch} |  0
 ...s.patch => 0838-cache-resource-keys.patch} |  0
 ...ange-the-podium-for-the-EnderDragon.patch} |  0
 ...erriding-a-block-entity-during-worl.patch} |  0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |  0
 ...t-tile-entity-copies-loading-chunks.patch} |  0
 ...ead-of-display-name-in-PlayerList-g.patch} |  0
 ...s-not-spawning-outside-slime-chunks.patch} |  0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0847-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0853-Add-PlayerStopUsingItemEvent.patch} |  0
 ...54-FallingBlock-auto-expire-setting.patch} |  0
 ...rs.patch => 0855-Don-t-tick-markers.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0857-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0860-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...65-Dont-resent-entity-on-art-update.patch} |  0
 ...atch => 0866-Add-missing-spawn-eggs.patch} |  0
 ... => 0867-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  4 +--
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0870-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  0
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...nent-in-resource-pack-rejection-mes.patch} |  2 +-
 ...atch => 0875-Add-Player-getFishHook.patch} |  0
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  0
 ...debug-information-to-chat-packet-er.patch} |  2 +-
 ...PE.patch => 0879-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...API.patch => 0882-More-Teleport-API.patch} |  2 +-
 ... => 0883-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  2 +-
 ...on-plugins-accessing-faraway-chunks.patch} |  2 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |  0
 ...=> 0888-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0889-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...ocess-cancelling-and-command-changi.patch} |  2 +-
 ...-invalid-signature-login-stacktrace.patch} |  0
 ...-to-PlayerConnection-internalTelepo.patch} |  2 +-
 ...API.patch => 0894-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...andom-in-ServerLoginPacketListenerI.patch} |  0
 ...897-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  0
 ...und-for-client-lag-spikes-MC-162253.patch} |  2 +-
 ...ok-changes-from-crashing-the-server.patch} |  0
 ...estroyerIdentity-to-sendBlockDamage.patch} |  0
 ...t-killed-statuses-should-be-false-f.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0904-Missing-eating-regain-reason.patch} |  0
 ....patch => 0905-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...8-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0909-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ...re-player-sending-on-dimension-chan.patch} |  2 +-
 ... 0912-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ...lockState-and-isPreferredTool-to-Bl.patch} |  0
 ...=> 0915-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...g-mlg.patch => 0916-Fix-nothing-mlg.patch} |  2 +-
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0918-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0919-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  2 +-
 ... 0922-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0924-Add-entity-knockback-API.patch} |  0
 ....patch => 0925-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...7-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0928-Added-EntityToggleSitEvent.patch} |  0
 ... => 0929-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0930-Add-Moving-Piston-API.patch} |  0
 ...> 0931-Ignore-impossible-spawn-tick.patch} |  0
 ...source-for-fireworks-from-dispenser.patch} |  0
 ...t-suggestion-permissions-to-align-w.patch} |  0
 ...Event-cancellation-cant-fully-preve.patch} |  0
 ...Prevent-compass-from-loading-chunks.patch} |  0
 work/CraftBukkit                              |  2 +-
 326 files changed, 80 insertions(+), 113 deletions(-)
 rename patches/server/{0624-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 delete mode 100644 patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch
 rename patches/server/{0625-Fix-CraftPotionBrewer-cache.patch => 0624-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0626-Add-basic-Datapack-API.patch => 0625-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0627-Add-environment-variable-to-disable-server-gui.patch => 0626-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0628-additions-to-PlayerGameModeChangeEvent.patch => 0627-additions-to-PlayerGameModeChangeEvent.patch} (96%)
 rename patches/server/{0629-ItemStack-repair-check-API.patch => 0628-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0630-More-Enchantment-API.patch => 0629-More-Enchantment-API.patch} (100%)
 rename patches/server/{0631-Move-range-check-for-block-placing-up.patch => 0630-Move-range-check-for-block-placing-up.patch} (92%)
 rename patches/server/{0632-Fix-and-optimise-world-force-upgrading.patch => 0631-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0633-Add-Mob-lookAt-API.patch => 0632-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0634-Add-Unix-domain-socket-support.patch => 0633-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0635-Add-EntityInsideBlockEvent.patch => 0634-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0636-Attributes-API-for-item-defaults.patch => 0635-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0637-Add-cause-to-Weather-ThunderChangeEvents.patch => 0636-Add-cause-to-Weather-ThunderChangeEvents.patch} (98%)
 rename patches/server/{0638-More-Lidded-Block-API.patch => 0637-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0639-Limit-item-frame-cursors-on-maps.patch => 0638-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0640-Add-PlayerKickEvent-causes.patch => 0639-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0641-Add-PufferFishStateChangeEvent.patch => 0640-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0642-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0643-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0644-Add-option-to-fix-items-merging-through-walls.patch => 0643-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0645-Add-BellRevealRaiderEvent.patch => 0644-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0646-Fix-invulnerable-end-crystals.patch => 0645-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0647-Add-ElderGuardianAppearanceEvent.patch => 0646-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0648-Fix-dangerous-end-portal-logic.patch => 0647-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0649-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0650-Make-item-validations-configurable.patch => 0649-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0651-Line-Of-Sight-Changes.patch => 0650-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0652-add-per-world-spawn-limits.patch => 0651-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0653-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0652-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0654-Add-more-LimitedRegion-API.patch => 0653-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0655-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0654-Fix-PlayerDropItemEvent-using-wrong-item.patch} (91%)
 rename patches/server/{0656-Missing-Entity-Behavior-API.patch => 0655-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0657-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (92%)
 rename patches/server/{0658-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0659-Use-getChunkIfLoadedImmediately-in-places.patch => 0658-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0660-Fix-commands-from-signs-not-firing-command-events.patch => 0659-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0661-Adds-PlayerArmSwingEvent.patch => 0660-Adds-PlayerArmSwingEvent.patch} (93%)
 rename patches/server/{0662-Fixes-kick-event-leave-message-not-being-sent.patch => 0661-Fixes-kick-event-leave-message-not-being-sent.patch} (96%)
 rename patches/server/{0663-Add-config-for-mobs-immune-to-default-effects.patch => 0662-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0664-Fix-incorrect-message-for-outdated-client.patch => 0663-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0665-Don-t-apply-cramming-damage-to-players.patch => 0664-Don-t-apply-cramming-damage-to-players.patch} (89%)
 rename patches/server/{0666-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0665-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0667-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0666-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0668-Stinger-API.patch => 0667-Stinger-API.patch} (100%)
 rename patches/server/{0669-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0670-Add-System.out-err-catcher.patch => 0669-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0671-Fix-test-not-bootstrapping.patch => 0670-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0672-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0673-Improve-boat-collision-performance.patch => 0672-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0674-Prevent-AFK-kick-while-watching-end-credits.patch => 0673-Prevent-AFK-kick-while-watching-end-credits.patch} (93%)
 rename patches/server/{0675-Allow-skipping-writing-of-comments-to-server.propert.patch => 0674-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0676-Add-PlayerSetSpawnEvent.patch => 0675-Add-PlayerSetSpawnEvent.patch} (97%)
 rename patches/server/{0677-Make-hoppers-respect-inventory-max-stack-size.patch => 0676-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0678-Optimize-entity-tracker-passenger-checks.patch => 0677-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0679-Config-option-for-Piglins-guarding-chests.patch => 0678-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0680-Added-EntityDamageItemEvent.patch => 0679-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0681-Optimize-indirect-passenger-iteration.patch => 0680-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0682-Fix-block-drops-position-losing-precision-millions-o.patch => 0681-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0683-Configurable-item-frame-map-cursor-update-interval.patch => 0682-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0684-Make-EntityUnleashEvent-cancellable.patch => 0683-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0685-Clear-bucket-NBT-after-dispense.patch => 0684-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0686-Change-EnderEye-target-without-changing-other-things.patch => 0685-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0687-Add-BlockBreakBlockEvent.patch => 0686-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0688-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0689-More-CommandBlock-API.patch => 0688-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0690-Add-missing-team-sidebar-display-slots.patch => 0689-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0691-Add-back-EntityPortalExitEvent.patch => 0690-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0692-Add-methods-to-find-targets-for-lightning-strikes.patch => 0691-Add-methods-to-find-targets-for-lightning-strikes.patch} (96%)
 rename patches/server/{0693-Get-entity-default-attributes.patch => 0692-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0694-Left-handed-API.patch => 0693-Left-handed-API.patch} (100%)
 rename patches/server/{0695-Add-more-advancement-API.patch => 0694-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0696-Add-ItemFactory-getMonsterEgg-API.patch => 0695-Add-ItemFactory-getMonsterEgg-API.patch} (100%)
 rename patches/server/{0697-Add-critical-damage-API.patch => 0696-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0698-Fix-issues-with-mob-conversion.patch => 0697-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0699-Add-isCollidable-methods-to-various-places.patch => 0698-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0700-Goat-ram-API.patch => 0699-Goat-ram-API.patch} (100%)
 rename patches/server/{0701-Add-API-for-resetting-a-single-score.patch => 0700-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0702-Add-Raw-Byte-Entity-Serialization.patch => 0701-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0703-Vanilla-command-permission-fixes.patch => 0702-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0704-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (96%)
 rename patches/server/{0705-Fix-GameProfileCache-concurrency.patch => 0704-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0706-Log-when-the-async-catcher-is-tripped.patch => 0705-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0707-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0706-Add-paper-mobcaps-and-paper-playermobcaps.patch} (99%)
 rename patches/server/{0708-Sanitize-ResourceLocation-error-logging.patch => 0707-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0709-Allow-controlled-flushing-for-network-manager.patch => 0708-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0710-Optimise-general-POI-access.patch => 0709-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0711-Optimise-chunk-tick-iteration.patch => 0710-Optimise-chunk-tick-iteration.patch} (99%)
 rename patches/server/{0712-Execute-chunk-tasks-mid-tick.patch => 0711-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0713-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0714-Custom-table-implementation-for-blockstate-state-loo.patch => 0713-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0715-Detail-more-information-in-watchdog-dumps.patch => 0714-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0716-Manually-inline-methods-in-BlockPosition.patch => 0715-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0717-Distance-manager-tick-timings.patch => 0716-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0718-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0717-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0719-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0720-Add-packet-limiter-config.patch => 0719-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0721-Use-correct-LevelStem-registry-when-loading-default-.patch => 0720-Use-correct-LevelStem-registry-when-loading-default-.patch} (100%)
 rename patches/server/{0722-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0723-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0722-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0724-Don-t-lookup-fluid-state-when-raytracing.patch => 0723-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0725-Time-scoreboard-search.patch => 0724-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0726-Send-full-pos-packets-for-hard-colliding-entities.patch => 0725-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0727-Do-not-run-raytrace-logic-for-AIR.patch => 0726-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0728-Oprimise-map-impl-for-tracked-players.patch => 0727-Oprimise-map-impl-for-tracked-players.patch} (92%)
 rename patches/server/{0729-Optimise-BlockSoil-nearby-water-lookup.patch => 0728-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0730-Optimise-random-block-ticking.patch => 0729-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0731-Optimise-non-flush-packet-sending.patch => 0730-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0732-Optimise-nearby-player-lookups.patch => 0731-Optimise-nearby-player-lookups.patch} (99%)
 rename patches/server/{0733-Remove-streams-for-villager-AI.patch => 0732-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0734-Use-Velocity-compression-and-cipher-natives.patch => 0733-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0735-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0736-Async-catch-modifications-to-critical-entity-state.patch => 0735-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0737-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0736-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0738-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0739-Check-requirement-before-suggesting-root-nodes.patch => 0738-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0740-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (92%)
 rename patches/server/{0741-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0742-Ensure-valid-vehicle-status.patch => 0741-Ensure-valid-vehicle-status.patch} (90%)
 rename patches/server/{0743-Prevent-softlocked-end-exit-portal-generation.patch => 0742-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0744-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0745-Don-t-log-debug-logging-being-disabled.patch => 0744-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0746-fix-various-menus-with-empty-level-accesses.patch => 0745-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0747-Preserve-overstacked-loot.patch => 0746-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0748-Update-head-rotation-in-missing-places.patch => 0747-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0749-prevent-unintended-light-block-manipulation.patch => 0748-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0750-Fix-CraftCriteria-defaults-map.patch => 0749-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0751-Fix-upstreams-block-state-factories.patch => 0750-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0752-Add-config-option-for-logging-player-ip-addresses.patch => 0751-Add-config-option-for-logging-player-ip-addresses.patch} (100%)
 rename patches/server/{0753-Configurable-feature-seeds.patch => 0752-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0754-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0755-Add-root-admin-user-detection.patch => 0754-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0756-Always-allow-item-changing-in-Fireball.patch => 0755-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0757-don-t-attempt-to-teleport-dead-entities.patch => 0756-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0758-Prevent-excessive-velocity-through-repeated-crits.patch => 0757-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0759-Remove-client-side-code-using-deprecated-for-removal.patch => 0758-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0760-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0761-Fix-removing-recipes-from-RecipeIterator.patch => 0760-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0762-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0761-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0763-Hide-unnecessary-itemmeta-from-clients.patch => 0762-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0764-Fix-Spigot-growth-modifiers.patch => 0763-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0765-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0766-Add-PlayerItemFrameChangeEvent.patch => 0765-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0767-Add-player-health-update-API.patch => 0766-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0768-Optimize-HashMapPalette.patch => 0767-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0769-Allow-delegation-to-vanilla-chunk-gen.patch => 0768-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0771-Optimise-collision-checking-in-player-move-packet-ha.patch => 0770-Optimise-collision-checking-in-player-move-packet-ha.patch} (99%)
 rename patches/server/{0772-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0773-Update-Log4j.patch => 0772-Update-Log4j.patch} (100%)
 rename patches/server/{0774-Add-more-Campfire-API.patch => 0773-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0775-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0776-Fix-tripwire-state-inconsistency.patch => 0775-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0777-Fix-fluid-logging-on-Block-breakNaturally.patch => 0776-Fix-fluid-logging-on-Block-breakNaturally.patch} (100%)
 rename patches/server/{0778-Forward-CraftEntity-in-teleport-command.patch => 0777-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0779-Improve-scoreboard-entries.patch => 0778-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0780-Entity-powdered-snow-API.patch => 0779-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0781-Add-API-for-item-entity-health.patch => 0780-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0782-Fix-entity-type-tags-suggestions-in-selectors.patch => 0781-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0783-Configurable-max-block-light-for-monster-spawning.patch => 0782-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0784-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0785-Load-effect-amplifiers-greater-than-127-correctly.patch => 0784-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0786-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0787-Fix-bees-aging-inside-hives.patch => 0786-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0788-Bucketable-API.patch => 0787-Bucketable-API.patch} (100%)
 rename patches/server/{0789-Validate-usernames.patch => 0788-Validate-usernames.patch} (100%)
 rename patches/server/{0790-Make-water-animal-spawn-height-configurable.patch => 0789-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0791-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (98%)
 rename patches/server/{0792-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0791-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0793-Add-new-overload-to-PersistentDataContainer-has.patch => 0792-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0794-Multiple-Entries-with-Scoreboards.patch => 0793-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0795-Reset-placed-block-on-exception.patch => 0794-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0796-Add-configurable-height-for-slime-spawn.patch => 0795-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0797-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0798-Fix-xp-reward-for-baby-zombies.patch => 0797-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0799-Kick-on-main-for-illegal-chat.patch => 0798-Kick-on-main-for-illegal-chat.patch} (97%)
 rename patches/server/{0800-Multi-Block-Change-API-Implementation.patch => 0799-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0801-Fix-NotePlayEvent.patch => 0800-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0802-Freeze-Tick-Lock-API.patch => 0801-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0803-Dolphin-API.patch => 0802-Dolphin-API.patch} (100%)
 rename patches/server/{0804-More-PotionEffectType-API.patch => 0803-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0805-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0806-API-for-creating-command-sender-which-forwards-feedb.patch => 0805-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0807-Add-missing-structure-set-seed-configs.patch => 0806-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0808-Implement-regenerateChunk.patch => 0807-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0809-Fix-cancelled-powdered-snow-bucket-placement.patch => 0808-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0810-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0811-Add-GameEvent-tags.patch => 0810-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0812-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0813-Furnace-RecipesUsed-API.patch => 0812-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0814-Configurable-sculk-sensor-listener-range.patch => 0813-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0815-Add-missing-block-data-mins-and-maxes.patch => 0814-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0816-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0817-Put-world-into-worldlist-before-initing-the-world.patch => 0816-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0818-Fix-Entity-Position-Desync.patch => 0817-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0819-Custom-Potion-Mixes.patch => 0818-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0820-Fix-Fluid-tags-isTagged-method.patch => 0819-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0821-Force-close-world-loading-screen.patch => 0820-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0822-Fix-falling-block-spawn-methods.patch => 0821-Fix-falling-block-spawn-methods.patch} (97%)
 rename patches/server/{0823-Expose-furnace-minecart-push-values.patch => 0822-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0824-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0825-More-Projectile-API.patch => 0824-More-Projectile-API.patch} (100%)
 rename patches/server/{0826-Fix-swamp-hut-cat-generation-deadlock.patch => 0825-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0827-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0828-Implement-getComputedBiome-API.patch => 0827-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0829-Make-some-itemstacks-nonnull.patch => 0828-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0830-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%)
 rename patches/server/{0831-Implement-enchantWithLevels-API.patch => 0830-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0832-Fix-saving-in-unloadWorld.patch => 0831-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0833-Buffer-OOB-setBlock-calls.patch => 0832-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0834-Add-TameableDeathMessageEvent.patch => 0833-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0835-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0836-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0835-fix-player-loottables-running-when-mob-loot-gamerule.patch} (92%)
 rename patches/server/{0837-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0836-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0838-Guard-against-invalid-entity-positions.patch => 0837-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0839-cache-resource-keys.patch => 0838-cache-resource-keys.patch} (100%)
 rename patches/server/{0840-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0839-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0841-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0842-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0843-Prevent-tile-entity-copies-loading-chunks.patch => 0842-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0844-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0843-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0845-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0846-Pass-ServerLevel-for-gamerule-callbacks.patch => 0845-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0847-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0848-WorldCreator-keepSpawnLoaded.patch => 0847-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0849-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0850-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0851-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0852-Fire-CauldronLevelChange-on-initial-fill.patch => 0851-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0853-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0852-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0854-Add-PlayerStopUsingItemEvent.patch => 0853-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0855-FallingBlock-auto-expire-setting.patch => 0854-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0856-Don-t-tick-markers.patch => 0855-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0857-Do-not-accept-invalid-client-settings.patch => 0856-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0858-Add-support-for-Proxy-Protocol.patch => 0857-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0859-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0858-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0860-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0861-Sanitize-Sent-BlockEntity-NBT.patch => 0860-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0862-Prevent-entity-loading-causing-async-lookups.patch => 0861-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0863-Disable-component-selector-resolving-in-books-by-def.patch => 0862-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0864-Throw-exception-on-world-create-while-being-ticked.patch => 0863-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0865-Add-Alternate-Current-redstone-implementation.patch => 0864-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0866-Dont-resent-entity-on-art-update.patch => 0865-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0867-Add-missing-spawn-eggs.patch => 0866-Add-missing-spawn-eggs.patch} (100%)
 rename patches/server/{0868-Add-WardenAngerChangeEvent.patch => 0867-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0869-Add-option-for-strict-advancement-dimension-checks.patch => 0868-Add-option-for-strict-advancement-dimension-checks.patch} (90%)
 rename patches/server/{0870-Add-missing-important-BlockStateListPopulator-method.patch => 0869-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0871-Nameable-Banner-API.patch => 0870-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0872-Don-t-broadcast-messages-to-command-blocks.patch => 0871-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0873-Prevent-empty-items-from-being-added-to-world.patch => 0872-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0874-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0875-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0874-Don-t-print-component-in-resource-pack-rejection-mes.patch} (94%)
 rename patches/server/{0876-Add-Player-getFishHook.patch => 0875-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0877-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0878-Add-various-missing-EntityDropItemEvent-calls.patch => 0877-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0879-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0878-Add-some-minimal-debug-information-to-chat-packet-er.patch} (95%)
 rename patches/server/{0880-Fix-Bee-flower-NPE.patch => 0879-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0881-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (92%)
 rename patches/server/{0882-Fixes-and-additions-to-the-SpawnReason-API.patch => 0881-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0883-More-Teleport-API.patch => 0882-More-Teleport-API.patch} (99%)
 rename patches/server/{0884-Add-EntityPortalReadyEvent.patch => 0883-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0885-Don-t-use-level-random-in-entity-constructors.patch => 0884-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0886-Send-block-entities-after-destroy-prediction.patch => 0885-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0887-Warn-on-plugins-accessing-faraway-chunks.patch => 0886-Warn-on-plugins-accessing-faraway-chunks.patch} (98%)
 rename patches/server/{0888-Custom-Chat-Completion-Suggestions-API.patch => 0887-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0889-Add-missing-BlockFadeEvents.patch => 0888-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0890-Collision-API.patch => 0889-Collision-API.patch} (100%)
 rename patches/server/{0891-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0892-Fix-command-preprocess-cancelling-and-command-changi.patch => 0891-Fix-command-preprocess-cancelling-and-command-changi.patch} (96%)
 rename patches/server/{0893-Remove-invalid-signature-login-stacktrace.patch => 0892-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0894-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (91%)
 rename patches/server/{0895-Block-Ticking-API.patch => 0894-Block-Ticking-API.patch} (100%)
 rename patches/server/{0896-Add-Velocity-IP-Forwarding-Support.patch => 0895-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0897-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0898-Add-NamespacedKey-biome-methods.patch => 0897-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0899-Fix-plugin-loggers-on-server-shutdown.patch => 0898-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0900-Workaround-for-client-lag-spikes-MC-162253.patch => 0899-Workaround-for-client-lag-spikes-MC-162253.patch} (98%)
 rename patches/server/{0901-Stop-large-look-changes-from-crashing-the-server.patch => 0900-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0902-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/server/{0903-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0904-Fire-EntityChangeBlockEvent-in-more-places.patch => 0903-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0905-Missing-eating-regain-reason.patch => 0904-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0906-Missing-effect-cause.patch => 0905-Missing-effect-cause.patch} (100%)
 rename patches/server/{0907-Added-byte-array-serialization-deserialization-for-P.patch => 0906-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0908-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0909-Call-BlockPhysicsEvent-more-often.patch => 0908-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0910-Configurable-chat-thread-limit.patch => 0909-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0911-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0912-Set-position-before-player-sending-on-dimension-chan.patch => 0911-Set-position-before-player-sending-on-dimension-chan.patch} (92%)
 rename patches/server/{0913-fix-Jigsaw-block-kicking-user.patch => 0912-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0914-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0913-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0915-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0916-Fix-a-bunch-of-vanilla-bugs.patch => 0915-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0917-Fix-nothing-mlg.patch => 0916-Fix-nothing-mlg.patch} (95%)
 rename patches/server/{0918-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0917-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0919-Fix-custom-piglin-loved-items.patch => 0918-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0920-EntityPickupItemEvent-fixes.patch => 0919-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0921-Correctly-handle-interactions-with-items-on-cooldown.patch => 0920-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0922-Add-PlayerInventorySlotChangeEvent.patch => 0921-Add-PlayerInventorySlotChangeEvent.patch} (97%)
 rename patches/server/{0923-Elder-Guardian-appearance-API.patch => 0922-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0924-Allow-changing-bed-s-occupied-property.patch => 0923-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0925-Add-entity-knockback-API.patch => 0924-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0926-Detect-headless-JREs.patch => 0925-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0927-fixed-entity-vehicle-collision-event-not-called.patch => 0926-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0928-optimized-dirt-and-snow-spreading.patch => 0927-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0929-Added-EntityToggleSitEvent.patch => 0928-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0930-Add-fire-tick-delay-option.patch => 0929-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0931-Add-Moving-Piston-API.patch => 0930-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0932-Ignore-impossible-spawn-tick.patch => 0931-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0933-Track-projectile-source-for-fireworks-from-dispenser.patch => 0932-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0934-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0935-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0936-Prevent-compass-from-loading-chunks.patch => 0935-Prevent-compass-from-loading-chunks.patch} (100%)

diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch
index 607bb4240..bdeedc585 100644
--- a/patches/server/0009-Adventure.patch
+++ b/patches/server/0009-Adventure.patch
@@ -1959,7 +1959,7 @@ index d7ece1ae4e9c97935de96eafd6d22cded1f8aa42..77cb412656e741fdb7e002011e3a99ac
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e5c0e5ea8 100644
+index c20f7eb3ee60fce38be2c817278ecaac8982b279..d7e66a9669c67bf7d619bf69dc49daed42b3e83a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -154,6 +154,7 @@ import net.minecraft.world.scores.Score;
@@ -2013,7 +2013,7 @@ index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e
  
              this.connection.send(new ClientboundPlayerCombatKillPacket(this.getCombatTracker(), ichatbasecomponent), PacketSendListener.exceptionallySend(() -> {
                  boolean flag1 = true;
-@@ -1730,8 +1728,13 @@ public class ServerPlayer extends Player {
+@@ -1738,8 +1736,13 @@ public class ServerPlayer extends Player {
      }
  
      public void sendChatMessage(OutgoingPlayerChatMessage message, boolean filterMaskEnabled, ChatType.Bound params) {
@@ -2028,7 +2028,7 @@ index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e
          }
  
      }
-@@ -1752,6 +1755,7 @@ public class ServerPlayer extends Player {
+@@ -1760,6 +1763,7 @@ public class ServerPlayer extends Player {
      }
  
      public String locale = "en_us"; // CraftBukkit - add, lowercase
@@ -2036,7 +2036,7 @@ index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e
      public void updateOptions(ServerboundClientInformationPacket packet) {
          // CraftBukkit start
          if (getMainArm() != packet.mainHand()) {
-@@ -1763,6 +1767,10 @@ public class ServerPlayer extends Player {
+@@ -1771,6 +1775,10 @@ public class ServerPlayer extends Player {
              this.server.server.getPluginManager().callEvent(event);
          }
          this.locale = packet.language;
diff --git a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
index 8fc7a9d37..bb7a817a8 100644
--- a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 301f78d1f9a0eae05096de071bda7def3a45f648..54f585f12890c665a097845acfe13108691f12b6 100644
+index 54dc00f521e7f7b4cb86b2653ac1d0058dcbb03b..0590fb50330b5387a25e7fc7139e04586999efc6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1755,7 +1755,7 @@ public class ServerPlayer extends Player {
+@@ -1763,7 +1763,7 @@ public class ServerPlayer extends Player {
          return s;
      }
  
@@ -17,7 +17,7 @@ index 301f78d1f9a0eae05096de071bda7def3a45f648..54f585f12890c665a097845acfe13108
      public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
      public void updateOptions(ServerboundClientInformationPacket packet) {
          // CraftBukkit start
-@@ -1763,9 +1763,10 @@ public class ServerPlayer extends Player {
+@@ -1771,9 +1771,10 @@ public class ServerPlayer extends Player {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
diff --git a/patches/server/0122-Properly-fix-item-duplication-bug.patch b/patches/server/0122-Properly-fix-item-duplication-bug.patch
index 6d598ed59..6a86bb31e 100644
--- a/patches/server/0122-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0122-Properly-fix-item-duplication-bug.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2ffce1200abe7ab7b50a187069e63392c0b3bfdd..776d2b38f284e13ec9a7dd67a538626817c79887 100644
+index 3cea2ceb5d30329aa84f6659330eea075387fe18..0fded4890038de77781c27565fa3c8fe60e50aac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2195,7 +2195,7 @@ public class ServerPlayer extends Player {
+@@ -2203,7 +2203,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
index b85784bc5..436b32ccd 100644
--- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a6ec766634e804263d55efe9df7d7fbe14d05946..65cf330708b4667fd60fdb1094df5a808ae5c2f2 100644
+index eea1a5c22b6aebf1ff9f5746d1fd0c247ee2631d..54ec2d33bf0306e5d4f6be99a3d9b37c93b26aec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1270,7 +1270,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index a6ec766634e804263d55efe9df7d7fbe14d05946..65cf330708b4667fd60fdb1094df5a80
              }
              // 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 91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d..1a3f9d09df6b6d8c6a84f7f62e142f341d74c6c1 100644
+index 81a0407256a3a37e8ccb136e7fd602d95106c590..bc0c4c2284d08ca88d4664bb39c744b36a607dcd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -611,7 +611,7 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d..1a3f9d09df6b6d8c6a84f7f62e142f34
          }
  
          net.kyori.adventure.text.Component deathMessage = event.deathMessage() != null ? event.deathMessage() : net.kyori.adventure.text.Component.empty(); // Paper - Adventure
-@@ -1442,7 +1442,7 @@ public class ServerPlayer extends Player {
+@@ -1450,7 +1450,7 @@ public class ServerPlayer extends Player {
          }
          // CraftBukkit end
          if (this.containerMenu != this.inventoryMenu) {
@@ -59,7 +59,7 @@ index 91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d..1a3f9d09df6b6d8c6a84f7f62e142f34
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1470,7 +1470,13 @@ public class ServerPlayer extends Player {
+@@ -1478,7 +1478,13 @@ public class ServerPlayer extends Player {
  
      @Override
      public void closeContainer() {
@@ -104,7 +104,7 @@ index 116dee1f1f9c489e6f85a8fa3b7f36267109d720..ea2f283634c8794bda3e531a20f39f8a
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 399735c923cfd52bd7b67beb9b974585ab507ca9..a99d6938d912a169ac329ba09f5a6becd072a94e 100644
+index 4dcc44b925ac261aaa2f4ee84e321d6c8852e835..a462b33a35bf2e5ea9492eb37ac689830abd392a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -508,7 +508,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
index f5bd1e340..862c5c74c 100644
--- a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,10 +19,10 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 645012ea3590a46773e2bb14e9cafd9e3c695fd4..cb55e38b22330dbc542003841e8140eb6bee01bf 100644
+index 6fa11d19b0a9858448fb22624c1d1a2fb228a3b4..942081c458f597d7a0ff7b3478b4b1bf93e8b30d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1876,14 +1876,58 @@ public class ServerPlayer extends Player {
+@@ -1884,14 +1884,58 @@ public class ServerPlayer extends Player {
      }
  
      public void setCamera(@Nullable Entity entity) {
diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
index 9eb908fdd..62d4f9200 100644
--- a/patches/server/0276-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cb55e38b22330dbc542003841e8140eb6bee01bf..32aba4c822742d6a2ebbc25b169ffb665e9413f7 100644
+index 942081c458f597d7a0ff7b3478b4b1bf93e8b30d..2f2def50a4dde2a949176da1030773e59521fb9a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2289,6 +2289,7 @@ public class ServerPlayer extends Player {
+@@ -2297,6 +2297,7 @@ public class ServerPlayer extends Player {
  
          this.setHealth(this.getMaxHealth());
          this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/server/0287-force-entity-dismount-during-teleportation.patch
index 9e0ed6a1d..ccd19976e 100644
--- a/patches/server/0287-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0287-force-entity-dismount-during-teleportation.patch
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 32aba4c822742d6a2ebbc25b169ffb665e9413f7..135e61ffa69a56e7c5edcd9e2066334abf963340 100644
+index 2f2def50a4dde2a949176da1030773e59521fb9a..c9aae32186b72723e879ffab50d73ade5a665a64 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1336,11 +1336,13 @@ public class ServerPlayer extends Player {
+@@ -1344,11 +1344,13 @@ public class ServerPlayer extends Player {
          }
      }
  
diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 699bb74ca..645c55b94 100644
--- a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e8ca0d8612e132fac5533b7672d0fccbf1bc9e24..f45e8b4a536d0cef9b295083f95a556b87fcd2fc 100644
+index 2f6fbceac68e173f3ba3d887407e44b22bfbc5de..f6b28eece6dc4f8d1b483ed2bfb6c9504d625bc8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1578,6 +1578,13 @@ public class ServerPlayer extends Player {
+@@ -1586,6 +1586,13 @@ public class ServerPlayer extends Player {
      public void disconnect() {
          this.disconnected = true;
          this.ejectPassengers();
diff --git a/patches/server/0381-Prevent-opening-inventories-when-frozen.patch b/patches/server/0381-Prevent-opening-inventories-when-frozen.patch
index a16f3603d..0be8769b5 100644
--- a/patches/server/0381-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0381-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eb0e5c43b995e778d28ecfad813ca3882cabe0fa..baff31a9dd003eef6191b59598523e387bc759a1 100644
+index 84bcabdd92cefe16f7bf5270e1d2989dd7d010d7..90992b652941365a46f9e01985365447ba2ff461 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -622,7 +622,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index eb0e5c43b995e778d28ecfad813ca3882cabe0fa..baff31a9dd003eef6191b59598523e38
              this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
              this.containerMenu = this.inventoryMenu;
          }
-@@ -1492,7 +1492,7 @@ public class ServerPlayer extends Player {
+@@ -1500,7 +1500,7 @@ public class ServerPlayer extends Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;
diff --git a/patches/server/0383-Implement-Player-Client-Options-API.patch b/patches/server/0383-Implement-Player-Client-Options-API.patch
index 5dd85f1f9..d51db1b26 100644
--- a/patches/server/0383-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0383-Implement-Player-Client-Options-API.patch
@@ -85,10 +85,10 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index baff31a9dd003eef6191b59598523e387bc759a1..a25be75e636fa1bac4890da3fa9db9267382c46d 100644
+index 90992b652941365a46f9e01985365447ba2ff461..fd2bc49f713cccdcb2a3e49db52f56374690c5de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1853,9 +1853,24 @@ public class ServerPlayer extends Player {
+@@ -1861,9 +1861,24 @@ public class ServerPlayer extends Player {
          return s;
      }
  
diff --git a/patches/server/0522-Player-Chunk-Load-Unload-Events.patch b/patches/server/0522-Player-Chunk-Load-Unload-Events.patch
index 1b29e41cf..5d27e96db 100644
--- a/patches/server/0522-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0522-Player-Chunk-Load-Unload-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c841cfba25d6f448fec929b3ca9653775d3e0ac9..826dcafaf65cef8bbff4f231f71305e851de0902 100644
+index 67cf1cd5f3a83a52dca54781670dcfe0cf2a89c2..e74d4523caa4d2d4b33e22145f7b2dcb63dba9fc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2133,11 +2133,21 @@ public class ServerPlayer extends Player {
+@@ -2141,11 +2141,21 @@ public class ServerPlayer extends Player {
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
          this.connection.send(chunkDataPacket);
diff --git a/patches/server/0624-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0624-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch
deleted file mode 100644
index bd13550fc..000000000
--- a/patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 12 May 2021 03:21:22 -0700
-Subject: [PATCH] call PortalCreateEvent players and end platform
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index becbe9c488577e1acea8ae1dac9792f4a25c2c66..498194b77e0efd97e59ef2adbcbc08526e925ace 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1193,15 +1193,21 @@ public class ServerPlayer extends Player {
-     private void createEndPlatform(ServerLevel world, BlockPos centerPos) {
-         BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable();
- 
-+        org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(world); // Paper
-         for (int i = -2; i <= 2; ++i) {
-             for (int j = -2; j <= 2; ++j) {
-                 for (int k = -1; k < 3; ++k) {
-                     BlockState iblockdata = k == -1 ? Blocks.OBSIDIAN.defaultBlockState() : Blocks.AIR.defaultBlockState();
- 
--                    world.setBlockAndUpdate(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata);
-+                    blockList.setBlock(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata, 3); // Paper
-                 }
-             }
-         }
-+        // Paper start
-+        if (new org.bukkit.event.world.PortalCreateEvent((List< org.bukkit.block.BlockState>) (List) blockList.getList(), world.getWorld(), this.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM).callEvent()) {
-+            blockList.updateList();
-+        }
-+        // Paper end
- 
-     }
- 
diff --git a/patches/server/0625-Fix-CraftPotionBrewer-cache.patch b/patches/server/0624-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0625-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0624-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0626-Add-basic-Datapack-API.patch b/patches/server/0625-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0626-Add-basic-Datapack-API.patch
rename to patches/server/0625-Add-basic-Datapack-API.patch
diff --git a/patches/server/0627-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0626-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0627-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0626-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0628-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch
similarity index 96%
rename from patches/server/0628-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch
index 069e50b9f..03838f2d6 100644
--- a/patches/server/0628-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,10 +45,10 @@ index 65089c0e78c9913a92ae9c66d664f48e2112ad92..7882ee2b7813d437d3b7580f046f38e7
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 498194b77e0efd97e59ef2adbcbc08526e925ace..4090b258672ac136172f3148bf1e297f270d4d93 100644
+index 781bad6dd4279eddeaa2d55eaf513ef725729d26..f033a1a2bb3e44d30107bf1494b315cdc0c94b56 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1795,8 +1795,15 @@ public class ServerPlayer extends Player {
+@@ -1797,8 +1797,15 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -66,7 +66,7 @@ index 498194b77e0efd97e59ef2adbcbc08526e925ace..4090b258672ac136172f3148bf1e297f
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1808,7 +1815,7 @@ public class ServerPlayer extends Player {
+@@ -1810,7 +1817,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -75,7 +75,7 @@ index 498194b77e0efd97e59ef2adbcbc08526e925ace..4090b258672ac136172f3148bf1e297f
          }
      }
  
-@@ -2224,6 +2231,16 @@ public class ServerPlayer extends Player {
+@@ -2226,6 +2233,16 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
diff --git a/patches/server/0629-ItemStack-repair-check-API.patch b/patches/server/0628-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0629-ItemStack-repair-check-API.patch
rename to patches/server/0628-ItemStack-repair-check-API.patch
diff --git a/patches/server/0630-More-Enchantment-API.patch b/patches/server/0629-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0630-More-Enchantment-API.patch
rename to patches/server/0629-More-Enchantment-API.patch
diff --git a/patches/server/0631-Move-range-check-for-block-placing-up.patch b/patches/server/0630-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0631-Move-range-check-for-block-placing-up.patch
rename to patches/server/0630-Move-range-check-for-block-placing-up.patch
index f4a82e33e..063490f93 100644
--- a/patches/server/0631-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0630-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 de4c3849cc60151de8f3a873adad2bc36e30fbc4..3ef39ebeb76f43d521266402e170bd1af6af2348 100644
+index cf5aac0c7bb719246b49a0ee08148141a381a16a..3fcd92c408258a60de049437478f6dab010f1fb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1830,6 +1830,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0632-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0631-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0632-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0631-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0633-Add-Mob-lookAt-API.patch b/patches/server/0632-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0633-Add-Mob-lookAt-API.patch
rename to patches/server/0632-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0634-Add-Unix-domain-socket-support.patch b/patches/server/0633-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0634-Add-Unix-domain-socket-support.patch
rename to patches/server/0633-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0635-Add-EntityInsideBlockEvent.patch b/patches/server/0634-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0635-Add-EntityInsideBlockEvent.patch
rename to patches/server/0634-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0636-Attributes-API-for-item-defaults.patch b/patches/server/0635-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0636-Attributes-API-for-item-defaults.patch
rename to patches/server/0635-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0637-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0637-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8edf6efd0..2f22b8921 100644
--- a/patches/server/0637-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,7 +95,7 @@ index 401787a5b55384b9ab7755e822b3b881dc45ac45..e537a8df45c31efa80cb898cbef9c3a0
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 888090b2548fb23089dcd05e9de2b1f09dc5876a..b39a9924f6dd8facc8f22b3e98f5a48cdd555f4c 100644
+index c801ba30f7d5fc891adc3dad7ee8e2d78e7ac359..b1382dab98963b362c49d2e8f1a97177eadeb22d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1184,7 +1184,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0638-More-Lidded-Block-API.patch b/patches/server/0637-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0638-More-Lidded-Block-API.patch
rename to patches/server/0637-More-Lidded-Block-API.patch
diff --git a/patches/server/0639-Limit-item-frame-cursors-on-maps.patch b/patches/server/0638-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0639-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0638-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0640-Add-PlayerKickEvent-causes.patch b/patches/server/0639-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0640-Add-PlayerKickEvent-causes.patch
rename to patches/server/0639-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0641-Add-PufferFishStateChangeEvent.patch b/patches/server/0640-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0641-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0640-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0642-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0642-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0643-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0643-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0644-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0643-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0644-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0643-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0645-Add-BellRevealRaiderEvent.patch b/patches/server/0644-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0645-Add-BellRevealRaiderEvent.patch
rename to patches/server/0644-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0646-Fix-invulnerable-end-crystals.patch b/patches/server/0645-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0646-Fix-invulnerable-end-crystals.patch
rename to patches/server/0645-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0647-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0646-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0647-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0646-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0648-Fix-dangerous-end-portal-logic.patch b/patches/server/0647-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0648-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0647-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0649-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0649-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0650-Make-item-validations-configurable.patch b/patches/server/0649-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0650-Make-item-validations-configurable.patch
rename to patches/server/0649-Make-item-validations-configurable.patch
diff --git a/patches/server/0651-Line-Of-Sight-Changes.patch b/patches/server/0650-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0651-Line-Of-Sight-Changes.patch
rename to patches/server/0650-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0652-add-per-world-spawn-limits.patch b/patches/server/0651-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0652-add-per-world-spawn-limits.patch
rename to patches/server/0651-add-per-world-spawn-limits.patch
index e087d8512..5d59715b0 100644
--- a/patches/server/0652-add-per-world-spawn-limits.patch
+++ b/patches/server/0651-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b39a9924f6dd8facc8f22b3e98f5a48cdd555f4c..5f780daddfc90c44bd621cee7a2a72a20b292e29 100644
+index b1382dab98963b362c49d2e8f1a97177eadeb22d..684e091e7eb68a3e9157e7b945248821553a03df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -210,6 +210,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0653-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0653-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0654-Add-more-LimitedRegion-API.patch b/patches/server/0653-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0654-Add-more-LimitedRegion-API.patch
rename to patches/server/0653-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0655-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 91%
rename from patches/server/0655-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 8086a1bf1..d9e822252 100644
--- a/patches/server/0655-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,10 +5,10 @@ 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 4090b258672ac136172f3148bf1e297f270d4d93..3ad77356734253f98cc92dd734d1171060dca62d 100644
+index f033a1a2bb3e44d30107bf1494b315cdc0c94b56..5bbc8f5f1f5c66ae6d1128d87fb7dde0b546387e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2200,7 +2200,7 @@ public class ServerPlayer extends Player {
+@@ -2202,7 +2202,7 @@ public class ServerPlayer extends Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {
diff --git a/patches/server/0656-Missing-Entity-Behavior-API.patch b/patches/server/0655-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0656-Missing-Entity-Behavior-API.patch
rename to patches/server/0655-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0657-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0657-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index a2ab09f58..3ef312f32 100644
--- a/patches/server/0657-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0656-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 55c5348e793fa560d7042cf90076a8f7a3b76547..63bfea707e0664e19726692546dd0ac8a86f8b8f 100644
+index 1673082e5badbc0f3057b11544fb39be0ed84a44..8d41767c0bbd55c3c3f291fee8ba92622c3cc881 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1213,7 +1213,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0658-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0658-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0659-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0659-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0660-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0659-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0660-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0659-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0661-Adds-PlayerArmSwingEvent.patch b/patches/server/0660-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0661-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0660-Adds-PlayerArmSwingEvent.patch
index a21292ebf..933614f01 100644
--- a/patches/server/0661-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0660-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63bfea707e0664e19726692546dd0ac8a86f8b8f..7d594e23dc7c393f258b16ec5f04e60fc31f91c8 100644
+index 8d41767c0bbd55c3c3f291fee8ba92622c3cc881..42f525b6e7bccca420abccfc2da80ead20966559 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2631,7 +2631,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0662-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 96%
rename from patches/server/0662-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch
index c01198965..0d770eaae 100644
--- a/patches/server/0662-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3ad77356734253f98cc92dd734d1171060dca62d..ca07a861d9005de51134152ef72dcbd3505f1baa 100644
+index 5bbc8f5f1f5c66ae6d1128d87fb7dde0b546387e..e505fa3a6f90efec32e408a08a31295ae829ac2c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -259,7 +259,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 3ad77356734253f98cc92dd734d1171060dca62d..ca07a861d9005de51134152ef72dcbd3
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7d594e23dc7c393f258b16ec5f04e60fc31f91c8..ebaf6ddcdccf4e2a5836782e58770e2cf1008f9d 100644
+index 42f525b6e7bccca420abccfc2da80ead20966559..ff31434e372693f6cf3d6a94815abd2ceb76f2d0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -522,7 +522,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0663-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0663-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0664-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0663-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0664-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0663-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0665-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0664-Don-t-apply-cramming-damage-to-players.patch
similarity index 89%
rename from patches/server/0665-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0664-Don-t-apply-cramming-damage-to-players.patch
index f7fff943d..99755d10d 100644
--- a/patches/server/0665-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0664-Don-t-apply-cramming-damage-to-players.patch
@@ -11,10 +11,10 @@ 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 ca07a861d9005de51134152ef72dcbd3505f1baa..95e2cbe6f80e64c00e8e261a3e1731c73845fc83 100644
+index e505fa3a6f90efec32e408a08a31295ae829ac2c..b335d10dcc2f23c6b7b9976b33af5ab2f221f15c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1431,7 +1431,7 @@ public class ServerPlayer extends Player {
+@@ -1433,7 +1433,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {
diff --git a/patches/server/0666-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0666-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0667-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0667-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0668-Stinger-API.patch b/patches/server/0667-Stinger-API.patch
similarity index 100%
rename from patches/server/0668-Stinger-API.patch
rename to patches/server/0667-Stinger-API.patch
diff --git a/patches/server/0669-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0669-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0670-Add-System.out-err-catcher.patch b/patches/server/0669-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0670-Add-System.out-err-catcher.patch
rename to patches/server/0669-Add-System.out-err-catcher.patch
diff --git a/patches/server/0671-Fix-test-not-bootstrapping.patch b/patches/server/0670-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0671-Fix-test-not-bootstrapping.patch
rename to patches/server/0670-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0672-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0672-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0673-Improve-boat-collision-performance.patch b/patches/server/0672-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0673-Improve-boat-collision-performance.patch
rename to patches/server/0672-Improve-boat-collision-performance.patch
diff --git a/patches/server/0674-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0674-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch
index e20f45173..6a5b1cb88 100644
--- a/patches/server/0674-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0673-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 ebaf6ddcdccf4e2a5836782e58770e2cf1008f9d..a4ed338b3317378fdad694d3b0b12379128ffd26 100644
+index ff31434e372693f6cf3d6a94815abd2ceb76f2d0..847011d143efb3f3af815d87dcc9c923d95a43c7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -438,7 +438,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0675-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0675-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0676-Add-PlayerSetSpawnEvent.patch b/patches/server/0675-Add-PlayerSetSpawnEvent.patch
similarity index 97%
rename from patches/server/0676-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0675-Add-PlayerSetSpawnEvent.patch
index 8884e7361..15f6f425e 100644
--- a/patches/server/0676-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0675-Add-PlayerSetSpawnEvent.patch
@@ -32,10 +32,10 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2
          String string = resourceKey.location().toString();
          if (targets.size() == 1) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b1e97a5b6 100644
+index b335d10dcc2f23c6b7b9976b33af5ab2f221f15c..e212f7a2f20fb5b8af18f3f11aef189d7d533160 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1272,7 +1272,7 @@ public class ServerPlayer extends Player {
+@@ -1274,7 +1274,7 @@ public class ServerPlayer extends Player {
              } else if (this.bedBlocked(blockposition, enumdirection)) {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
@@ -44,7 +44,7 @@ index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b
                  if (this.level.isDay()) {
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2127,12 +2127,33 @@ public class ServerPlayer extends Player {
+@@ -2129,12 +2129,33 @@ public class ServerPlayer extends Player {
          return this.respawnForced;
      }
  
@@ -80,7 +80,7 @@ index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b
              }
  
              this.respawnPosition = pos;
-@@ -2146,6 +2167,7 @@ public class ServerPlayer extends Player {
+@@ -2148,6 +2169,7 @@ public class ServerPlayer extends Player {
              this.respawnForced = false;
          }
  
diff --git a/patches/server/0677-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0677-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0678-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0677-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0678-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0677-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0679-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0678-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0679-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0678-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0680-Added-EntityDamageItemEvent.patch b/patches/server/0679-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0680-Added-EntityDamageItemEvent.patch
rename to patches/server/0679-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0681-Optimize-indirect-passenger-iteration.patch b/patches/server/0680-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0681-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0680-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0682-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0682-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0683-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0682-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0683-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0682-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0684-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0683-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0684-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0683-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0685-Clear-bucket-NBT-after-dispense.patch b/patches/server/0684-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0685-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0684-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0686-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0685-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0686-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0685-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0687-Add-BlockBreakBlockEvent.patch b/patches/server/0686-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0687-Add-BlockBreakBlockEvent.patch
rename to patches/server/0686-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0688-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0688-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0689-More-CommandBlock-API.patch b/patches/server/0688-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0689-More-CommandBlock-API.patch
rename to patches/server/0688-More-CommandBlock-API.patch
diff --git a/patches/server/0690-Add-missing-team-sidebar-display-slots.patch b/patches/server/0689-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0690-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0689-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0691-Add-back-EntityPortalExitEvent.patch b/patches/server/0690-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0691-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0690-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0692-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0692-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch
index a2b7b70aa..1b8d4998a 100644
--- a/patches/server/0692-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -29,7 +29,7 @@ index 304002cab34cdbb000f22d18ee94ffe233ac2b8e..7d35d948e395258c77301c3dfee57254
                      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 5f780daddfc90c44bd621cee7a2a72a20b292e29..0d5ae9b6db5cba4154c1e3ac042ae27fcd84d209 100644
+index 684e091e7eb68a3e9157e7b945248821553a03df..ef1b84c52722e33f1f3d346df60c11d5bb805a0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -686,6 +686,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0693-Get-entity-default-attributes.patch b/patches/server/0692-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0693-Get-entity-default-attributes.patch
rename to patches/server/0692-Get-entity-default-attributes.patch
diff --git a/patches/server/0694-Left-handed-API.patch b/patches/server/0693-Left-handed-API.patch
similarity index 100%
rename from patches/server/0694-Left-handed-API.patch
rename to patches/server/0693-Left-handed-API.patch
diff --git a/patches/server/0695-Add-more-advancement-API.patch b/patches/server/0694-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0695-Add-more-advancement-API.patch
rename to patches/server/0694-Add-more-advancement-API.patch
diff --git a/patches/server/0696-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0695-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0696-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0695-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0697-Add-critical-damage-API.patch b/patches/server/0696-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0697-Add-critical-damage-API.patch
rename to patches/server/0696-Add-critical-damage-API.patch
diff --git a/patches/server/0698-Fix-issues-with-mob-conversion.patch b/patches/server/0697-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0698-Fix-issues-with-mob-conversion.patch
rename to patches/server/0697-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0699-Add-isCollidable-methods-to-various-places.patch b/patches/server/0698-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0699-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0698-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0700-Goat-ram-API.patch b/patches/server/0699-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0700-Goat-ram-API.patch
rename to patches/server/0699-Goat-ram-API.patch
diff --git a/patches/server/0701-Add-API-for-resetting-a-single-score.patch b/patches/server/0700-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0701-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0700-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0702-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0701-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0702-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0701-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0703-Vanilla-command-permission-fixes.patch b/patches/server/0702-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0703-Vanilla-command-permission-fixes.patch
rename to patches/server/0702-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0704-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 96%
rename from patches/server/0704-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 33166594b..65a0bf85b 100644
--- a/patches/server/0704-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,10 +28,10 @@ index 7d35d948e395258c77301c3dfee572545d3e52ff..34c587232c6bb9876de68f4bf07d11b3
          }
          // 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 218a71cbd62795fdf3b9b3ad224e201b1e97a5b6..ffee74216d6ba1742e97400a7177725766bb557e 100644
+index e212f7a2f20fb5b8af18f3f11aef189d7d533160..eac88fdb3c9184e9c0d3500c62fbc34958bfcb47 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1573,6 +1573,18 @@ public class ServerPlayer extends Player {
+@@ -1575,6 +1575,18 @@ public class ServerPlayer extends Player {
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }
diff --git a/patches/server/0705-Fix-GameProfileCache-concurrency.patch b/patches/server/0704-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0705-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0704-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0706-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0705-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0706-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0705-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0707-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0707-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch
index c1a6a6f32..081ae6f3d 100644
--- a/patches/server/0707-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -302,7 +302,7 @@ index 3ebf81b45cf1897471a3262d23cc59dd45652b6d..c648acdd0066f6c480d08927a3c72524
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0d5ae9b6db5cba4154c1e3ac042ae27fcd84d209..4fcd36e6c0ad99575917962fbd1353f509383482 100644
+index ef1b84c52722e33f1f3d346df60c11d5bb805a0b..80abef83b4b2533fdc50773d4d76c3c6af662df1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1701,9 +1701,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0708-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0707-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0708-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0707-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0709-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0708-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0709-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0708-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0710-Optimise-general-POI-access.patch b/patches/server/0709-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0710-Optimise-general-POI-access.patch
rename to patches/server/0709-Optimise-general-POI-access.patch
diff --git a/patches/server/0711-Optimise-chunk-tick-iteration.patch b/patches/server/0710-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/0711-Optimise-chunk-tick-iteration.patch
rename to patches/server/0710-Optimise-chunk-tick-iteration.patch
index 30dc14741..bbcb493d0 100644
--- a/patches/server/0711-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0710-Optimise-chunk-tick-iteration.patch
@@ -72,7 +72,7 @@ index a61f55ed1fbe5aac5289014cb95cb6950b4c77fa..e11ec87e8007979a1c6932b414bcd70c
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ed6e0a186dba26bee5ebcc02120c24ecb38d6892..bfc1965482fe6556caa09306767583e3635b06c8 100644
+index a488c33ce546cd29b30fcff9748869c20fc835aa..d91dbffab2c541bd3ca5542026f1a000f9b114d3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
diff --git a/patches/server/0712-Execute-chunk-tasks-mid-tick.patch b/patches/server/0711-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0712-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0711-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0713-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0713-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0714-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0714-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0715-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0714-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0715-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0714-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0716-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0715-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0716-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0715-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0717-Distance-manager-tick-timings.patch b/patches/server/0716-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0717-Distance-manager-tick-timings.patch
rename to patches/server/0716-Distance-manager-tick-timings.patch
diff --git a/patches/server/0718-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0718-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0719-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0719-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0720-Add-packet-limiter-config.patch b/patches/server/0719-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0720-Add-packet-limiter-config.patch
rename to patches/server/0719-Add-packet-limiter-config.patch
diff --git a/patches/server/0721-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 100%
rename from patches/server/0721-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0722-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0722-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0723-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0723-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0724-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0724-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0725-Time-scoreboard-search.patch b/patches/server/0724-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0725-Time-scoreboard-search.patch
rename to patches/server/0724-Time-scoreboard-search.patch
diff --git a/patches/server/0726-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0726-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0727-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0726-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0727-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0726-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0728-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0727-Oprimise-map-impl-for-tracked-players.patch
similarity index 92%
rename from patches/server/0728-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0727-Oprimise-map-impl-for-tracked-players.patch
index 2f0167797..26977cfb0 100644
--- a/patches/server/0728-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0727-Oprimise-map-impl-for-tracked-players.patch
@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index bfc1965482fe6556caa09306767583e3635b06c8..0abcc48cea5f0ca99d9ad5b753cc0c5bc91e97d9 100644
+index d91dbffab2c541bd3ca5542026f1a000f9b114d3..b93d98b8ce576508b051a904e83cb4d19b87017b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1360,7 +1360,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0729-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0729-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0730-Optimise-random-block-ticking.patch b/patches/server/0729-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0730-Optimise-random-block-ticking.patch
rename to patches/server/0729-Optimise-random-block-ticking.patch
diff --git a/patches/server/0731-Optimise-non-flush-packet-sending.patch b/patches/server/0730-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0731-Optimise-non-flush-packet-sending.patch
rename to patches/server/0730-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0732-Optimise-nearby-player-lookups.patch b/patches/server/0731-Optimise-nearby-player-lookups.patch
similarity index 99%
rename from patches/server/0732-Optimise-nearby-player-lookups.patch
rename to patches/server/0731-Optimise-nearby-player-lookups.patch
index c100775c9..810247119 100644
--- a/patches/server/0732-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0731-Optimise-nearby-player-lookups.patch
@@ -39,7 +39,7 @@ index e11ec87e8007979a1c6932b414bcd70c10db746c..bc46479fd0622a90fd98ac88f92b2840
      // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0abcc48cea5f0ca99d9ad5b753cc0c5bc91e97d9..43466ce2b9ce583a5af067937ce9c47f7635f56d 100644
+index b93d98b8ce576508b051a904e83cb4d19b87017b..b9143dd8454eb3b1d628188ea11c73dec4fac949 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -152,6 +152,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0733-Remove-streams-for-villager-AI.patch b/patches/server/0732-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0733-Remove-streams-for-villager-AI.patch
rename to patches/server/0732-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0734-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0733-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0734-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0733-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0735-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0735-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0736-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0736-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0737-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0737-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0738-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0738-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0739-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0738-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0739-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0738-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0740-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0740-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index b218b2916..fbc13dfc7 100644
--- a/patches/server/0740-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0739-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 a4ed338b3317378fdad694d3b0b12379128ffd26..678c0b1c37b16e405205933a16f0d2d29359fd12 100644
+index 847011d143efb3f3af815d87dcc9c923d95a43c7..f9e2392e705a0168b9dc359313e68cbca08b2d3a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0741-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0741-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0742-Ensure-valid-vehicle-status.patch b/patches/server/0741-Ensure-valid-vehicle-status.patch
similarity index 90%
rename from patches/server/0742-Ensure-valid-vehicle-status.patch
rename to patches/server/0741-Ensure-valid-vehicle-status.patch
index d06307975..914ee7494 100644
--- a/patches/server/0742-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0741-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 ffee74216d6ba1742e97400a7177725766bb557e..e761e01a02e2bc1f13bf88163f9cc55849031155 100644
+index eac88fdb3c9184e9c0d3500c62fbc34958bfcb47..1463d210656c801f8da89d8a2060680684e9c46e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -498,7 +498,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0743-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0742-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0743-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0742-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0744-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0744-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0745-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0744-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0745-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0744-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0746-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0745-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0746-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0745-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0747-Preserve-overstacked-loot.patch b/patches/server/0746-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0747-Preserve-overstacked-loot.patch
rename to patches/server/0746-Preserve-overstacked-loot.patch
diff --git a/patches/server/0748-Update-head-rotation-in-missing-places.patch b/patches/server/0747-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0748-Update-head-rotation-in-missing-places.patch
rename to patches/server/0747-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0749-prevent-unintended-light-block-manipulation.patch b/patches/server/0748-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0749-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0748-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0750-Fix-CraftCriteria-defaults-map.patch b/patches/server/0749-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0750-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0749-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0751-Fix-upstreams-block-state-factories.patch b/patches/server/0750-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0751-Fix-upstreams-block-state-factories.patch
rename to patches/server/0750-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0752-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0751-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0752-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0751-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0753-Configurable-feature-seeds.patch b/patches/server/0752-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0753-Configurable-feature-seeds.patch
rename to patches/server/0752-Configurable-feature-seeds.patch
diff --git a/patches/server/0754-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0754-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0755-Add-root-admin-user-detection.patch b/patches/server/0754-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0755-Add-root-admin-user-detection.patch
rename to patches/server/0754-Add-root-admin-user-detection.patch
diff --git a/patches/server/0756-Always-allow-item-changing-in-Fireball.patch b/patches/server/0755-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0756-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0755-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0757-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0756-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0757-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0756-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0758-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0758-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0759-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0759-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0760-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0760-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0761-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0760-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0761-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0760-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0762-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0762-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0763-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0763-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0764-Fix-Spigot-growth-modifiers.patch b/patches/server/0763-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0764-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0763-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0765-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0765-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0766-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0765-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0766-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0765-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0767-Add-player-health-update-API.patch b/patches/server/0766-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0767-Add-player-health-update-API.patch
rename to patches/server/0766-Add-player-health-update-API.patch
diff --git a/patches/server/0768-Optimize-HashMapPalette.patch b/patches/server/0767-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0768-Optimize-HashMapPalette.patch
rename to patches/server/0767-Optimize-HashMapPalette.patch
diff --git a/patches/server/0769-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0769-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index f9b2b0bde..4053b40c4 100644
--- a/patches/server/0770-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e761e01a02e2bc1f13bf88163f9cc55849031155..fd785c88b4e269fde577eb7abab3dc1c46365f1f 100644
+index 1463d210656c801f8da89d8a2060680684e9c46e..dbd0f0be3c0aaa55fa52f84e557d6a1e29c1146b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -408,7 +408,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0771-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0771-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch
index 529611581..3637b95a0 100644
--- a/patches/server/0771-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1d024bfbada440c93b1174568feaa67544f7f0d2..f5a2299e43e4e7863aff9f0fb5ed1773b1330c7a 100644
+index 2db7071d80a2d288d864ae32f250435d63b5ac45..1962550a1d8ca5302025438d95e1e50eeb3e2f68 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -655,7 +655,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0772-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0772-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0773-Update-Log4j.patch b/patches/server/0772-Update-Log4j.patch
similarity index 100%
rename from patches/server/0773-Update-Log4j.patch
rename to patches/server/0772-Update-Log4j.patch
diff --git a/patches/server/0774-Add-more-Campfire-API.patch b/patches/server/0773-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0774-Add-more-Campfire-API.patch
rename to patches/server/0773-Add-more-Campfire-API.patch
diff --git a/patches/server/0775-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0775-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0776-Fix-tripwire-state-inconsistency.patch b/patches/server/0775-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0776-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0775-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0777-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0777-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0778-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0777-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0778-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0777-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0779-Improve-scoreboard-entries.patch b/patches/server/0778-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0779-Improve-scoreboard-entries.patch
rename to patches/server/0778-Improve-scoreboard-entries.patch
diff --git a/patches/server/0780-Entity-powdered-snow-API.patch b/patches/server/0779-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0780-Entity-powdered-snow-API.patch
rename to patches/server/0779-Entity-powdered-snow-API.patch
diff --git a/patches/server/0781-Add-API-for-item-entity-health.patch b/patches/server/0780-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0781-Add-API-for-item-entity-health.patch
rename to patches/server/0780-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0782-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0782-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0783-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0782-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0783-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0782-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0784-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0784-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0785-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0785-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0786-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0786-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0787-Fix-bees-aging-inside-hives.patch b/patches/server/0786-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0787-Fix-bees-aging-inside-hives.patch
rename to patches/server/0786-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0788-Bucketable-API.patch b/patches/server/0787-Bucketable-API.patch
similarity index 100%
rename from patches/server/0788-Bucketable-API.patch
rename to patches/server/0787-Bucketable-API.patch
diff --git a/patches/server/0789-Validate-usernames.patch b/patches/server/0788-Validate-usernames.patch
similarity index 100%
rename from patches/server/0789-Validate-usernames.patch
rename to patches/server/0788-Validate-usernames.patch
diff --git a/patches/server/0790-Make-water-animal-spawn-height-configurable.patch b/patches/server/0789-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0790-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0789-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0791-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0791-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index ec28493f6..63a0b0141 100644
--- a/patches/server/0791-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index ed3f27e605a6d9454953a6fd8b0e784b1b89acf3..94961c271b4fc1b8b2b6c4d35e9c2ac6
              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 4fcd36e6c0ad99575917962fbd1353f509383482..0e5a375b25a647e26e47aacc87d2db899da5d520 100644
+index 80abef83b4b2533fdc50773d4d76c3c6af662df1..579fd470e6198a5caefaaf815510ca1f78325f68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -200,6 +200,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0792-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0792-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0793-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0793-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0794-Multiple-Entries-with-Scoreboards.patch b/patches/server/0793-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0794-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0793-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0795-Reset-placed-block-on-exception.patch b/patches/server/0794-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0795-Reset-placed-block-on-exception.patch
rename to patches/server/0794-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0796-Add-configurable-height-for-slime-spawn.patch b/patches/server/0795-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0796-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0795-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0797-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0797-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0798-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0797-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0798-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0797-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0799-Kick-on-main-for-illegal-chat.patch b/patches/server/0798-Kick-on-main-for-illegal-chat.patch
similarity index 97%
rename from patches/server/0799-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0798-Kick-on-main-for-illegal-chat.patch
index 054da6947..565db94e1 100644
--- a/patches/server/0799-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0798-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f5a2299e43e4e7863aff9f0fb5ed1773b1330c7a..b82d6ebb30c0fdc49f21d993c6a1affbecc27af7 100644
+index 1962550a1d8ca5302025438d95e1e50eeb3e2f68..f138aef5182724aaa87d526172cacb9cc248006f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2175,7 +2175,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0800-Multi-Block-Change-API-Implementation.patch b/patches/server/0799-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0800-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0799-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0801-Fix-NotePlayEvent.patch b/patches/server/0800-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0801-Fix-NotePlayEvent.patch
rename to patches/server/0800-Fix-NotePlayEvent.patch
diff --git a/patches/server/0802-Freeze-Tick-Lock-API.patch b/patches/server/0801-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0802-Freeze-Tick-Lock-API.patch
rename to patches/server/0801-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0803-Dolphin-API.patch b/patches/server/0802-Dolphin-API.patch
similarity index 100%
rename from patches/server/0803-Dolphin-API.patch
rename to patches/server/0802-Dolphin-API.patch
diff --git a/patches/server/0804-More-PotionEffectType-API.patch b/patches/server/0803-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0804-More-PotionEffectType-API.patch
rename to patches/server/0803-More-PotionEffectType-API.patch
diff --git a/patches/server/0805-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0805-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0806-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0806-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0807-Add-missing-structure-set-seed-configs.patch b/patches/server/0806-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0807-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0806-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0808-Implement-regenerateChunk.patch b/patches/server/0807-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0808-Implement-regenerateChunk.patch
rename to patches/server/0807-Implement-regenerateChunk.patch
index 3c341b549..b37120e7a 100644
--- a/patches/server/0808-Implement-regenerateChunk.patch
+++ b/patches/server/0807-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 0e5a375b25a647e26e47aacc87d2db899da5d520..7251506312f96873de4d70231eb0c211dcc16fd0 100644
+index 579fd470e6198a5caefaaf815510ca1f78325f68..439a360c351f0d82245ee7703f7d0bf48a29c2fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -139,6 +139,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0809-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0809-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0810-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0810-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0811-Add-GameEvent-tags.patch b/patches/server/0810-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0811-Add-GameEvent-tags.patch
rename to patches/server/0810-Add-GameEvent-tags.patch
diff --git a/patches/server/0812-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0812-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0813-Furnace-RecipesUsed-API.patch b/patches/server/0812-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0813-Furnace-RecipesUsed-API.patch
rename to patches/server/0812-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0814-Configurable-sculk-sensor-listener-range.patch b/patches/server/0813-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0814-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0813-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0815-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0814-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0815-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0814-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0816-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0816-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0817-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0817-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0818-Fix-Entity-Position-Desync.patch b/patches/server/0817-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0818-Fix-Entity-Position-Desync.patch
rename to patches/server/0817-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0819-Custom-Potion-Mixes.patch b/patches/server/0818-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0819-Custom-Potion-Mixes.patch
rename to patches/server/0818-Custom-Potion-Mixes.patch
diff --git a/patches/server/0820-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0819-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0820-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0819-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0821-Force-close-world-loading-screen.patch b/patches/server/0820-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0821-Force-close-world-loading-screen.patch
rename to patches/server/0820-Force-close-world-loading-screen.patch
diff --git a/patches/server/0822-Fix-falling-block-spawn-methods.patch b/patches/server/0821-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0822-Fix-falling-block-spawn-methods.patch
rename to patches/server/0821-Fix-falling-block-spawn-methods.patch
index e217bea0a..c3e296a6a 100644
--- a/patches/server/0822-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0821-Fix-falling-block-spawn-methods.patch
@@ -21,7 +21,7 @@ index d1fca0e3227b5f37c11367548be362f5a49b6a71..5628940cd3c3566c5db2beda506d4f20
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7251506312f96873de4d70231eb0c211dcc16fd0..10c57995a65980a37ab9bd601332686a9ba97482 100644
+index 439a360c351f0d82245ee7703f7d0bf48a29c2fa..1aa28195d2d2ef466764a162891c232f99b678e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1395,7 +1395,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0823-Expose-furnace-minecart-push-values.patch b/patches/server/0822-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0823-Expose-furnace-minecart-push-values.patch
rename to patches/server/0822-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0824-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0824-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0825-More-Projectile-API.patch b/patches/server/0824-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0825-More-Projectile-API.patch
rename to patches/server/0824-More-Projectile-API.patch
diff --git a/patches/server/0826-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0826-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0827-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0827-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 77c8b0c11..e445bd19d 100644
--- a/patches/server/0827-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0826-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 b82d6ebb30c0fdc49f21d993c6a1affbecc27af7..cf3f9d225e4c4114fd14979ac5f7bf8ea45c3765 100644
+index f138aef5182724aaa87d526172cacb9cc248006f..c29e3d867a4a4ed30a075c07cfafc58d21b6e709 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -585,6 +585,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0828-Implement-getComputedBiome-API.patch b/patches/server/0827-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0828-Implement-getComputedBiome-API.patch
rename to patches/server/0827-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0829-Make-some-itemstacks-nonnull.patch b/patches/server/0828-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0829-Make-some-itemstacks-nonnull.patch
rename to patches/server/0828-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0830-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0830-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0831-Implement-enchantWithLevels-API.patch b/patches/server/0830-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0831-Implement-enchantWithLevels-API.patch
rename to patches/server/0830-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0832-Fix-saving-in-unloadWorld.patch b/patches/server/0831-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0832-Fix-saving-in-unloadWorld.patch
rename to patches/server/0831-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0833-Buffer-OOB-setBlock-calls.patch b/patches/server/0832-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0833-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0832-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0834-Add-TameableDeathMessageEvent.patch b/patches/server/0833-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0834-Add-TameableDeathMessageEvent.patch
rename to patches/server/0833-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0835-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0835-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0836-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 92%
rename from patches/server/0836-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 80926e82e..69f3bac97 100644
--- a/patches/server/0836-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0835-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 fd785c88b4e269fde577eb7abab3dc1c46365f1f..566da3ef03bd866762d02a7240b92b4f36d793c9 100644
+index dbd0f0be3c0aaa55fa52f84e557d6a1e29c1146b..58d17cc0c5ba5093fe306c8a1514c27f355f49ae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -846,12 +846,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0837-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0837-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0838-Guard-against-invalid-entity-positions.patch b/patches/server/0837-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0838-Guard-against-invalid-entity-positions.patch
rename to patches/server/0837-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0839-cache-resource-keys.patch b/patches/server/0838-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0839-cache-resource-keys.patch
rename to patches/server/0838-cache-resource-keys.patch
diff --git a/patches/server/0840-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0840-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0841-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0841-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0842-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0842-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0843-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0843-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0844-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0844-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0845-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0845-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0846-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0846-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0847-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0847-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0848-WorldCreator-keepSpawnLoaded.patch b/patches/server/0847-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0848-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0847-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0849-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0849-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0850-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0850-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0851-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0851-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0852-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0852-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0853-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0853-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0854-Add-PlayerStopUsingItemEvent.patch b/patches/server/0853-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0854-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0853-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0855-FallingBlock-auto-expire-setting.patch b/patches/server/0854-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0855-FallingBlock-auto-expire-setting.patch
rename to patches/server/0854-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0856-Don-t-tick-markers.patch b/patches/server/0855-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0856-Don-t-tick-markers.patch
rename to patches/server/0855-Don-t-tick-markers.patch
diff --git a/patches/server/0857-Do-not-accept-invalid-client-settings.patch b/patches/server/0856-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0857-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0856-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0858-Add-support-for-Proxy-Protocol.patch b/patches/server/0857-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0858-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0857-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0859-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0859-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0860-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0860-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0861-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0860-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0861-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0860-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0862-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0861-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0862-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0861-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0863-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0862-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0863-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0862-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0864-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0864-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0865-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0864-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0865-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0864-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0866-Dont-resent-entity-on-art-update.patch b/patches/server/0865-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0866-Dont-resent-entity-on-art-update.patch
rename to patches/server/0865-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0867-Add-missing-spawn-eggs.patch b/patches/server/0866-Add-missing-spawn-eggs.patch
similarity index 100%
rename from patches/server/0867-Add-missing-spawn-eggs.patch
rename to patches/server/0866-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0868-Add-WardenAngerChangeEvent.patch b/patches/server/0867-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0868-Add-WardenAngerChangeEvent.patch
rename to patches/server/0867-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0869-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 90%
rename from patches/server/0869-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch
index 618757ad5..8ac83721d 100644
--- a/patches/server/0869-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch
@@ -11,10 +11,10 @@ distance trigger. This adds a config option to ignore that
 and use the exact dimension key of the worlds involved.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 566da3ef03bd866762d02a7240b92b4f36d793c9..b40200993fa1aea187c7d5c0d7e5f28477288f62 100644
+index 58d17cc0c5ba5093fe306c8a1514c27f355f49ae..20f29f0570ceb077dbd92f19b27f36f2fdc925ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1236,6 +1236,12 @@ public class ServerPlayer extends Player {
+@@ -1238,6 +1238,12 @@ public class ServerPlayer extends Player {
          // CraftBukkit start
          ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
          ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level);
diff --git a/patches/server/0870-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0869-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0870-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0869-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0871-Nameable-Banner-API.patch b/patches/server/0870-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0871-Nameable-Banner-API.patch
rename to patches/server/0870-Nameable-Banner-API.patch
diff --git a/patches/server/0872-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0872-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0873-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0872-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0873-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0872-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0874-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0874-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0875-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 94%
rename from patches/server/0875-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch
index e39a50872..f22ef382f 100644
--- a/patches/server/0875-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a7fe72d745625951172a8fdf9a4689b5bf540445..ac08f538087465b383f6127ae3d908fec29d765f 100644
+index a630bc98e5cfb82c1a706214344c4d73d9fc6c1a..e156be2e21e7df4fffc841dd0451dae0cf9ab57b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2049,7 +2049,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0876-Add-Player-getFishHook.patch b/patches/server/0875-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0876-Add-Player-getFishHook.patch
rename to patches/server/0875-Add-Player-getFishHook.patch
diff --git a/patches/server/0877-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0877-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0878-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0878-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0879-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 95%
rename from patches/server/0879-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 2cbecbfbe..efcec77cc 100644
--- a/patches/server/0879-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ac08f538087465b383f6127ae3d908fec29d765f..2d924260b76fd77413d125a009773e4d3620a51f 100644
+index e156be2e21e7df4fffc841dd0451dae0cf9ab57b..0e803b7ee309190ebb3878df477feda190638208 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2298,7 +2298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0880-Fix-Bee-flower-NPE.patch b/patches/server/0879-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0880-Fix-Bee-flower-NPE.patch
rename to patches/server/0879-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0881-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0881-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 90422ebe0..120e3881e 100644
--- a/patches/server/0881-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0880-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 2d924260b76fd77413d125a009773e4d3620a51f..421d7e28370085dffa415d71d4e28d3c4d38ac87 100644
+index 0e803b7ee309190ebb3878df477feda190638208..4c9fc7d60ca5fc9fd65843947a4f2beb2d1acc97 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2589,7 +2589,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0882-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0882-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0883-More-Teleport-API.patch b/patches/server/0882-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0883-More-Teleport-API.patch
rename to patches/server/0882-More-Teleport-API.patch
index 36acf9cea..00e1ac2dc 100644
--- a/patches/server/0883-More-Teleport-API.patch
+++ b/patches/server/0882-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 421d7e28370085dffa415d71d4e28d3c4d38ac87..92617a19fb328320e17b58956cf0276d5a08325b 100644
+index 4c9fc7d60ca5fc9fd65843947a4f2beb2d1acc97..525183cd9b6b3a75eff3ff2512c686cca89bfa8a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1729,11 +1729,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0884-Add-EntityPortalReadyEvent.patch b/patches/server/0883-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0884-Add-EntityPortalReadyEvent.patch
rename to patches/server/0883-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0885-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0884-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0885-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0884-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0886-Send-block-entities-after-destroy-prediction.patch b/patches/server/0885-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0886-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0885-Send-block-entities-after-destroy-prediction.patch
index 0d7cf4345..1dc2010d6 100644
--- a/patches/server/0886-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0885-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 9378e83a67a70dbb1fb4f05b33f1e553d008e62b..5a60f5dc202c44b06ca34e9a19d45cb7
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 92617a19fb328320e17b58956cf0276d5a08325b..e88c82aac6d9947c7205f865c18146e7a5756b40 100644
+index 525183cd9b6b3a75eff3ff2512c686cca89bfa8a..e2310de1152e56ab51bff144e6c32cd4d74798a9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1874,8 +1874,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0887-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 98%
rename from patches/server/0887-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch
index bd796458d..d73136cc0 100644
--- a/patches/server/0887-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -18,7 +18,7 @@ index cd6edd02da99ef0e53d5cf451e037a591b4f585a..596fb8ee21ba8450db13a11890d241ef
  
      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 532727b69f8af7351e78c428a06b7c8d13990ab5..81ab184cb5235913ef43ae4d7f1ac82bce927519 100644
+index 5fcea8546b574a6fc91502c0674ab8f9389c7cf3..55d83a9a691d11c9408d2c3260c3e77dfb51b97e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -313,9 +313,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0888-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0887-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0888-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0887-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0889-Add-missing-BlockFadeEvents.patch b/patches/server/0888-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0889-Add-missing-BlockFadeEvents.patch
rename to patches/server/0888-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0890-Collision-API.patch b/patches/server/0889-Collision-API.patch
similarity index 100%
rename from patches/server/0890-Collision-API.patch
rename to patches/server/0889-Collision-API.patch
diff --git a/patches/server/0891-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0891-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0892-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch
similarity index 96%
rename from patches/server/0892-Fix-command-preprocess-cancelling-and-command-changi.patch
rename to patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch
index 6a4d1cbe4..abb42e37a 100644
--- a/patches/server/0892-Fix-command-preprocess-cancelling-and-command-changi.patch
+++ b/patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix command preprocess cancelling and command changing
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e88c82aac6d9947c7205f865c18146e7a5756b40..8ae8055c185237a76159285c8fce3aacc295fb3b 100644
+index e2310de1152e56ab51bff144e6c32cd4d74798a9..334690049d7b74f4b001a2b1421e39a737534656 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2259,13 +2259,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0893-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0892-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0893-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0892-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0894-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 91%
rename from patches/server/0894-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 6ebf299ac..28566014f 100644
--- a/patches/server/0894-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8ae8055c185237a76159285c8fce3aacc295fb3b..8a35db69e986c393bf56ae556ea28adff91da08d 100644
+index 334690049d7b74f4b001a2b1421e39a737534656..602f78652d4e4df265e844fec4450e10443dd087 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1757,6 +1757,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0895-Block-Ticking-API.patch b/patches/server/0894-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0895-Block-Ticking-API.patch
rename to patches/server/0894-Block-Ticking-API.patch
diff --git a/patches/server/0896-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0896-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0897-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0897-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0898-Add-NamespacedKey-biome-methods.patch b/patches/server/0897-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0898-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0897-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0899-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0898-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0899-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0898-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0900-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 98%
rename from patches/server/0900-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch
index 0c84412be..15a6fed34 100644
--- a/patches/server/0900-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch
@@ -16,7 +16,7 @@ Co-authored-by: =?UTF-8?q?Dani=C3=ABl=20Goossens?= <daniel@goossens.ch>
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 43466ce2b9ce583a5af067937ce9c47f7635f56d..9ad7c417616e68b1d14a702aca38b2582feb896c 100644
+index b9143dd8454eb3b1d628188ea11c73dec4fac949..d1edafb3e44a4d17586e0e9c4fca30389b529074 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1328,6 +1328,46 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0901-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0901-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0902-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0902-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0903-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0903-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0904-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0904-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0905-Missing-eating-regain-reason.patch b/patches/server/0904-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0905-Missing-eating-regain-reason.patch
rename to patches/server/0904-Missing-eating-regain-reason.patch
diff --git a/patches/server/0906-Missing-effect-cause.patch b/patches/server/0905-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0906-Missing-effect-cause.patch
rename to patches/server/0905-Missing-effect-cause.patch
diff --git a/patches/server/0907-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0906-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0907-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0906-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0908-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0908-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0909-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0908-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0909-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0908-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0910-Configurable-chat-thread-limit.patch b/patches/server/0909-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0910-Configurable-chat-thread-limit.patch
rename to patches/server/0909-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0911-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0911-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0912-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 92%
rename from patches/server/0912-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch
index 4965b9904..c1c4dd141 100644
--- a/patches/server/0912-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch
@@ -7,7 +7,7 @@ This causes a moment where the player entity is sent with the previous location,
 teleport packet which is sent shortly after is meant to correct that.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b40200993fa1aea187c7d5c0d7e5f28477288f62..59629d81f9a767fabf9f641bc9b1200be722ddb6 100644
+index 20f29f0570ceb077dbd92f19b27f36f2fdc925ed..21caac15a397bcbd5a170d71ace21dabd53f6694 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1141,6 +1141,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0913-fix-Jigsaw-block-kicking-user.patch b/patches/server/0912-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0913-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0912-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0914-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0914-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0915-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0915-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0916-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0915-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0916-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0915-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0917-Fix-nothing-mlg.patch b/patches/server/0916-Fix-nothing-mlg.patch
similarity index 95%
rename from patches/server/0917-Fix-nothing-mlg.patch
rename to patches/server/0916-Fix-nothing-mlg.patch
index b3405c25b..fbb19bc11 100644
--- a/patches/server/0917-Fix-nothing-mlg.patch
+++ b/patches/server/0916-Fix-nothing-mlg.patch
@@ -19,7 +19,7 @@ doCheckFallDamage method is meant to be called repeatedly anyway.
 Mojira-ID: MC-255653
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8a35db69e986c393bf56ae556ea28adff91da08d..9ad36447e82a3504576f6c10cb297514a2f69289 100644
+index 602f78652d4e4df265e844fec4450e10443dd087..4ab50df1e4c855587ef030cf3f2a1502798cb721 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1564,6 +1564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0918-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0918-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0919-Fix-custom-piglin-loved-items.patch b/patches/server/0918-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0919-Fix-custom-piglin-loved-items.patch
rename to patches/server/0918-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0920-EntityPickupItemEvent-fixes.patch b/patches/server/0919-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0920-EntityPickupItemEvent-fixes.patch
rename to patches/server/0919-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0921-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0921-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0922-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0921-Add-PlayerInventorySlotChangeEvent.patch
similarity index 97%
rename from patches/server/0922-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0921-Add-PlayerInventorySlotChangeEvent.patch
index 65dbba202..3993721d6 100644
--- a/patches/server/0922-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0921-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 59629d81f9a767fabf9f641bc9b1200be722ddb6..5819e8e5e3c6f87eb123cf16091ea74357d53b3b 100644
+index 21caac15a397bcbd5a170d71ace21dabd53f6694..3b122f521c166253f20d233c0fcebdede6660be5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -318,6 +318,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0923-Elder-Guardian-appearance-API.patch b/patches/server/0922-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0923-Elder-Guardian-appearance-API.patch
rename to patches/server/0922-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0924-Allow-changing-bed-s-occupied-property.patch b/patches/server/0923-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0924-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0923-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0925-Add-entity-knockback-API.patch b/patches/server/0924-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0925-Add-entity-knockback-API.patch
rename to patches/server/0924-Add-entity-knockback-API.patch
diff --git a/patches/server/0926-Detect-headless-JREs.patch b/patches/server/0925-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0926-Detect-headless-JREs.patch
rename to patches/server/0925-Detect-headless-JREs.patch
diff --git a/patches/server/0927-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0926-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0927-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0926-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0928-optimized-dirt-and-snow-spreading.patch b/patches/server/0927-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0928-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0927-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0929-Added-EntityToggleSitEvent.patch b/patches/server/0928-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0929-Added-EntityToggleSitEvent.patch
rename to patches/server/0928-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0930-Add-fire-tick-delay-option.patch b/patches/server/0929-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0930-Add-fire-tick-delay-option.patch
rename to patches/server/0929-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0931-Add-Moving-Piston-API.patch b/patches/server/0930-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0931-Add-Moving-Piston-API.patch
rename to patches/server/0930-Add-Moving-Piston-API.patch
diff --git a/patches/server/0932-Ignore-impossible-spawn-tick.patch b/patches/server/0931-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0932-Ignore-impossible-spawn-tick.patch
rename to patches/server/0931-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0933-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0933-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0934-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0934-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0935-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0935-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0936-Prevent-compass-from-loading-chunks.patch b/patches/server/0935-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0936-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0935-Prevent-compass-from-loading-chunks.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f43634ae4..300e7448f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f43634ae431d1ba7ee959627ee295417fe08b067
+Subproject commit 300e7448f5f0466e23b97d69aa424629c816fc8e